From a31f4148af338cec13afa8805e3a15de82f42d12 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Wed, 20 Nov 2013 08:30:31 -0800
Subject: [PATCH 0001/1100] Initial commit

---
 LICENSE   | 20 ++++++++++++++++++++
 README.md |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..5387be979f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Drifty
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..00cc6c4f0b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+ionic-cli
+=========
+
+The Ionic Framework command line utility

From f462e727f27dea9272e0bfba2146877aa52f0b40 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 10:34:52 -0600
Subject: [PATCH 0002/1100] Inital commit

---
 ionic.js            |  90 ++++++++++++++++++++++++++
 lib/ionic/start.js  |  58 +++++++++++++++++
 lib/ionic/task.js   |  21 ++++++
 npm-debug.log       | 154 ++++++++++++++++++++++++++++++++++++++++++++
 package.json        |  18 ++++++
 template/index.html |   0
 template/t          |   0
 7 files changed, 341 insertions(+)
 create mode 100644 ionic.js
 create mode 100644 lib/ionic/start.js
 create mode 100644 lib/ionic/task.js
 create mode 100644 npm-debug.log
 create mode 100644 package.json
 create mode 100644 template/index.html
 create mode 100644 template/t

diff --git a/ionic.js b/ionic.js
new file mode 100644
index 0000000000..5585912d22
--- /dev/null
+++ b/ionic.js
@@ -0,0 +1,90 @@
+/*
+   __          __  
+| /  \ |\ | | /  ` 
+| \__/ | \| | \__, 
+
+http://ionicframework.com/
+
+A utility for starting and administering Ionic based mobile app projects.
+Licensed under the MITlicense. See LICENSE For more.
+
+Copyright 2013 Drifty (http://drifty.com/)
+*/
+                   
+var IonicStartTask = require('./lib/ionic/start.js').IonicStartTask;
+
+var argv = require('optimist').argv;
+
+var TASKS = [
+  {
+    title: 'start',
+    name: 'start',
+    usage: 'appname',
+    task: IonicStartTask
+  }
+];
+
+Ionic = function() {};
+
+Ionic.prototype = {
+  _tryBuildingTask: function() {
+    if(argv._.length == 0) {
+      return false;
+    }
+    var taskName = argv._[0];
+
+    return this._getTaskWithName(taskName);
+  },
+
+  _getTaskWithName: function(name) {
+    for(var i = 0; i < TASKS.length; i++) {
+      var t = TASKS[i];
+      if(t.name === name) {
+        return t;
+      }
+    }
+  },
+
+  _printGenericUsage: function() {
+    this._printIonic();
+    process.stderr.write('Usage: ionic task args\n\n===============\n\nAvailable tasks:\n\n');
+
+    for(var i = 0; i < TASKS.length; i++) {
+      var task = TASKS[i];
+      process.stderr.write('  ' + task.name + '\t\t' + task.task.HELP_LINE + '\n');
+    }
+
+    process.exit(1);
+  },
+
+  _printIonic: function() {
+    process.stdout.write('\n   __          __  \n');
+    process.stdout.write('| /  \\ |\\ | | /  `\n' + '| \\__/ | \\| | \\__,\n\n');
+  },
+
+  _loadTaskRunner: function(which) {
+
+  },
+
+  run: function() {
+    var task = this._tryBuildingTask();
+    if(!task) {
+      return this._printGenericUsage();
+    }
+
+    console.log('Running', task.title, 'task...')
+
+    var taskObj = new task.task();
+    taskObj.run(this);
+  },
+
+  fail: function(msg) {
+    process.stderr.write(msg + '\n');
+    process.exit(1);
+  },
+
+};
+
+
+var ionic = new Ionic();
+ionic.run();
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
new file mode 100644
index 0000000000..e6904f76e0
--- /dev/null
+++ b/lib/ionic/start.js
@@ -0,0 +1,58 @@
+var fs = require('fs'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    IonicTask = require('./task').IonicTask;
+
+var argv = require('optimist').argv;
+
+var IonicStartTask = function() {
+}
+
+IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
+
+IonicStartTask.prototype = new IonicTask();
+
+IonicStartTask.prototype._printUsage = function() {
+  process.stderr.write('ionic start appname\n');
+}
+
+IonicStartTask.prototype.run = function(ionic) {
+  if(argv._.length < 2) {
+    ionic.fail('No app name specified');
+  }
+
+  this.appName = argv._[1];
+  this.targetPath = path.resolve(this.appName);
+
+  // Make sure to create this, or ask them if they want to override it
+  if(this._checkTargetPath() === false) {
+    process.stderr.write('Not continuing.');
+    process.exit(1);
+  }
+
+  console.log('Creating Ionic app in folder', this.targetPath);
+
+  this._writeTemplateFolder();
+};
+
+IonicStartTask.prototype._writeTemplateFolder = function() {
+  console.log('Copying template to', this.targetPath);
+  ncp('template', this.appName, function(err) {
+    if(err) {
+      this._fail('Unable to build starter folder', err);
+    }
+  });
+};
+
+IonicStartTask.prototype._checkTargetPath = function() { 
+  if(fs.existsSync(this.targetPath)) {
+    var resp = this.ask('The ' + this.targetPath + ' directory already exists. Overwrite files? (y/n)')
+    if(resp === 'y') {
+      return true;
+    }
+    return false;
+  }
+  return true;
+};
+
+exports.IonicStartTask = IonicStartTask;
\ No newline at end of file
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
new file mode 100644
index 0000000000..20b74b4c1f
--- /dev/null
+++ b/lib/ionic/task.js
@@ -0,0 +1,21 @@
+var fs = require('fs');
+
+var IonicTask = function() {
+};
+
+IonicTask.prototype = {
+  // Prompt the user for a response
+  ask: function(question) {
+    var response;
+
+    process.stdout.write(question + ' ');
+    process.stdin.resume();
+    response = fs.readSync(process.stdin.fd, 100, 0, "utf8");
+    process.stdin.pause();
+    return response[0].trim();
+  },
+  run: function(ionic) {
+  }
+};
+
+exports.IonicTask = IonicTask;
\ No newline at end of file
diff --git a/npm-debug.log b/npm-debug.log
new file mode 100644
index 0000000000..aee84a0a4b
--- /dev/null
+++ b/npm-debug.log
@@ -0,0 +1,154 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'node', '/usr/local/bin/npm', 'publish' ]
+2 info using npm@1.2.32
+3 info using node@v0.10.12
+4 verbose publish [ '.' ]
+5 verbose read json /Users/driftyadmin/git/ionic/tools/ionic/package.json
+6 warn package.json ionic@0.9.05 No repository field.
+7 warn package.json ionic@0.9.05 No readme data.
+8 verbose cache add [ '.', null ]
+9 verbose cache add name=undefined spec="." args=[".",null]
+10 verbose parsed url { protocol: null,
+10 verbose parsed url   slashes: null,
+10 verbose parsed url   auth: null,
+10 verbose parsed url   host: null,
+10 verbose parsed url   port: null,
+10 verbose parsed url   hostname: null,
+10 verbose parsed url   hash: null,
+10 verbose parsed url   search: null,
+10 verbose parsed url   query: null,
+10 verbose parsed url   pathname: '.',
+10 verbose parsed url   path: '.',
+10 verbose parsed url   href: '.' }
+11 silly lockFile 3a52ce78- .
+12 verbose lock . /Users/driftyadmin/.npm/3a52ce78-.lock
+13 verbose read json package.json
+14 verbose tar pack [ '/var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz',
+14 verbose tar pack   '.' ]
+15 verbose tarball /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+16 verbose folder .
+17 info prepublish ionic@0.9.05
+18 silly lockFile 1f1177db-tar tar://.
+19 verbose lock tar://. /Users/driftyadmin/.npm/1f1177db-tar.lock
+20 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+21 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz /Users/driftyadmin/.npm/74dec091-97226-0-8251332442741841-tmp-tgz.lock
+22 silly lockFile 1f1177db-tar tar://.
+23 silly lockFile 1f1177db-tar tar://.
+24 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+25 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+26 verbose tar unpack /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+27 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+28 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package /Users/driftyadmin/.npm/c4b8a2e3-97226-0-8251332442741841-package.lock
+29 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+30 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz /Users/driftyadmin/.npm/74dec091-97226-0-8251332442741841-tmp-tgz.lock
+31 silly gunzTarPerm modes [ '755', '644' ]
+32 silly gunzTarPerm extractEntry package.json
+33 silly gunzTarPerm extractEntry ionic.js
+34 silly gunzTarPerm extractEntry lib/ionic/start.js
+35 silly gunzTarPerm extractEntry lib/ionic/task.js
+36 silly gunzTarPerm extractEntry template/index.html
+37 silly gunzTarPerm extractEntry template/t
+38 verbose read json /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package/package.json
+39 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+40 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+41 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+42 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
+43 verbose from cache /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package/package.json
+44 verbose tar pack [ '/Users/driftyadmin/.npm/ionic/0.9.05/package.tgz',
+44 verbose tar pack   '/var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package' ]
+45 verbose tarball /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+46 verbose folder /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+47 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+48 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package /Users/driftyadmin/.npm/c4b8a2e3-97226-0-8251332442741841-package.lock
+49 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+50 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz /Users/driftyadmin/.npm/be49939d-min-npm-ionic-0-9-05-package-tgz.lock
+51 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+52 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
+53 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+54 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+55 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
+56 verbose lock /Users/driftyadmin/.npm/ionic/0.9.05/package /Users/driftyadmin/.npm/1478df52-tyadmin-npm-ionic-0-9-05-package.lock
+57 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
+58 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
+59 verbose tar unpack /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+60 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
+61 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package /Users/driftyadmin/.npm/ce6e26b9-tyadmin-npm-ionic-0-9-05-package.lock
+62 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+63 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz /Users/driftyadmin/.npm/be49939d-min-npm-ionic-0-9-05-package-tgz.lock
+64 silly gunzTarPerm modes [ '755', '644' ]
+65 silly gunzTarPerm extractEntry package.json
+66 silly gunzTarPerm extractEntry ionic.js
+67 silly gunzTarPerm extractEntry lib/ionic/start.js
+68 silly gunzTarPerm extractEntry lib/ionic/task.js
+69 silly gunzTarPerm extractEntry template/index.html
+70 silly gunzTarPerm extractEntry template/t
+71 verbose read json /Users/driftyadmin/.npm/ionic/0.9.05/package/package.json
+72 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
+73 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
+74 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+75 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
+76 verbose from cache /Users/driftyadmin/.npm/ionic/0.9.05/package/package.json
+77 verbose chmod /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz 644
+78 verbose chown /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz [ 503, 20 ]
+79 silly lockFile 3a52ce78- .
+80 silly lockFile 3a52ce78- .
+81 silly publish { name: 'ionic',
+81 silly publish   version: '0.9.05',
+81 silly publish   preferGlobal: true,
+81 silly publish   description: 'A tool for creating and building Ionic Framework mobile apps.',
+81 silly publish   homepage: 'http://ionicframework.com/',
+81 silly publish   main: 'ionic.js',
+81 silly publish   scripts: { test: 'echo "Error: no test specified" && exit 1' },
+81 silly publish   author: { name: 'Max Lynch', email: 'max@drifty.com' },
+81 silly publish   license: 'MIT',
+81 silly publish   dependencies: { cordova: '>=3.1.0', optimist: '0.0.2', wrench: '1.5.1' },
+81 silly publish   readme: 'ERROR: No README data found!',
+81 silly publish   _id: 'ionic@0.9.05',
+81 silly publish   dist: { shasum: '901fb6f02fcfb8f2944c61b575ba88f70395b720' },
+81 silly publish   _from: '.' }
+82 verbose url raw ionic
+83 verbose url resolving [ 'https://registry.npmjs.org/', './ionic' ]
+84 verbose url resolved https://registry.npmjs.org/ionic
+85 info trying registry request attempt 1 at 10:29:58
+86 http PUT https://registry.npmjs.org/ionic
+87 http 409 https://registry.npmjs.org/ionic
+88 verbose url raw ionic
+89 verbose url resolving [ 'https://registry.npmjs.org/', './ionic' ]
+90 verbose url resolved https://registry.npmjs.org/ionic
+91 info trying registry request attempt 1 at 10:29:58
+92 http GET https://registry.npmjs.org/ionic
+93 http 200 https://registry.npmjs.org/ionic
+94 verbose uploading [ 'ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db',
+94 verbose uploading   '/Users/driftyadmin/.npm/ionic/0.9.05/package.tgz' ]
+95 verbose url raw ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+96 verbose url resolving [ 'https://registry.npmjs.org/',
+96 verbose url resolving   './ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db' ]
+97 verbose url resolved https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+98 info trying registry request attempt 1 at 10:29:59
+99 http PUT https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+100 http 403 https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+101 info trying registry request attempt 1 at 10:29:59
+102 http PUT https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+103 http 403 https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+104 error publish Error uploading package
+105 error Error: forbidden user: drifty not authorized to modify ionic
+105 error Added: _attachments.ionic-0.9.05.tgz: ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
+105 error     at RegClient.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:272:14)
+105 error     at Request.self.callback (/usr/local/lib/node_modules/npm/node_modules/request/index.js:148:22)
+105 error     at Request.EventEmitter.emit (events.js:98:17)
+105 error     at Request.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/index.js:876:14)
+105 error     at Request.EventEmitter.emit (events.js:117:20)
+105 error     at IncomingMessage.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/index.js:827:12)
+105 error     at IncomingMessage.EventEmitter.emit (events.js:117:20)
+105 error     at _stream_readable.js:910:16
+105 error     at process._tickCallback (node.js:415:13)
+106 error If you need help, you may report this log at:
+106 error     <http://github.com/isaacs/npm/issues>
+106 error or email it to:
+106 error     <npm-@googlegroups.com>
+107 error System Darwin 12.5.0
+108 error command "node" "/usr/local/bin/npm" "publish"
+109 error cwd /Users/driftyadmin/git/ionic/tools/ionic
+110 error node -v v0.10.12
+111 error npm -v 1.2.32
+112 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..23b00115a2
--- /dev/null
+++ b/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "ionic",
+  "version": "0.9.05",
+  "preferGlobal": true,
+  "description": "A tool for creating and building Ionic Framework mobile apps.",
+  "homepage": "http://ionicframework.com/",
+  "main": "ionic.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Max Lynch <max@drifty.com>",
+  "license": "MIT",
+  "dependencies": {
+    "cordova": ">=3.1.0",
+    "optimist": "0.0.2",
+    "wrench": "1.5.1"
+  }
+}
diff --git a/template/index.html b/template/index.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/template/t b/template/t
new file mode 100644
index 0000000000..e69de29bb2

From a72f43128adc296cd00fb07a6225942e59c1edcf Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 10:46:41 -0600
Subject: [PATCH 0003/1100] Fixed package.json

---
 .gitignore         |   1 +
 lib/ionic/start.js |   2 +-
 npm-debug.log      | 154 ---------------------------------------------
 package.json       |  14 ++++-
 template/t         |   0
 5 files changed, 15 insertions(+), 156 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 npm-debug.log
 delete mode 100644 template/t

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..1ee84da988
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.sw*
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index e6904f76e0..9e978bdf93 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -55,4 +55,4 @@ IonicStartTask.prototype._checkTargetPath = function() {
   return true;
 };
 
-exports.IonicStartTask = IonicStartTask;
\ No newline at end of file
+exports.IonicStartTask = IonicStartTask;
diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index aee84a0a4b..0000000000
--- a/npm-debug.log
+++ /dev/null
@@ -1,154 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'publish' ]
-2 info using npm@1.2.32
-3 info using node@v0.10.12
-4 verbose publish [ '.' ]
-5 verbose read json /Users/driftyadmin/git/ionic/tools/ionic/package.json
-6 warn package.json ionic@0.9.05 No repository field.
-7 warn package.json ionic@0.9.05 No readme data.
-8 verbose cache add [ '.', null ]
-9 verbose cache add name=undefined spec="." args=[".",null]
-10 verbose parsed url { protocol: null,
-10 verbose parsed url   slashes: null,
-10 verbose parsed url   auth: null,
-10 verbose parsed url   host: null,
-10 verbose parsed url   port: null,
-10 verbose parsed url   hostname: null,
-10 verbose parsed url   hash: null,
-10 verbose parsed url   search: null,
-10 verbose parsed url   query: null,
-10 verbose parsed url   pathname: '.',
-10 verbose parsed url   path: '.',
-10 verbose parsed url   href: '.' }
-11 silly lockFile 3a52ce78- .
-12 verbose lock . /Users/driftyadmin/.npm/3a52ce78-.lock
-13 verbose read json package.json
-14 verbose tar pack [ '/var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz',
-14 verbose tar pack   '.' ]
-15 verbose tarball /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-16 verbose folder .
-17 info prepublish ionic@0.9.05
-18 silly lockFile 1f1177db-tar tar://.
-19 verbose lock tar://. /Users/driftyadmin/.npm/1f1177db-tar.lock
-20 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-21 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz /Users/driftyadmin/.npm/74dec091-97226-0-8251332442741841-tmp-tgz.lock
-22 silly lockFile 1f1177db-tar tar://.
-23 silly lockFile 1f1177db-tar tar://.
-24 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-25 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-26 verbose tar unpack /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-27 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-28 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package /Users/driftyadmin/.npm/c4b8a2e3-97226-0-8251332442741841-package.lock
-29 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-30 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz /Users/driftyadmin/.npm/74dec091-97226-0-8251332442741841-tmp-tgz.lock
-31 silly gunzTarPerm modes [ '755', '644' ]
-32 silly gunzTarPerm extractEntry package.json
-33 silly gunzTarPerm extractEntry ionic.js
-34 silly gunzTarPerm extractEntry lib/ionic/start.js
-35 silly gunzTarPerm extractEntry lib/ionic/task.js
-36 silly gunzTarPerm extractEntry template/index.html
-37 silly gunzTarPerm extractEntry template/t
-38 verbose read json /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package/package.json
-39 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-40 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-41 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-42 silly lockFile 74dec091-97226-0-8251332442741841-tmp-tgz tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/tmp.tgz
-43 verbose from cache /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package/package.json
-44 verbose tar pack [ '/Users/driftyadmin/.npm/ionic/0.9.05/package.tgz',
-44 verbose tar pack   '/var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package' ]
-45 verbose tarball /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-46 verbose folder /var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-47 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-48 verbose lock tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package /Users/driftyadmin/.npm/c4b8a2e3-97226-0-8251332442741841-package.lock
-49 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-50 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz /Users/driftyadmin/.npm/be49939d-min-npm-ionic-0-9-05-package-tgz.lock
-51 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-52 silly lockFile c4b8a2e3-97226-0-8251332442741841-package tar:///var/folders/yc/wb4ct6qn5vl2r6hv8k3mck_w0000gq/T/npm-51998/1384964997226-0.8251332442741841/package
-53 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-54 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-55 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
-56 verbose lock /Users/driftyadmin/.npm/ionic/0.9.05/package /Users/driftyadmin/.npm/1478df52-tyadmin-npm-ionic-0-9-05-package.lock
-57 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
-58 silly lockFile 1478df52-tyadmin-npm-ionic-0-9-05-package /Users/driftyadmin/.npm/ionic/0.9.05/package
-59 verbose tar unpack /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-60 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
-61 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package /Users/driftyadmin/.npm/ce6e26b9-tyadmin-npm-ionic-0-9-05-package.lock
-62 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-63 verbose lock tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz /Users/driftyadmin/.npm/be49939d-min-npm-ionic-0-9-05-package-tgz.lock
-64 silly gunzTarPerm modes [ '755', '644' ]
-65 silly gunzTarPerm extractEntry package.json
-66 silly gunzTarPerm extractEntry ionic.js
-67 silly gunzTarPerm extractEntry lib/ionic/start.js
-68 silly gunzTarPerm extractEntry lib/ionic/task.js
-69 silly gunzTarPerm extractEntry template/index.html
-70 silly gunzTarPerm extractEntry template/t
-71 verbose read json /Users/driftyadmin/.npm/ionic/0.9.05/package/package.json
-72 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
-73 silly lockFile ce6e26b9-tyadmin-npm-ionic-0-9-05-package tar:///Users/driftyadmin/.npm/ionic/0.9.05/package
-74 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-75 silly lockFile be49939d-min-npm-ionic-0-9-05-package-tgz tar:///Users/driftyadmin/.npm/ionic/0.9.05/package.tgz
-76 verbose from cache /Users/driftyadmin/.npm/ionic/0.9.05/package/package.json
-77 verbose chmod /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz 644
-78 verbose chown /Users/driftyadmin/.npm/ionic/0.9.05/package.tgz [ 503, 20 ]
-79 silly lockFile 3a52ce78- .
-80 silly lockFile 3a52ce78- .
-81 silly publish { name: 'ionic',
-81 silly publish   version: '0.9.05',
-81 silly publish   preferGlobal: true,
-81 silly publish   description: 'A tool for creating and building Ionic Framework mobile apps.',
-81 silly publish   homepage: 'http://ionicframework.com/',
-81 silly publish   main: 'ionic.js',
-81 silly publish   scripts: { test: 'echo "Error: no test specified" && exit 1' },
-81 silly publish   author: { name: 'Max Lynch', email: 'max@drifty.com' },
-81 silly publish   license: 'MIT',
-81 silly publish   dependencies: { cordova: '>=3.1.0', optimist: '0.0.2', wrench: '1.5.1' },
-81 silly publish   readme: 'ERROR: No README data found!',
-81 silly publish   _id: 'ionic@0.9.05',
-81 silly publish   dist: { shasum: '901fb6f02fcfb8f2944c61b575ba88f70395b720' },
-81 silly publish   _from: '.' }
-82 verbose url raw ionic
-83 verbose url resolving [ 'https://registry.npmjs.org/', './ionic' ]
-84 verbose url resolved https://registry.npmjs.org/ionic
-85 info trying registry request attempt 1 at 10:29:58
-86 http PUT https://registry.npmjs.org/ionic
-87 http 409 https://registry.npmjs.org/ionic
-88 verbose url raw ionic
-89 verbose url resolving [ 'https://registry.npmjs.org/', './ionic' ]
-90 verbose url resolved https://registry.npmjs.org/ionic
-91 info trying registry request attempt 1 at 10:29:58
-92 http GET https://registry.npmjs.org/ionic
-93 http 200 https://registry.npmjs.org/ionic
-94 verbose uploading [ 'ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db',
-94 verbose uploading   '/Users/driftyadmin/.npm/ionic/0.9.05/package.tgz' ]
-95 verbose url raw ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-96 verbose url resolving [ 'https://registry.npmjs.org/',
-96 verbose url resolving   './ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db' ]
-97 verbose url resolved https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-98 info trying registry request attempt 1 at 10:29:59
-99 http PUT https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-100 http 403 https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-101 info trying registry request attempt 1 at 10:29:59
-102 http PUT https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-103 http 403 https://registry.npmjs.org/ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-104 error publish Error uploading package
-105 error Error: forbidden user: drifty not authorized to modify ionic
-105 error Added: _attachments.ionic-0.9.05.tgz: ionic/-/ionic-0.9.05.tgz/-rev/3-eaa605a9ad6fae3bb8c301e3127943db
-105 error     at RegClient.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:272:14)
-105 error     at Request.self.callback (/usr/local/lib/node_modules/npm/node_modules/request/index.js:148:22)
-105 error     at Request.EventEmitter.emit (events.js:98:17)
-105 error     at Request.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/index.js:876:14)
-105 error     at Request.EventEmitter.emit (events.js:117:20)
-105 error     at IncomingMessage.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/index.js:827:12)
-105 error     at IncomingMessage.EventEmitter.emit (events.js:117:20)
-105 error     at _stream_readable.js:910:16
-105 error     at process._tickCallback (node.js:415:13)
-106 error If you need help, you may report this log at:
-106 error     <http://github.com/isaacs/npm/issues>
-106 error or email it to:
-106 error     <npm-@googlegroups.com>
-107 error System Darwin 12.5.0
-108 error command "node" "/usr/local/bin/npm" "publish"
-109 error cwd /Users/driftyadmin/git/ionic/tools/ionic
-110 error node -v v0.10.12
-111 error npm -v 1.2.32
-112 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
index 23b00115a2..6790582e9b 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,22 @@
 {
-  "name": "ionic",
+  "name": "ionic-framework",
   "version": "0.9.05",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
   "main": "ionic.js",
+  "keywords": [
+    "ionic",
+    "ionic framework",
+    "mobile",
+    "html5",
+    "cordova",
+    "phonegap"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/driftyco/ionic-cli.git"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/template/t b/template/t
deleted file mode 100644
index e69de29bb2..0000000000

From fba2e19291e3132bf52426c4c3f00949ed6ace99 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 10:48:43 -0600
Subject: [PATCH 0004/1100] Updated optimist

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6790582e9b..2b0ea80abb 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "cordova": ">=3.1.0",
-    "optimist": "0.0.2",
+    "optimist": "0.6.0",
     "wrench": "1.5.1"
   }
 }

From cd3f536dcf0ae7208e41edc98f6e875a96377e27 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 11:21:57 -0600
Subject: [PATCH 0005/1100] Updated deps

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2b0ea80abb..f15132d587 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "cordova": ">=3.1.0",
+    "ncp": "0.4.2",
     "optimist": "0.6.0",
     "wrench": "1.5.1"
   }

From ad0748bfb7e0c9c95c8bde1dc22ad9a680e16b0d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 11:28:06 -0600
Subject: [PATCH 0006/1100] Updated git ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1ee84da988..be106cacde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.sw*
+node_modules/

From 21ff99d7b24611d9caa19926b58919d90c633f2d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 11:35:31 -0600
Subject: [PATCH 0007/1100] Created ionic binary:

---
 bin/ionic                | 10 ++++++++++
 ionic.js => lib/ionic.js |  8 +++-----
 package.json             |  4 +++-
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 bin/ionic
 rename ionic.js => lib/ionic.js (91%)

diff --git a/bin/ionic b/bin/ionic
new file mode 100644
index 0000000000..0454b93e1f
--- /dev/null
+++ b/bin/ionic
@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+'use strict';
+
+process.title = 'ionic';
+
+var Ionic = require('../lib/ionic').Ionic;
+
+var ionic = new Ionic();
+ionic.run();
diff --git a/ionic.js b/lib/ionic.js
similarity index 91%
rename from ionic.js
rename to lib/ionic.js
index 5585912d22..8dc4cbcb5c 100644
--- a/ionic.js
+++ b/lib/ionic.js
@@ -6,12 +6,12 @@
 http://ionicframework.com/
 
 A utility for starting and administering Ionic based mobile app projects.
-Licensed under the MITlicense. See LICENSE For more.
+Licensed under the MIT license. See LICENSE For more.
 
 Copyright 2013 Drifty (http://drifty.com/)
 */
                    
-var IonicStartTask = require('./lib/ionic/start.js').IonicStartTask;
+var IonicStartTask = require('./ionic/start.js').IonicStartTask;
 
 var argv = require('optimist').argv;
 
@@ -85,6 +85,4 @@ Ionic.prototype = {
 
 };
 
-
-var ionic = new Ionic();
-ionic.run();
+exports.Ionic = Ionic;
diff --git a/package.json b/package.json
index f15132d587..95cc6d189b 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,9 @@
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
-  "main": "ionic.js",
+  "bin": {
+    "ionic": "bin/ionic"
+  },
   "keywords": [
     "ionic",
     "ionic framework",

From ce657333766b733bba87ba7da08a3fb9b37f1092 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 15:05:16 -0600
Subject: [PATCH 0008/1100] Working start

---
 lib/ionic.js       |  1 +
 lib/ionic/start.js | 73 +++++++++++++++++++++++++++++++++++++++++-----
 package.json       |  5 +++-
 3 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 8dc4cbcb5c..2316f539df 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -54,6 +54,7 @@ Ionic.prototype = {
       process.stderr.write('  ' + task.name + '\t\t' + task.task.HELP_LINE + '\n');
     }
 
+    process.stderr.write('\n');
     process.exit(1);
   },
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9e978bdf93..ec6e01d99a 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,10 +1,32 @@
 var fs = require('fs'),
+    os = require('os'),
+    path = require('path'),
+    request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
     IonicTask = require('./task').IonicTask;
 
 var argv = require('optimist').argv;
 
+fs.mkdirParent = function(dirPath, mode, callback) {
+  //Call the standard fs.mkdir
+  console.log('MKDIR');
+  fs.mkdir(dirPath, mode, function(error) {
+    //When it fail in this way, do the custom steps
+    if (error && error.errno === 34) {
+      //Create all the parents recursively
+      fs.mkdirParent(path.dirname(dirPath), mode, callback);
+      //And then the directory
+      fs.mkdirParent(dirPath, mode, callback);
+    }
+    console.log('MKDIR DONE');
+    //Manually run the callback since we used our own callback to do all these
+    callback && callback(error);
+  });
+};
+
 var IonicStartTask = function() {
 }
 
@@ -18,21 +40,61 @@ IonicStartTask.prototype._printUsage = function() {
 
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No app name specified');
+    ionic.fail('No app name specified, exiting.');
   }
 
+  // Grab the name of the app
   this.appName = argv._[1];
+
+  // Grab the target path from the command line, or use this as the app name
+  var targetPathName = argv._[2] || this.appName;
+
   this.targetPath = path.resolve(this.appName);
 
   // Make sure to create this, or ask them if they want to override it
   if(this._checkTargetPath() === false) {
-    process.stderr.write('Not continuing.');
+    process.stderr.write('Exiting.\n');
     process.exit(1);
   }
 
   console.log('Creating Ionic app in folder', this.targetPath);
 
-  this._writeTemplateFolder();
+  fs.mkdirSync(this.targetPath);
+
+  //this._writeTemplateFolder();
+  this._fetchAndWriteSeed();
+
+};
+
+IonicStartTask.prototype._fetchAndWriteSeed = function() {
+  var _this = this;
+
+  var templateUrl = 'https://github.com/driftyco/ionic-angular-cordova-seed/archive/master.zip' ;
+  console.log('Downloading starter template from', templateUrl);
+
+  var tmpFolder = os.tmpdir();
+  var tempZipFilePath = tmpFolder + 'ionic-angular-cordova-seed' + new Date().getTime() + '.zip';
+  console.log('Writing to', tempZipFilePath);
+  var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
+
+  var unzipRepo = function(fileName) {
+    var readStream = fs.createReadStream(fileName);
+
+    var writeStream = unzip.Extract({ path: _this.targetPath });
+    writeStream.on('close', function() {
+      console.log('END');
+      //fs.renameSync(_this.targetPath + '/' + 'ionic-angular-cordova-seed-master', _this.targetPath + '/app');
+      cp('-R', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', _this.targetPath);
+      rm('-rf', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
+    });
+    readStream.pipe(writeStream);
+  };
+
+  request({ url: templateUrl, encoding: null }, function(err, res, body) {
+    tempZipFileStream.write(body);
+    tempZipFileStream.close();
+    unzipRepo(tempZipFilePath);
+  });
 };
 
 IonicStartTask.prototype._writeTemplateFolder = function() {
@@ -46,10 +108,7 @@ IonicStartTask.prototype._writeTemplateFolder = function() {
 
 IonicStartTask.prototype._checkTargetPath = function() { 
   if(fs.existsSync(this.targetPath)) {
-    var resp = this.ask('The ' + this.targetPath + ' directory already exists. Overwrite files? (y/n)')
-    if(resp === 'y') {
-      return true;
-    }
+    process.stderr.write('The directory ' + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.\n');
     return false;
   }
   return true;
diff --git a/package.json b/package.json
index 95cc6d189b..3c24a5d63d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic-framework",
-  "version": "0.9.05",
+  "version": "0.9.06",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -26,6 +26,9 @@
   "license": "MIT",
   "dependencies": {
     "cordova": ">=3.1.0",
+    "request": "2.27.0",
+    "shelljs": "0.2.6",
+    "unzip": "0.1.9",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
     "wrench": "1.5.1"

From e236311e76dee7c5634ce11ab5c2a42dc07bb06a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 15:06:58 -0600
Subject: [PATCH 0009/1100] Updated debugging message

---
 lib/ionic/start.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ec6e01d99a..e057cd5124 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -74,7 +74,6 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 
   var tmpFolder = os.tmpdir();
   var tempZipFilePath = tmpFolder + 'ionic-angular-cordova-seed' + new Date().getTime() + '.zip';
-  console.log('Writing to', tempZipFilePath);
   var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
 
   var unzipRepo = function(fileName) {
@@ -82,7 +81,6 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 
     var writeStream = unzip.Extract({ path: _this.targetPath });
     writeStream.on('close', function() {
-      console.log('END');
       //fs.renameSync(_this.targetPath + '/' + 'ionic-angular-cordova-seed-master', _this.targetPath + '/app');
       cp('-R', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', _this.targetPath);
       rm('-rf', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/');

From 6afddb94b0a831296da0049765d8ff4e8d707caa Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 15:08:59 -0600
Subject: [PATCH 0010/1100] Note

---
 lib/ionic/start.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index e057cd5124..7170c1df3e 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -84,6 +84,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
       //fs.renameSync(_this.targetPath + '/' + 'ionic-angular-cordova-seed-master', _this.targetPath + '/app');
       cp('-R', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', _this.targetPath);
       rm('-rf', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
+      console.log('Project created!');
     });
     readStream.pipe(writeStream);
   };

From 699dc374abbceb7bc9215e6109703ae648c5d252 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 20 Nov 2013 15:15:33 -0600
Subject: [PATCH 0011/1100] Better ascii

---
 lib/ionic.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2316f539df..1c5870f7ce 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -1,7 +1,10 @@
 /*
-   __          __  
-| /  \ |\ | | /  ` 
-| \__/ | \| | \__, 
+ _             _      
+(_)           (_)     
+ _  ___  _ __  _  ___ 
+| |/ _ \| '_ \| |/ __|
+| | (_) | | | | | (__ 
+|_|\___/|_| |_|_|\___|
 
 http://ionicframework.com/
 

From 236a7464de93eb38b8c371b25aca3b0076f25a6f Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 21 Nov 2013 11:40:39 -0600
Subject: [PATCH 0012/1100] Moved ionic-framework npm to ionic, thanks
 @jaredhanson

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c24a5d63d..476e893bb9 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ionic-framework",
+  "name": "ionic",
   "version": "0.9.06",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",

From 3cbe371e41bd8f9e34695c98a7f7221f54daa54b Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 21 Nov 2013 11:45:05 -0600
Subject: [PATCH 0013/1100] Updated package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 476e893bb9..6c9d78c74a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.06",
+  "version": "0.9.08",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 465dea10198e4927457f3c6d130dc770b1a84f03 Mon Sep 17 00:00:00 2001
From: Matt Goodall <matt.goodall@gmail.com>
Date: Thu, 28 Nov 2013 16:42:13 +0000
Subject: [PATCH 0014/1100] Build seed zip path correctly when temp dir does
 not end with path separator.

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 7170c1df3e..42f16ebd70 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -73,7 +73,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
   console.log('Downloading starter template from', templateUrl);
 
   var tmpFolder = os.tmpdir();
-  var tempZipFilePath = tmpFolder + 'ionic-angular-cordova-seed' + new Date().getTime() + '.zip';
+  var tempZipFilePath = path.join(tmpFolder, 'ionic-angular-cordova-seed' + new Date().getTime() + '.zip');
   var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
 
   var unzipRepo = function(fileName) {

From e264593c81fe0238447fa08b82661cc78b70f135 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 9 Dec 2013 09:12:15 -0600
Subject: [PATCH 0015/1100] Updated version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c9d78c74a..2a8b42c5ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.08",
+  "version": "0.9.09",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From c7861ba72326a10529d424c949a372921c1dea90 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 9 Dec 2013 09:15:29 -0600
Subject: [PATCH 0016/1100] Removed unnecesary path

---
 lib/ionic/start.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 42f16ebd70..650efb1d7b 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,6 +1,5 @@
 var fs = require('fs'),
     os = require('os'),
-    path = require('path'),
     request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
@@ -12,7 +11,6 @@ var argv = require('optimist').argv;
 
 fs.mkdirParent = function(dirPath, mode, callback) {
   //Call the standard fs.mkdir
-  console.log('MKDIR');
   fs.mkdir(dirPath, mode, function(error) {
     //When it fail in this way, do the custom steps
     if (error && error.errno === 34) {
@@ -21,7 +19,6 @@ fs.mkdirParent = function(dirPath, mode, callback) {
       //And then the directory
       fs.mkdirParent(dirPath, mode, callback);
     }
-    console.log('MKDIR DONE');
     //Manually run the callback since we used our own callback to do all these
     callback && callback(error);
   });

From f8516bce8b539de83ab976016957bde6915c13f2 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 9 Dec 2013 09:27:01 -0600
Subject: [PATCH 0017/1100] Removed unused package

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 2a8b42c5ad..41e12d4066 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,5 @@
     "unzip": "0.1.9",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
-    "wrench": "1.5.1"
   }
 }

From 1dc96637239f0077324203a19b4de2998f75ccaf Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 9 Dec 2013 09:27:19 -0600
Subject: [PATCH 0018/1100] Updated v

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41e12d4066..b3d59a251e 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,6 @@
     "shelljs": "0.2.6",
     "unzip": "0.1.9",
     "ncp": "0.4.2",
-    "optimist": "0.6.0",
+    "optimist": "0.6.0"
   }
 }

From d6e30540b832f1036666042e89b76cd0152c1edc Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 13 Dec 2013 10:42:35 -0600
Subject: [PATCH 0019/1100] Moved cordova version to 3.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b3d59a251e..74e910bd49 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   "author": "Max Lynch <max@drifty.com>",
   "license": "MIT",
   "dependencies": {
-    "cordova": ">=3.1.0",
+    "cordova": "~3.2.0",
     "request": "2.27.0",
     "shelljs": "0.2.6",
     "unzip": "0.1.9",

From a33fac7ed14889415168a23a76eb2077a94dbeff Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 19 Dec 2013 14:04:59 -0600
Subject: [PATCH 0020/1100] Add initial build task

---
 bin/ionic          |  0
 lib/ionic.js       |  7 +++++++
 lib/ionic/build.js | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 mode change 100644 => 100755 bin/ionic
 create mode 100644 lib/ionic/build.js

diff --git a/bin/ionic b/bin/ionic
old mode 100644
new mode 100755
diff --git a/lib/ionic.js b/lib/ionic.js
index 1c5870f7ce..bbac5d4dcb 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -15,6 +15,7 @@ Copyright 2013 Drifty (http://drifty.com/)
 */
                    
 var IonicStartTask = require('./ionic/start.js').IonicStartTask;
+var IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
 
 var argv = require('optimist').argv;
 
@@ -24,6 +25,12 @@ var TASKS = [
     name: 'start',
     usage: 'appname',
     task: IonicStartTask
+  },
+  {
+    title: 'build',
+    name: 'build',
+    usage: 'platform',
+    task: IonicBuildTask
   }
 ];
 
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
new file mode 100644
index 0000000000..40e4d5a18a
--- /dev/null
+++ b/lib/ionic/build.js
@@ -0,0 +1,32 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
+    IonicTask = require('./task').IonicTask;
+
+var argv = require('optimist').argv;
+
+var IonicBuildTask = function() {
+}
+
+IonicBuildTask.HELP_LINE = 'Build an Ionic project for the given plaform.';
+
+IonicBuildTask.prototype = new IonicTask();
+
+IonicBuildTask.prototype._printUsage = function() {
+  process.stderr.write('ionic build plaform (eg. android, ios)\n');
+}
+
+IonicBuildTask.prototype.run = function(ionic) {
+  if(argv._.length < 2) {
+    ionic.fail('No plaform specified, exiting.');
+  }
+
+  // Grab the name of the app
+  this.platform = argv._[1];
+};
+
+exports.IonicBuildTask = IonicBuildTask;

From 95a080a803e08e8b425a527be9a4c819fe20dc34 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 20 Dec 2013 17:45:26 -0600
Subject: [PATCH 0021/1100] I don't understand the error

---
 lib/ionic.js       | 11 +++++++++--
 lib/ionic/build.js | 10 ++--------
 lib/ionic/login.js | 29 +++++++++++++++++++++++++++++
 lib/ionic/start.js |  3 +--
 4 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 lib/ionic/login.js

diff --git a/lib/ionic.js b/lib/ionic.js
index bbac5d4dcb..492d2c3ad7 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -14,8 +14,9 @@ Licensed under the MIT license. See LICENSE For more.
 Copyright 2013 Drifty (http://drifty.com/)
 */
                    
-var IonicStartTask = require('./ionic/start.js').IonicStartTask;
-var IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
+var IonicStartTask = require('./ionic/start.js').IonicStartTask,
+    IonicLoginTask = require('./ionic/login.js').IonicLoginTask,
+    IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
 
 var argv = require('optimist').argv;
 
@@ -26,6 +27,12 @@ var TASKS = [
     usage: 'appname',
     task: IonicStartTask
   },
+  {
+    title: 'login',
+    name: 'login',
+    usage: '[email]',
+    task: IonicLoginTask
+  },
   {
     title: 'build',
     name: 'build',
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 40e4d5a18a..7f94545266 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,14 +1,8 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
+var request = require('request'),
     shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
+    argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
 
-var argv = require('optimist').argv;
-
 var IonicBuildTask = function() {
 }
 
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
new file mode 100644
index 0000000000..ed60ab9192
--- /dev/null
+++ b/lib/ionic/login.js
@@ -0,0 +1,29 @@
+var request = require('request'),
+    shelljs = require('shelljs/global'),
+    argv = require('optimist').argv,
+    IonicTask = require('./task').IonicTask;
+
+var IonicLoginTask = function() {
+}
+
+IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
+
+IonicLoginTask.prototype = new IonicTask();
+
+IonicLoginTask.prototype._printUsage = function() {
+  process.stderr.write('ionic login [email]\n');
+}
+
+IonicLoginTask.prototype.run = function(ionic) {
+  if(argv._.length >= 2) {
+    // Grab the email for login
+    this.email = argv._[1];
+  } else {
+  	this.email = this.ask("Email?");
+  }
+
+  this.password = this.ask("Password?", true);
+  
+};
+
+exports.IonicLoginTask = IonicLoginTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 650efb1d7b..73e8863db4 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,10 +5,9 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
+    argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
 
-var argv = require('optimist').argv;
-
 fs.mkdirParent = function(dirPath, mode, callback) {
   //Call the standard fs.mkdir
   fs.mkdir(dirPath, mode, function(error) {

From 21e1a21f8c91253b07cb4281dcf4edb3f53def53 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Sat, 21 Dec 2013 00:47:56 -0600
Subject: [PATCH 0022/1100] Use prompt package

---
 lib/ionic/build.js |  4 ----
 lib/ionic/login.js | 12 ++++--------
 lib/ionic/start.js |  4 ----
 lib/ionic/task.js  | 11 +----------
 package.json       |  3 ++-
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 7f94545266..593e624102 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -10,10 +10,6 @@ IonicBuildTask.HELP_LINE = 'Build an Ionic project for the given plaform.';
 
 IonicBuildTask.prototype = new IonicTask();
 
-IonicBuildTask.prototype._printUsage = function() {
-  process.stderr.write('ionic build plaform (eg. android, ios)\n');
-}
-
 IonicBuildTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
     ionic.fail('No plaform specified, exiting.');
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index ed60ab9192..42dbb89382 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,7 +1,7 @@
 var request = require('request'),
     shelljs = require('shelljs/global'),
-    argv = require('optimist').argv,
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    argv = require('optimist').argv;
 
 var IonicLoginTask = function() {
 }
@@ -10,19 +10,15 @@ IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
 
 IonicLoginTask.prototype = new IonicTask();
 
-IonicLoginTask.prototype._printUsage = function() {
-  process.stderr.write('ionic login [email]\n');
-}
-
 IonicLoginTask.prototype.run = function(ionic) {
   if(argv._.length >= 2) {
     // Grab the email for login
     this.email = argv._[1];
   } else {
-  	this.email = this.ask("Email?");
+  	// this.email = this.ask("Email?");
   }
 
-  this.password = this.ask("Password?", true);
+  // this.password = this.ask("Password?", true);
   
 };
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 73e8863db4..af342fee23 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -30,10 +30,6 @@ IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
 
 IonicStartTask.prototype = new IonicTask();
 
-IonicStartTask.prototype._printUsage = function() {
-  process.stderr.write('ionic start appname\n');
-}
-
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
     ionic.fail('No app name specified, exiting.');
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 20b74b4c1f..24bbcd9921 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,19 +1,10 @@
 var fs = require('fs');
 
 var IonicTask = function() {
+  HELP_LINE: ''
 };
 
 IonicTask.prototype = {
-  // Prompt the user for a response
-  ask: function(question) {
-    var response;
-
-    process.stdout.write(question + ' ');
-    process.stdin.resume();
-    response = fs.readSync(process.stdin.fd, 100, 0, "utf8");
-    process.stdin.pause();
-    return response[0].trim();
-  },
   run: function(ionic) {
   }
 };
diff --git a/package.json b/package.json
index 74e910bd49..8f994518ed 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "shelljs": "0.2.6",
     "unzip": "0.1.9",
     "ncp": "0.4.2",
-    "optimist": "0.6.0"
+    "optimist": "0.6.0",
+    "prompt": "0.2.12"
   }
 }

From 1986415508ff22a3b0712b1a727e971901971ce5 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Sat, 21 Dec 2013 01:13:37 -0600
Subject: [PATCH 0023/1100] Initial use of prompt for login

---
 lib/ionic/login.js | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 42dbb89382..1fa97c9896 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,7 +1,7 @@
 var request = require('request'),
-    shelljs = require('shelljs/global'),
-    IonicTask = require('./task').IonicTask,
-    argv = require('optimist').argv;
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    IonicTask = require('./task').IonicTask;
 
 var IonicLoginTask = function() {
 }
@@ -11,13 +11,32 @@ IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
 IonicLoginTask.prototype = new IonicTask();
 
 IonicLoginTask.prototype.run = function(ionic) {
+  var schema = [{
+  	name: 'password',
+    hidden: true,
+    required: true
+  }];
+
   if(argv._.length >= 2) {
     // Grab the email for login
     this.email = argv._[1];
   } else {
-  	// this.email = this.ask("Email?");
+  	schema.unshift({
+  	  name: 'email',
+	  pattern: /^\w+[@]\w+[\.]\w+$/, // Find a better email regex
+	  message: 'Email for Ionic Studio login',
+	  required: true
+	});
   }
 
+  prompt.start();
+
+  prompt.get(schema, function (err, result) {
+    console.log('Command-line input received:');
+    console.log('  email: ' + result.email);
+    console.log('  password: ' + result.password);
+  });
+
   // this.password = this.ask("Password?", true);
   
 };

From ac2b2aea5df0bc7debc8d585aa2f7624d9d8cfb5 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Sun, 22 Dec 2013 21:36:15 -0600
Subject: [PATCH 0024/1100] Make it cleaner!

---
 lib/ionic/login.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 1fa97c9896..827993b6cd 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -12,22 +12,23 @@ IonicLoginTask.prototype = new IonicTask();
 
 IonicLoginTask.prototype.run = function(ionic) {
   var schema = [{
+  	  name: 'email',
+	  pattern: /^\w+[@]\w+[\.]\w+$/, // Find a better email regex
+	  message: 'Email for Ionic Studio login',
+	  required: true
+	}, {
   	name: 'password',
     hidden: true,
     required: true
   }];
 
+  // Grab the email for login
   if(argv._.length >= 2) {
-    // Grab the email for login
     this.email = argv._[1];
-  } else {
-  	schema.unshift({
-  	  name: 'email',
-	  pattern: /^\w+[@]\w+[\.]\w+$/, // Find a better email regex
-	  message: 'Email for Ionic Studio login',
-	  required: true
-	});
-  }
+    schema.shift();
+  } 
+
+  // prompt.override = optimist.argv;
 
   prompt.start();
 
@@ -37,7 +38,6 @@ IonicLoginTask.prototype.run = function(ionic) {
     console.log('  password: ' + result.password);
   });
 
-  // this.password = this.ask("Password?", true);
   
 };
 

From a3c8433d7ee2501b83a5c89602cb154eb0790d64 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Sun, 22 Dec 2013 22:04:04 -0600
Subject: [PATCH 0025/1100] Awesome sauce.

---
 lib/ionic/login.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 827993b6cd..f00bcdf441 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -11,31 +11,37 @@ IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
 IonicLoginTask.prototype = new IonicTask();
 
 IonicLoginTask.prototype.run = function(ionic) {
+  var _this = this;
   var schema = [{
   	  name: 'email',
-	  pattern: /^\w+[@]\w+[\.]\w+$/, // Find a better email regex
+	  pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
 	  message: 'Email for Ionic Studio login',
 	  required: true
 	}, {
-  	name: 'password',
-    hidden: true,
-    required: true
+  	  name: 'password',
+      hidden: true,
+      required: true
   }];
 
   // Grab the email for login
-  if(argv._.length >= 2) {
-    this.email = argv._[1];
+  if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
+    this.email = argv._[1].toLowerCase();
     schema.shift();
   } 
 
-  // prompt.override = optimist.argv;
+  prompt.override = argv;
 
   prompt.start();
 
   prompt.get(schema, function (err, result) {
+  	if(!_this.email) {
+  		_this.email = result.email.toLowerCase();
+  	}
+  	_this.password = result.password;
+  	
     console.log('Command-line input received:');
-    console.log('  email: ' + result.email);
-    console.log('  password: ' + result.password);
+    console.log('  email: ' + _this.email);
+    console.log('  password: ' + _this.password);
   });
 
   

From d8757d9c272d149e835a8f56b96b434ea3313d26 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 30 Dec 2013 15:09:28 -0600
Subject: [PATCH 0026/1100] Initial login request and cookie storage

---
 lib/ionic/login.js | 8 ++++++++
 lib/ionic/task.js  | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index f00bcdf441..9c8b187281 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -42,6 +42,14 @@ IonicLoginTask.prototype.run = function(ionic) {
     console.log('Command-line input received:');
     console.log('  email: ' + _this.email);
     console.log('  password: ' + _this.password);
+
+    var jar = request.jar();
+    console.log(IonicTask.IONIC_DASH);
+    // request({url: _this.IONIC_DASH+'login/', jar: jar}, function (error, response, body) {
+    //   console.log(response);
+    // });
+
+    
   });
 
   
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 24bbcd9921..bdd9dde8d1 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,10 +1,9 @@
 var fs = require('fs');
 
-var IonicTask = function() {
-  HELP_LINE: ''
-};
+var IonicTask = function() { };
 
 IonicTask.prototype = {
+  IONIC_DASH: 'http://virt/',
   run: function(ionic) {
   }
 };

From 7c3e7e7f2c6fe1b223df269899a64266c39861a5 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 30 Dec 2013 16:14:31 -0600
Subject: [PATCH 0027/1100] Logging in with the dash!

---
 .gitignore         |  1 +
 lib/ionic/login.js | 48 ++++++++++++++++++++++++++++++++++++++--------
 lib/ionic/task.js  |  1 +
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index be106cacde..ccc574f1f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.sw*
+*.cookies
 node_modules/
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 9c8b187281..21afc74584 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,4 +1,5 @@
-var request = require('request'),
+var fs = require('fs'),
+    request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     IonicTask = require('./task').IonicTask;
@@ -34,20 +35,51 @@ IonicLoginTask.prototype.run = function(ionic) {
   prompt.start();
 
   prompt.get(schema, function (err, result) {
+    if(err) {
+      console.log(err);
+      return;
+    }
+
   	if(!_this.email) {
   		_this.email = result.email.toLowerCase();
   	}
   	_this.password = result.password;
   	
-    console.log('Command-line input received:');
-    console.log('  email: ' + _this.email);
-    console.log('  password: ' + _this.password);
+    // console.log('Command-line input received:');
+    // console.log('  email: ' + _this.email);
+    // console.log('  password: ' + _this.password);
 
     var jar = request.jar();
-    console.log(IonicTask.IONIC_DASH);
-    // request({url: _this.IONIC_DASH+'login/', jar: jar}, function (error, response, body) {
-    //   console.log(response);
-    // });
+    console.log(_this.IONIC_DASH);
+    request({url: _this.IONIC_DASH+'login', jar: jar}, function (err, response, body) {
+      if(err || jar.cookies.length == 0) {
+        console.log(err);
+        return;
+      }
+
+      request({method: 'POST', url: _this.IONIC_DASH+'login', jar: jar, form: {username: _this.email, password: _this.password, csrfmiddlewaretoken: jar.cookies[0].value}}, function (err, response, body) { 
+        if(err) {
+          console.log(err);
+          return;
+        }
+        // Should be a 304 redirect status code if correct
+        if(response.statusCode == 200) {
+          console.log('Email or Password incorrect.  Please visit '+_this.IONIC_DASH+' for help. :)')
+          return;
+        }
+        
+        fs.writeFile(_this.IONIC_COOKIES, JSON.stringify(jar, null, 2), function(err) {
+          if(err) {
+            console.log(err);
+          } else {
+            console.log('Logged in! :)');
+          }
+        });
+        // console.log(response);
+        
+      });
+
+    });
 
     
   });
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index bdd9dde8d1..804d5bf0e9 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -4,6 +4,7 @@ var IonicTask = function() { };
 
 IonicTask.prototype = {
   IONIC_DASH: 'http://virt/',
+  IONIC_COOKIES: 'ionic.cookies',
   run: function(ionic) {
   }
 };

From dc4ff1d61a3431c900e9b7da9c1671f0e2af650c Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 30 Dec 2013 21:08:22 -0600
Subject: [PATCH 0028/1100] Login cleanup

---
 lib/ionic/login.js | 23 ++++++++++++++++-------
 lib/ionic/task.js  |  2 --
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 21afc74584..de76f6dd51 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -45,19 +45,29 @@ IonicLoginTask.prototype.run = function(ionic) {
   	}
   	_this.password = result.password;
   	
-    // console.log('Command-line input received:');
-    // console.log('  email: ' + _this.email);
-    // console.log('  password: ' + _this.password);
-
     var jar = request.jar();
     console.log(_this.IONIC_DASH);
-    request({url: _this.IONIC_DASH+'login', jar: jar}, function (err, response, body) {
+    request({
+      url: _this.IONIC_DASH+'login',
+      jar: jar
+    }, 
+    function (err, response, body) {
       if(err || jar.cookies.length == 0) {
         console.log(err);
         return;
       }
 
-      request({method: 'POST', url: _this.IONIC_DASH+'login', jar: jar, form: {username: _this.email, password: _this.password, csrfmiddlewaretoken: jar.cookies[0].value}}, function (err, response, body) { 
+      request({
+        method: 'POST',
+        url: _this.IONIC_DASH+'login', 
+        jar: jar, 
+        form: {
+          username: _this.email,
+          password: _this.password,
+          csrfmiddlewaretoken: jar.cookies[0].value
+        }
+      },
+      function (err, response, body) { 
         if(err) {
           console.log(err);
           return;
@@ -75,7 +85,6 @@ IonicLoginTask.prototype.run = function(ionic) {
             console.log('Logged in! :)');
           }
         });
-        // console.log(response);
         
       });
 
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 804d5bf0e9..2335cefd14 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,5 +1,3 @@
-var fs = require('fs');
-
 var IonicTask = function() { };
 
 IonicTask.prototype = {

From 2d7dfde45131775dff8d4cbd0ff5726d7928eb30 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 30 Dec 2013 21:18:57 -0600
Subject: [PATCH 0029/1100] Indentation fix

---
 lib/ionic/login.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index de76f6dd51..b7c3153150 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -14,14 +14,14 @@ IonicLoginTask.prototype = new IonicTask();
 IonicLoginTask.prototype.run = function(ionic) {
   var _this = this;
   var schema = [{
-  	  name: 'email',
-	  pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
-	  message: 'Email for Ionic Studio login',
-	  required: true
-	}, {
-  	  name: 'password',
-      hidden: true,
-      required: true
+    name: 'email',
+    pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
+    message: 'Email for Ionic Studio login',
+    required: true
+  }, {
+    name: 'password',
+    hidden: true,
+    required: true
   }];
 
   // Grab the email for login
@@ -40,11 +40,11 @@ IonicLoginTask.prototype.run = function(ionic) {
       return;
     }
 
-  	if(!_this.email) {
-  		_this.email = result.email.toLowerCase();
-  	}
-  	_this.password = result.password;
-  	
+    if(!_this.email) {
+      _this.email = result.email.toLowerCase();
+    }
+    _this.password = result.password;
+    
     var jar = request.jar();
     console.log(_this.IONIC_DASH);
     request({

From 6611930cb4654c53a7c3c506306b01bd2d5f5c54 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 31 Dec 2013 00:36:34 -0600
Subject: [PATCH 0030/1100] Build task using login!

---
 lib/ionic.js       |  3 +++
 lib/ionic/build.js |  9 ++++++-
 lib/ionic/login.js | 65 +++++++++++++++++++++++++++++-----------------
 lib/ionic/start.js | 10 +++----
 lib/ionic/task.js  |  2 --
 5 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 492d2c3ad7..6ac0cd8e66 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -44,6 +44,9 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
+  IONIC_DASH: 'http://virt/',
+  IONIC_COOKIES: 'ionic.cookies',
+
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
       return false;
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 593e624102..cb1915ff19 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,7 +1,8 @@
 var request = require('request'),
     shelljs = require('shelljs/global'),
     argv = require('optimist').argv,
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    IonicLoginTask = require('./login.js').IonicLoginTask;
 
 var IonicBuildTask = function() {
 }
@@ -17,6 +18,12 @@ IonicBuildTask.prototype.run = function(ionic) {
 
   // Grab the name of the app
   this.platform = argv._[1];
+
+  var login = new IonicLoginTask();
+  login.get(ionic, function(jar) {
+    console.log(jar);
+  });
+  
 };
 
 exports.IonicBuildTask = IonicBuildTask;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index b7c3153150..a8198f8891 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -11,8 +11,8 @@ IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
 
 IonicLoginTask.prototype = new IonicTask();
 
-IonicLoginTask.prototype.run = function(ionic) {
-  var _this = this;
+IonicLoginTask.prototype.run = function(ionic, callback) {
+  var self = this;
   var schema = [{
     name: 'email',
     pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
@@ -40,18 +40,18 @@ IonicLoginTask.prototype.run = function(ionic) {
       return;
     }
 
-    if(!_this.email) {
-      _this.email = result.email.toLowerCase();
+    if(!self.email) {
+      self.email = result.email.toLowerCase();
     }
-    _this.password = result.password;
+    self.password = result.password;
     
     var jar = request.jar();
-    console.log(_this.IONIC_DASH);
+    console.log(ionic.IONIC_DASH);
     request({
-      url: _this.IONIC_DASH+'login',
+      url: ionic.IONIC_DASH+'login',
       jar: jar
     }, 
-    function (err, response, body) {
+    function(err, response, body) {
       if(err || jar.cookies.length == 0) {
         console.log(err);
         return;
@@ -59,11 +59,11 @@ IonicLoginTask.prototype.run = function(ionic) {
 
       request({
         method: 'POST',
-        url: _this.IONIC_DASH+'login', 
+        url: ionic.IONIC_DASH+'login', 
         jar: jar, 
         form: {
-          username: _this.email,
-          password: _this.password,
+          username: self.email,
+          password: self.password,
           csrfmiddlewaretoken: jar.cookies[0].value
         }
       },
@@ -74,26 +74,43 @@ IonicLoginTask.prototype.run = function(ionic) {
         }
         // Should be a 304 redirect status code if correct
         if(response.statusCode == 200) {
-          console.log('Email or Password incorrect.  Please visit '+_this.IONIC_DASH+' for help. :)')
+          console.log('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
           return;
         }
         
-        fs.writeFile(_this.IONIC_COOKIES, JSON.stringify(jar, null, 2), function(err) {
-          if(err) {
-            console.log(err);
-          } else {
-            console.log('Logged in! :)');
-          }
-        });
+        var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
+        if(err) {
+          console.log(err);
+          return;
+        }
         
-      });
+        console.log('Logged in! :)');
 
+        if(callback) {
+          callback(jar);
+        }
+      });
     });
-
-    
   });
-
-  
 };
 
+IonicLoginTask.prototype.get = function(ionic, callback) {
+  var self = this;
+
+  if(fs.existsSync(ionic.IONIC_COOKIES)) {
+    var jar = JSON.parse(fs.readFileSync(ionic.IONIC_COOKIES));
+    if(jar.cookies && jar.cookies.length > 0) {
+      for(i in jar.cookies) {
+        var cookie = jar.cookies[i];
+        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+          callback(jar);
+          return;
+        }
+      }
+    }
+  }
+
+  this.run(ionic, callback);
+}
+
 exports.IonicLoginTask = IonicLoginTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index af342fee23..5d05f13e84 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -59,7 +59,7 @@ IonicStartTask.prototype.run = function(ionic) {
 };
 
 IonicStartTask.prototype._fetchAndWriteSeed = function() {
-  var _this = this;
+  var self = this;
 
   var templateUrl = 'https://github.com/driftyco/ionic-angular-cordova-seed/archive/master.zip' ;
   console.log('Downloading starter template from', templateUrl);
@@ -71,11 +71,11 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
   var unzipRepo = function(fileName) {
     var readStream = fs.createReadStream(fileName);
 
-    var writeStream = unzip.Extract({ path: _this.targetPath });
+    var writeStream = unzip.Extract({ path: self.targetPath });
     writeStream.on('close', function() {
-      //fs.renameSync(_this.targetPath + '/' + 'ionic-angular-cordova-seed-master', _this.targetPath + '/app');
-      cp('-R', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', _this.targetPath);
-      rm('-rf', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
+      //fs.renameSync(self.targetPath + '/' + 'ionic-angular-cordova-seed-master', self.targetPath + '/app');
+      cp('-R', self.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', self.targetPath);
+      rm('-rf', self.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
       console.log('Project created!');
     });
     readStream.pipe(writeStream);
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 2335cefd14..8ac8da9425 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,8 +1,6 @@
 var IonicTask = function() { };
 
 IonicTask.prototype = {
-  IONIC_DASH: 'http://virt/',
-  IONIC_COOKIES: 'ionic.cookies',
   run: function(ionic) {
   }
 };

From f21ccc6bb83935884ade9229d361a8b0c2894b6e Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 2 Jan 2014 20:48:45 -0600
Subject: [PATCH 0031/1100] Create a custom config file for ionic

---
 lib/ionic.js        |  3 +++
 lib/ionic/build.js  | 10 ++++++++++
 lib/ionic/login.js  | 16 +++++-----------
 lib/ionic/start.js  | 16 ++++++++--------
 template/index.html |  0
 5 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 template/index.html

diff --git a/lib/ionic.js b/lib/ionic.js
index 6ac0cd8e66..2462140629 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -46,6 +46,9 @@ Ionic = function() {};
 Ionic.prototype = {
   IONIC_DASH: 'http://virt/',
   IONIC_COOKIES: 'ionic.cookies',
+  IONIC_CONFIG: 'ionic.config',
+  IONIC_API_VERSION: 1,
+  IONIC_API: 'api/v'+this.IONIC_API_VERSION+'/',
 
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index cb1915ff19..db350a7121 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -21,6 +21,16 @@ IonicBuildTask.prototype.run = function(ionic) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
+    request({
+      method: 'POST',
+      url: ionic.IONIC_DASH+ionic.IONIC_API+'export/',
+      jar: jar
+    }, 
+    function(err, response, body) {
+      if(err) {
+        ionic.fail(err);
+      }
+    });
     console.log(jar);
   });
   
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index a8198f8891..e1b3b31bc5 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -36,8 +36,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 
   prompt.get(schema, function (err, result) {
     if(err) {
-      console.log(err);
-      return;
+      ionic.fail(err);
     }
 
     if(!self.email) {
@@ -46,15 +45,13 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     self.password = result.password;
     
     var jar = request.jar();
-    console.log(ionic.IONIC_DASH);
     request({
       url: ionic.IONIC_DASH+'login',
       jar: jar
     }, 
     function(err, response, body) {
       if(err || jar.cookies.length == 0) {
-        console.log(err);
-        return;
+        ionic.fail(err);
       }
 
       request({
@@ -69,19 +66,16 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
       },
       function (err, response, body) { 
         if(err) {
-          console.log(err);
-          return;
+          ionic.fail(err);
         }
         // Should be a 304 redirect status code if correct
         if(response.statusCode == 200) {
-          console.log('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
-          return;
+          ionic.fail('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
         }
         
         var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
         if(err) {
-          console.log(err);
-          return;
+          ionic.fail(err);
         }
         
         console.log('Logged in! :)');
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5d05f13e84..e017052ac8 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -53,8 +53,8 @@ IonicStartTask.prototype.run = function(ionic) {
 
   fs.mkdirSync(this.targetPath);
 
-  //this._writeTemplateFolder();
   this._fetchAndWriteSeed();
+  this._writeConfig(ionic);
 
 };
 
@@ -88,13 +88,13 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
   });
 };
 
-IonicStartTask.prototype._writeTemplateFolder = function() {
-  console.log('Copying template to', this.targetPath);
-  ncp('template', this.appName, function(err) {
-    if(err) {
-      this._fail('Unable to build starter folder', err);
-    }
-  });
+IonicStartTask.prototype._writeConfig = function(ionic) {
+  console.log('Writing ionic.config', this.targetPath);
+  var err = fs.writeFileSync(this.targetPath + '/' + ionic.IONIC_CONFIG, JSON.stringify({name: this.appName}, null, 2));
+  if(err) {
+    process.stderr.write('Error writing ' + this.targetPath + '/' + ionic.IONIC_CONFIG + ': ' + err + '\n');
+    return;
+  }
 };
 
 IonicStartTask.prototype._checkTargetPath = function() { 
diff --git a/template/index.html b/template/index.html
deleted file mode 100644
index e69de29bb2..0000000000

From 481ed35e92052605d534e55346d2c1ae08811a80 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 3 Jan 2014 15:32:29 -0600
Subject: [PATCH 0032/1100] Load ionic.config for build

---
 lib/ionic/build.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index db350a7121..27bb1bdb89 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,4 +1,5 @@
-var request = require('request'),
+var fs = require('fs'),
+    request = require('request'),
     shelljs = require('shelljs/global'),
     argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask,
@@ -16,9 +17,15 @@ IonicBuildTask.prototype.run = function(ionic) {
     ionic.fail('No plaform specified, exiting.');
   }
 
-  // Grab the name of the app
+  // Grab the platform build for the app
   this.platform = argv._[1];
 
+  if(!fs.existsSync(ionic.IONIC_CONFIG)) {
+    ionic.fail('Could not find ' + ionic.IONIC_CONFIG + '!'+
+      ' Please run this command your root ionic project directory with that file.');
+  }
+  var project = JSON.parse(fs.readFileSync(ionic.IONIC_CONFIG));
+
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
     request({

From 7645df6a3bedd7cfbc0c531d83f20d0cb1576322 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 7 Jan 2014 15:02:07 -0600
Subject: [PATCH 0033/1100] Initial upload code

---
 lib/ionic.js        | 29 ++++++++++++++++++++++++++---
 lib/ionic/build.js  | 18 ++++++------------
 lib/ionic/login.js  |  8 ++++----
 lib/ionic/upload.js | 36 ++++++++++++++++++++++++++++++++++++
 package.json        | 11 ++++++-----
 5 files changed, 78 insertions(+), 24 deletions(-)
 create mode 100644 lib/ionic/upload.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 2462140629..13b35f118e 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -16,9 +16,11 @@ Copyright 2013 Drifty (http://drifty.com/)
                    
 var IonicStartTask = require('./ionic/start.js').IonicStartTask,
     IonicLoginTask = require('./ionic/login.js').IonicLoginTask,
+    IonicUploadTask = require('./ionic/upload.js').IonicUploadTask,
     IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
 
-var argv = require('optimist').argv;
+var fs = require('fs'), 
+    argv = require('optimist').argv;
 
 var TASKS = [
   {
@@ -33,6 +35,12 @@ var TASKS = [
     usage: '[email]',
     task: IonicLoginTask
   },
+  {
+    title: 'upload',
+    name: 'upload',
+    usage: '',
+    task: IonicUploadTask
+  },
   {
     title: 'build',
     name: 'build',
@@ -47,8 +55,7 @@ Ionic.prototype = {
   IONIC_DASH: 'http://virt/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_CONFIG: 'ionic.config',
-  IONIC_API_VERSION: 1,
-  IONIC_API: 'api/v'+this.IONIC_API_VERSION+'/',
+  IONIC_API: 'api/v1/',
 
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
@@ -107,6 +114,22 @@ Ionic.prototype = {
     process.exit(1);
   },
 
+  loadConfig: function() {
+    if(!fs.existsSync(this.IONIC_CONFIG)) {
+      this.fail('Could not find ' + this.IONIC_CONFIG + '!'+
+        ' Please run this command your root ionic project directory with that file.');
+    }
+    return JSON.parse(fs.readFileSync(this.IONIC_CONFIG));
+  },
+
+  saveConfig: function(project) {
+    var err = fs.writeFileSync(this.IONIC_CONFIG, JSON.stringify(project, null, 2));
+    if(err) {
+      process.stderr.write('Error writing ' + ionic.IONIC_CONFIG + ': ' + err + '\n');
+    }
+  }
+  
+
 };
 
 exports.Ionic = Ionic;
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 27bb1bdb89..811d7770fc 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,6 +1,4 @@
-var fs = require('fs'),
-    request = require('request'),
-    shelljs = require('shelljs/global'),
+var request = require('request'),
     argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login.js').IonicLoginTask;
@@ -20,27 +18,23 @@ IonicBuildTask.prototype.run = function(ionic) {
   // Grab the platform build for the app
   this.platform = argv._[1];
 
-  if(!fs.existsSync(ionic.IONIC_CONFIG)) {
-    ionic.fail('Could not find ' + ionic.IONIC_CONFIG + '!'+
-      ' Please run this command your root ionic project directory with that file.');
-  }
-  var project = JSON.parse(fs.readFileSync(ionic.IONIC_CONFIG));
+  var project = ionic.loadConfig();
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
     request({
       method: 'POST',
-      url: ionic.IONIC_DASH+ionic.IONIC_API+'export/',
+      url: ionic.IONIC_DASH+'export/',
       jar: jar
     }, 
     function(err, response, body) {
       if(err) {
-        ionic.fail(err);
+        ionic.fail("Error building: " + err);
       }
     });
     console.log(jar);
-  });
-  
+    console.log(project.name);
+  });  
 };
 
 exports.IonicBuildTask = IonicBuildTask;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index e1b3b31bc5..c749e61ebe 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -36,7 +36,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 
   prompt.get(schema, function (err, result) {
     if(err) {
-      ionic.fail(err);
+      ionic.fail('Error logging in: ' + err);
     }
 
     if(!self.email) {
@@ -51,7 +51,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     }, 
     function(err, response, body) {
       if(err || jar.cookies.length == 0) {
-        ionic.fail(err);
+        ionic.fail('Error logging in: ' + err);
       }
 
       request({
@@ -66,7 +66,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
       },
       function (err, response, body) { 
         if(err) {
-          ionic.fail(err);
+          ionic.fail('Error logging in: ' + err);
         }
         // Should be a 304 redirect status code if correct
         if(response.statusCode == 200) {
@@ -75,7 +75,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
         
         var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
         if(err) {
-          ionic.fail(err);
+          ionic.fail('Error writing ' + ionic.IONIC_COOKIES + ': ' + err);
         }
         
         console.log('Logged in! :)');
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
new file mode 100644
index 0000000000..971db5b56c
--- /dev/null
+++ b/lib/ionic/upload.js
@@ -0,0 +1,36 @@
+var request = require('request'),
+    argv = require('optimist').argv,
+    zip = require('adm-zip');
+    IonicTask = require('./task').IonicTask,
+    IonicLoginTask = require('./login.js').IonicLoginTask;
+
+var IonicUploadTask = function() {
+}
+
+IonicUploadTask.HELP_LINE = 'Upload an Ionic project.';
+
+IonicUploadTask.prototype = new IonicTask();
+
+IonicUploadTask.prototype.run = function(ionic) {
+  var project = ionic.loadConfig();
+
+  var login = new IonicLoginTask();
+  login.get(ionic, function(jar) {
+    request({
+      method: 'POST',
+      url: ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:''),
+      jar: jar
+    }, 
+    function(err, response, body) {
+      if(err) {
+        ionic.fail("Error uploading: " + err);
+      }
+
+
+      console.log(response);
+    });
+  });
+  
+};
+
+exports.IonicUploadTask = IonicUploadTask;
diff --git a/package.json b/package.json
index 8f994518ed..7b4a2f57f1 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,13 @@
   "author": "Max Lynch <max@drifty.com>",
   "license": "MIT",
   "dependencies": {
-    "cordova": "~3.2.0",
-    "request": "2.27.0",
-    "shelljs": "0.2.6",
-    "unzip": "0.1.9",
+    "adm-zip": "0.4.3",
+    "cordova": "~3.2.0",    
     "ncp": "0.4.2",
     "optimist": "0.6.0",
-    "prompt": "0.2.12"
+    "prompt": "0.2.12",
+    "request": "2.27.0",
+    "shelljs": "0.2.6",
+    "unzip": "0.1.9"
   }
 }

From 1ac019c4b8ae57e57b437c72b7559669550c98e4 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 7 Jan 2014 18:28:14 -0600
Subject: [PATCH 0034/1100] Broken code to upload zip

---
 lib/ionic/start.js  |  1 -
 lib/ionic/upload.js | 38 ++++++++++++++++++++++++++++++++------
 package.json        |  2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index e017052ac8..a9891e92d2 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -3,7 +3,6 @@ var fs = require('fs'),
     request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
-    shelljs = require('shelljs/global'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 971db5b56c..1dd03d0684 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,6 +1,9 @@
-var request = require('request'),
+var fs = require('fs'),
+    path = require('path'),
+    request = require('request'),
     argv = require('optimist').argv,
-    zip = require('adm-zip');
+    FormData = require('form-data');
+    Zip = require('adm-zip');
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login.js').IonicLoginTask;
 
@@ -16,19 +19,42 @@ IonicUploadTask.prototype.run = function(ionic) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
-    request({
-      method: 'POST',
+    var zip = new Zip();
+    zip.addLocalFolder('www');
+    zip.writeZip('www.zip');
+
+    // var form = new FormData();
+
+    // form.getLength(function(err,length){
+      // console.log(length);
+    var r = request.post({
+      // method: 'POST',
       url: ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:''),
-      jar: jar
+      jar: jar,
+      // headers: { 'content-length': length }
+      // form: {
+      //   csrfmiddlewaretoken: jar.cookies[0].value,
+      //   app_file: fs.createReadStream('www.zip')        
+      // }
     }, 
     function(err, response, body) {
+      // fs.unlinkSync('www.zip');
+
       if(err) {
         ionic.fail("Error uploading: " + err);
       }
 
-
       console.log(response);
     });
+
+    var form = r.form();
+    form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+    form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip'});
+    // form.append('app_file', zip.toBuffer(), {filename: 'www.zip'});
+      // r._form = form;
+    // });
+
+    console.log('poop');
   });
   
 };
diff --git a/package.json b/package.json
index 7b4a2f57f1..8f9319776d 100644
--- a/package.json
+++ b/package.json
@@ -27,11 +27,11 @@
   "dependencies": {
     "adm-zip": "0.4.3",
     "cordova": "~3.2.0",    
+    "form-data": "~0.1.0",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "request": "2.27.0",
-    "shelljs": "0.2.6",
     "unzip": "0.1.9"
   }
 }

From 1fbd0468dce7ab943bae844ead0ed018b7c693ac Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 13 Jan 2014 11:35:23 -0600
Subject: [PATCH 0035/1100] Upload zips!

---
 lib/ionic/upload.js | 52 ++++++++++++++++++++-------------------------
 package.json        |  2 +-
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 1dd03d0684..e532ce7c77 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,9 +1,10 @@
 var fs = require('fs'),
     path = require('path'),
+    parseUrl = require('url').parse,
     request = require('request'),
     argv = require('optimist').argv,
-    FormData = require('form-data');
-    Zip = require('adm-zip');
+    FormData = require('form-data'),
+    Zip = require('adm-zip'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login.js').IonicLoginTask;
 
@@ -23,40 +24,33 @@ IonicUploadTask.prototype.run = function(ionic) {
     zip.addLocalFolder('www');
     zip.writeZip('www.zip');
 
-    // var form = new FormData();
-
-    // form.getLength(function(err,length){
-      // console.log(length);
-    var r = request.post({
-      // method: 'POST',
-      url: ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:''),
-      jar: jar,
-      // headers: { 'content-length': length }
-      // form: {
-      //   csrfmiddlewaretoken: jar.cookies[0].value,
-      //   app_file: fs.createReadStream('www.zip')        
-      // }
-    }, 
-    function(err, response, body) {
+    var form = new FormData();
+    form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+    // form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip'});
+    form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
+
+    var url = ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:'');
+    var params = parseUrl(url);
+
+    form.submit({
+      host: params.host,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: jar.cookies.map(function (c) {
+          return c.name + "=" + encodeURIComponent(c.value)
+        }).join("; ")
+      })
+    }, function(err, response, body) {
       // fs.unlinkSync('www.zip');
+      console.log(response);
+      // console.log(body);
 
       if(err) {
+        console.trace();
         ionic.fail("Error uploading: " + err);
       }
-
-      console.log(response);
     });
-
-    var form = r.form();
-    form.append('csrfmiddlewaretoken', jar.cookies[0].value);
-    form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip'});
-    // form.append('app_file', zip.toBuffer(), {filename: 'www.zip'});
-      // r._form = form;
-    // });
-
-    console.log('poop');
   });
-  
 };
 
 exports.IonicUploadTask = IonicUploadTask;
diff --git a/package.json b/package.json
index 8f9319776d..cd652b3163 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "Max Lynch <max@drifty.com>",
+  "author": "Max Lynch <max@drifty.com> and Peter Collins <peter@drifty.com>",
   "license": "MIT",
   "dependencies": {
     "adm-zip": "0.4.3",

From 8906a89c53a560e6f31fd5fce114352537c51bae Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 13 Jan 2014 12:20:55 -0600
Subject: [PATCH 0036/1100] Save app_id for project when uploaded

---
 lib/ionic/upload.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index e532ce7c77..d734bcfb43 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -40,15 +40,15 @@ IonicUploadTask.prototype.run = function(ionic) {
           return c.name + "=" + encodeURIComponent(c.value)
         }).join("; ")
       })
-    }, function(err, response, body) {
-      // fs.unlinkSync('www.zip');
-      console.log(response);
-      // console.log(body);
-
+    }, function(err, response) {
       if(err) {
-        console.trace();
         ionic.fail("Error uploading: " + err);
       }
+      if(response.statusCode == 302) {
+        var redirectPath = parseUrl(response.headers.location);
+        project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];
+        ionic.saveConfig(project);
+      }
     });
   });
 };

From a7c6684bdb9e2daafeee20c5b2bcf59372eeec49 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 13 Jan 2014 14:08:50 -0600
Subject: [PATCH 0037/1100] Don't write zip file

---
 lib/ionic/upload.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index d734bcfb43..ccc5750702 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -22,7 +22,6 @@ IonicUploadTask.prototype.run = function(ionic) {
   login.get(ionic, function(jar) {
     var zip = new Zip();
     zip.addLocalFolder('www');
-    zip.writeZip('www.zip');
 
     var form = new FormData();
     form.append('csrfmiddlewaretoken', jar.cookies[0].value);

From c8aedac953ce975366d44fb29259e59a40e68656 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 13 Jan 2014 19:10:55 -0600
Subject: [PATCH 0038/1100] Added initial plugin install, and build and run

---
 lib/ionic.js          | 23 ++++++++++++++++++++-
 lib/ionic/build.js    | 46 ++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/platform.js | 47 +++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/run.js      | 46 ++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/start.js    | 11 ++++++++++
 package.json          |  2 +-
 6 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 lib/ionic/build.js
 create mode 100644 lib/ionic/platform.js
 create mode 100644 lib/ionic/run.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 1c5870f7ce..9d1186486a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -15,6 +15,9 @@ Copyright 2013 Drifty (http://drifty.com/)
 */
                    
 var IonicStartTask = require('./ionic/start.js').IonicStartTask;
+var IonicPlatformTask = require('./ionic/platform.js').IonicPlatformTask;
+var IonicRunTask = require('./ionic/run.js').IonicRunTask;
+var IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
 
 var argv = require('optimist').argv;
 
@@ -24,6 +27,24 @@ var TASKS = [
     name: 'start',
     usage: 'appname',
     task: IonicStartTask
+  }, 
+  {
+    title: 'run',
+    name: 'run',
+    usage: 'run',
+    task: IonicRunTask
+  },
+  {
+    title: 'build',
+    name: 'build',
+    usage: 'build',
+    task: IonicBuildTask
+  },
+  {
+    title: 'platform',
+    name: 'platform',
+    usage: 'platform',
+    task: IonicPlatformTask
   }
 ];
 
@@ -54,7 +75,7 @@ Ionic.prototype = {
 
     for(var i = 0; i < TASKS.length; i++) {
       var task = TASKS[i];
-      process.stderr.write('  ' + task.name + '\t\t' + task.task.HELP_LINE + '\n');
+      process.stderr.write('  ' + task.name + ' - ' + task.task.HELP_LINE + '\n');
     }
 
     process.stderr.write('\n');
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
new file mode 100644
index 0000000000..486ffc909a
--- /dev/null
+++ b/lib/ionic/build.js
@@ -0,0 +1,46 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
+    IonicTask = require('./task').IonicTask;
+
+var argv = require('optimist').argv;
+
+var IonicBuildTask = function() {
+}
+
+IonicBuildTask.HELP_LINE = 'Locally build an ionic project for a given platform';
+
+IonicBuildTask.prototype = new IonicTask();
+
+IonicBuildTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic build [platform]\n');
+}
+
+IonicBuildTask.prototype.run = function(ionic) {
+  var patform;
+
+  if(argv._.length < 2) {
+    IonicBuildTask.prototype._printUsage();
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  var platforms = argv._.slice(1);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  for(var i = 0; i < platforms.length; i++) {
+    platform = platforms[i];
+    console.log('Building platform', platform);
+    if(exec("cordova build " + platform).code !== 0) {
+      ionic.fail('Unable to build app on platform ' + platform + '. Please see console for more info.');
+    }
+  }
+};
+
+exports.IonicBuildTask = IonicBuildTask;
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
new file mode 100644
index 0000000000..9993cb3ac1
--- /dev/null
+++ b/lib/ionic/platform.js
@@ -0,0 +1,47 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
+    IonicTask = require('./task').IonicTask;
+
+var argv = require('optimist').argv;
+
+var IonicPlatformTask = function() {
+}
+
+IonicPlatformTask.HELP_LINE = 'Configure platform targets for building an Ionic app';
+
+IonicPlatformTask.prototype = new IonicTask();
+
+IonicPlatformTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic platforms [platform1, platform2]\nSupported platforms currently "ios" and "android"\n\n');
+}
+
+IonicPlatformTask.prototype.run = function(ionic) {
+  var patform;
+
+  if(argv._.length < 2) {
+    IonicPlatformTask.prototype._printUsage();
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  // Grab the name of the app
+  var platforms = argv._.slice(1);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  for(var i = 0; i < platforms.length; i++) {
+    platform = platforms[i];
+    console.log('Adding platform', platform);
+    if(exec("cordova platform add " + platform).code !== 0) {
+      process.stderr.write('Unable to add platform ' + platform + '. Please see console for more info.\n');
+    }
+  }
+};
+
+exports.IonicPlatformTask = IonicPlatformTask;
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
new file mode 100644
index 0000000000..6010728608
--- /dev/null
+++ b/lib/ionic/run.js
@@ -0,0 +1,46 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
+    IonicTask = require('./task').IonicTask;
+
+var argv = require('optimist').argv;
+
+var IonicRunTask = function() {
+}
+
+IonicRunTask.HELP_LINE = 'Run an ionic project on a connected device.';
+
+IonicRunTask.prototype = new IonicTask();
+
+IonicRunTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic run [platform]\n');
+}
+
+IonicRunTask.prototype.run = function(ionic) {
+  var patform;
+
+  if(argv._.length < 2) {
+    IonicRunTask.prototype._printUsage();
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  var platforms = argv._.slice(1);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  for(var i = 0; i < platforms.length; i++) {
+    platform = platforms[i];
+    console.log('Running app on platform', platform);
+    if(exec("cordova run " + platform).code !== 0) {
+      ionic.fail('Unable to run app on platform ' + platform + '. Please see console for more info.');
+    }
+  }
+};
+
+exports.IonicRunTask = IonicRunTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 650efb1d7b..9079838880 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -82,6 +82,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
       cp('-R', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', _this.targetPath);
       rm('-rf', _this.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
       console.log('Project created!');
+
+      _this._finish();
     });
     readStream.pipe(writeStream);
   };
@@ -93,6 +95,15 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
   });
 };
 
+IonicStartTask.prototype._finish = function() {
+  cd(this.targetPath);
+  console.log('Initializing cordova project.');
+  if(!exec('cordova plugin add org.apache.cordova.device') || !exec('cordova plugin add org.apache.cordova.console') ||
+    !exec('cordova plugin add org.apache.cordova.statusbar')) {
+      process.stderr.write('Unable to install one or more cordova plugins.\n');
+  }
+};
+
 IonicStartTask.prototype._writeTemplateFolder = function() {
   console.log('Copying template to', this.targetPath);
   ncp('template', this.appName, function(err) {
diff --git a/package.json b/package.json
index 74e910bd49..4cada292c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.09",
+  "version": "0.9.10",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From bbbba6eb8b9cc4d842f24d2edf6a917a2be42ab5 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 14 Jan 2014 14:25:50 -0600
Subject: [PATCH 0039/1100] Move build to package and added alt names for
 commands

---
 lib/ionic.js                       | 16 +++++++++++++---
 lib/ionic/{build.js => package.js} | 10 +++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)
 rename lib/ionic/{build.js => package.js} (70%)

diff --git a/lib/ionic.js b/lib/ionic.js
index 13b35f118e..6e3498c172 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -38,14 +38,16 @@ var TASKS = [
   {
     title: 'upload',
     name: 'upload',
+    alt: ['up'],
     usage: '',
     task: IonicUploadTask
   },
   {
-    title: 'build',
-    name: 'build',
+    title: 'package',
+    name: 'package',
+    alt: ['pack'],
     usage: 'platform',
-    task: IonicBuildTask
+    task: IonicPackageTask
   }
 ];
 
@@ -72,6 +74,14 @@ Ionic.prototype = {
       if(t.name === name) {
         return t;
       }
+      if(t.alt) {
+        for(var j = 0; j < t.alt.length; j++) {
+          var alt = t.alt[j];
+          if(alt === name) {
+            return t;
+          }   
+        }
+      }
     }
   },
 
diff --git a/lib/ionic/build.js b/lib/ionic/package.js
similarity index 70%
rename from lib/ionic/build.js
rename to lib/ionic/package.js
index 811d7770fc..fd93cb1b28 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/package.js
@@ -3,14 +3,14 @@ var request = require('request'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login.js').IonicLoginTask;
 
-var IonicBuildTask = function() {
+var IonicPackageTask = function() {
 }
 
-IonicBuildTask.HELP_LINE = 'Build an Ionic project for the given plaform.';
+IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
 
-IonicBuildTask.prototype = new IonicTask();
+IonicPackageTask.prototype = new IonicTask();
 
-IonicBuildTask.prototype.run = function(ionic) {
+IonicPackageTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
     ionic.fail('No plaform specified, exiting.');
   }
@@ -37,4 +37,4 @@ IonicBuildTask.prototype.run = function(ionic) {
   });  
 };
 
-exports.IonicBuildTask = IonicBuildTask;
+exports.IonicPackageTask = IonicPackageTask;

From 025bd8bdc196a6ef796460d3f4367e3757713394 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 14 Jan 2014 14:57:04 -0600
Subject: [PATCH 0040/1100] Fix formatting and make more consistent code

---
 lib/ionic/build.js    | 16 +++-------------
 lib/ionic/package.js  | 38 +++++++++++++++++++++++---------------
 lib/ionic/platform.js | 16 +++-------------
 lib/ionic/run.js      | 16 +++-------------
 4 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 486ffc909a..eb948aff7d 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,14 +1,6 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
+var argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
 
-var argv = require('optimist').argv;
-
 var IonicBuildTask = function() {
 }
 
@@ -17,12 +9,10 @@ IonicBuildTask.HELP_LINE = 'Locally build an ionic project for a given platform'
 IonicBuildTask.prototype = new IonicTask();
 
 IonicBuildTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic build [platform]\n');
+  process.stderr.write('\nUsage: ionic build platform [more platforms,...]\n');
 }
 
 IonicBuildTask.prototype.run = function(ionic) {
-  var patform;
-
   if(argv._.length < 2) {
     IonicBuildTask.prototype._printUsage();
     ionic.fail('No platforms specified, exiting.');
@@ -35,7 +25,7 @@ IonicBuildTask.prototype.run = function(ionic) {
   }
 
   for(var i = 0; i < platforms.length; i++) {
-    platform = platforms[i];
+    var platform = platforms[i];
     console.log('Building platform', platform);
     if(exec("cordova build " + platform).code !== 0) {
       ionic.fail('Unable to build app on platform ' + platform + '. Please see console for more info.');
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index fd93cb1b28..26b46adec7 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -10,30 +10,38 @@ IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
 
 IonicPackageTask.prototype = new IonicTask();
 
+IonicPackageTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic package platform [more platforms,...]\n');
+}
+
 IonicPackageTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No plaform specified, exiting.');
+    IonicPackageTask.prototype._printUsage();
+    ionic.fail('No platforms specified, exiting.');
   }
 
-  // Grab the platform build for the app
-  this.platform = argv._[1];
+  var platforms = argv._.slice(1);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
 
   var project = ionic.loadConfig();
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
-    request({
-      method: 'POST',
-      url: ionic.IONIC_DASH+'export/',
-      jar: jar
-    }, 
-    function(err, response, body) {
-      if(err) {
-        ionic.fail("Error building: " + err);
-      }
-    });
-    console.log(jar);
-    console.log(project.name);
+    for(var i = 0; i < platforms.length; i++) {
+      request({
+        method: 'POST',
+        url: ionic.IONIC_DASH+'export/',
+        jar: jar
+      }, 
+      function(err, response, body) {
+        if(err) {
+          ionic.fail("Error building: " + err);
+        }
+      });
+    }
   });  
 };
 
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index 9993cb3ac1..68eb4c5042 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -1,14 +1,6 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
+var argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
 
-var argv = require('optimist').argv;
-
 var IonicPlatformTask = function() {
 }
 
@@ -17,12 +9,10 @@ IonicPlatformTask.HELP_LINE = 'Configure platform targets for building an Ionic
 IonicPlatformTask.prototype = new IonicTask();
 
 IonicPlatformTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic platforms [platform1, platform2]\nSupported platforms currently "ios" and "android"\n\n');
+  process.stderr.write('\nUsage: ionic platform [more platforms,...]\nSupported platforms currently "ios" and "android"\n\n');
 }
 
 IonicPlatformTask.prototype.run = function(ionic) {
-  var patform;
-
   if(argv._.length < 2) {
     IonicPlatformTask.prototype._printUsage();
     ionic.fail('No platforms specified, exiting.');
@@ -36,7 +26,7 @@ IonicPlatformTask.prototype.run = function(ionic) {
   }
 
   for(var i = 0; i < platforms.length; i++) {
-    platform = platforms[i];
+    var platform = platforms[i];
     console.log('Adding platform', platform);
     if(exec("cordova platform add " + platform).code !== 0) {
       process.stderr.write('Unable to add platform ' + platform + '. Please see console for more info.\n');
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 6010728608..995c801b46 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,14 +1,6 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
+var argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
 
-var argv = require('optimist').argv;
-
 var IonicRunTask = function() {
 }
 
@@ -17,12 +9,10 @@ IonicRunTask.HELP_LINE = 'Run an ionic project on a connected device.';
 IonicRunTask.prototype = new IonicTask();
 
 IonicRunTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic run [platform]\n');
+  process.stderr.write('\nUsage: ionic run platform [more platforms,...]\n');
 }
 
 IonicRunTask.prototype.run = function(ionic) {
-  var patform;
-
   if(argv._.length < 2) {
     IonicRunTask.prototype._printUsage();
     ionic.fail('No platforms specified, exiting.');
@@ -35,7 +25,7 @@ IonicRunTask.prototype.run = function(ionic) {
   }
 
   for(var i = 0; i < platforms.length; i++) {
-    platform = platforms[i];
+    var platform = platforms[i];
     console.log('Running app on platform', platform);
     if(exec("cordova run " + platform).code !== 0) {
       ionic.fail('Unable to run app on platform ' + platform + '. Please see console for more info.');

From 746055bc6f5984f9c9cdc1fe391ec15c04e9209e Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 15 Jan 2014 14:21:57 -0600
Subject: [PATCH 0041/1100] Getting ready to export

---
 lib/ionic.js         | 29 +++++++++++++------
 lib/ionic/login.js   | 12 ++++++++
 lib/ionic/package.js | 68 ++++++++++++++++++++++++++++++--------------
 lib/ionic/upload.js  |  8 ++++--
 4 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ca4bd69086..de4e1caecf 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -14,13 +14,13 @@ Licensed under the MIT license. See LICENSE For more.
 Copyright 2013 Drifty (http://drifty.com/)
 */
                    
-var IonicStartTask = require('./ionic/start.js').IonicStartTask,
-    IonicPlatformTask = require('./ionic/platform.js').IonicPlatformTask;
-    IonicRunTask = require('./ionic/run.js').IonicRunTask;
-    IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
-    IonicLoginTask = require('./ionic/login.js').IonicLoginTask,
-    IonicUploadTask = require('./ionic/upload.js').IonicUploadTask,
-    IonicPackageTask = require('./ionic/package.js').IonicPackageTask;
+var IonicStartTask = require('./ionic/start').IonicStartTask,
+    IonicPlatformTask = require('./ionic/platform').IonicPlatformTask,
+    IonicRunTask = require('./ionic/run').IonicRunTask,
+    IonicBuildTask = require('./ionic/build').IonicBuildTask,
+    IonicLoginTask = require('./ionic/login').IonicLoginTask,
+    IonicUploadTask = require('./ionic/upload').IonicUploadTask,
+    IonicPackageTask = require('./ionic/package').IonicPackageTask;
 
 var fs = require('fs'), 
     argv = require('optimist').argv;
@@ -67,7 +67,7 @@ var TASKS = [
     title: 'package',
     name: 'package',
     alt: ['pack'],
-    usage: 'platform',
+    usage: 'mode platform',
     task: IonicPackageTask
   }
 ];
@@ -79,6 +79,19 @@ Ionic.prototype = {
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_CONFIG: 'ionic.config',
   IONIC_API: 'api/v1/',
+  CONFIG_DEFAULT: {
+    name: '',
+    email: '',
+    app_id: '',
+    package_name: '',    
+    ios_certificate: '',
+    ios_certificate_password: '',
+    ios_profile: '',
+    android_keystore: '',
+    android_keystore_alias: '',
+    android_keystore_password: '',
+    android_key_password: ''
+  },
 
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index c749e61ebe..cb40e3077d 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -24,11 +24,18 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     required: true
   }];
 
+  var project = ionic.loadConfig();
+
   // Grab the email for login
   if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
     this.email = argv._[1].toLowerCase();
     schema.shift();
   } 
+  // Assume project email is login email if it exists
+  else if(project.email && project.email != '') {
+    this.email = project.email;
+    schema.shift();
+  }
 
   prompt.override = argv;
 
@@ -43,6 +50,11 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
       self.email = result.email.toLowerCase();
     }
     self.password = result.password;
+
+    if(!project.email || project.email == '') {
+      project.email = self.email;
+      ionic.saveConfig(project);
+    }
     
     var jar = request.jar();
     request({
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 26b46adec7..1e021438a4 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,7 +1,9 @@
 var request = require('request'),
     argv = require('optimist').argv,
+    prompt = require('prompt'),
     IonicTask = require('./task').IonicTask,
-    IonicLoginTask = require('./login.js').IonicLoginTask;
+    IonicUploadTask = require('./upload').IonicUploadTask;
+    IonicLoginTask = require('./login').IonicLoginTask;
 
 var IonicPackageTask = function() {
 }
@@ -11,38 +13,62 @@ IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
 IonicPackageTask.prototype = new IonicTask();
 
 IonicPackageTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic package platform [more platforms,...]\n');
+  process.stderr.write('\nUsage: ionic package mode(debug|release) platform [more platforms,...]\n');
 }
 
 IonicPackageTask.prototype.run = function(ionic) {
-  if(argv._.length < 2) {
+  if(argv._.length < 3) {
     IonicPackageTask.prototype._printUsage();
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms or build mode specified, exiting.');
   }
 
-  var platforms = argv._.slice(1);
+  var mode = argv._[1].toLowerCase();
+  if(mode != 'debug' && mode != 'release') {
+    IonicPackageTask.prototype._printUsage();
+    ionic.fail('Package build mode must be debug or release, exiting.');
+  }
+
+  var platforms = argv._.slice(2);
 
   if(platforms.length < 1) {
     ionic.fail('No platforms specified, exiting.');
   }
 
-  var project = ionic.loadConfig();
-
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
-    for(var i = 0; i < platforms.length; i++) {
-      request({
-        method: 'POST',
-        url: ionic.IONIC_DASH+'export/',
-        jar: jar
-      }, 
-      function(err, response, body) {
-        if(err) {
-          ionic.fail("Error building: " + err);
+  var upload = new IonicUploadTask();
+  upload.run(ionic, function() {
+
+    var login = new IonicLoginTask();
+    login.get(ionic, function(jar) {
+
+      var project = ionic.loadConfig();
+
+      for(var i = 0; i < platforms.length; i++) {
+        var platform = platforms[i];
+
+        switch (platform) {
+          case 'android':
+            break;
+          case 'ios':
+            break;
+          default:
+            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently "ios" and "android"\n\n');
+            continue;
         }
-      });
-    }
-  });  
+
+        request({
+          method: 'POST',
+          url: ionic.IONIC_DASH+'export/',
+          jar: jar
+        }, 
+        function(err, response, body) {
+          if(err) {
+            ionic.fail("Error packaging: " + err);
+          }
+        });
+      }
+      
+    });  
+  });
 };
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index ccc5750702..457cceb099 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -6,7 +6,7 @@ var fs = require('fs'),
     FormData = require('form-data'),
     Zip = require('adm-zip'),
     IonicTask = require('./task').IonicTask,
-    IonicLoginTask = require('./login.js').IonicLoginTask;
+    IonicLoginTask = require('./login').IonicLoginTask;
 
 var IonicUploadTask = function() {
 }
@@ -15,7 +15,7 @@ IonicUploadTask.HELP_LINE = 'Upload an Ionic project.';
 
 IonicUploadTask.prototype = new IonicTask();
 
-IonicUploadTask.prototype.run = function(ionic) {
+IonicUploadTask.prototype.run = function(ionic, callback) {
   var project = ionic.loadConfig();
 
   var login = new IonicLoginTask();
@@ -47,6 +47,10 @@ IonicUploadTask.prototype.run = function(ionic) {
         var redirectPath = parseUrl(response.headers.location);
         project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];
         ionic.saveConfig(project);
+
+        if (callback) {
+          callback();
+        };
       }
     });
   });

From 3ea1d14780d02df0f77de00cbfd4c71a4f3581d7 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 15 Jan 2014 15:59:57 -0600
Subject: [PATCH 0042/1100] Use default config for template

---
 lib/ionic.js         |  6 +++---
 lib/ionic/package.js | 28 +++++++++++++++++++---------
 lib/ionic/start.js   | 12 ++++++------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index de4e1caecf..da3269216d 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -166,10 +166,10 @@ Ionic.prototype = {
     return JSON.parse(fs.readFileSync(this.IONIC_CONFIG));
   },
 
-  saveConfig: function(project) {
-    var err = fs.writeFileSync(this.IONIC_CONFIG, JSON.stringify(project, null, 2));
+  saveConfig: function(project, targetPath) {
+    var err = fs.writeFileSync((targetPath?targetPath+'/':'')+this.IONIC_CONFIG, JSON.stringify(project, null, 2));
     if(err) {
-      process.stderr.write('Error writing ' + ionic.IONIC_CONFIG + ': ' + err + '\n');
+      process.stderr.write('Error writing ' + (targetPath?targetPath+'/':'')+ ionic.IONIC_CONFIG + ': ' + err + '\n');
     }
   }
   
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 1e021438a4..8555502843 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -2,7 +2,7 @@ var request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     IonicTask = require('./task').IonicTask,
-    IonicUploadTask = require('./upload').IonicUploadTask;
+    IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
 
 var IonicPackageTask = function() {
@@ -45,8 +45,12 @@ IonicPackageTask.prototype.run = function(ionic) {
       for(var i = 0; i < platforms.length; i++) {
         var platform = platforms[i];
 
+        prompt.override = argv;
+        prompt.start();
+        var schema;
+
         switch (platform) {
-          case 'android':
+          case 'android':          
             break;
           case 'ios':
             break;
@@ -55,15 +59,21 @@ IonicPackageTask.prototype.run = function(ionic) {
             continue;
         }
 
-        request({
-          method: 'POST',
-          url: ionic.IONIC_DASH+'export/',
-          jar: jar
-        }, 
-        function(err, response, body) {
+        prompt.get(schema, function (err, result) {
           if(err) {
-            ionic.fail("Error packaging: " + err);
+            ionic.fail('Error packaging: ' + err);
           }
+          
+          request({
+            method: 'POST',
+            url: ionic.IONIC_DASH+'export/',
+            jar: jar
+          }, 
+          function(err, response, body) {
+            if(err) {
+              ionic.fail("Error packaging: " + err);
+            }
+          });
         });
       }
       
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5eb8133f7e..516a3a8505 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -95,12 +95,12 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 };
 
 IonicStartTask.prototype._writeConfig = function(ionic) {
-  console.log('Writing ionic.config', this.targetPath);
-  var err = fs.writeFileSync(this.targetPath + '/' + ionic.IONIC_CONFIG, JSON.stringify({name: this.appName}, null, 2));
-  if(err) {
-    process.stderr.write('Error writing ' + this.targetPath + '/' + ionic.IONIC_CONFIG + ': ' + err + '\n');
-    return;
-  }
+  console.log('Writing '+this.targetPath+'/ionic.config');
+
+  var project = ionic.CONFIG_DEFAULT;
+  project.name = this.appName;
+  
+  ionic.saveConfig(project, this.targetPath);
 };
 
 IonicStartTask.prototype._checkTargetPath = function() { 

From 013d6f5f7623e6b8bd226491a31d73b297f562a8 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 15 Jan 2014 19:06:30 -0600
Subject: [PATCH 0043/1100] Add package properties

---
 lib/ionic.js         |  5 ++++
 lib/ionic/package.js | 70 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index da3269216d..9bc2852ffa 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -167,6 +167,11 @@ Ionic.prototype = {
   },
 
   saveConfig: function(project, targetPath) {
+    if(!project) {
+      console.trace();
+      this.fail('This should never happen!');
+    }
+
     var err = fs.writeFileSync((targetPath?targetPath+'/':'')+this.IONIC_CONFIG, JSON.stringify(project, null, 2));
     if(err) {
       process.stderr.write('Error writing ' + (targetPath?targetPath+'/':'')+ ionic.IONIC_CONFIG + ': ' + err + '\n');
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 8555502843..113ebea833 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -47,26 +47,88 @@ IonicPackageTask.prototype.run = function(ionic) {
 
         prompt.override = argv;
         prompt.start();
-        var schema;
+        var properties = {};
 
         switch (platform) {
-          case 'android':          
+          case 'android':
+            if(mode == 'release') {
+              properties = {
+                android_keystore: {
+                  description: 'Android Keystore File (.keystore)',
+                  message: 'Relative path to your release keystore file (eg. release.keystore)',
+                  required: true
+                }, 
+                android_keystore_alias: {
+                  description: 'Keystore Alias',
+                  message: 'Alias of the Keystore',
+                  required: true
+                },
+                android_keystore_password: {
+                  description: 'Keystore Password',
+                  message: 'Password of the Keystore',
+                  hidden: true,
+                  required: true
+                }, 
+                android_key_password: {
+                  description: 'Key Password',
+                  message: 'Password for Key (usually same as Keystore Password and if left blank will use it)',
+                  hidden: true,
+                }
+              };
+            }
+
             break;
           case 'ios':
+             properties = {
+                ios_certificate: {
+                  description: 'iOS Certificate File (.p12)',
+                  message: 'Relative path to your certificate file (eg. cert.p12)',
+                  required: true
+                }, 
+                ios_certificate_password: {
+                  description: 'Certificate Password',
+                  message: 'Password of the Certificate',
+                  hidden: true,
+                  required: true
+                }, 
+                ios_profile: {
+                  description: 'iOS Mobile Provisioning Profile (.mobileprofile)',
+                  message: 'Relative path to your Mobile Provisioning Profile (eg. my.mobileprofile)',
+                  required: true
+                }, 
+              };
             break;
           default:
             process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently "ios" and "android"\n\n');
             continue;
         }
 
-        prompt.get(schema, function (err, result) {
+        properties.package_name = {
+          description: 'Package Name (eg. com.mycompany.app)',
+          message: 'Package Name (eg. com.mycompany.app) not required',
+        };
+
+        for (var property in properties) {
+          if(project[property] && project[project] == '') {
+            delete properties[property];
+          }
+        }
+
+        prompt.get({properties: properties}, function (err, result) {
           if(err) {
             ionic.fail('Error packaging: ' + err);
           }
+
+          for (var property in properties) {
+            if(project[property] && project[project] == '') {
+              project[property] = result[property];
+            }
+          }
+          ionic.saveConfig(project);
           
           request({
             method: 'POST',
-            url: ionic.IONIC_DASH+'export/',
+            url: ionic.IONIC_DASH+'export/'+project.app_id,
             jar: jar
           }, 
           function(err, response, body) {

From 23602bd42ee8d4f504700dbc6a1f4c64cd036533 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 16 Jan 2014 14:39:58 -0600
Subject: [PATCH 0044/1100] Finish package command

---
 lib/ionic/package.js | 82 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 113ebea833..df39bcd421 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -49,8 +49,10 @@ IonicPackageTask.prototype.run = function(ionic) {
         prompt.start();
         var properties = {};
 
+        // Just prompt for some build properties
         switch (platform) {
           case 'android':
+            // Android debug doesn't require anything
             if(mode == 'release') {
               properties = {
                 android_keystore: {
@@ -99,15 +101,17 @@ IonicPackageTask.prototype.run = function(ionic) {
               };
             break;
           default:
-            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently "ios" and "android"\n\n');
+            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently are "ios" and "android"\n\n');
             continue;
         }
 
+        // Should we just not add this since it's optional?
         properties.package_name = {
-          description: 'Package Name (eg. com.mycompany.app)',
-          message: 'Package Name (eg. com.mycompany.app) not required',
+          description: 'Package Name (eg. com.mycompany.app) optional',
+          message: 'Package Name (eg. com.mycompany.app) optional',
         };
 
+        // Don't prompt for properties we already have in the config
         for (var property in properties) {
           if(project[property] && project[project] == '') {
             delete properties[property];
@@ -119,19 +123,79 @@ IonicPackageTask.prototype.run = function(ionic) {
             ionic.fail('Error packaging: ' + err);
           }
 
+          // Overwrite any empty properties with prompt responses
           for (var property in properties) {
             if(project[property] && project[project] == '') {
               project[property] = result[property];
             }
           }
           ionic.saveConfig(project);
+
+          var form = new FormData();
+          form.append('platform', platform);
+          form.append('build_mode', mode);
+          form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+
+          // Add the project properties to the post
+          for (var property in project) {
+            if(property.indexOf(platform)) {
+              form.append(property, project[project]);
+            }
+          }
           
-          request({
-            method: 'POST',
-            url: ionic.IONIC_DASH+'export/'+project.app_id,
-            jar: jar
-          }, 
-          function(err, response, body) {
+          // Gimmie those sweet sweet files
+          switch(platform) {
+            case 'android':
+              var keystoreFilePath = path.resolve(project.android_keystore);
+              if(mode = 'release') {
+                if(fs.existsSync(keystoreFilePath)) {
+                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath));
+                } else {
+                  delete project.android_keystore;
+                  ionic.saveConfig(project);
+                  process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
+                  return;
+                }
+              }
+              break;
+            case 'ios': 
+              var certificateFilePath = path.resolve(project.ios_certificate);
+              if(fs.existsSync(certificateFilePath)) {
+                form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
+              } else {
+                delete project.ios_certificate;
+                ionic.saveConfig(project);
+                process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
+                return;
+              }
+              var profileFilePath = path.resolve(project.ios_profile);
+              if(fs.existsSync(profileFilePath)) {
+                form.append('ios_profile_file', fs.createReadStream(profileFilePath));
+              } else {
+                delete project.ios_profile;
+                ionic.saveConfig(project);
+                process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
+                return;
+              }
+              break;
+            default:
+              console.trace();
+              process.stderr.write('\nUnknown platform: "'+platform+'"\nWe should never get here"\n\n');
+              break;
+          }
+
+          var url = ionic.IONIC_DASH+'export/'+project.app_id;
+          var params = parseUrl(url);
+
+          form.submit({
+            host: params.host,
+            path: params.path,
+            headers: form.getHeaders({
+              cookie: jar.cookies.map(function (c) {
+                return c.name + "=" + encodeURIComponent(c.value)
+              }).join("; ")
+            })
+          }, function(err, response) {
             if(err) {
               ionic.fail("Error packaging: " + err);
             }

From 132e7a47eba46fc19c1bb14d401494c429074e9d Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 16 Jan 2014 15:57:47 -0600
Subject: [PATCH 0045/1100] Small fixes

---
 lib/ionic/package.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index df39bcd421..825c1c9297 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,6 +1,9 @@
-var request = require('request'),
+var fs = require('fs'),
+    path = require('path'),
+    parseUrl = require('url').parse,
     argv = require('optimist').argv,
     prompt = require('prompt'),
+    FormData = require('form-data'),    
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
@@ -132,13 +135,15 @@ IonicPackageTask.prototype.run = function(ionic) {
           ionic.saveConfig(project);
 
           var form = new FormData();
+          form.append('email', project.email);
           form.append('platform', platform);
           form.append('build_mode', mode);
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
-          // Add the project properties to the post
+          // Add the platform specific project properties to the post
+          console.log(project);
           for (var property in project) {
-            if(property.indexOf(platform)) {
+            if(property.indexOf(platform) == 0) {
               form.append(property, project[project]);
             }
           }
@@ -146,10 +151,10 @@ IonicPackageTask.prototype.run = function(ionic) {
           // Gimmie those sweet sweet files
           switch(platform) {
             case 'android':
-              var keystoreFilePath = path.resolve(project.android_keystore);
-              if(mode = 'release') {
+              if(mode == 'release') {
+                var keystoreFilePath = path.resolve(project.android_keystore);
                 if(fs.existsSync(keystoreFilePath)) {
-                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath));
+                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
                 } else {
                   delete project.android_keystore;
                   ionic.saveConfig(project);

From e25a00e8b21332f66c0c36ac147fc25a6b2184cc Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 16 Jan 2014 21:19:27 -0600
Subject: [PATCH 0046/1100] Try using tar.gz doesn't work

---
 lib/ionic/package.js | 23 +++++++++++++----------
 lib/ionic/start.js   |  3 ++-
 lib/ionic/upload.js  | 20 ++++++++++++++------
 package.json         |  4 +++-
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 825c1c9297..b5ffb76f05 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -37,8 +37,8 @@ IonicPackageTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
-  var upload = new IonicUploadTask();
-  upload.run(ionic, function() {
+  //var upload = new IonicUploadTask();
+  //upload.run(ionic, function() {
 
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
@@ -75,7 +75,7 @@ IonicPackageTask.prototype.run = function(ionic) {
                   required: true
                 }, 
                 android_key_password: {
-                  description: 'Key Password',
+                  description: 'Key Password (optional)',
                   message: 'Password for Key (usually same as Keystore Password and if left blank will use it)',
                   hidden: true,
                 }
@@ -109,10 +109,10 @@ IonicPackageTask.prototype.run = function(ionic) {
         }
 
         // Should we just not add this since it's optional?
-        properties.package_name = {
-          description: 'Package Name (eg. com.mycompany.app) optional',
-          message: 'Package Name (eg. com.mycompany.app) optional',
-        };
+        // properties.package_name = {
+        //   description: 'Package Name (eg. com.mycompany.app) optional',
+        //   message: 'Package Name (eg. com.mycompany.app) optional',
+        // };
 
         // Don't prompt for properties we already have in the config
         for (var property in properties) {
@@ -141,14 +141,13 @@ IonicPackageTask.prototype.run = function(ionic) {
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
           // Add the platform specific project properties to the post
-          console.log(project);
           for (var property in project) {
             if(property.indexOf(platform) == 0) {
               form.append(property, project[project]);
             }
           }
           
-          // Gimmie those sweet sweet files
+          // Gimmie dem sweet sweet files
           switch(platform) {
             case 'android':
               if(mode == 'release') {
@@ -201,6 +200,10 @@ IonicPackageTask.prototype.run = function(ionic) {
               }).join("; ")
             })
           }, function(err, response) {
+            response.on("data", function(data) {
+                console.log(data);
+            });
+
             if(err) {
               ionic.fail("Error packaging: " + err);
             }
@@ -209,7 +212,7 @@ IonicPackageTask.prototype.run = function(ionic) {
       }
       
     });  
-  });
+  //});
 };
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 516a3a8505..37ed0fbc63 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -3,6 +3,7 @@ var fs = require('fs'),
     request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
+    shelljs = require('shelljs/global'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
     IonicTask = require('./task').IonicTask;
@@ -77,7 +78,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
       rm('-rf', self.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
       console.log('Project created!');
 
-      cd(this.targetPath);
+      cd(self.targetPath);
       console.log('Initializing cordova project.');
       if(!exec('cordova plugin add org.apache.cordova.device') || !exec('cordova plugin add org.apache.cordova.console') ||
         !exec('cordova plugin add org.apache.cordova.statusbar')) {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 457cceb099..d3724be4ad 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -3,8 +3,11 @@ var fs = require('fs'),
     parseUrl = require('url').parse,
     request = require('request'),
     argv = require('optimist').argv,
+    shelljs = require('shelljs/global'),
+    fstream = require('fstream'),
+    tar = require('tar'),
+    zlib = require('zlib'),
     FormData = require('form-data'),
-    Zip = require('adm-zip'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login').IonicLoginTask;
 
@@ -20,13 +23,17 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
-    var zip = new Zip();
-    zip.addLocalFolder('www');
-
     var form = new FormData();
     form.append('csrfmiddlewaretoken', jar.cookies[0].value);
-    // form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip'});
-    form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
+
+
+    // Using this http://stackoverflow.com/questions/15530435/node-js-zip-unzip-a-folder
+    fstream.Reader({ 'path': 'www', 'type': 'Directory' }) /* Read the source directory */
+      .pipe(tar.Pack()) /* Convert the directory to a .tar file */
+      .pipe(zlib.Gzip()) /* Compress the .tar file */
+      .pipe(fstream.Writer({ 'path': 'www.tar.gz', 'type': 'File' }));
+    form.append('app_file', fs.createReadStream(path.resolve('www.tar.gz')), {filename: 'www.tar.gz', contentType: 'application/x-gzip'});
+    // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
 
     var url = ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:'');
     var params = parseUrl(url);
@@ -40,6 +47,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
         }).join("; ")
       })
     }, function(err, response) {
+      //rm('-f', 'www.tar.gz');
       if(err) {
         ionic.fail("Error uploading: " + err);
       }
diff --git a/package.json b/package.json
index 9ae2025ed9..56cbfad473 100644
--- a/package.json
+++ b/package.json
@@ -25,13 +25,15 @@
   "author": "Max Lynch <max@drifty.com> and Peter Collins <peter@drifty.com>",
   "license": "MIT",
   "dependencies": {
-    "adm-zip": "0.4.3",
     "cordova": "~3.2.0",    
     "form-data": "~0.1.0",
+    "fstream": "0.1.25",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "request": "2.27.0",
+    "shelljs": "0.2.6",
+    "tar": "0.1.19",
     "unzip": "0.1.9"
   }
 }

From fe3955c09eae7fdccff4a43df4f7056493c26851 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Thu, 16 Jan 2014 22:01:31 -0600
Subject: [PATCH 0047/1100] Got zips to work and upload

---
 lib/ionic/package.js |  7 ++--
 lib/ionic/upload.js  | 77 ++++++++++++++++++++++++--------------------
 package.json         |  3 +-
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index b5ffb76f05..324d86d242 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -37,8 +37,8 @@ IonicPackageTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
-  //var upload = new IonicUploadTask();
-  //upload.run(ionic, function() {
+  var upload = new IonicUploadTask();
+  upload.run(ionic, function() {
 
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
@@ -210,9 +210,8 @@ IonicPackageTask.prototype.run = function(ionic) {
           });
         });
       }
-      
     });  
-  //});
+  });
 };
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index d3724be4ad..3e1837f966 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,12 +1,8 @@
 var fs = require('fs'),
     path = require('path'),
     parseUrl = require('url').parse,
-    request = require('request'),
+    archiver = require('archiver'),
     argv = require('optimist').argv,
-    shelljs = require('shelljs/global'),
-    fstream = require('fstream'),
-    tar = require('tar'),
-    zlib = require('zlib'),
     FormData = require('form-data'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login').IonicLoginTask;
@@ -23,43 +19,54 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
-    var form = new FormData();
-    form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+    
+    var zip = fs.createWriteStream('www.zip');
 
+    var archive = archiver('zip');
+    archive.pipe(zip);
 
-    // Using this http://stackoverflow.com/questions/15530435/node-js-zip-unzip-a-folder
-    fstream.Reader({ 'path': 'www', 'type': 'Directory' }) /* Read the source directory */
-      .pipe(tar.Pack()) /* Convert the directory to a .tar file */
-      .pipe(zlib.Gzip()) /* Compress the .tar file */
-      .pipe(fstream.Writer({ 'path': 'www.tar.gz', 'type': 'File' }));
-    form.append('app_file', fs.createReadStream(path.resolve('www.tar.gz')), {filename: 'www.tar.gz', contentType: 'application/x-gzip'});
-    // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
+    archive.bulk([
+      { expand: true, cwd: 'www/', src: ['**'] }
+    ]);
 
-    var url = ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:'');
-    var params = parseUrl(url);
-
-    form.submit({
-      host: params.host,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: jar.cookies.map(function (c) {
-          return c.name + "=" + encodeURIComponent(c.value)
-        }).join("; ")
-      })
-    }, function(err, response) {
-      //rm('-f', 'www.tar.gz');
+    archive.finalize(function(err, bytes) {
       if(err) {
         ionic.fail("Error uploading: " + err);
       }
-      if(response.statusCode == 302) {
-        var redirectPath = parseUrl(response.headers.location);
-        project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];
-        ionic.saveConfig(project);
+    });
 
-        if (callback) {
-          callback();
-        };
-      }
+    zip.on('close', function() {
+      var form = new FormData();
+      form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+      form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
+      // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
+
+      var url = ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:'');
+      var params = parseUrl(url);
+
+      form.submit({
+        host: params.host,
+        path: params.path,
+        headers: form.getHeaders({
+          cookie: jar.cookies.map(function (c) {
+            return c.name + "=" + encodeURIComponent(c.value)
+          }).join("; ")
+        })
+      }, function(err, response) {
+        rm('-f', 'www.zip');
+        if(err) {
+          ionic.fail("Error uploading: " + err);
+        }
+        if(response.statusCode == 302) {
+          var redirectPath = parseUrl(response.headers.location);
+          project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];
+          ionic.saveConfig(project);
+
+          if (callback) {
+            callback();
+          };
+        }
+      });
     });
   });
 };
diff --git a/package.json b/package.json
index 56cbfad473..d4c193df28 100644
--- a/package.json
+++ b/package.json
@@ -25,15 +25,14 @@
   "author": "Max Lynch <max@drifty.com> and Peter Collins <peter@drifty.com>",
   "license": "MIT",
   "dependencies": {
+    "archiver": "0.5.1",
     "cordova": "~3.2.0",    
     "form-data": "~0.1.0",
-    "fstream": "0.1.25",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "request": "2.27.0",
     "shelljs": "0.2.6",
-    "tar": "0.1.19",
     "unzip": "0.1.9"
   }
 }

From fb79e3a6b8ec17afac7505c159b2af4cc40ac723 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 17 Jan 2014 15:15:14 -0600
Subject: [PATCH 0048/1100] Handle errors in package

---
 lib/ionic/package.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 324d86d242..6746589084 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -200,8 +200,15 @@ IonicPackageTask.prototype.run = function(ionic) {
               }).join("; ")
             })
           }, function(err, response) {
+
+            response.setEncoding('utf8');
             response.on("data", function(data) {
-                console.log(data);
+              var json = JSON.parse(data);
+              if(json.errors) {
+                for (var j = 0; j < json.errors.length; j++) {
+                  process.stderr.write(json.errors[j]);
+                }
+              }              
             });
 
             if(err) {

From 0cd395a25db282cb826748fb9782d5089a44e6ef Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 17 Jan 2014 16:18:02 -0600
Subject: [PATCH 0049/1100] Upload name with app

---
 lib/ionic/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 6746589084..7db6b4fbab 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -136,6 +136,7 @@ IonicPackageTask.prototype.run = function(ionic) {
 
           var form = new FormData();
           form.append('email', project.email);
+          form.append('name', project.name);
           form.append('platform', platform);
           form.append('build_mode', mode);
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);

From 26b034211d575a8555db51706fdc7e64d176e7cc Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 3 Feb 2014 22:38:26 -0600
Subject: [PATCH 0050/1100] Updated build and emulate

---
 lib/ionic.js         |   8 +
 lib/ionic/build.js   |   5 +-
 lib/ionic/config.js  |  46 ++++
 lib/ionic/emulate.js |  49 ++++
 lib/ionic/run.js     |   5 +-
 lib/ionic/start.js   |   5 +-
 lib/ionic/stats.js   | 542 +++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/task.js    |  15 +-
 package.json         |   5 +-
 9 files changed, 670 insertions(+), 10 deletions(-)
 create mode 100644 lib/ionic/config.js
 create mode 100644 lib/ionic/emulate.js
 create mode 100644 lib/ionic/stats.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 9d1186486a..ce21f1c517 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -17,6 +17,7 @@ Copyright 2013 Drifty (http://drifty.com/)
 var IonicStartTask = require('./ionic/start.js').IonicStartTask;
 var IonicPlatformTask = require('./ionic/platform.js').IonicPlatformTask;
 var IonicRunTask = require('./ionic/run.js').IonicRunTask;
+var IonicEmulateTask = require('./ionic/emulate.js').IonicEmulateTask;
 var IonicBuildTask = require('./ionic/build.js').IonicBuildTask;
 
 var argv = require('optimist').argv;
@@ -28,6 +29,12 @@ var TASKS = [
     usage: 'appname',
     task: IonicStartTask
   }, 
+  {
+    title: 'emulate',
+    name: 'emulate',
+    usage: 'emulate',
+    task: IonicEmulateTask
+  },
   {
     title: 'run',
     name: 'run',
@@ -51,6 +58,7 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
+  IONIC_CONF: '.ionic',
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
       return false;
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 486ffc909a..1c5cee9200 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
 
 var argv = require('optimist').argv;
 
@@ -34,6 +35,8 @@ IonicBuildTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
+  IonicStats.t('build', { 'platform': platforms.join(',') });
+
   for(var i = 0; i < platforms.length; i++) {
     platform = platforms[i];
     console.log('Building platform', platform);
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
new file mode 100644
index 0000000000..af16f1066f
--- /dev/null
+++ b/lib/ionic/config.js
@@ -0,0 +1,46 @@
+var fs = require('fs'),
+    path = require('path'),
+    ionic = require('../ionic');
+
+var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+
+module.exports = {
+  CONF_DIR: '.ionic',
+  CONF_FILE: '.ionic/info.json',
+  getConfig: function() {
+    if(fs.existsSync(path.join(home, this.CONF_FILE))) {
+      var data = JSON.parse(fs.readFileSync(path.join(home, this.CONF_FILE)));
+      this.data = data;
+    } else {
+      this.create();
+    }
+    return this;
+  },
+  get: function(k) {
+    return this.data[k];
+  },
+  set: function(k, v) {
+    if(!this.data) {
+      this.create();
+    }
+    this.data[k] = v;
+    this.save();
+  },
+  save: function() {
+    if(!this.data) { return; }
+
+    var dirPath = path.join(home, this.CONF_DIR);
+    var p = path.join(home, this.CONF_FILE);
+
+    if(!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath);
+    }
+    if(!fs.exists(p)) {
+      fs.writeFileSync(p, JSON.stringify(this.data));
+    }
+  },
+  create: function() {
+    this.data = {};
+    this.save();
+  }
+};
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
new file mode 100644
index 0000000000..0c1934b12e
--- /dev/null
+++ b/lib/ionic/emulate.js
@@ -0,0 +1,49 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    shelljs = require('shelljs/global'),
+    unzip = require('unzip'),
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+
+var argv = require('optimist').argv;
+
+var IonicEmulateTask = function() {
+}
+
+IonicEmulateTask.HELP_LINE = 'Emulate an ionic project on a simulator or emulator.';
+
+IonicEmulateTask.prototype = new IonicTask();
+
+IonicEmulateTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic emulate [platform]\n');
+}
+
+IonicEmulateTask.prototype.run = function(ionic) {
+  var patform;
+
+  if(argv._.length < 2) {
+    IonicEmulateTask.prototype._printUsage();
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  var platforms = argv._.slice(1);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  IonicStats.t('emulate', { 'platform': platforms.join(',') });
+
+  for(var i = 0; i < platforms.length; i++) {
+    platform = platforms[i];
+    console.log('Emulating app on platform', platform);
+    if(exec("cordova emulate " + platform).code !== 0) {
+      ionic.fail('Unable to emulate app on platform ' + platform + '. Please see console for more info.');
+    }
+  }
+};
+
+exports.IonicEmulateTask = IonicEmulateTask;
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 6010728608..cb47f6a8f0 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
 
 var argv = require('optimist').argv;
 
@@ -34,6 +35,8 @@ IonicRunTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
+  IonicStats.t('run', { 'platform': platforms.join(',') });
+
   for(var i = 0; i < platforms.length; i++) {
     platform = platforms[i];
     console.log('Running app on platform', platform);
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9079838880..8025e79e0a 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
 
 var argv = require('optimist').argv;
 
@@ -102,6 +103,8 @@ IonicStartTask.prototype._finish = function() {
     !exec('cordova plugin add org.apache.cordova.statusbar')) {
       process.stderr.write('Unable to install one or more cordova plugins.\n');
   }
+
+  IonicStats.t('start', {});
 };
 
 IonicStartTask.prototype._writeTemplateFolder = function() {
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
new file mode 100644
index 0000000000..7dc7d5948c
--- /dev/null
+++ b/lib/ionic/stats.js
@@ -0,0 +1,542 @@
+var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, ionic, os, IonicConfig;
+var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, 
+        __slice = Array.prototype.slice;
+
+path = require('path'),
+http = require('http');
+querystring = require('querystring');
+crypto = require('crypto');
+Buffer          = require('buffer').Buffer,
+util = require('util');
+es = require('event-stream');
+fs = require('fs');
+os = require('os');
+ionic = require('../ionic');
+IonicConfig = require('./config');
+
+/*
+    Heavily inspired by the original js library copyright Mixpanel, Inc.
+    (http://mixpanel.com/)
+
+    Copyright (c) 2012 Carl Sverre
+
+    Released under the MIT license.
+*/
+
+var create_client = function(token, config) {
+    var metrics = {};
+
+    if(!token) {
+        throw new Error("The Mixpanel Client needs a Mixpanel token: `init(token)`");
+    }
+
+    metrics.config = {
+        test: false,
+        debug: false,
+        verbose: false
+    };
+
+    metrics.token = token;
+
+    /**
+        send_request(data)
+        ---
+        this function sends an async GET request to mixpanel
+
+        data:object                     the data to send in the request
+        callback:function(err:Error)    callback is called when the request is
+                                        finished or an error occurs
+    */
+    metrics.send_request = function(endpoint, data, callback) {
+        callback = callback || function() {};
+        var event_data = new Buffer(JSON.stringify(data));
+        var request_data = {
+            'data': event_data.toString('base64'),
+            'ip': 0,
+            'verbose': metrics.config.verbose ? 1 : 0
+        };
+
+        if (endpoint === '/import') {
+            var key = metrics.config.key;
+            if (!key) {
+                throw new Error("The Mixpanel Client needs a Mixpanel api key when importing old events: `init(token, { key: ... })`");
+            }
+            request_data.api_key = key;
+        }
+
+        var request_options = {
+            host: 'api.mixpanel.com',
+            port: 80,
+            headers: {}
+        };
+
+        if (metrics.config.test) { request_data.test = 1; }
+
+        var query = querystring.stringify(request_data);
+
+        request_options.path = [endpoint,"?",query].join("");
+
+        http.get(request_options, function(res) {
+            var data = "";
+            res.on('data', function(chunk) {
+               data += chunk;
+            });
+
+            res.on('end', function() {
+                var e;
+                if(metrics.config.verbose) {
+                    try {
+                        var result = JSON.parse(data);
+                        if(result.status != 1) {
+                            e = new Error("Mixpanel Server Error: " + result.error);
+                        }
+                    }
+                    catch(ex) {
+                        e = new Error("Could not parse response from Mixpanel");
+                    }
+                }
+                else {
+                    e = (data !== '1') ? new Error("Mixpanel Server Error: " + data) : undefined;
+                }
+
+                callback(e);
+            });
+        }).on('error', function(e) {
+            if(metrics.config.debug) {
+                console.log("Got Error: " + e.message);
+            }
+            callback(e);
+        });
+    };
+
+    /**
+        track(event, properties, callback)
+        ---
+        this function sends an event to mixpanel.
+
+        event:string                    the event name
+        properties:object               additional event properties to send
+        callback:function(err:Error)    callback is called when the request is
+                                        finished or an error occurs
+    */
+    metrics.track = function(event, properties, callback) {
+        if (typeof(properties) === 'function' || !properties) {
+            callback = properties;
+            properties = {};
+        }
+
+        // if properties.time exists, use import endpoint
+        var endpoint = (typeof(properties.time) === 'number') ? '/import' : '/track';
+
+        properties.token = metrics.token;
+        properties.mp_lib = "node";
+
+        var data = {
+            'event' : event,
+            'properties' : properties
+        };
+
+        if (metrics.config.debug) {
+            console.log("Sending the following event to Mixpanel:");
+            console.log(data);
+        }
+
+        metrics.send_request(endpoint, data, callback);
+    };
+
+    /**
+        import(event, properties, callback)
+        ---
+        This function sends an event to mixpanel using the import
+        endpoint.  The time argument should be either a Date or Number,
+        and should signify the time the event occurred.
+
+        It is highly recommended that you specify the distinct_id
+        property for each event you import, otherwise the events will be
+        tied to the IP address of the sending machine.
+
+        For more information look at:
+        https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
+
+        event:string                    the event name
+        time:date|number                the time of the event
+        properties:object               additional event properties to send
+        callback:function(err:Error)    callback is called when the request is
+                                        finished or an error occurs
+    */
+    metrics.import = function(event, time, properties, callback) {
+        if (typeof(properties) === 'function' || !properties) {
+            callback = properties;
+            properties = {};
+        }
+
+        if (time === void 0) {
+            throw new Error("The import method requires you to specify the time of the event");
+        } else if (Object.prototype.toString.call(time) === '[object Date]') {
+            time = Math.floor(time.getTime() / 1000);
+        }
+
+        properties.time = time;
+
+        metrics.track(event, properties, callback);
+    };
+
+    /**
+        alias(distinct_id, alias)
+        ---
+        This function creates an alias for distinct_id
+
+        For more information look at:
+        https://mixpanel.com/docs/integration-libraries/using-mixpanel-alias
+
+        distinct_id:string              the current identifier
+        alias:string                    the future alias
+    */
+    metrics.alias = function(distinct_id, alias, callback) {
+        var properties = {
+            distinct_id: distinct_id,
+            alias: alias
+        };
+
+        metrics.track('$create_alias', properties, callback);
+    };
+
+    metrics.people = {
+        /** people.set_once(distinct_id, prop, to, callback)
+            ---
+            The same as people.set but in the words of mixpanel:
+            mixpanel.people.set_once
+
+            " This method allows you to set a user attribute, only if
+             it is not currently set. It can be called multiple times
+             safely, so is perfect for storing things like the first date
+             you saw a user, or the referrer that brought them to your
+             website for the first time. "
+
+        */
+        set_once: function(distinct_id, prop, to, callback) {
+            var $set = {}, data = {};
+
+            if (typeof(prop) === 'object') {
+                callback = to;
+                $set = prop;
+            } else {
+                $set[prop] = to;
+            }
+
+            this._set(distinct_id, $set, callback, { set_once: true });
+        },
+
+        /**
+            people.set(distinct_id, prop, to, callback)
+            ---
+            set properties on an user record in engage
+
+            usage:
+
+                mixpanel.people.set('bob', 'gender', 'm');
+
+                mixpanel.people.set('joe', {
+                    'company': 'acme',
+                    'plan': 'premium'
+                });
+        */
+        set: function(distinct_id, prop, to, callback) {
+            var $set = {}, data = {};
+
+            if (typeof(prop) === 'object') {
+                callback = to;
+                $set = prop;
+            } else {
+                $set[prop] = to;
+            }
+
+            this._set(distinct_id, $set, callback);
+        },
+
+        // used internally by set and set_once
+        _set: function(distinct_id, $set, callback, options) {
+            var set_key = (options && options.set_once) ? "$set_once" : "$set";
+
+            var data = {
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+            data[set_key] = $set;
+
+            if ('ip' in $set) {
+                data.$ip = $set.ip;
+                delete $set.ip;
+            }
+
+            if ($set.$ignore_time) {
+                data.$ignore_time = $set.$ignore_time;
+                delete $set.$ignore_time;
+            }
+
+            if(metrics.config.debug) {
+                console.log("Sending the following data to Mixpanel (Engage):");
+                console.log(data);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        },
+
+        /**
+            people.increment(distinct_id, prop, to, callback)
+            ---
+            increment/decrement properties on an user record in engage
+
+            usage:
+
+                mixpanel.people.increment('bob', 'page_views', 1);
+
+                // or, for convenience, if you're just incrementing a counter by 1, you can
+                // simply do
+                mixpanel.people.increment('bob', 'page_views');
+
+                // to decrement a counter, pass a negative number
+                mixpanel.people.increment('bob', 'credits_left', -1);
+
+                // like mixpanel.people.set(), you can increment multiple properties at once:
+                mixpanel.people.increment('bob', {
+                    counter1: 1,
+                    counter2: 3,
+                    counter3: -2
+                });
+        */
+        increment: function(distinct_id, prop, by, callback) {
+            var $add = {};
+
+            if (typeof(prop) === 'object') {
+                callback = by;
+                Object.keys(prop).forEach(function(key) {
+                    var val = prop[key];
+
+                    if (isNaN(parseFloat(val))) {
+                        if (metrics.config.debug) {
+                            console.error("Invalid increment value passed to mixpanel.people.increment - must be a number");
+                            console.error("Passed " + key + ":" + val);
+                        }
+                        return;
+                    } else {
+                        $add[key] = val;
+                    }
+                });
+            } else {
+                if (!by) { by = 1; }
+                $add[prop] = by;
+            }
+
+            var data = {
+                '$add': $add,
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+
+            if(metrics.config.debug) {
+                console.log("Sending the following data to Mixpanel (Engage):");
+                console.log(data);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        },
+
+        /**
+            people.track_charge(distinct_id, amount, properties, callback)
+            ---
+            Record that you have charged the current user a certain
+            amount of money.
+
+            usage:
+
+                // charge a user $29.99
+                mixpanel.people.track_charge('bob', 29.99);
+
+                // charge a user $19 on the 1st of february
+                mixpanel.people.track_charge('bob', 19, { '$time': new Date('feb 1 2012') });
+        */
+        track_charge: function(distinct_id, amount, properties, callback) {
+            var $append = {};
+
+            if (!properties) { properties = {}; }
+
+            if (typeof(amount) !== 'number') {
+                amount = parseFloat(amount);
+                if (isNaN(amount)) {
+                    console.error("Invalid value passed to mixpanel.people.track_charge - must be a number");
+                    return;
+                }
+            }
+
+            properties.$amount = amount;
+
+            if (properties.hasOwnProperty('$time')) {
+                var time = properties.$time;
+                if (Object.prototype.toString.call(time) === '[object Date]') {
+                    properties.$time = time.toISOString();
+                }
+            }
+
+            var data = {
+                '$append': { '$transactions': properties },
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+
+            if(metrics.config.debug) {
+                console.log("Sending the following data to Mixpanel (Engage):");
+                console.log(data);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        },
+
+        /**
+            people.clear_charges(distinct_id, callback)
+            ---
+            Clear all the current user's transactions.
+
+            usage:
+
+                mixpanel.people.clear_charges('bob');
+        */
+        clear_charges: function(distinct_id, callback) {
+            var data = {
+                '$set': { '$transactions': [] },
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+
+            if(metrics.config.debug) {
+                console.log("Clearing this user's charges:", distinct_id);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        },
+
+        /**
+            people.delete_user(distinct_id, callback)
+            ---
+            delete an user record in engage
+
+            usage:
+
+                mixpanel.people.delete_user('bob');
+        */
+        delete_user: function(distinct_id, callback) {
+            var data = {
+                '$delete': distinct_id,
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+
+            if(metrics.config.debug) {
+                console.log("Deleting the user from engage:", distinct_id);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        },
+
+        /**
+         people.unset(distinct_id, prop, callback)
+         ---
+         delete a property on an user record in engage
+
+         usage:
+
+            mixpanel.people.unset('bob', 'page_views');
+
+            mixpanel.people.unset('bob', ['page_views', 'last_login']);
+         */
+        unset: function(distinct_id, prop, callback) {
+            var $unset = [];
+
+            if (util.isArray(prop)) {
+                $unset = prop;
+            } else if (typeof(prop) === 'string') {
+                $unset = [prop];
+            } else {
+                if (metrics.config.debug) {
+                    console.error("Invalid argument passed to mixpanel.people.unset - must be a string or array");
+                    console.error("Passed: " + prop);
+                }
+                return;
+            }
+
+            data = {
+                '$unset': $unset,
+                '$token': metrics.token,
+                '$distinct_id': distinct_id
+            };
+
+            if(metrics.config.debug) {
+                console.log("Sending the following data to Mixpanel (Engage):");
+                console.log(data);
+            }
+
+            metrics.send_request('/engage', data, callback);
+        }
+    };
+
+    /**
+        set_config(config)
+        ---
+        Modifies the mixpanel config
+
+        config:object       an object with properties to override in the
+                            mixpanel client config
+    */
+    metrics.set_config = function(config) {
+        for (var c in config) {
+            if (config.hasOwnProperty(c)) {
+                metrics.config[c] = config[c];
+            }
+        }
+    };
+
+    if (config) {
+        metrics.set_config(config);
+    }
+
+    return metrics;
+};
+
+// module exporting
+/*
+module.exports = {
+    Client: function(token) {
+        console.warn("The function `Client(token)` is deprecated.  It is now called `init(token)`.");
+        return create_client(token);
+    },
+    init: create_client
+};
+*/
+
+var mixpanel = create_client('69f7271aa8f3d43f2e1b6baf698159b7');
+
+var ionicConfig = IonicConfig.getConfig();
+
+
+exports.IonicStats = {
+  t: function(e, d) {
+    var unique_id = ionicConfig.get('ank');
+    if(!unique_id) {
+      this.createdId();
+      unique_id = ionicConfig.get('ank');
+    }
+    d.distinct_id = unique_id;
+    mixpanel.track(e, d, function(err, data) {
+    });
+  },
+  createId: function() {
+    var d = new Date().getTime();
+    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+      var r = (d + Math.random()*16)%16 | 0;
+      d = Math.floor(d/16);
+      return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+    });
+
+    ionicConfig.set('ank', uuid);
+  }
+}
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 20b74b4c1f..6a8dcf9d3c 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -5,17 +5,22 @@ var IonicTask = function() {
 
 IonicTask.prototype = {
   // Prompt the user for a response
-  ask: function(question) {
+  ask: function(question, cb) {
     var response;
 
     process.stdout.write(question + ' ');
+
     process.stdin.resume();
-    response = fs.readSync(process.stdin.fd, 100, 0, "utf8");
-    process.stdin.pause();
-    return response[0].trim();
+    process.stdin.setEncoding('utf8');
+    var util = require('util');
+
+    process.stdin.on('data', function (text) {
+      cb(util.inspect(text));
+      process.stdin.pause();
+    });
   },
   run: function(ionic) {
   }
 };
 
-exports.IonicTask = IonicTask;
\ No newline at end of file
+exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index 4cada292c0..c1de740772 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -30,6 +30,7 @@
     "shelljs": "0.2.6",
     "unzip": "0.1.9",
     "ncp": "0.4.2",
-    "optimist": "0.6.0"
+    "optimist": "0.6.0",
+    "event-stream": "3.0.x"
   }
 }

From 83b36d900e37f0218128f8ed6b0624dd785d33a0 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 3 Feb 2014 22:47:36 -0600
Subject: [PATCH 0051/1100] Platform

---
 lib/ionic/platform.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index 9993cb3ac1..873d7736a4 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
 
 var argv = require('optimist').argv;
 
@@ -35,6 +36,8 @@ IonicPlatformTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
+  IonicStats.t('platform', { 'platform': platforms.join(',') });
+
   for(var i = 0; i < platforms.length; i++) {
     platform = platforms[i];
     console.log('Adding platform', platform);

From bd5546d3e66c55f1e15c0e6033c3800105d51af5 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 3 Feb 2014 22:48:00 -0600
Subject: [PATCH 0052/1100] version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1de740772..a46d586acc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 52f84c55e39a0239e2bfe258fc893b7ce3edb048 Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Tue, 4 Feb 2014 08:56:53 -0500
Subject: [PATCH 0053/1100] fix(stats): typo s/createdId/createId

---
 lib/ionic/stats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 7dc7d5948c..bddc6bba87 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -522,7 +522,7 @@ exports.IonicStats = {
   t: function(e, d) {
     var unique_id = ionicConfig.get('ank');
     if(!unique_id) {
-      this.createdId();
+      this.createId();
       unique_id = ionicConfig.get('ank');
     }
     d.distinct_id = unique_id;

From 421a035ff09579a96e6d359d6eb468e7f511644e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 4 Feb 2014 08:13:10 -0600
Subject: [PATCH 0054/1100] Package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a46d586acc..7e482cd965 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 285772fc82b19d2844179a87d7cdc468b1277db0 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Tue, 4 Feb 2014 09:51:12 -0600
Subject: [PATCH 0055/1100] Readme info

---
 README.md | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 00cc6c4f0b..a6c22c3037 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,44 @@
-ionic-cli
+Ionic-Cli
 =========
 
-The Ionic Framework command line utility
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate Ionic apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
+
+## Installing
+
+```bash
+$ sudo npm install -g ionic
+```
+
+## Starting an Ionic App
+
+```bash
+$ ionic start myApp
+```
+
+## Adding a platform target
+
+```bash
+$ ionic platform ios android
+```
+
+## Building your app
+
+```bash
+$ ionic build ios
+```
+
+## Emulating your app
+
+```bash
+$ ionic emulate ios
+```
+
+## Running your app
+
+```bash
+$ ionic run ios
+```
+
+Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
+
+Note: we occasionally anonymous usage statistics to the Ionic team to make the tool better.

From 7ea32c2acf483545c42206328f140a760714b4f9 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Tue, 4 Feb 2014 09:51:28 -0600
Subject: [PATCH 0056/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a6c22c3037..87439694e8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate Ionic apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
 
 ## Installing
 

From 78df86502d821d12c42498f6d4afc2bc41ff0abd Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Sat, 8 Feb 2014 09:25:26 -0600
Subject: [PATCH 0057/1100] Added some protection

---
 lib/ionic/config.js | 18 +++++++++++-------
 package.json        |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index af16f1066f..2b9e1b6c67 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -29,14 +29,18 @@ module.exports = {
   save: function() {
     if(!this.data) { return; }
 
-    var dirPath = path.join(home, this.CONF_DIR);
-    var p = path.join(home, this.CONF_FILE);
+    try {
+      var dirPath = path.join(home, this.CONF_DIR);
+      var p = path.join(home, this.CONF_FILE);
 
-    if(!fs.existsSync(dirPath)) {
-      fs.mkdirSync(dirPath);
-    }
-    if(!fs.exists(p)) {
-      fs.writeFileSync(p, JSON.stringify(this.data));
+      if(!fs.existsSync(dirPath)) {
+        fs.mkdirSync(dirPath);
+      }
+      if(!fs.exists(p)) {
+        fs.writeFileSync(p, JSON.stringify(this.data));
+      }
+    } catch(e) {
+      console.error('Unable to save settings file:', e);
     }
   },
   create: function() {
diff --git a/package.json b/package.json
index 7e482cd965..db428156d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.13",
+  "version": "0.9.14",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From eb33cbf47ebe55fd8d39fee632af75cfb206a7cf Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 8 Feb 2014 10:17:51 -0600
Subject: [PATCH 0058/1100] Unix line endings


From 59518ac11c1519376d305855629bc7bb2489092a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 8 Feb 2014 10:18:35 -0600
Subject: [PATCH 0059/1100] Carriage return

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db428156d9..621b96a50f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e45c39b660100d71e522f2a194df70c46bf370c1 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Sat, 8 Feb 2014 10:22:54 -0600
Subject: [PATCH 0060/1100] Trying to force line ending fix

---
 bin/ionic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/ionic b/bin/ionic
index 0454b93e1f..171649cb21 100644
--- a/bin/ionic
+++ b/bin/ionic
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+
 'use strict';
 
 process.title = 'ionic';

From 73a66f697a37ef6988f7831a52c84c96696176ae Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 8 Feb 2014 10:42:47 -0600
Subject: [PATCH 0061/1100] Ban CRLF forever

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..83cb362591
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# FUCK CRLF
+* text eol=lf

From a44fd0fc4f62d05d9a860d974ab7619e0e0224b6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 8 Feb 2014 10:44:04 -0600
Subject: [PATCH 0062/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 621b96a50f..7bd10d86f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d306ae25d73fcf3648b2e4bb0e4ad50a8d95ceb9 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 10 Feb 2014 11:37:16 -0600
Subject: [PATCH 0063/1100] Whoops finish merge

---
 lib/ionic/build.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 5c6eef5e90..04e871ed02 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,9 +1,6 @@
-<<<<<<< HEAD
-var argv = require('optimist').argv,
-    IonicTask = require('./task').IonicTask;
-=======
 var fs = require('fs'),
     os = require('os'),
+    argv = require('optimist').argv,
     request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
@@ -11,7 +8,6 @@ var fs = require('fs'),
     unzip = require('unzip'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
->>>>>>> master
 
 var IonicBuildTask = function() {
 }

From 224a385e6892a70af5123bd24c6091662c85ef38 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 17 Feb 2014 11:41:51 -0600
Subject: [PATCH 0064/1100] Change to official package site

---
 lib/ionic.js         |   4 +-
 lib/ionic/login.js   | 244 +++++++++++------------
 lib/ionic/package.js | 456 ++++++++++++++++++++++---------------------
 lib/ionic/upload.js  |   8 +
 4 files changed, 363 insertions(+), 349 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index dffbaf246c..1107c92990 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -17,7 +17,7 @@ Copyright 2013 Drifty (http://drifty.com/)
 var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicPlatformTask = require('./ionic/platform').IonicPlatformTask,
     IonicRunTask = require('./ionic/run').IonicRunTask,
-    IonicEmulateTask = require('./ionic/emulate.js').IonicEmulateTask;
+    IonicEmulateTask = require('./ionic/emulate').IonicEmulateTask;
     IonicBuildTask = require('./ionic/build').IonicBuildTask,
     IonicLoginTask = require('./ionic/login').IonicLoginTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
@@ -82,7 +82,7 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
-  IONIC_DASH: 'http://virt/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_CONFIG: 'ionic.config',
   IONIC_CONF: '.ionic',
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index cb40e3077d..c631b6c353 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,122 +1,122 @@
-var fs = require('fs'),
-    request = require('request'),
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    IonicTask = require('./task').IonicTask;
-
-var IonicLoginTask = function() {
-}
-
-IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
-
-IonicLoginTask.prototype = new IonicTask();
-
-IonicLoginTask.prototype.run = function(ionic, callback) {
-  var self = this;
-  var schema = [{
-    name: 'email',
-    pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
-    message: 'Email for Ionic Studio login',
-    required: true
-  }, {
-    name: 'password',
-    hidden: true,
-    required: true
-  }];
-
-  var project = ionic.loadConfig();
-
-  // Grab the email for login
-  if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
-    this.email = argv._[1].toLowerCase();
-    schema.shift();
-  } 
-  // Assume project email is login email if it exists
-  else if(project.email && project.email != '') {
-    this.email = project.email;
-    schema.shift();
-  }
-
-  prompt.override = argv;
-
-  prompt.start();
-
-  prompt.get(schema, function (err, result) {
-    if(err) {
-      ionic.fail('Error logging in: ' + err);
-    }
-
-    if(!self.email) {
-      self.email = result.email.toLowerCase();
-    }
-    self.password = result.password;
-
-    if(!project.email || project.email == '') {
-      project.email = self.email;
-      ionic.saveConfig(project);
-    }
-    
-    var jar = request.jar();
-    request({
-      url: ionic.IONIC_DASH+'login',
-      jar: jar
-    }, 
-    function(err, response, body) {
-      if(err || jar.cookies.length == 0) {
-        ionic.fail('Error logging in: ' + err);
-      }
-
-      request({
-        method: 'POST',
-        url: ionic.IONIC_DASH+'login', 
-        jar: jar, 
-        form: {
-          username: self.email,
-          password: self.password,
-          csrfmiddlewaretoken: jar.cookies[0].value
-        }
-      },
-      function (err, response, body) { 
-        if(err) {
-          ionic.fail('Error logging in: ' + err);
-        }
-        // Should be a 304 redirect status code if correct
-        if(response.statusCode == 200) {
-          ionic.fail('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
-        }
-        
-        var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
-        if(err) {
-          ionic.fail('Error writing ' + ionic.IONIC_COOKIES + ': ' + err);
-        }
-        
-        console.log('Logged in! :)');
-
-        if(callback) {
-          callback(jar);
-        }
-      });
-    });
-  });
-};
-
-IonicLoginTask.prototype.get = function(ionic, callback) {
-  var self = this;
-
-  if(fs.existsSync(ionic.IONIC_COOKIES)) {
-    var jar = JSON.parse(fs.readFileSync(ionic.IONIC_COOKIES));
-    if(jar.cookies && jar.cookies.length > 0) {
-      for(i in jar.cookies) {
-        var cookie = jar.cookies[i];
-        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
-          callback(jar);
-          return;
-        }
-      }
-    }
-  }
-
-  this.run(ionic, callback);
-}
-
-exports.IonicLoginTask = IonicLoginTask;
+var fs = require('fs'),
+    request = require('request'),
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    IonicTask = require('./task').IonicTask;
+
+var IonicLoginTask = function() {
+}
+
+IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
+
+IonicLoginTask.prototype = new IonicTask();
+
+IonicLoginTask.prototype.run = function(ionic, callback) {
+  var self = this;
+  var schema = [{
+    name: 'email',
+    pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
+    message: 'Email for Ionic Studio login',
+    required: true
+  }, {
+    name: 'password',
+    hidden: true,
+    required: true
+  }];
+
+  var project = ionic.loadConfig();
+
+  // Grab the email for login
+  if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
+    this.email = argv._[1].toLowerCase();
+    schema.shift();
+  } 
+  // Assume project email is login email if it exists
+  else if(project.email && project.email != '') {
+    this.email = project.email;
+    schema.shift();
+  }
+
+  prompt.override = argv;
+
+  prompt.start();
+
+  prompt.get(schema, function (err, result) {
+    if(err) {
+      ionic.fail('Error logging in: ' + err);
+    }
+
+    if(!self.email) {
+      self.email = result.email.toLowerCase();
+    }
+    self.password = result.password;
+
+    if(!project.email || project.email == '') {
+      project.email = self.email;
+      ionic.saveConfig(project);
+    }
+    
+    var jar = request.jar();
+    request({
+      url: ionic.IONIC_DASH+'login',
+      jar: jar
+    }, 
+    function(err, response, body) {
+      if(err || jar.cookies.length == 0) {
+        ionic.fail('Error logging in: ' + err);
+      }
+
+      request({
+        method: 'POST',
+        url: ionic.IONIC_DASH+'login', 
+        jar: jar, 
+        form: {
+          username: self.email,
+          password: self.password,
+          csrfmiddlewaretoken: jar.cookies[0].value
+        }
+      },
+      function (err, response, body) { 
+        if(err) {
+          ionic.fail('Error logging in: ' + err);
+        }
+        // Should be a 304 redirect status code if correct
+        if(response.statusCode == 200) {
+          ionic.fail('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
+        }
+        
+        var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
+        if(err) {
+          ionic.fail('Error writing ' + ionic.IONIC_COOKIES + ': ' + err);
+        }
+        
+        console.log('Logged in! :)');
+
+        if(callback) {
+          callback(jar);
+        }
+      });
+    });
+  });
+};
+
+IonicLoginTask.prototype.get = function(ionic, callback) {
+  var self = this;
+
+  if(fs.existsSync(ionic.IONIC_COOKIES)) {
+    var jar = JSON.parse(fs.readFileSync(ionic.IONIC_COOKIES));
+    if(jar.cookies && jar.cookies.length > 0) {
+      for(i in jar.cookies) {
+        var cookie = jar.cookies[i];
+        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+          callback(jar);
+          return;
+        }
+      }
+    }
+  }
+
+  this.run(ionic, callback);
+}
+
+exports.IonicLoginTask = IonicLoginTask;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 7db6b4fbab..113dcb67ff 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,225 +1,231 @@
-var fs = require('fs'),
-    path = require('path'),
-    parseUrl = require('url').parse,
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    FormData = require('form-data'),    
-    IonicTask = require('./task').IonicTask,
-    IonicUploadTask = require('./upload').IonicUploadTask,
-    IonicLoginTask = require('./login').IonicLoginTask;
-
-var IonicPackageTask = function() {
-}
-
-IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
-
-IonicPackageTask.prototype = new IonicTask();
-
-IonicPackageTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic package mode(debug|release) platform [more platforms,...]\n');
-}
-
-IonicPackageTask.prototype.run = function(ionic) {
-  if(argv._.length < 3) {
-    IonicPackageTask.prototype._printUsage();
-    ionic.fail('No platforms or build mode specified, exiting.');
-  }
-
-  var mode = argv._[1].toLowerCase();
-  if(mode != 'debug' && mode != 'release') {
-    IonicPackageTask.prototype._printUsage();
-    ionic.fail('Package build mode must be debug or release, exiting.');
-  }
-
-  var platforms = argv._.slice(2);
-
-  if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
-  }
-
-  var upload = new IonicUploadTask();
-  upload.run(ionic, function() {
-
-    var login = new IonicLoginTask();
-    login.get(ionic, function(jar) {
-
-      var project = ionic.loadConfig();
-
-      for(var i = 0; i < platforms.length; i++) {
-        var platform = platforms[i];
-
-        prompt.override = argv;
-        prompt.start();
-        var properties = {};
-
-        // Just prompt for some build properties
-        switch (platform) {
-          case 'android':
-            // Android debug doesn't require anything
-            if(mode == 'release') {
-              properties = {
-                android_keystore: {
-                  description: 'Android Keystore File (.keystore)',
-                  message: 'Relative path to your release keystore file (eg. release.keystore)',
-                  required: true
-                }, 
-                android_keystore_alias: {
-                  description: 'Keystore Alias',
-                  message: 'Alias of the Keystore',
-                  required: true
-                },
-                android_keystore_password: {
-                  description: 'Keystore Password',
-                  message: 'Password of the Keystore',
-                  hidden: true,
-                  required: true
-                }, 
-                android_key_password: {
-                  description: 'Key Password (optional)',
-                  message: 'Password for Key (usually same as Keystore Password and if left blank will use it)',
-                  hidden: true,
-                }
-              };
-            }
-
-            break;
-          case 'ios':
-             properties = {
-                ios_certificate: {
-                  description: 'iOS Certificate File (.p12)',
-                  message: 'Relative path to your certificate file (eg. cert.p12)',
-                  required: true
-                }, 
-                ios_certificate_password: {
-                  description: 'Certificate Password',
-                  message: 'Password of the Certificate',
-                  hidden: true,
-                  required: true
-                }, 
-                ios_profile: {
-                  description: 'iOS Mobile Provisioning Profile (.mobileprofile)',
-                  message: 'Relative path to your Mobile Provisioning Profile (eg. my.mobileprofile)',
-                  required: true
-                }, 
-              };
-            break;
-          default:
-            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently are "ios" and "android"\n\n');
-            continue;
-        }
-
-        // Should we just not add this since it's optional?
-        // properties.package_name = {
-        //   description: 'Package Name (eg. com.mycompany.app) optional',
-        //   message: 'Package Name (eg. com.mycompany.app) optional',
-        // };
-
-        // Don't prompt for properties we already have in the config
-        for (var property in properties) {
-          if(project[property] && project[project] == '') {
-            delete properties[property];
-          }
-        }
-
-        prompt.get({properties: properties}, function (err, result) {
-          if(err) {
-            ionic.fail('Error packaging: ' + err);
-          }
-
-          // Overwrite any empty properties with prompt responses
-          for (var property in properties) {
-            if(project[property] && project[project] == '') {
-              project[property] = result[property];
-            }
-          }
-          ionic.saveConfig(project);
-
-          var form = new FormData();
-          form.append('email', project.email);
-          form.append('name', project.name);
-          form.append('platform', platform);
-          form.append('build_mode', mode);
-          form.append('csrfmiddlewaretoken', jar.cookies[0].value);
-
-          // Add the platform specific project properties to the post
-          for (var property in project) {
-            if(property.indexOf(platform) == 0) {
-              form.append(property, project[project]);
-            }
-          }
-          
-          // Gimmie dem sweet sweet files
-          switch(platform) {
-            case 'android':
-              if(mode == 'release') {
-                var keystoreFilePath = path.resolve(project.android_keystore);
-                if(fs.existsSync(keystoreFilePath)) {
-                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
-                } else {
-                  delete project.android_keystore;
-                  ionic.saveConfig(project);
-                  process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
-                  return;
-                }
-              }
-              break;
-            case 'ios': 
-              var certificateFilePath = path.resolve(project.ios_certificate);
-              if(fs.existsSync(certificateFilePath)) {
-                form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
-              } else {
-                delete project.ios_certificate;
-                ionic.saveConfig(project);
-                process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
-                return;
-              }
-              var profileFilePath = path.resolve(project.ios_profile);
-              if(fs.existsSync(profileFilePath)) {
-                form.append('ios_profile_file', fs.createReadStream(profileFilePath));
-              } else {
-                delete project.ios_profile;
-                ionic.saveConfig(project);
-                process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
-                return;
-              }
-              break;
-            default:
-              console.trace();
-              process.stderr.write('\nUnknown platform: "'+platform+'"\nWe should never get here"\n\n');
-              break;
-          }
-
-          var url = ionic.IONIC_DASH+'export/'+project.app_id;
-          var params = parseUrl(url);
-
-          form.submit({
-            host: params.host,
-            path: params.path,
-            headers: form.getHeaders({
-              cookie: jar.cookies.map(function (c) {
-                return c.name + "=" + encodeURIComponent(c.value)
-              }).join("; ")
-            })
-          }, function(err, response) {
-
-            response.setEncoding('utf8');
-            response.on("data", function(data) {
-              var json = JSON.parse(data);
-              if(json.errors) {
-                for (var j = 0; j < json.errors.length; j++) {
-                  process.stderr.write(json.errors[j]);
-                }
-              }              
-            });
-
-            if(err) {
-              ionic.fail("Error packaging: " + err);
-            }
-          });
-        });
-      }
-    });  
-  });
-};
-
-exports.IonicPackageTask = IonicPackageTask;
+var fs = require('fs'),
+    path = require('path'),
+    parseUrl = require('url').parse,
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    FormData = require('form-data'),    
+    IonicTask = require('./task').IonicTask,
+    IonicUploadTask = require('./upload').IonicUploadTask,
+    IonicLoginTask = require('./login').IonicLoginTask;
+
+var IonicPackageTask = function() {
+}
+
+IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
+
+IonicPackageTask.prototype = new IonicTask();
+
+IonicPackageTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic package mode(debug|release) platform [more platforms,...]\n');
+}
+
+IonicPackageTask.prototype.run = function(ionic) {
+  if(argv._.length < 3) {
+    IonicPackageTask.prototype._printUsage();
+    ionic.fail('No platforms or build mode specified, exiting.');
+  }
+
+  var mode = argv._[1].toLowerCase();
+  if(mode != 'debug' && mode != 'release') {
+    IonicPackageTask.prototype._printUsage();
+    ionic.fail('Package build mode must be debug or release, exiting.');
+  }
+
+  var platforms = argv._.slice(2);
+
+  if(platforms.length < 1) {
+    ionic.fail('No platforms specified, exiting.');
+  }
+
+  var upload = new IonicUploadTask();
+  upload.run(ionic, function() {
+
+    var login = new IonicLoginTask();
+    login.get(ionic, function(jar) {
+
+      var project = ionic.loadConfig();
+
+      for(var i = 0; i < platforms.length; i++) {
+        var platform = platforms[i];
+
+        prompt.override = argv;
+        prompt.start();
+        var properties = {};
+
+        // Just prompt for some build properties
+        switch (platform) {
+          case 'android':
+            // Android debug doesn't require anything
+            if(mode == 'release') {
+              properties = {
+                android_keystore: {
+                  description: 'Android Keystore File (.keystore)',
+                  message: 'Relative path to your release keystore file (eg. release.keystore)',
+                  required: true
+                }, 
+                android_keystore_alias: {
+                  description: 'Keystore Alias',
+                  message: 'Alias of the Keystore',
+                  required: true
+                },
+                android_keystore_password: {
+                  description: 'Keystore Password',
+                  message: 'Password of the Keystore',
+                  hidden: true,
+                  required: true
+                }, 
+                android_key_password: {
+                  description: 'Key Password (optional)',
+                  message: 'Password for Key (usually same as Keystore Password and if left blank will use it)',
+                  hidden: true,
+                }
+              };
+            }
+
+            break;
+          case 'ios':
+             properties = {
+                ios_certificate: {
+                  description: 'iOS Certificate File (.p12)',
+                  message: 'Relative path to your certificate file (eg. cert.p12)',
+                  required: true
+                }, 
+                ios_certificate_password: {
+                  description: 'Certificate Password',
+                  message: 'Password of the Certificate',
+                  hidden: true,
+                  required: true
+                }, 
+                ios_profile: {
+                  description: 'iOS Mobile Provisioning Profile (.mobileprovision)',
+                  message: 'Relative path to your Mobile Provisioning Profile (eg. my.mobileprovision)',
+                  required: true
+                }, 
+              };
+            break;
+          default:
+            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently are "ios" and "android"\n\n');
+            continue;
+        }
+
+        // Should we just not add this since it's optional?
+        // properties.package_name = {
+        //   description: 'Package Name (eg. com.mycompany.app) optional',
+        //   message: 'Package Name (eg. com.mycompany.app) optional',
+        // };
+
+        // Don't prompt for properties we already have in the config
+        for (var property in properties) {
+          if(project[property]) {
+            delete properties[property];
+          }
+        }
+
+        prompt.get({properties: properties}, function (err, result) {
+          if(err) {
+            ionic.fail('Error packaging: ' + err);
+          }
+
+          // Overwrite any empty properties with prompt responses
+          for (var property in properties) {
+            if(result[property] && !project[property]) {
+              project[property] = result[property];
+            }
+          }
+          ionic.saveConfig(project);
+
+          console.log('Packaging '+platform+' app...');
+
+          var form = new FormData();
+          form.append('email', project.email);
+          form.append('name', project.name);
+          form.append('platform', platform);
+          form.append('build_mode', mode);
+          form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+
+
+          // Add the platform specific project properties to the post
+          for (var property in project) {
+            // console.log(property);
+            // console.log(project[property]);
+            if(property.indexOf(platform) == 0) {
+              form.append(property, project[property]);
+            }
+          }
+          
+          // Gimmie dem sweet sweet files
+          switch(platform) {
+            case 'android':
+              if(mode == 'release') {
+                var keystoreFilePath = path.resolve(project.android_keystore);
+                if(fs.existsSync(keystoreFilePath)) {
+                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
+                } else {
+                  delete project.android_keystore;
+                  ionic.saveConfig(project);
+                  process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
+                  return;
+                }
+              }
+              break;
+            case 'ios': 
+              var certificateFilePath = path.resolve(project.ios_certificate);
+              if(fs.existsSync(certificateFilePath)) {
+                form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
+              } else {
+                delete project.ios_certificate;
+                ionic.saveConfig(project);
+                process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
+                return;
+              }
+              var profileFilePath = path.resolve(project.ios_profile);
+              if(fs.existsSync(profileFilePath)) {
+                form.append('ios_profile_file', fs.createReadStream(profileFilePath));
+              } else {
+                delete project.ios_profile;
+                ionic.saveConfig(project);
+                process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
+                return;
+              }
+              break;
+            default:
+              console.trace();
+              process.stderr.write('\nUnknown platform: "'+platform+'"\nWe should never get here"\n\n');
+              break;
+          }
+
+          var url = ionic.IONIC_DASH+'export/'+project.app_id;
+          var params = parseUrl(url);
+
+          form.submit({
+            host: params.host,
+            path: params.path,
+            headers: form.getHeaders({
+              cookie: jar.cookies.map(function (c) {
+                return c.name + "=" + encodeURIComponent(c.value)
+              }).join("; ")
+            })
+          }, function(err, response) {
+
+            response.setEncoding('utf8');
+            response.on("data", function(data) {
+              var json = JSON.parse(data);
+              if(json.errors) {
+                for (var j = 0; j < json.errors.length; j++) {
+                  process.stderr.write(json.errors[j]);
+                }
+              }              
+            });
+
+            if(err) {
+              ionic.fail("Error packaging: " + err);
+            }
+            console.log('Done');
+          });
+        });
+      }
+    });  
+  });
+};
+
+exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index e65f01fe0f..31e963f8c7 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -20,6 +20,8 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
     
+    console.log('Zipping...');
+
     var zip = fs.createWriteStream('www.zip');
 
     var archive = archiver('zip');
@@ -36,6 +38,9 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     });
 
     zip.on('close', function() {
+      console.log('Done');
+      console.log('Uploading...');
+
       var form = new FormData();
       form.append('csrfmiddlewaretoken', jar.cookies[0].value);
       form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
@@ -57,6 +62,9 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
         if(err) {
           ionic.fail("Error uploading: " + err);
         }
+        
+        console.log('Done');
+
         if(response.statusCode == 302) {
           var redirectPath = parseUrl(response.headers.location);
           project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];

From dd99e7c2abf1f6604c592df757292e9786581a77 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 17 Feb 2014 11:51:53 -0600
Subject: [PATCH 0065/1100] Add signup link

---
 lib/ionic/login.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index c631b6c353..21ee0e4ccf 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -37,6 +37,8 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     schema.shift();
   }
 
+  console.log('Signup here! http://apps.ionicframework.com/signup');
+
   prompt.override = argv;
 
   prompt.start();

From 540ceb2072bf713677e94f1fcc996f3ffdd50a3e Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 17 Feb 2014 16:07:12 -0600
Subject: [PATCH 0066/1100] Merge config wip

---
 lib/ionic.js         | 38 +-----------------
 lib/ionic/config.js  | 94 +++++++++++++++++++++++++++++++-------------
 lib/ionic/login.js   |  8 ++--
 lib/ionic/package.js |  3 +-
 lib/ionic/start.js   |  7 ++--
 lib/ionic/stats.js   |  5 +--
 lib/ionic/upload.js  |  3 +-
 7 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 1107c92990..e5a80ae121 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -84,22 +84,7 @@ Ionic = function() {};
 Ionic.prototype = {
   IONIC_DASH: 'http://apps.ionicframework.com/',
   IONIC_COOKIES: 'ionic.cookies',
-  IONIC_CONFIG: 'ionic.config',
-  IONIC_CONF: '.ionic',
-  IONIC_API: 'api/v1/',
-  CONFIG_DEFAULT: {
-    name: '',
-    email: '',
-    app_id: '',
-    package_name: '',    
-    ios_certificate: '',
-    ios_certificate_password: '',
-    ios_profile: '',
-    android_keystore: '',
-    android_keystore_alias: '',
-    android_keystore_password: '',
-    android_key_password: ''
-  },  
+  IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
     if(argv._.length == 0) {
       return false;
@@ -163,28 +148,7 @@ Ionic.prototype = {
   fail: function(msg) {
     process.stderr.write(msg + '\n');
     process.exit(1);
-  },
-
-  loadConfig: function() {
-    if(!fs.existsSync(this.IONIC_CONFIG)) {
-      this.fail('Could not find ' + this.IONIC_CONFIG + '!'+
-        ' Please run this command your root ionic project directory with that file.');
-    }
-    return JSON.parse(fs.readFileSync(this.IONIC_CONFIG));
-  },
-
-  saveConfig: function(project, targetPath) {
-    if(!project) {
-      console.trace();
-      this.fail('This should never happen!');
-    }
-
-    var err = fs.writeFileSync((targetPath?targetPath+'/':'')+this.IONIC_CONFIG, JSON.stringify(project, null, 2));
-    if(err) {
-      process.stderr.write('Error writing ' + (targetPath?targetPath+'/':'')+ ionic.IONIC_CONFIG + ': ' + err + '\n');
-    }
   }
-  
 
 };
 
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 2b9e1b6c67..dafc63e9c7 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -5,46 +5,86 @@ var fs = require('fs'),
 var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
 
 module.exports = {
-  CONF_DIR: '.ionic',
-  CONF_FILE: '.ionic/info.json',
-  getConfig: function() {
-    if(fs.existsSync(path.join(home, this.CONF_FILE))) {
-      var data = JSON.parse(fs.readFileSync(path.join(home, this.CONF_FILE)));
-      this.data = data;
+  CONFIG_FILE: '.ionic/ionic.config',
+  PROJECT_FILE: 'ionic.project',
+  PROJECT_DEFAULT: {
+    name: '',
+    email: '',
+    app_id: '',
+    package_name: '',    
+    ios_certificate: '',
+    ios_certificate_password: '',
+    ios_profile: '',
+    android_keystore: '',
+    android_keystore_alias: '',
+    android_keystore_password: '',
+    android_key_password: ''
+  },
+  loadConfig: function() {
+    this.file = this.CONFIG_FILE;
+    if(fs.existsSync(path.join(home,this.file))) {      
+      this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
     } else {
-      this.create();
+      this.data = {};
     }
     return this;
   },
-  get: function(k) {
-    return this.data[k];
-  },
-  set: function(k, v) {
-    if(!this.data) {
-      this.create();
+  loadProject: function() {
+    this.file = this.PROJECT_FILE;
+    if(fs.existsSync(this.file)) {      
+      this.data = JSON.parse(fs.readFileSync(this.file))
+    } else {
+      console.error('Could not find ' + this.file + '!'+
+        ' Please run this command in your root ionic project directory with that file.');
     }
-    this.data[k] = v;
-    this.save();
+    return this;
   },
-  save: function() {
-    if(!this.data) { return; }
-
+  createProject: function(name) {
+    this.file = this.PROJECT_FILE;
+    this.data = this.PROJECT_DEFAULT;
+    this.data.name = name;
+    return this;
+  },
+  saveConfig: function() {
+    if(!this.data) { 
+      return;
+    }
     try {
-      var dirPath = path.join(home, this.CONF_DIR);
-      var p = path.join(home, this.CONF_FILE);
+      var dirPath = path.join(home, path.dirname(this.CONFIG_FILE));
+      var p = path.join(home, this.CONFIG_FILE);
 
       if(!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath);
       }
-      if(!fs.exists(p)) {
-        fs.writeFileSync(p, JSON.stringify(this.data));
-      }
+      fs.writeFileSync(p, JSON.stringify(this.data, null, 2));
     } catch(e) {
       console.error('Unable to save settings file:', e);
     }
   },
-  create: function() {
-    this.data = {};
-    this.save();
-  }
+  saveProject: function(targetPath) {
+    if(!this.data) { 
+      console.trace();
+      console.error('This should never happen!'); 
+    }
+    try {
+      fs.writeFileSync((targetPath?targetPath+'/':'')+this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
+    } catch(e) {
+      console.error('Unable to save settings file:', e);
+    }
+  },
+  get: function(k) {
+    return this.data[k];
+  },
+  set: function(k, v) {
+    if(!this.data) {
+      this.data = {};
+    }
+    this.data[k] = v;
+    
+    if(this.file == this.PROJECT_FILE) {
+      this.saveProject();
+    } else {
+      this.saveConfig();
+    }
+  }  
 };
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 21ee0e4ccf..245d996e9e 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -2,6 +2,7 @@ var fs = require('fs'),
     request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
+    IonicConfig = require('./config'),
     IonicTask = require('./task').IonicTask;
 
 var IonicLoginTask = function() {
@@ -24,7 +25,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     required: true
   }];
 
-  var project = ionic.loadConfig();
+  var project = IonicConfig.loadProject();
 
   // Grab the email for login
   if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
@@ -53,9 +54,8 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     }
     self.password = result.password;
 
-    if(!project.email || project.email == '') {
-      project.email = self.email;
-      ionic.saveConfig(project);
+    if(!project.get('email')) {
+      project.set('email');
     }
     
     var jar = request.jar();
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 113dcb67ff..5a27ad71de 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -4,6 +4,7 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     FormData = require('form-data'),    
+    IonicConfig = require('./config'),
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
@@ -43,7 +44,7 @@ IonicPackageTask.prototype.run = function(ionic) {
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
 
-      var project = ionic.loadConfig();
+      var project = IonicConfig.loadProject();
 
       for(var i = 0; i < platforms.length; i++) {
         var platform = platforms[i];
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 349cafebce..ac118768ec 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
+    IonicConfig = require('./config'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
 
@@ -101,10 +102,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 IonicStartTask.prototype._writeConfig = function(ionic) {
   console.log('Writing '+this.targetPath+'/ionic.config');
 
-  var project = ionic.CONFIG_DEFAULT;
-  project.name = this.appName;
-  
-  ionic.saveConfig(project, this.targetPath);
+  var project = IonicConfig.createProject(this.appName);  
+  project.saveProject(this.targetPath);
 };
 
 IonicStartTask.prototype._checkTargetPath = function() { 
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index bddc6bba87..ed5313f429 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -1,4 +1,4 @@
-var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, ionic, os, IonicConfig;
+var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, os, IonicConfig;
 var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, 
         __slice = Array.prototype.slice;
 
@@ -11,7 +11,6 @@ util = require('util');
 es = require('event-stream');
 fs = require('fs');
 os = require('os');
-ionic = require('../ionic');
 IonicConfig = require('./config');
 
 /*
@@ -515,7 +514,7 @@ module.exports = {
 
 var mixpanel = create_client('69f7271aa8f3d43f2e1b6baf698159b7');
 
-var ionicConfig = IonicConfig.getConfig();
+var ionicConfig = IonicConfig.loadConfig();
 
 
 exports.IonicStats = {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 31e963f8c7..c06eda379f 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -4,6 +4,7 @@ var fs = require('fs'),
     archiver = require('archiver'),
     argv = require('optimist').argv,
     FormData = require('form-data'),
+    IonicConfig = require('./config'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login').IonicLoginTask;
 
@@ -15,7 +16,7 @@ IonicUploadTask.HELP_LINE = 'Upload an Ionic project.';
 IonicUploadTask.prototype = new IonicTask();
 
 IonicUploadTask.prototype.run = function(ionic, callback) {
-  var project = ionic.loadConfig();
+  var project = IonicConfig.loadProject();
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {

From f91d53db31f4cdc717d9b909c34091e05bce0be2 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 17 Feb 2014 17:21:44 -0600
Subject: [PATCH 0067/1100] Just move them to two different files

---
 lib/ionic/config.js  | 51 +++---------------------------------
 lib/ionic/login.js   | 10 ++++----
 lib/ionic/package.js | 38 +++++++++++++--------------
 lib/ionic/project.js | 61 ++++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/start.js   |  7 ++---
 lib/ionic/stats.js   |  2 +-
 lib/ionic/upload.js  | 10 ++++----
 7 files changed, 98 insertions(+), 81 deletions(-)
 create mode 100644 lib/ionic/project.js

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index dafc63e9c7..541240d073 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -6,21 +6,7 @@ var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
 
 module.exports = {
   CONFIG_FILE: '.ionic/ionic.config',
-  PROJECT_FILE: 'ionic.project',
-  PROJECT_DEFAULT: {
-    name: '',
-    email: '',
-    app_id: '',
-    package_name: '',    
-    ios_certificate: '',
-    ios_certificate_password: '',
-    ios_profile: '',
-    android_keystore: '',
-    android_keystore_alias: '',
-    android_keystore_password: '',
-    android_key_password: ''
-  },
-  loadConfig: function() {
+  load: function() {
     this.file = this.CONFIG_FILE;
     if(fs.existsSync(path.join(home,this.file))) {      
       this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
@@ -29,23 +15,7 @@ module.exports = {
     }
     return this;
   },
-  loadProject: function() {
-    this.file = this.PROJECT_FILE;
-    if(fs.existsSync(this.file)) {      
-      this.data = JSON.parse(fs.readFileSync(this.file))
-    } else {
-      console.error('Could not find ' + this.file + '!'+
-        ' Please run this command in your root ionic project directory with that file.');
-    }
-    return this;
-  },
-  createProject: function(name) {
-    this.file = this.PROJECT_FILE;
-    this.data = this.PROJECT_DEFAULT;
-    this.data.name = name;
-    return this;
-  },
-  saveConfig: function() {
+  save: function() {
     if(!this.data) { 
       return;
     }
@@ -61,17 +31,6 @@ module.exports = {
       console.error('Unable to save settings file:', e);
     }
   },
-  saveProject: function(targetPath) {
-    if(!this.data) { 
-      console.trace();
-      console.error('This should never happen!'); 
-    }
-    try {
-      fs.writeFileSync((targetPath?targetPath+'/':'')+this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
-    } catch(e) {
-      console.error('Unable to save settings file:', e);
-    }
-  },
   get: function(k) {
     return this.data[k];
   },
@@ -81,10 +40,6 @@ module.exports = {
     }
     this.data[k] = v;
     
-    if(this.file == this.PROJECT_FILE) {
-      this.saveProject();
-    } else {
-      this.saveConfig();
-    }
+    this.saveConfig();
   }  
 };
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 245d996e9e..5567796ba4 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -2,7 +2,7 @@ var fs = require('fs'),
     request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
-    IonicConfig = require('./config'),
+    IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
 
 var IonicLoginTask = function() {
@@ -25,7 +25,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     required: true
   }];
 
-  var project = IonicConfig.loadProject();
+  var project = IonicProject.load();
 
   // Grab the email for login
   if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
@@ -33,12 +33,12 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     schema.shift();
   } 
   // Assume project email is login email if it exists
-  else if(project.email && project.email != '') {
-    this.email = project.email;
+  else if(project.get('email')) {
+    this.email = project.get('email');
     schema.shift();
   }
 
-  console.log('Signup here! http://apps.ionicframework.com/signup');
+  console.log('Signup here! '+ionic.IONIC_DASH+'signup');
 
   prompt.override = argv;
 
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 5a27ad71de..a8837fd976 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -4,7 +4,7 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     FormData = require('form-data'),    
-    IonicConfig = require('./config'),
+    IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
@@ -44,7 +44,7 @@ IonicPackageTask.prototype.run = function(ionic) {
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
 
-      var project = IonicConfig.loadProject();
+      var project = IonicProject.load();
 
       for(var i = 0; i < platforms.length; i++) {
         var platform = platforms[i];
@@ -117,7 +117,7 @@ IonicPackageTask.prototype.run = function(ionic) {
 
         // Don't prompt for properties we already have in the config
         for (var property in properties) {
-          if(project[property]) {
+          if(project.get(property)) {
             delete properties[property];
           }
         }
@@ -129,17 +129,17 @@ IonicPackageTask.prototype.run = function(ionic) {
 
           // Overwrite any empty properties with prompt responses
           for (var property in properties) {
-            if(result[property] && !project[property]) {
-              project[property] = result[property];
+            if(result[property] && !project.get(property)) {
+              project.set(property, result[property]);
             }
           }
-          ionic.saveConfig(project);
+          project.save();
 
           console.log('Packaging '+platform+' app...');
 
           var form = new FormData();
-          form.append('email', project.email);
-          form.append('name', project.name);
+          form.append('email', project.get('email'));
+          form.append('name', project.get('name'));
           form.append('platform', platform);
           form.append('build_mode', mode);
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
@@ -150,7 +150,7 @@ IonicPackageTask.prototype.run = function(ionic) {
             // console.log(property);
             // console.log(project[property]);
             if(property.indexOf(platform) == 0) {
-              form.append(property, project[property]);
+              form.append(property, project.get(property));
             }
           }
           
@@ -158,33 +158,33 @@ IonicPackageTask.prototype.run = function(ionic) {
           switch(platform) {
             case 'android':
               if(mode == 'release') {
-                var keystoreFilePath = path.resolve(project.android_keystore);
+                var keystoreFilePath = path.resolve(project.get('android_keystore'));
                 if(fs.existsSync(keystoreFilePath)) {
                   form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
                 } else {
-                  delete project.android_keystore;
-                  ionic.saveConfig(project);
+                  project.remove('android_keystore');
+                  project.save();
                   process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
                   return;
                 }
               }
               break;
             case 'ios': 
-              var certificateFilePath = path.resolve(project.ios_certificate);
+              var certificateFilePath = path.resolve(project.get('ios_certificate'));
               if(fs.existsSync(certificateFilePath)) {
                 form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
               } else {
-                delete project.ios_certificate;
-                ionic.saveConfig(project);
+                project.remove('ios_certificate');
+                project.save();
                 process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
                 return;
               }
-              var profileFilePath = path.resolve(project.ios_profile);
+              var profileFilePath = path.resolve(project.get('ios_profile'));
               if(fs.existsSync(profileFilePath)) {
                 form.append('ios_profile_file', fs.createReadStream(profileFilePath));
               } else {
-                delete project.ios_profile;
-                ionic.saveConfig(project);
+                project.remove('ios_profile');
+                project.save();
                 process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
                 return;
               }
@@ -195,7 +195,7 @@ IonicPackageTask.prototype.run = function(ionic) {
               break;
           }
 
-          var url = ionic.IONIC_DASH+'export/'+project.app_id;
+          var url = ionic.IONIC_DASH+'export/'+project.get('app_id');
           var params = parseUrl(url);
 
           form.submit({
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
new file mode 100644
index 0000000000..e04027d52e
--- /dev/null
+++ b/lib/ionic/project.js
@@ -0,0 +1,61 @@
+var fs = require('fs'),
+    path = require('path'),
+    ionic = require('../ionic');
+
+module.exports = {
+  PROJECT_FILE: 'ionic.project',
+  PROJECT_DEFAULT: {
+    name: '',
+    email: '',
+    app_id: '',
+    package_name: '',    
+    ios_certificate: '',
+    ios_certificate_password: '',
+    ios_profile: '',
+    android_keystore: '',
+    android_keystore_alias: '',
+    android_keystore_password: '',
+    android_key_password: ''
+  },
+  load: function() {
+    this.file = this.PROJECT_FILE;
+    if(fs.existsSync(this.file)) {      
+      this.data = JSON.parse(fs.readFileSync(this.file))
+    } else {
+      console.error('Could not find ' + this.file + '!'+
+        ' Please run this command in your root ionic project directory with that file.');
+    }
+    return this;
+  },
+  create: function(name) {
+    this.file = this.PROJECT_FILE;
+    this.data = this.PROJECT_DEFAULT;
+    return this;
+  },
+  save: function(targetPath) {
+    if(!this.data) { 
+      console.trace();
+      console.error('This should never happen!'); 
+    }
+    try {
+      fs.writeFileSync((targetPath?targetPath+'/':'')+this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
+    } catch(e) {
+      console.error('Unable to save settings file:', e);
+    }
+  },
+  get: function(k) {
+    return this.data[k];
+  },
+  set: function(k, v) {
+    if(!this.data) {
+      this.data = PROJECT_DEFAULT;
+    }
+    this.data[k] = v;
+  },
+  remove: function(k) {
+    if(!this.data) {
+      this.data = PROJECT_DEFAULT;
+    }
+    this.data[k] = '';
+  }
+};
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ac118768ec..ed6667d65a 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -6,7 +6,7 @@ var fs = require('fs'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
-    IonicConfig = require('./config'),
+    IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
 
@@ -102,8 +102,9 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 IonicStartTask.prototype._writeConfig = function(ionic) {
   console.log('Writing '+this.targetPath+'/ionic.config');
 
-  var project = IonicConfig.createProject(this.appName);  
-  project.saveProject(this.targetPath);
+  var project = IonicProject.create();  
+  project.set('name', this.appName);
+  project.save(this.targetPath);
 };
 
 IonicStartTask.prototype._checkTargetPath = function() { 
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index ed5313f429..b4823afbee 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -514,7 +514,7 @@ module.exports = {
 
 var mixpanel = create_client('69f7271aa8f3d43f2e1b6baf698159b7');
 
-var ionicConfig = IonicConfig.loadConfig();
+var ionicConfig = IonicConfig.load();
 
 
 exports.IonicStats = {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index c06eda379f..05148f3a79 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -4,7 +4,7 @@ var fs = require('fs'),
     archiver = require('archiver'),
     argv = require('optimist').argv,
     FormData = require('form-data'),
-    IonicConfig = require('./config'),
+    IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
     IonicLoginTask = require('./login').IonicLoginTask;
 
@@ -16,7 +16,7 @@ IonicUploadTask.HELP_LINE = 'Upload an Ionic project.';
 IonicUploadTask.prototype = new IonicTask();
 
 IonicUploadTask.prototype.run = function(ionic, callback) {
-  var project = IonicConfig.loadProject();
+  var project = IonicProject.load();
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
@@ -47,7 +47,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
       form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
       // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
 
-      var url = ionic.IONIC_DASH+'projects/'+(project.app_id?project.app_id:'');
+      var url = ionic.IONIC_DASH+'projects/'+project.get('app_id');
       var params = parseUrl(url);
 
       form.submit({
@@ -68,8 +68,8 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
         if(response.statusCode == 302) {
           var redirectPath = parseUrl(response.headers.location);
-          project.app_id = redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1];
-          ionic.saveConfig(project);
+          project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
+          project.save();
 
           if (callback) {
             callback();

From 751497cb69996acbff9a324c92e829740cdf9785 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 21 Feb 2014 16:39:02 -0600
Subject: [PATCH 0068/1100] Add name for Timmy

---
 lib/ionic.js        | 2 +-
 lib/ionic/upload.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index e5a80ae121..5aa09ba996 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -82,7 +82,7 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
+  IONIC_DASH: 'http://virt/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 05148f3a79..0c292ffa9f 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -43,6 +43,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
       console.log('Uploading...');
 
       var form = new FormData();
+      form.append('name', project.get('name'));
       form.append('csrfmiddlewaretoken', jar.cookies[0].value);
       form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
       // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
@@ -68,6 +69,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
         if(response.statusCode == 302) {
           var redirectPath = parseUrl(response.headers.location);
+          console.log(redirectPath);
           project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
           project.save();
 

From 69148a72ef3a595f95b4ef3dd509ae90e1bc61cf Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 21 Feb 2014 16:42:36 -0600
Subject: [PATCH 0069/1100] Fail when it can't find the project file

---
 lib/ionic/project.js | 6 +++---
 lib/ionic/upload.js  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index e04027d52e..e437226a73 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -18,11 +18,11 @@ module.exports = {
     android_key_password: ''
   },
   load: function() {
-    this.file = this.PROJECT_FILE;
-    if(fs.existsSync(this.file)) {      
+    this.file = this.PROJECT_FILE;    
+    if(fs.existsSync(this.file)) {
       this.data = JSON.parse(fs.readFileSync(this.file))
     } else {
-      console.error('Could not find ' + this.file + '!'+
+      new Ionic().fail('Could not find ' + this.file + '!'+
         ' Please run this command in your root ionic project directory with that file.');
     }
     return this;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 0c292ffa9f..196d98992d 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -69,7 +69,6 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
         if(response.statusCode == 302) {
           var redirectPath = parseUrl(response.headers.location);
-          console.log(redirectPath);
           project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
           project.save();
 

From 6b23b40ef40594aff1ef0099ba8de7d06e77c2af Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 26 Feb 2014 17:20:28 -0600
Subject: [PATCH 0070/1100] Grab and upload plugins

---
 lib/ionic/package.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index a8837fd976..660b471acf 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -3,6 +3,7 @@ var fs = require('fs'),
     parseUrl = require('url').parse,
     argv = require('optimist').argv,
     prompt = require('prompt'),
+    shelljs = require('shelljs/global'),
     FormData = require('form-data'),    
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
@@ -144,6 +145,19 @@ IonicPackageTask.prototype.run = function(ionic) {
           form.append('build_mode', mode);
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
+          console.log('Grabbing plugins...');
+          exec('cordova plugins', function(code, output) {
+            if(code != 0 ) {
+              process.stderr.write('Unable to read cordova plugin list. Please see console for more info.\n');
+            } else {
+              output = output.replace(/'/g, '"');
+              var plugins = JSON.parse(output);
+              for (var i = 0; i < plugins.length; i++) {
+                form.append('plugin_'+i, plugins[i]);
+              };
+            }
+          });
+
 
           // Add the platform specific project properties to the post
           for (var property in project) {

From 5609783ba407cfdfe4b78dc9ad166553dcbfa47e Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Fri, 28 Feb 2014 12:19:00 -0600
Subject: [PATCH 0071/1100] Whoops do the plugin grab sychronously

---
 lib/ionic.js         |  2 +-
 lib/ionic/package.js | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 5aa09ba996..e5a80ae121 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -82,7 +82,7 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
-  IONIC_DASH: 'http://virt/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 660b471acf..a695dc48bc 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -47,6 +47,16 @@ IonicPackageTask.prototype.run = function(ionic) {
 
       var project = IonicProject.load();
 
+      console.log('Grabbing plugins...');
+      var plugins = [];
+      var pluginExec = exec('cordova plugins');
+      if(pluginExec.code != 0 ) {
+        process.stderr.write('Unable to read cordova plugin list. Please see console for more info.\n');
+      } else {
+        pluginExec.output = pluginExec.output.replace(/'/g, '"');
+        plugins = JSON.parse(pluginExec.output);
+      }
+
       for(var i = 0; i < platforms.length; i++) {
         var platform = platforms[i];
 
@@ -145,24 +155,12 @@ IonicPackageTask.prototype.run = function(ionic) {
           form.append('build_mode', mode);
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
-          console.log('Grabbing plugins...');
-          exec('cordova plugins', function(code, output) {
-            if(code != 0 ) {
-              process.stderr.write('Unable to read cordova plugin list. Please see console for more info.\n');
-            } else {
-              output = output.replace(/'/g, '"');
-              var plugins = JSON.parse(output);
-              for (var i = 0; i < plugins.length; i++) {
-                form.append('plugin_'+i, plugins[i]);
-              };
-            }
-          });
-
+          for (var i = 0; i < plugins.length; i++) {
+            form.append('plugin_'+i, plugins[i]);
+          };
 
           // Add the platform specific project properties to the post
           for (var property in project) {
-            // console.log(property);
-            // console.log(project[property]);
             if(property.indexOf(platform) == 0) {
               form.append(property, project.get(property));
             }
@@ -236,7 +234,7 @@ IonicPackageTask.prototype.run = function(ionic) {
               ionic.fail("Error packaging: " + err);
             }
             console.log('Done');
-          });
+          }); 
         });
       }
     });  

From b0438e30e32c0bc165812dfa951f4c3c26af06df Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 3 Mar 2014 12:35:21 -0600
Subject: [PATCH 0072/1100] Why wasn't this ever committed?

---
 lib/ionic/config.js  | 2 +-
 lib/ionic/package.js | 8 ++++----
 lib/ionic/project.js | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 541240d073..b1c2e648e6 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -40,6 +40,6 @@ module.exports = {
     }
     this.data[k] = v;
     
-    this.saveConfig();
+    this.save();
   }  
 };
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index a695dc48bc..f555ef577f 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -39,8 +39,8 @@ IonicPackageTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
-  var upload = new IonicUploadTask();
-  upload.run(ionic, function() {
+  //var upload = new IonicUploadTask();
+  //upload.run(ionic, function() {
 
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
@@ -160,7 +160,7 @@ IonicPackageTask.prototype.run = function(ionic) {
           };
 
           // Add the platform specific project properties to the post
-          for (var property in project) {
+          for (var property in project.get()) {
             if(property.indexOf(platform) == 0) {
               form.append(property, project.get(property));
             }
@@ -238,7 +238,7 @@ IonicPackageTask.prototype.run = function(ionic) {
         });
       }
     });  
-  });
+  //});
 };
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index e437226a73..c227284b10 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -44,7 +44,11 @@ module.exports = {
     }
   },
   get: function(k) {
-    return this.data[k];
+    if(k) {
+      return this.data[k];
+    } else {
+      return this.data;
+    }
   },
   set: function(k, v) {
     if(!this.data) {

From 1f27d375f2834028dfe3152c06f1ce0e61494737 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 3 Mar 2014 12:41:09 -0600
Subject: [PATCH 0073/1100] Tim's wish is my command

---
 lib/ionic/login.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 5567796ba4..5064e38eab 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -39,6 +39,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
   }
 
   console.log('Signup here! '+ionic.IONIC_DASH+'signup');
+  console.log('Login Info:');
 
   prompt.override = argv;
 

From 001d4d43042ea2ae291febf22435ad5dcf9f5a31 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 3 Mar 2014 16:20:51 -0600
Subject: [PATCH 0074/1100] Should upload when packaging

---
 lib/ionic/package.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index f555ef577f..bf66b47b42 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -39,8 +39,8 @@ IonicPackageTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
-  //var upload = new IonicUploadTask();
-  //upload.run(ionic, function() {
+  var upload = new IonicUploadTask();
+  upload.run(ionic, function() {
 
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
@@ -238,7 +238,7 @@ IonicPackageTask.prototype.run = function(ionic) {
         });
       }
     });  
-  //});
+  });
 };
 
 exports.IonicPackageTask = IonicPackageTask;

From b8af9dd2b5c7de9c631b05b36bd5850afd1d1e8f Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Mon, 10 Mar 2014 14:37:00 -0500
Subject: [PATCH 0075/1100] Ignore add keyword for platform

---
 lib/ionic/platform.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index d8a1a76d99..671c76ff8a 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -33,10 +33,14 @@ IonicPlatformTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified, exiting.');
   }
 
+  if(platforms[0].toLowerCase() == 'add') {
+    platforms.shift();
+  }
+
   IonicStats.t('platform', { 'platform': platforms.join(',') });
 
   for(var i = 0; i < platforms.length; i++) {
-    var platform = platforms[i];
+    var platform = platforms[i].toLowerCase();
     console.log('Adding platform', platform);
     if(exec("cordova platform add " + platform).code !== 0) {
       process.stderr.write('Unable to add platform ' + platform + '. Please see console for more info.\n');

From 477e79456fd5088388f1c820f9abbcc940413156 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 21 Mar 2014 14:48:35 -0500
Subject: [PATCH 0076/1100] Added support for starter project naming

---
 lib/ionic.js        |  2 +-
 lib/ionic/config.js |  2 +-
 lib/ionic/login.js  | 11 ++++++-----
 lib/ionic/start.js  | 29 ++++++++++++++++++++---------
 lib/ionic/upload.js |  3 +++
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 5aa09ba996..e5a80ae121 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -82,7 +82,7 @@ var TASKS = [
 Ionic = function() {};
 
 Ionic.prototype = {
-  IONIC_DASH: 'http://virt/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 541240d073..b1c2e648e6 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -40,6 +40,6 @@ module.exports = {
     }
     this.data[k] = v;
     
-    this.saveConfig();
+    this.save();
   }  
 };
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 5567796ba4..41fd38e57b 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -17,7 +17,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
   var schema = [{
     name: 'email',
     pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
-    message: 'Email for Ionic Studio login',
+    message: 'Email for Ionic Apps login',
     required: true
   }, {
     name: 'password',
@@ -38,12 +38,13 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     schema.shift();
   }
 
-  console.log('Signup here! '+ionic.IONIC_DASH+'signup');
+  console.log('To continue, please login to your Ionic Apps account (Create a free account here: ' + ionic.IONIC_DASH + 'signup)');
 
   prompt.override = argv;
 
   prompt.start();
 
+
   prompt.get(schema, function (err, result) {
     if(err) {
       ionic.fail('Error logging in: ' + err);
@@ -60,7 +61,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     
     var jar = request.jar();
     request({
-      url: ionic.IONIC_DASH+'login',
+      url: ionic.IONIC_DASH + 'login',
       jar: jar
     }, 
     function(err, response, body) {
@@ -70,7 +71,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 
       request({
         method: 'POST',
-        url: ionic.IONIC_DASH+'login', 
+        url: ionic.IONIC_DASH + 'login', 
         jar: jar, 
         form: {
           username: self.email,
@@ -84,7 +85,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
         }
         // Should be a 304 redirect status code if correct
         if(response.statusCode == 200) {
-          ionic.fail('Email or Password incorrect.  Please visit '+ionic.IONIC_DASH+' for help. :)')
+          ionic.fail('Email or Password incorrect.  Please visit '+ ionic.IONIC_DASH +' for help.')
         }
         
         var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ed6667d65a..09b615ff8a 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -43,6 +43,8 @@ IonicStartTask.prototype.run = function(ionic) {
   // Grab the target path from the command line, or use this as the app name
   var targetPathName = argv._[2] || this.appName;
 
+  var starterProject = argv._[3] || 'tabs';
+
   this.targetPath = path.resolve(this.appName);
 
   // Make sure to create this, or ask them if they want to override it
@@ -51,23 +53,30 @@ IonicStartTask.prototype.run = function(ionic) {
     process.exit(1);
   }
 
-  console.log('Creating Ionic app in folder', this.targetPath);
+  console.log('Creating Ionic app in folder', this.targetPath, 'based on', starterProject, 'project');
 
   fs.mkdirSync(this.targetPath);
 
-  this._fetchAndWriteSeed();
+  this._fetchAndWriteSeed(starterProject);
   this._writeConfig(ionic);
 
 };
 
-IonicStartTask.prototype._fetchAndWriteSeed = function() {
+IonicStartTask.prototype._getStarterUrl = function(repo) {
+  return 'https://github.com/driftyco/' + repo + '/archive/master.zip' ;
+};
+
+IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var self = this;
 
-  var templateUrl = 'https://github.com/driftyco/ionic-angular-cordova-seed/archive/master.zip' ;
+  var repoName = 'ionic-starter-' + projectType;
+  var repoFolderName = repoName + '-master';
+  var templateUrl = this._getStarterUrl(repoName);
+
   console.log('Downloading starter template from', templateUrl);
 
   var tmpFolder = os.tmpdir();
-  var tempZipFilePath = path.join(tmpFolder, 'ionic-angular-cordova-seed' + new Date().getTime() + '.zip');
+  var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
   var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
 
   var unzipRepo = function(fileName) {
@@ -76,8 +85,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
     var writeStream = unzip.Extract({ path: self.targetPath });
     writeStream.on('close', function() {
       //fs.renameSync(self.targetPath + '/' + 'ionic-angular-cordova-seed-master', self.targetPath + '/app');
-      cp('-R', self.targetPath + '/' + 'ionic-angular-cordova-seed-master/.', self.targetPath);
-      rm('-rf', self.targetPath + '/' + 'ionic-angular-cordova-seed-master/');
+      cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
+      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
       console.log('Project created!');
 
       cd(self.targetPath);
@@ -93,6 +102,10 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
   };
 
   request({ url: templateUrl, encoding: null }, function(err, res, body) {
+    if(res.statusCode !== 200) {
+      console.log('Unable to fetch project: HTTP', res.statusCode);
+      return;
+    }
     tempZipFileStream.write(body);
     tempZipFileStream.close();
     unzipRepo(tempZipFilePath);
@@ -100,8 +113,6 @@ IonicStartTask.prototype._fetchAndWriteSeed = function() {
 };
 
 IonicStartTask.prototype._writeConfig = function(ionic) {
-  console.log('Writing '+this.targetPath+'/ionic.config');
-
   var project = IonicProject.create();  
   project.set('name', this.appName);
   project.save(this.targetPath);
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 196d98992d..7378de53a1 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats,
     IonicLoginTask = require('./login').IonicLoginTask;
 
 var IonicUploadTask = function() {
@@ -23,6 +24,8 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     
     console.log('Zipping...');
 
+    IonicStats.t('upload', {});
+
     var zip = fs.createWriteStream('www.zip');
 
     var archive = archiver('zip');

From 41cf47dfd3e289c5cf808b1bfec90d577cf4a021 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 12:42:25 -0500
Subject: [PATCH 0077/1100] Updated ascii art and added ability to specify
 starter project

---
 lib/ionic.js       | 14 ++++++++++++--
 lib/ionic/start.js | 11 ++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index e5a80ae121..41a59c0ab9 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -125,8 +125,17 @@ Ionic.prototype = {
   },
 
   _printIonic: function() {
-    process.stdout.write('\n   __          __  \n');
-    process.stdout.write('| /  \\ |\\ | | /  `\n' + '| \\__/ | \\| | \\__,\n\n');
+    var w = function(s) {
+      process.stdout.write(s);
+    };
+
+    w('  _             _     \n');
+    w(' (_)           (_)     \n');
+    w('  _  ___  _ __  _  ___ \n');
+    w(' | |/ _ \\| \'_ \\| |/ __|\n');
+    w(' | | (_) | | | | | (__ \n');
+    w(' |_|\\___/|_| |_|_|\\___|\n');
+
   },
 
   _loadTaskRunner: function(which) {
@@ -146,6 +155,7 @@ Ionic.prototype = {
   },
 
   fail: function(msg) {
+    process.stderr.write('Error, exiting:');
     process.stderr.write(msg + '\n');
     process.exit(1);
   }
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 09b615ff8a..128cc98d9e 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -32,6 +32,10 @@ IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
 
 IonicStartTask.prototype = new IonicTask();
 
+IonicStartTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic start appName [starterProject(blank,tabs,sidemenu)]\n');
+};
+
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
     ionic.fail('No app name specified, exiting.');
@@ -41,9 +45,9 @@ IonicStartTask.prototype.run = function(ionic) {
   this.appName = argv._[1];
 
   // Grab the target path from the command line, or use this as the app name
-  var targetPathName = argv._[2] || this.appName;
+  var targetPathName = this.appName;
 
-  var starterProject = argv._[3] || 'tabs';
+  var starterProject = argv._[2] || 'tabs';
 
   this.targetPath = path.resolve(this.appName);
 
@@ -103,7 +107,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
 
   request({ url: templateUrl, encoding: null }, function(err, res, body) {
     if(res.statusCode !== 200) {
-      console.log('Unable to fetch project: HTTP', res.statusCode);
+      console.error('Error: Unable to fetch project: HTTP', res.statusCode);
+      console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)');
       return;
     }
     tempZipFileStream.write(body);

From 035114ae6dede65aff3fb0475eab877cccc08f95 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 16:40:33 -0500
Subject: [PATCH 0078/1100] New starter project sourcing

---
 bin/ionic          |   3 +-
 lib/ionic.js       |  68 ++++++++++++++++++++++++++---
 lib/ionic/start.js | 105 +++++++++++++++++++++++++++++++--------------
 package.json       |   8 ++--
 4 files changed, 140 insertions(+), 44 deletions(-)

diff --git a/bin/ionic b/bin/ionic
index 171649cb21..3b444affe9 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -7,5 +7,4 @@ process.title = 'ionic';
 
 var Ionic = require('../lib/ionic').Ionic;
 
-var ionic = new Ionic();
-ionic.run();
+Ionic.run();
diff --git a/lib/ionic.js b/lib/ionic.js
index 41a59c0ab9..e2d3e406a8 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -21,7 +21,29 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicBuildTask = require('./ionic/build').IonicBuildTask,
     IonicLoginTask = require('./ionic/login').IonicLoginTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
-    IonicPackageTask = require('./ionic/package').IonicPackageTask;
+    IonicPackageTask = require('./ionic/package').IonicPackageTask,
+    path = require('path'),
+    request = require('request'),
+    os = require('os'),
+    unzip = require('unzip'),
+    colors = require('colors'),
+    Q = require('q');
+
+
+colors.setTheme({
+    silly: 'rainbow',
+    input: 'grey',
+    small: 'grey',
+    verbose: 'cyan',
+    prompt: 'grey',
+    info: 'white',
+    data: 'grey',
+    help: 'cyan',
+    warn: 'yellow',
+    debug: 'blue',
+    error: 'red'
+});
+
 
 var fs = require('fs'), 
     argv = require('optimist').argv;
@@ -79,9 +101,7 @@ var TASKS = [
   }
 ];
 
-Ionic = function() {};
-
-Ionic.prototype = {
+Ionic = {
   IONIC_DASH: 'http://apps.ionicframework.com/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
@@ -148,7 +168,7 @@ Ionic.prototype = {
       return this._printGenericUsage();
     }
 
-    console.log('Running', task.title, 'task...')
+    console.log('Running', task.title.info.bold, 'task...')
 
     var taskObj = new task.task();
     taskObj.run(this);
@@ -158,8 +178,44 @@ Ionic.prototype = {
     process.stderr.write('Error, exiting:');
     process.stderr.write(msg + '\n');
     process.exit(1);
-  }
+  },
+
+  /**
+   * Fetch a repo from GitHub, unzip it to a specific folder.
+   */
+  fetchRepo: function(targetPath, repoName, repoUrl) {
+    var q = Q.defer();
+
+    // The folder name the project will be downloaded and extracted to
+    var repoFolderName = repoName + '-master';
+    console.log('Fetching repo:', repoUrl);
+
+    var tmpFolder = os.tmpdir();
+    var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
+    var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
 
+    var unzipRepo = function(fileName) {
+      var readStream = fs.createReadStream(fileName);
+
+      var writeStream = unzip.Extract({ path: targetPath });
+      writeStream.on('close', function() {
+        q.resolve(repoFolderName);
+      });
+      readStream.pipe(writeStream);
+    };
+
+    request({ url: repoUrl, encoding: null }, function(err, res, body) {
+      if(res.statusCode !== 200) {
+        q.reject(res);
+        return;
+      }
+      tempZipFileStream.write(body);
+      tempZipFileStream.close();
+      unzipRepo(tempZipFilePath);
+    });
+
+    return q.promise;
+  }
 };
 
 exports.Ionic = Ionic;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 128cc98d9e..a07f8b359b 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -6,6 +6,9 @@ var fs = require('fs'),
     shelljs = require('shelljs/global'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
+    colors = require('colors'),
+    Q = require('q'),
+    IonicProject = require('../ionic'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
@@ -28,6 +31,9 @@ fs.mkdirParent = function(dirPath, mode, callback) {
 var IonicStartTask = function() {
 }
 
+// The URL for the cordova wrapper project
+IonicStartTask.WRAPPER_REPO_NAME = 'ionic-cordova-wrapper';
+
 IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
 
 IonicStartTask.prototype = new IonicTask();
@@ -53,11 +59,11 @@ IonicStartTask.prototype.run = function(ionic) {
 
   // Make sure to create this, or ask them if they want to override it
   if(this._checkTargetPath() === false) {
-    process.stderr.write('Exiting.\n');
+    process.stderr.write('\nExiting.\n');
     process.exit(1);
   }
 
-  console.log('Creating Ionic app in folder', this.targetPath, 'based on', starterProject, 'project');
+  console.log('Creating Ionic app in folder', this.targetPath, 'based on', starterProject.info.bold, 'project');
 
   fs.mkdirSync(this.targetPath);
 
@@ -70,51 +76,84 @@ IonicStartTask.prototype._getStarterUrl = function(repo) {
   return 'https://github.com/driftyco/' + repo + '/archive/master.zip' ;
 };
 
+IonicStartTask.prototype._fetchWrapper = function() {
+  var q = Q.defer();
+  var self = this;
+
+  var repoName = IonicStartTask.WRAPPER_REPO_NAME;
+  var repoUrl = 'https://github.com/driftyco/' + IonicStartTask.WRAPPER_REPO_NAME + '/archive/master.zip';
+  console.log('Fetching', 'Cordova'.info.bold, 'wrapper');
+
+  Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
+    cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
+    rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+    cd(self.targetPath);
+
+    q.resolve(self.targetPath);
+  }, function(err) {
+    q.reject(err);
+  });
+
+  return q.promise;
+};
+
 IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var self = this;
 
-  var repoName = 'ionic-starter-' + projectType;
-  var repoFolderName = repoName + '-master';
-  var templateUrl = this._getStarterUrl(repoName);
+  // First, grab the wrapper project.
 
-  console.log('Downloading starter template from', templateUrl);
+  var wrapperPromise = this._fetchWrapper();
 
-  var tmpFolder = os.tmpdir();
-  var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
-  var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
+  wrapperPromise.then(function(targetPath) {
+    // Get the starter project repo name:
+    var repoName = 'ionic-starter-' + projectType;
 
-  var unzipRepo = function(fileName) {
-    var readStream = fs.createReadStream(fileName);
+    // The folder name the project will be downloaded and extracted to
+    var repoFolderName = repoName + '-master';
 
-    var writeStream = unzip.Extract({ path: self.targetPath });
-    writeStream.on('close', function() {
-      //fs.renameSync(self.targetPath + '/' + 'ionic-angular-cordova-seed-master', self.targetPath + '/app');
-      cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
-      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
-      console.log('Project created!');
+    // Get the URL for the starter project repo:
+    var repoUrl = self._getStarterUrl(repoName);
 
-      cd(self.targetPath);
-      console.log('Initializing cordova project.');
+    Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
+      // Move the content of this repo into the www folder
+      cp('-R', targetPath + '/' + repoFolderName + '/.', 'www');
+
+      // Copy the root config file to the www folder
+      cp(targetPath + '/config.xml', 'www');
+
+      // Clean up start template folder
+      rm('-rf', targetPath + '/' + repoFolderName + '/');
+
+      console.log('Initializing cordova project.'.info.bold);
       if(!exec('cordova plugin add org.apache.cordova.device') || !exec('cordova plugin add org.apache.cordova.console') ||
         !exec('cordova plugin add org.apache.cordova.statusbar')) {
-          process.stderr.write('Unable to install one or more cordova plugins.\n');
+          process.stderr.write('Unable to install one or more cordova plugins.\n'.error.bold);
       }
 
+      self._printQuickHelp();
+
       IonicStats.t('start', {});
+    }, function(err) {
+      console.error('Error: Unable to fetch project: HTTP'.error.bold, res.statusCode);
+      console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
+      Ionic.fail('');
     });
-    readStream.pipe(writeStream);
-  };
-
-  request({ url: templateUrl, encoding: null }, function(err, res, body) {
-    if(res.statusCode !== 200) {
-      console.error('Error: Unable to fetch project: HTTP', res.statusCode);
-      console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)');
-      return;
-    }
-    tempZipFileStream.write(body);
-    tempZipFileStream.close();
-    unzipRepo(tempZipFilePath);
+
+  }, function(err) {
+    Ionic.fail('Unable to grab wrapper project:'.error.bold, err);
   });
+
+};
+
+IonicStartTask.prototype._printQuickHelp = function() {
+  console.log('\nYour Ionic project is ready to go!'.green.bold);
+  console.log('\nSome quick tips:');
+  console.log(' * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
+  console.log('    Note: iOS development requires OS X currently'.small);
+  console.log('\n * To build your project, run', 'ionic build [platform]'.info.bold);
+  console.log('\n * To emulate your project in a simulator or emulator, run', 'ionic emulate [platform]'.info.bold);
+  console.log('\n * To run your project on a device, run', 'ionic run [platform]'.info.bold);
+  console.log('\n\nFor more help, visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold);
 };
 
 IonicStartTask.prototype._writeConfig = function(ionic) {
@@ -125,7 +164,7 @@ IonicStartTask.prototype._writeConfig = function(ionic) {
 
 IonicStartTask.prototype._checkTargetPath = function() { 
   if(fs.existsSync(this.targetPath)) {
-    process.stderr.write('The directory ' + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.\n');
+    process.stderr.write('The directory '.error.bold + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.\n'.error.bold);
     return false;
   }
   return true;
diff --git a/package.json b/package.json
index f6598e9c05..1ba7e6295f 100644
--- a/package.json
+++ b/package.json
@@ -26,14 +26,16 @@
   "license": "MIT",
   "dependencies": {
     "archiver": "0.5.1",
-    "cordova": "~3.2.0",   
-    "event-stream": "3.0.x", 
+    "cordova": "~3.2.0",
+    "event-stream": "3.0.x",
     "form-data": "~0.1.0",
     "ncp": "0.4.2",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "request": "2.27.0",
     "shelljs": "0.2.6",
-    "unzip": "0.1.9"
+    "unzip": "0.1.9",
+    "q": "^1.0.1",
+    "colors": "^0.6.2"
   }
 }

From 79c4842421c77fecae36c5e1f7e602ff4f6f7a6a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 16:53:24 -0500
Subject: [PATCH 0079/1100] Updated package

---
 package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1ba7e6295f..d276025bc6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "0.9.16",
+  "version": "1.0.0-beta",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -19,14 +19,10 @@
     "type": "git",
     "url": "https://github.com/driftyco/ionic-cli.git"
   },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "author": "Max Lynch <max@drifty.com> and Peter Collins <peter@drifty.com>",
   "license": "MIT",
   "dependencies": {
     "archiver": "0.5.1",
-    "cordova": "~3.2.0",
     "event-stream": "3.0.x",
     "form-data": "~0.1.0",
     "ncp": "0.4.2",

From c33048227d34aeaf0741e0615326e67eb786531c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 16:55:03 -0500
Subject: [PATCH 0080/1100] Added note

---
 lib/ionic/start.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a07f8b359b..3e8019be36 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -150,6 +150,7 @@ IonicStartTask.prototype._printQuickHelp = function() {
   console.log('\nSome quick tips:');
   console.log(' * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
   console.log('    Note: iOS development requires OS X currently'.small);
+  console.log('\n * cd into your project directory before running any of the following commands'.info.bold);
   console.log('\n * To build your project, run', 'ionic build [platform]'.info.bold);
   console.log('\n * To emulate your project in a simulator or emulator, run', 'ionic emulate [platform]'.info.bold);
   console.log('\n * To run your project on a device, run', 'ionic run [platform]'.info.bold);

From 9c4b9eeee815e61e7cede5f6953b44b9c1a9f4ab Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 16:58:17 -0500
Subject: [PATCH 0081/1100] Added note

---
 lib/ionic/start.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 3e8019be36..1cc218e738 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -130,7 +130,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
           process.stderr.write('Unable to install one or more cordova plugins.\n'.error.bold);
       }
 
-      self._printQuickHelp();
+      self._printQuickHelp(targetPath);
 
       IonicStats.t('start', {});
     }, function(err) {
@@ -145,12 +145,12 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
 
 };
 
-IonicStartTask.prototype._printQuickHelp = function() {
+IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\nYour Ionic project is ready to go!'.green.bold);
   console.log('\nSome quick tips:');
+  console.log('\n * cd into your project directory before running any of the following commands', ('(cd ' + projectDirectory + ')').info.bold);
   console.log(' * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
   console.log('    Note: iOS development requires OS X currently'.small);
-  console.log('\n * cd into your project directory before running any of the following commands'.info.bold);
   console.log('\n * To build your project, run', 'ionic build [platform]'.info.bold);
   console.log('\n * To emulate your project in a simulator or emulator, run', 'ionic emulate [platform]'.info.bold);
   console.log('\n * To run your project on a device, run', 'ionic run [platform]'.info.bold);

From 915fab6957e9a329010038ef7706dabdb8787256 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 16:59:47 -0500
Subject: [PATCH 0082/1100] Added note

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 1cc218e738..2651f8b484 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -130,7 +130,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
           process.stderr.write('Unable to install one or more cordova plugins.\n'.error.bold);
       }
 
-      self._printQuickHelp(targetPath);
+      self._printQuickHelp(self.targetPath);
 
       IonicStats.t('start', {});
     }, function(err) {

From 1baed22745eb99fa8cafcea1c18491836bcb0082 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 17:01:00 -0500
Subject: [PATCH 0083/1100] Added note

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 2651f8b484..4c70aa52e4 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -130,7 +130,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
           process.stderr.write('Unable to install one or more cordova plugins.\n'.error.bold);
       }
 
-      self._printQuickHelp(self.targetPath);
+      self._printQuickHelp(self.appName);
 
       IonicStats.t('start', {});
     }, function(err) {

From d9e40ff0f77937df0739ff55469b4c60cf025555 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 24 Mar 2014 17:16:18 -0500
Subject: [PATCH 0084/1100] Updated

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 4c70aa52e4..2a0942f7bf 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -149,7 +149,7 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\nYour Ionic project is ready to go!'.green.bold);
   console.log('\nSome quick tips:');
   console.log('\n * cd into your project directory before running any of the following commands', ('(cd ' + projectDirectory + ')').info.bold);
-  console.log(' * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
+  console.log('\n * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
   console.log('    Note: iOS development requires OS X currently'.small);
   console.log('\n * To build your project, run', 'ionic build [platform]'.info.bold);
   console.log('\n * To emulate your project in a simulator or emulator, run', 'ionic emulate [platform]'.info.bold);

From a297872e673aa8d479b390806d548d7178df86dd Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 00:45:18 -0500
Subject: [PATCH 0085/1100] Moved to base project

---
 lib/ionic.js       |  4 ++--
 lib/ionic/start.js | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index e2d3e406a8..f8d4ee9481 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -175,8 +175,8 @@ Ionic = {
   },
 
   fail: function(msg) {
-    process.stderr.write('Error, exiting:');
-    process.stderr.write(msg + '\n');
+    process.stderr.write('ERROR: ');
+    process.stderr.write(msg.error.bold + '\nExiting.\n');
     process.exit(1);
   },
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 2a0942f7bf..6d79baaeb9 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -32,7 +32,7 @@ var IonicStartTask = function() {
 }
 
 // The URL for the cordova wrapper project
-IonicStartTask.WRAPPER_REPO_NAME = 'ionic-cordova-wrapper';
+IonicStartTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
 IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
 
@@ -104,7 +104,11 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
 
   var wrapperPromise = this._fetchWrapper();
 
-  wrapperPromise.then(function(targetPath) {
+  wrapperPromise.then(function() {
+    exec('npm install');
+    exec('gulp bootstrap --sass');
+  })
+  .then(function() {
     // Get the starter project repo name:
     var repoName = 'ionic-starter-' + projectType;
 
@@ -115,22 +119,33 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     var repoUrl = self._getStarterUrl(repoName);
 
     Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
+      var pluginQ = Q.defer();
+
       // Move the content of this repo into the www folder
-      cp('-R', targetPath + '/' + repoFolderName + '/.', 'www');
+      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
 
       // Copy the root config file to the www folder
-      cp(targetPath + '/config.xml', 'www');
+      cp(self.targetPath + '/config.xml', 'www');
 
       // Clean up start template folder
-      rm('-rf', targetPath + '/' + repoFolderName + '/');
+      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
 
       console.log('Initializing cordova project.'.info.bold);
-      if(!exec('cordova plugin add org.apache.cordova.device') || !exec('cordova plugin add org.apache.cordova.console') ||
-        !exec('cordova plugin add org.apache.cordova.statusbar')) {
-          process.stderr.write('Unable to install one or more cordova plugins.\n'.error.bold);
-      }
-
-      self._printQuickHelp(self.appName);
+      exec('cordova plugin add org.apache.cordova.device && ' + 
+           'cordova plugin add org.apache.cordova.console && ' +
+           'cordova plugin add org.apache.cordova.statusbar', function(err, stdout, stderr) {
+        if(err) {
+          pluginQ.reject(stderr);
+        } else {
+          pluginQ.resolve(stdout);
+        }
+      })
+
+      pluginQ.promise.then(function() {
+        self._printQuickHelp(self.appName);
+      }, function(err) {
+        Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+      });
 
       IonicStats.t('start', {});
     }, function(err) {

From c75e86049451701ad24ac827ef2ef33fa7bf57fa Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 00:59:30 -0500
Subject: [PATCH 0086/1100] Tweaked install order, fixed error handler

---
 lib/ionic/start.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 6d79baaeb9..f9d708ed17 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -105,10 +105,6 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var wrapperPromise = this._fetchWrapper();
 
   wrapperPromise.then(function() {
-    exec('npm install');
-    exec('gulp bootstrap --sass');
-  })
-  .then(function() {
     // Get the starter project repo name:
     var repoName = 'ionic-starter-' + projectType;
 
@@ -121,6 +117,9 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
       var pluginQ = Q.defer();
 
+      exec('npm install');
+      exec('gulp bootstrap --sass');
+
       // Move the content of this repo into the www folder
       cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
 
@@ -148,8 +147,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       });
 
       IonicStats.t('start', {});
-    }, function(err) {
-      console.error('Error: Unable to fetch project: HTTP'.error.bold, res.statusCode);
+    }).catch(function(err) {
+      console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode);
       console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
       Ionic.fail('');
     });

From 34e506b2054da92ba6094061de03604af9695a79 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 10:07:33 -0500
Subject: [PATCH 0087/1100] Run init instead of bootstrap

---
 lib/ionic/start.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f9d708ed17..f2e35398c6 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -117,8 +117,9 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
       var pluginQ = Q.defer();
 
+      // Install dependencies for the starter project
       exec('npm install');
-      exec('gulp bootstrap --sass');
+      exec('gulp init --sass');
 
       // Move the content of this repo into the www folder
       cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');

From 48af5213f38d647eb6c3a155ee954fdfe8978c90 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 15:56:55 -0500
Subject: [PATCH 0088/1100] Delay release of login stuff

---
 lib/ionic.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index f8d4ee9481..f8dbeccfc2 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -79,6 +79,7 @@ var TASKS = [
     usage: 'platform',
     task: IonicPlatformTask
   },
+  /*
   {
     title: 'login',
     name: 'login',
@@ -99,6 +100,7 @@ var TASKS = [
     usage: 'mode platform',
     task: IonicPackageTask
   }
+  */
 ];
 
 Ionic = {

From ea41deb4e3daa2f7890ab7dcae071da7666fb588 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 22:47:24 -0500
Subject: [PATCH 0089/1100] Fixed upload task

---
 lib/ionic.js         |  5 ++---
 lib/ionic/login.js   |  6 +++---
 lib/ionic/package.js | 14 +++++++-------
 lib/ionic/project.js |  6 +++---
 lib/ionic/upload.js  | 23 ++++++++++++++++++-----
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index f8dbeccfc2..50e25c698b 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -79,7 +79,6 @@ var TASKS = [
     usage: 'platform',
     task: IonicPlatformTask
   },
-  /*
   {
     title: 'login',
     name: 'login',
@@ -100,11 +99,11 @@ var TASKS = [
     usage: 'mode platform',
     task: IonicPackageTask
   }
-  */
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
+  //IONIC_DASH: 'http://apps.ionicframework.com/',
+  IONIC_DASH: 'http://127.0.0.1:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 41fd38e57b..1b11ea70b0 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -8,7 +8,7 @@ var fs = require('fs'),
 var IonicLoginTask = function() {
 }
 
-IonicLoginTask.HELP_LINE = 'Login to Ionic Studio';
+IonicLoginTask.HELP_LINE = 'Login to the Ionic Platform';
 
 IonicLoginTask.prototype = new IonicTask();
 
@@ -17,7 +17,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
   var schema = [{
     name: 'email',
     pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
-    message: 'Email for Ionic Apps login',
+    message: 'Email for your Ionic Platform login',
     required: true
   }, {
     name: 'password',
@@ -38,7 +38,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     schema.shift();
   }
 
-  console.log('To continue, please login to your Ionic Apps account (Create a free account here: ' + ionic.IONIC_DASH + 'signup)');
+  console.log('To continue, please login to your Ionic Platform account (Create a free account here: ' + ionic.IONIC_DASH + 'signup)');
 
   prompt.override = argv;
 
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index bf66b47b42..0a958a33be 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -13,7 +13,7 @@ var fs = require('fs'),
 var IonicPackageTask = function() {
 }
 
-IonicPackageTask.HELP_LINE = 'Package an Ionic project for the given plaform.';
+IonicPackageTask.HELP_LINE = 'Package an Ionic project using the Ionic Platform Build service (requires login)';
 
 IonicPackageTask.prototype = new IonicTask();
 
@@ -146,7 +146,7 @@ IonicPackageTask.prototype.run = function(ionic) {
           }
           project.save();
 
-          console.log('Packaging '+platform+' app...');
+          console.log('Packaging ' + platform + ' app...');
 
           var form = new FormData();
           form.append('email', project.get('email'));
@@ -156,7 +156,7 @@ IonicPackageTask.prototype.run = function(ionic) {
           form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
           for (var i = 0; i < plugins.length; i++) {
-            form.append('plugin_'+i, plugins[i]);
+            form.append('plugin_' + i, plugins[i]);
           };
 
           // Add the platform specific project properties to the post
@@ -176,7 +176,7 @@ IonicPackageTask.prototype.run = function(ionic) {
                 } else {
                   project.remove('android_keystore');
                   project.save();
-                  process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
+                  process.stderr.write('\nCan\'t find file: "' + keystoreFilePath + '"\nSkipping build..."\n\n');
                   return;
                 }
               }
@@ -188,7 +188,7 @@ IonicPackageTask.prototype.run = function(ionic) {
               } else {
                 project.remove('ios_certificate');
                 project.save();
-                process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
+                process.stderr.write('\nCan\'t find file: "' + certificateFilePath + '"\nSkipping build..."\n\n');
                 return;
               }
               var profileFilePath = path.resolve(project.get('ios_profile'));
@@ -197,13 +197,13 @@ IonicPackageTask.prototype.run = function(ionic) {
               } else {
                 project.remove('ios_profile');
                 project.save();
-                process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
+                process.stderr.write('\nCan\'t find file: "' + profileFilePath + '"\nSkipping build..."\n\n');
                 return;
               }
               break;
             default:
               console.trace();
-              process.stderr.write('\nUnknown platform: "'+platform+'"\nWe should never get here"\n\n');
+              process.stderr.write('\nUnknown platform: "' + platform + '"\nWe should never get here"\n\n');
               break;
           }
 
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index c227284b10..36a6f246bb 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -22,8 +22,8 @@ module.exports = {
     if(fs.existsSync(this.file)) {
       this.data = JSON.parse(fs.readFileSync(this.file))
     } else {
-      new Ionic().fail('Could not find ' + this.file + '!'+
-        ' Please run this command in your root ionic project directory with that file.');
+      Ionic.fail('Could not find your ' + this.file + ' file!'+
+        ' Please run this command in the root of your ionic project.');
     }
     return this;
   },
@@ -38,7 +38,7 @@ module.exports = {
       console.error('This should never happen!'); 
     }
     try {
-      fs.writeFileSync((targetPath?targetPath+'/':'')+this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
+      fs.writeFileSync((targetPath?targetPath + '/':'') + this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
     } catch(e) {
       console.error('Unable to save settings file:', e);
     }
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 7378de53a1..a170318251 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -7,17 +7,19 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicLoginTask;
+    IonicLoginTask = require('./login').IonicLoginTask,
+    Q = require('q');
 
 var IonicUploadTask = function() {
 }
 
-IonicUploadTask.HELP_LINE = 'Upload an Ionic project.';
+IonicUploadTask.HELP_LINE = 'Upload an Ionic project to the Ionic Platform (requires login)';
 
 IonicUploadTask.prototype = new IonicTask();
 
 IonicUploadTask.prototype.run = function(ionic, callback) {
   var project = IonicProject.load();
+  var q = Q.defer();
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
@@ -51,7 +53,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
       form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
       // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
 
-      var url = ionic.IONIC_DASH+'projects/'+project.get('app_id');
+      var url = ionic.IONIC_DASH + 'projects/' + project.get('app_id');
       var params = parseUrl(url);
 
       form.submit({
@@ -67,9 +69,9 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
         if(err) {
           ionic.fail("Error uploading: " + err);
         }
-        
-        console.log('Done');
 
+        console.log('Done uploading'.info.bold);
+        
         if(response.statusCode == 302) {
           var redirectPath = parseUrl(response.headers.location);
           project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
@@ -78,10 +80,21 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
           if (callback) {
             callback();
           };
+        } else {
+          callback && callback();
         }
+
+        q.resolve(callback);
       });
     });
   });
+
+  q.promise.then(function(callback) {
+    // Exit if there was no callback
+    if(!callback) {
+      process.exit(0);
+    }
+  });
 };
 
 exports.IonicUploadTask = IonicUploadTask;

From 735a2fe870a2663810e200694af3c13faa14bff5 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 23:04:54 -0500
Subject: [PATCH 0090/1100] Spacing around quotes

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 0a958a33be..8213893389 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -207,7 +207,7 @@ IonicPackageTask.prototype.run = function(ionic) {
               break;
           }
 
-          var url = ionic.IONIC_DASH+'export/'+project.get('app_id');
+          var url = ionic.IONIC_DASH + 'export/' + project.get('app_id');
           var params = parseUrl(url);
 
           form.submit({

From cbd212092f1398ef82994e11b6dafdc98afbcb97 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 25 Mar 2014 23:07:10 -0500
Subject: [PATCH 0091/1100] Removing some stuff

---
 lib/ionic.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 50e25c698b..b234f32f0e 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -79,6 +79,7 @@ var TASKS = [
     usage: 'platform',
     task: IonicPlatformTask
   },
+  /*
   {
     title: 'login',
     name: 'login',
@@ -99,6 +100,7 @@ var TASKS = [
     usage: 'mode platform',
     task: IonicPackageTask
   }
+  */
 ];
 
 Ionic = {

From 2c3f9c5c4980a7ca7b299ee038bcf9a59c9b6e98 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 26 Mar 2014 14:56:33 -0500
Subject: [PATCH 0092/1100] Initial private settings for projects

---
 lib/ionic/package.js | 32 +++++++++++----------
 lib/ionic/private.js | 67 ++++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/project.js |  7 -----
 lib/ionic/upload.js  |  2 +-
 4 files changed, 85 insertions(+), 23 deletions(-)
 create mode 100644 lib/ionic/private.js

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index bf66b47b42..b227526a31 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     shelljs = require('shelljs/global'),
     FormData = require('form-data'),    
     IonicProject = require('./project'),
+    IonicProjectPrivate = require('./private'),
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
@@ -46,6 +47,7 @@ IonicPackageTask.prototype.run = function(ionic) {
     login.get(ionic, function(jar) {
 
       var project = IonicProject.load();
+      var projectPrivate = IonicProjectPrivate.load(project.get('app_id'));
 
       console.log('Grabbing plugins...');
       var plugins = [];
@@ -128,7 +130,7 @@ IonicPackageTask.prototype.run = function(ionic) {
 
         // Don't prompt for properties we already have in the config
         for (var property in properties) {
-          if(project.get(property)) {
+          if(projectPrivate.get(property)) {
             delete properties[property];
           }
         }
@@ -140,11 +142,11 @@ IonicPackageTask.prototype.run = function(ionic) {
 
           // Overwrite any empty properties with prompt responses
           for (var property in properties) {
-            if(result[property] && !project.get(property)) {
-              project.set(property, result[property]);
+            if(result[property] && !projectPrivate.get(property)) {
+              projectPrivate.set(property, result[property]);
             }
           }
-          project.save();
+          projectPrivate.save(project.get('app_id'));
 
           console.log('Packaging '+platform+' app...');
 
@@ -160,9 +162,9 @@ IonicPackageTask.prototype.run = function(ionic) {
           };
 
           // Add the platform specific project properties to the post
-          for (var property in project.get()) {
+          for (var property in projectPrivate.get()) {
             if(property.indexOf(platform) == 0) {
-              form.append(property, project.get(property));
+              form.append(property, projectPrivate.get(property));
             }
           }
           
@@ -170,33 +172,33 @@ IonicPackageTask.prototype.run = function(ionic) {
           switch(platform) {
             case 'android':
               if(mode == 'release') {
-                var keystoreFilePath = path.resolve(project.get('android_keystore'));
+                var keystoreFilePath = path.resolve(projectPrivate.get('android_keystore'));
                 if(fs.existsSync(keystoreFilePath)) {
                   form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
                 } else {
-                  project.remove('android_keystore');
-                  project.save();
+                  projectPrivate.remove('android_keystore');
+                  projectPrivate.save(project.get('app_id'));
                   process.stderr.write('\nCan\'t find file: "'+keystoreFilePath+'"\nSkipping build..."\n\n');
                   return;
                 }
               }
               break;
             case 'ios': 
-              var certificateFilePath = path.resolve(project.get('ios_certificate'));
+              var certificateFilePath = path.resolve(projectPrivate.get('ios_certificate'));
               if(fs.existsSync(certificateFilePath)) {
                 form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
               } else {
-                project.remove('ios_certificate');
-                project.save();
+                projectPrivate.remove('ios_certificate');
+                projectPrivate.save(project.get('app_id'));
                 process.stderr.write('\nCan\'t find file: "'+certificateFilePath+'"\nSkipping build..."\n\n');
                 return;
               }
-              var profileFilePath = path.resolve(project.get('ios_profile'));
+              var profileFilePath = path.resolve(projectPrivate.get('ios_profile'));
               if(fs.existsSync(profileFilePath)) {
                 form.append('ios_profile_file', fs.createReadStream(profileFilePath));
               } else {
-                project.remove('ios_profile');
-                project.save();
+                projectPrivate.remove('ios_profile');
+                projectPrivate.save(project.get('app_id'));
                 process.stderr.write('\nCan\'t find file: "'+profileFilePath+'"\nSkipping build..."\n\n');
                 return;
               }
diff --git a/lib/ionic/private.js b/lib/ionic/private.js
new file mode 100644
index 0000000000..63a3377a64
--- /dev/null
+++ b/lib/ionic/private.js
@@ -0,0 +1,67 @@
+var fs = require('fs'),
+    path = require('path'),
+    ionic = require('../ionic');
+
+var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+
+module.exports = {
+  PRIVATE_PATH: '.ionic/',
+  PRIVATE_EXT: '.project',
+  PRIVATE_DEFAULT: {
+    ios_certificate: '',
+    ios_certificate_password: '',
+    ios_profile: '',
+    android_keystore: '',
+    android_keystore_alias: '',
+    android_keystore_password: '',
+    android_key_password: ''
+  },
+  load: function(app_id) {
+    if(app_id) {
+      this.file = this.PRIVATE_PATH+app_id+this.PRIVATE_EXT;    
+      if(fs.existsSync(path.join(home,this.file))) {      
+        this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
+      } else {
+        this.data = {};
+      }
+    }
+    return this;
+  },
+  create: function(name) {
+    this.data = this.PRIVATE_DEFAULT;
+    return this;
+  },
+  save: function(app_id) {
+    if(!this.data) { 
+      console.trace();
+      console.error('This should never happen!'); 
+    }
+    if(app_id) {
+      this.file = this.PRIVATE_PATH+app_id+this.PRIVATE_EXT;  
+      try {
+        fs.writeFileSync(path.join(home,this.file), JSON.stringify(this.data, null, 2));
+      } catch(e) {
+        console.error('Unable to save private settings file:', e);
+      }
+    }
+  },
+  get: function(k) {
+    if(k) {
+      return this.data[k];
+    } else {
+      return this.data;
+    }
+  },
+  set: function(k, v) {
+    if(!this.data) {
+      this.data = PRIVATE_DEFAULT;
+    }
+    this.data[k] = v;
+  },
+  remove: function(k) {
+    if(!this.data) {
+      this.data = PRIVATE_DEFAULT;
+    }
+    this.data[k] = '';
+  }
+};
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index c227284b10..180757375c 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -9,13 +9,6 @@ module.exports = {
     email: '',
     app_id: '',
     package_name: '',    
-    ios_certificate: '',
-    ios_certificate_password: '',
-    ios_profile: '',
-    android_keystore: '',
-    android_keystore_alias: '',
-    android_keystore_password: '',
-    android_key_password: ''
   },
   load: function() {
     this.file = this.PROJECT_FILE;    
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 196d98992d..997de2bbe4 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -72,7 +72,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
           project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
           project.save();
 
-          if (callback) {
+          if(callback) {
             callback();
           };
         }

From 7b2cda1c5bdf49282d6a299b231bbf0358c4dad5 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 26 Mar 2014 15:42:54 -0500
Subject: [PATCH 0093/1100] Finish privatizing passwords

---
 lib/ionic/package.js | 4 ++--
 lib/ionic/private.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index b227526a31..10acd4e397 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -41,7 +41,7 @@ IonicPackageTask.prototype.run = function(ionic) {
   }
 
   var upload = new IonicUploadTask();
-  upload.run(ionic, function() {
+  //upload.run(ionic, function() {
 
     var login = new IonicLoginTask();
     login.get(ionic, function(jar) {
@@ -240,7 +240,7 @@ IonicPackageTask.prototype.run = function(ionic) {
         });
       }
     });  
-  });
+  //});
 };
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/private.js b/lib/ionic/private.js
index 63a3377a64..e58d810c4f 100644
--- a/lib/ionic/private.js
+++ b/lib/ionic/private.js
@@ -22,12 +22,12 @@ module.exports = {
       if(fs.existsSync(path.join(home,this.file))) {      
         this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
       } else {
-        this.data = {};
+        this.data = this.PRIVATE_DEFAULT;
       }
     }
     return this;
   },
-  create: function(name) {
+  create: function() {
     this.data = this.PRIVATE_DEFAULT;
     return this;
   },

From ce6aea76023eeda0b85fb6bd286fc670770753ed Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 27 Mar 2014 18:53:32 -0500
Subject: [PATCH 0094/1100] Removed dep on gulp and bower

---
 lib/ionic.js       | 32 ++++++++++++++++++++-
 lib/ionic/start.js | 69 +++++++++++++++++++++++++---------------------
 package.json       |  4 +--
 3 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index b234f32f0e..2578e279a8 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -27,6 +27,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     os = require('os'),
     unzip = require('unzip'),
     colors = require('colors'),
+    spawn = require('child_process').spawn,
     Q = require('q');
 
 
@@ -183,6 +184,35 @@ Ionic = {
     process.exit(1);
   },
 
+  spawnPromise: function(cmd, args, onStdOut, onStdErr) {
+    var q = Q.defer();
+    console.log('\nRUNNING:'.info.bold, cmd, args.join(' '));
+    try {
+      var child = spawn(cmd, args);
+    } catch(e) {
+    }
+    child.stdout.setEncoding('utf8');
+    child.stderr.setEncoding('utf8');
+    child.stdout.on('data', function(data) {
+      process.stdout.write(data);
+      onStdOut && onStdOut(data);
+    });
+    child.stderr.on('data', function(data) {
+      process.stderr.write(data);
+      onStdErr && onStdErr(data);
+    });
+    child.on('error', function(err) {
+      q.reject(err);
+    });
+    child.on('exit', function(code) {
+      if(code === 0) {
+        q.resolve();
+      } else {
+        q.reject(code);
+      }
+    });
+    return q.promise;
+  },
   /**
    * Fetch a repo from GitHub, unzip it to a specific folder.
    */
@@ -191,7 +221,7 @@ Ionic = {
 
     // The folder name the project will be downloaded and extracted to
     var repoFolderName = repoName + '-master';
-    console.log('Fetching repo:', repoUrl);
+    console.log('\nDOWNLOADING:'.info.bold, repoUrl);
 
     var tmpFolder = os.tmpdir();
     var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f2e35398c6..b15b700769 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -7,6 +7,7 @@ var fs = require('fs'),
     unzip = require('unzip'),
     argv = require('optimist').argv,
     colors = require('colors'),
+    spawn = require('child_process').spawn,
     Q = require('q'),
     IonicProject = require('../ionic'),
     IonicProject = require('./project'),
@@ -82,7 +83,6 @@ IonicStartTask.prototype._fetchWrapper = function() {
 
   var repoName = IonicStartTask.WRAPPER_REPO_NAME;
   var repoUrl = 'https://github.com/driftyco/' + IonicStartTask.WRAPPER_REPO_NAME + '/archive/master.zip';
-  console.log('Fetching', 'Cordova'.info.bold, 'wrapper');
 
   Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
     cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
@@ -115,41 +115,46 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     var repoUrl = self._getStarterUrl(repoName);
 
     Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
+      var npmQ = Q.defer();
+      var gulpQ = Q.defer();
       var pluginQ = Q.defer();
-
       // Install dependencies for the starter project
-      exec('npm install');
-      exec('gulp init --sass');
-
-      // Move the content of this repo into the www folder
-      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
-
-      // Copy the root config file to the www folder
-      cp(self.targetPath + '/config.xml', 'www');
-
-      // Clean up start template folder
-      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
-
-      console.log('Initializing cordova project.'.info.bold);
-      exec('cordova plugin add org.apache.cordova.device && ' + 
-           'cordova plugin add org.apache.cordova.console && ' +
-           'cordova plugin add org.apache.cordova.statusbar', function(err, stdout, stderr) {
-        if(err) {
-          pluginQ.reject(stderr);
-        } else {
-          pluginQ.resolve(stdout);
-        }
-      })
-
-      pluginQ.promise.then(function() {
-        self._printQuickHelp(self.appName);
-      }, function(err) {
-        Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
-      });
 
-      IonicStats.t('start', {});
+      //Ionic.spawnPromise('npm', ['install', '--quiet']).then(function() {
+        // Move the content of this repo into the www folder
+        cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
+
+        // Copy the root config file to the www folder
+        cp(self.targetPath + '/config.xml', 'www');
+
+        // Clean up start template folder
+        rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+
+        console.log('Initializing cordova project.'.info.bold);
+        exec('cordova plugin add org.apache.cordova.device && ' + 
+             'cordova plugin add org.apache.cordova.console && ' +
+             'cordova plugin add org.apache.cordova.statusbar', function(err, stdout, stderr) {
+          if(err) {
+            pluginQ.reject(stderr);
+          } else {
+            pluginQ.resolve(stdout);
+          }
+        })
+
+        pluginQ.promise.then(function() {
+          self._printQuickHelp(self.appName);
+        }, function(err) {
+          Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+        });
+
+        IonicStats.t('start', {});
+      /*
+      }).fail(function(err, stderr) {;
+        Ionic.fail('Unable to install Ionic dependencies. Please make sure you\'ve installed cordova, and gulp globally by running:\nsudo npm install -g cordova gulp. Error:\n'.error.bold + err + '\n' + stderr);
+      });
+      */
     }).catch(function(err) {
-      console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode);
+      console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode, err);
       console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
       Ionic.fail('');
     });
diff --git a/package.json b/package.json
index d276025bc6..a09d323b0a 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "request": "2.27.0",
     "shelljs": "0.2.6",
     "unzip": "0.1.9",
-    "q": "^1.0.1",
-    "colors": "^0.6.2"
+    "colors": "^0.6.2",
+    "q": "^1.0.1"
   }
 }

From 556374c1e7c1256adab642dd8cbf2cb00536365a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 27 Mar 2014 18:59:04 -0500
Subject: [PATCH 0095/1100] vNum Update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a09d323b0a..0d780a255e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 0c683eca716fa6bc9a34de3ab0c656f5f8e28efe Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 27 Mar 2014 18:59:51 -0500
Subject: [PATCH 0096/1100] idk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d780a255e..902e99e824 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.1-beta",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 15933b01a3e27f969afa89269416a2f570b8fc09 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Wed, 2 Apr 2014 11:44:34 -0500
Subject: [PATCH 0097/1100] Just lowercase all starter projects by default

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index b15b700769..1a74914dfa 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -68,7 +68,7 @@ IonicStartTask.prototype.run = function(ionic) {
 
   fs.mkdirSync(this.targetPath);
 
-  this._fetchAndWriteSeed(starterProject);
+  this._fetchAndWriteSeed(starterProject.toLowerCase());
   this._writeConfig(ionic);
 
 };

From 269804a6542243613daef18455c8d5293d528d85 Mon Sep 17 00:00:00 2001
From: Peter C <pmcollins2@wisc.edu>
Date: Fri, 18 Apr 2014 14:34:29 -0500
Subject: [PATCH 0098/1100] Don't copy config.xml into www anymore

People were getting confused on new versions of cordova with config.xml files appearing in the www folder and the project parent directory.
---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 1a74914dfa..17fd663948 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -125,7 +125,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
         cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
 
         // Copy the root config file to the www folder
-        cp(self.targetPath + '/config.xml', 'www');
+        // cp(self.targetPath + '/config.xml', 'www');
 
         // Clean up start template folder
         rm('-rf', self.targetPath + '/' + repoFolderName + '/');

From c218c3f4f15347dfdf5b53cb89dc7283daf75b49 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 24 Apr 2014 15:55:22 -0700
Subject: [PATCH 0099/1100] Removed statusbar plugin by default

---
 lib/ionic/start.js | 4 ++--
 package.json       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 17fd663948..ed46b18347 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -132,8 +132,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
 
         console.log('Initializing cordova project.'.info.bold);
         exec('cordova plugin add org.apache.cordova.device && ' + 
-             'cordova plugin add org.apache.cordova.console && ' +
-             'cordova plugin add org.apache.cordova.statusbar', function(err, stdout, stderr) {
+             'cordova plugin add org.apache.cordova.console'
+             , function(err, stdout, stderr) {
           if(err) {
             pluginQ.reject(stderr);
           } else {
diff --git a/package.json b/package.json
index 902e99e824..5f87238aca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.1-beta",
+  "version": "1.0.3-beta",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -32,6 +32,7 @@
     "shelljs": "0.2.6",
     "unzip": "0.1.9",
     "colors": "^0.6.2",
-    "q": "^1.0.1"
+    "q": "^1.0.1",
+    "npm": "^1.4.6"
   }
 }

From 278d0051e65886e31c0d9d1b03cd768d8148f12c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 28 Apr 2014 12:33:40 -0500
Subject: [PATCH 0100/1100] Proxy support

---
 lib/ionic.js         |  5 ++++-
 lib/ionic/project.js |  3 +++
 lib/ionic/start.js   | 12 ++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2578e279a8..91bea82f99 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -22,6 +22,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicLoginTask = require('./ionic/login').IonicLoginTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
+    IonicProject = require('./ionic/project'),
     path = require('path'),
     request = require('request'),
     os = require('os'),
@@ -219,6 +220,8 @@ Ionic = {
   fetchRepo: function(targetPath, repoName, repoUrl) {
     var q = Q.defer();
 
+    var proxy = process.env.PROXY || null;
+
     // The folder name the project will be downloaded and extracted to
     var repoFolderName = repoName + '-master';
     console.log('\nDOWNLOADING:'.info.bold, repoUrl);
@@ -237,7 +240,7 @@ Ionic = {
       readStream.pipe(writeStream);
     };
 
-    request({ url: repoUrl, encoding: null }, function(err, res, body) {
+    request({ url: repoUrl, encoding: null, proxy: proxy }, function(err, res, body) {
       if(res.statusCode !== 200) {
         q.reject(res);
         return;
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index 0494f94ef1..8390466d82 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -37,6 +37,9 @@ module.exports = {
     }
   },
   get: function(k) {
+    if(!this.data) {
+      return null;
+    }
     if(k) {
       return this.data[k];
     } else {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ed46b18347..7b9d7c79a8 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,7 +9,6 @@ var fs = require('fs'),
     colors = require('colors'),
     spawn = require('child_process').spawn,
     Q = require('q'),
-    IonicProject = require('../ionic'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
@@ -168,12 +167,13 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
 IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\nYour Ionic project is ready to go!'.green.bold);
   console.log('\nSome quick tips:');
-  console.log('\n * cd into your project directory before running any of the following commands', ('(cd ' + projectDirectory + ')').info.bold);
-  console.log('\n * Make sure to add a platform (ios or Android):', 'ionic platform add android [ios]'.info.bold);
+  console.log('\n * cd into your project:', ('$ cd ' + projectDirectory).info.bold);
+  console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
   console.log('    Note: iOS development requires OS X currently'.small);
-  console.log('\n * To build your project, run', 'ionic build [platform]'.info.bold);
-  console.log('\n * To emulate your project in a simulator or emulator, run', 'ionic emulate [platform]'.info.bold);
-  console.log('\n * To run your project on a device, run', 'ionic run [platform]'.info.bold);
+  console.log('    See the Android Platform Guid for full Android installation instructions: https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
+  console.log('\n * Build your app:', 'ionic build [platform]'.info.bold);
+  console.log('\n * Simulate your app:', 'ionic emulate [platform]'.info.bold);
+  console.log('\n * Run your app on a device:', 'ionic run [platform]'.info.bold);
   console.log('\n\nFor more help, visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold);
 };
 

From 3ad53647fca5f64399de9d602107bcbae70bbd19 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 28 Apr 2014 12:33:57 -0500
Subject: [PATCH 0101/1100] Proxy support

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5f87238aca..c2d3b2ad24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.3-beta",
+  "version": "1.0.4",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 5e298d1fd40d1feaf302deff87c47b36b544e299 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 09:51:50 -0500
Subject: [PATCH 0102/1100] Alpha features

---
 lib/ionic.js | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 91bea82f99..7dde3ff159 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -81,7 +81,6 @@ var TASKS = [
     usage: 'platform',
     task: IonicPlatformTask
   },
-  /*
   {
     title: 'login',
     name: 'login',
@@ -94,7 +93,8 @@ var TASKS = [
     alt: ['up'],
     usage: '',
     task: IonicUploadTask
-  },
+  }
+  /*
   {
     title: 'package',
     name: 'package',
diff --git a/package.json b/package.json
index c2d3b2ad24..c6fab60902 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 995a0218b22bc22f311eb5454a2401a1971957b8 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 11:54:06 -0500
Subject: [PATCH 0103/1100] Fixed URL

---
 lib/ionic.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 7dde3ff159..756365d872 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -106,8 +106,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  //IONIC_DASH: 'http://apps.ionicframework.com/',
-  IONIC_DASH: 'http://127.0.0.1:8000/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
+  //IONIC_DASH: 'http://127.0.0.1:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {

From 5ff69acc57dc5268a962f91bc09da6567285ed4c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 11:54:27 -0500
Subject: [PATCH 0104/1100] v

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c6fab60902..123e1357e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 08ab635933ad353ac39c3b4159abef23aebe2ee2 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 12:26:07 -0500
Subject: [PATCH 0105/1100] Ionic serve

---
 lib/ionic.js       | 13 ++++++++++---
 lib/ionic/serve.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
 package.json       |  6 ++++--
 3 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 lib/ionic/serve.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 756365d872..bf56c3606a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -22,6 +22,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicLoginTask = require('./ionic/login').IonicLoginTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
+    IonicServeTask = require('./ionic/serve'),
     IonicProject = require('./ionic/project'),
     path = require('path'),
     request = require('request'),
@@ -51,6 +52,12 @@ var fs = require('fs'),
     argv = require('optimist').argv;
 
 var TASKS = [
+  {
+    title: 'serve',
+    name: 'serve',
+    usage: '',
+    task: IonicServeTask
+  },
   {
     title: 'start',
     name: 'start',
@@ -93,7 +100,7 @@ var TASKS = [
     alt: ['up'],
     usage: '',
     task: IonicUploadTask
-  }
+  },
   /*
   {
     title: 'package',
@@ -106,8 +113,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
-  //IONIC_DASH: 'http://127.0.0.1:8000/',
+  //IONIC_DASH: 'http://apps.ionicframework.com/',
+  IONIC_DASH: 'http://127.0.0.1:8002/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
new file mode 100644
index 0000000000..1c5768bcaa
--- /dev/null
+++ b/lib/ionic/serve.js
@@ -0,0 +1,45 @@
+var fs = require('fs'),
+    argv = require('optimist').argv,
+    connect = require('connect'),
+    open = require('open'),
+    Q = require('q'),
+    IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask;
+    IonicStats = require('./stats').IonicStats;
+
+var IonicServeTask = function() {}
+
+IonicServeTask.HELP_LINE = 'Start a local development server for easy app development and testing';
+
+IonicServeTask.prototype = new IonicTask();
+
+IonicServeTask.prototype._printUsage = function() {
+  process.stderr.write('\nUsage: ionic serve [port] [options]\n');
+  process.stderr.write('\nUse --nobrowser to disable auto browser launch\n');
+};
+
+IonicServeTask.prototype.run = function(ionic) {
+  var project = IonicProject.load();
+
+  // Grab the name of the app
+  this.port = argv._[1] || '8100';
+
+  this.launchBrowser = typeof argv['nobrowser'] === 'undefined';
+
+  this._start();
+};
+
+IonicServeTask.prototype._start = function() {
+  var self = this;
+
+  console.log('Running local development server at', ('http://0.0.0.0:' + this.port).info.bold);
+
+  setTimeout(function() {
+    if(self.launchBrowser) {
+      open('http://localhost:' + self.port);
+    }
+  });
+  connect().use(connect.static('www')).listen(this.port);
+};
+
+module.exports = IonicServeTask;
diff --git a/package.json b/package.json
index 123e1357e5..cdc985d42d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "preferGlobal": true,
   "description": "A tool for creating and building Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -33,6 +33,8 @@
     "unzip": "0.1.9",
     "colors": "^0.6.2",
     "q": "^1.0.1",
-    "npm": "^1.4.6"
+    "npm": "^1.4.6",
+    "connect": "^2.14.5",
+    "open": "0.0.5"
   }
 }

From ee87fb0fce90f8ff8b31424aa82674e575bf0103 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 14:36:25 -0500
Subject: [PATCH 0106/1100] Livereload

---
 lib/ionic.js       | 15 +++++++++++
 lib/ionic/serve.js | 67 +++++++++++++++++++++++++++++++++++++++-------
 package.json       |  9 ++++---
 3 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index bf56c3606a..c4b7b2c61d 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -258,6 +258,21 @@ Ionic = {
     });
 
     return q.promise;
+  },
+
+  getLocalIps: function() {
+    var interfaces = os.networkInterfaces();
+    var addresses = [];
+    for (k in interfaces) {
+      for (k2 in interfaces[k]) {
+        var address = interfaces[k][k2];
+        if (address.family == 'IPv4' && !address.internal) {
+          addresses.push(address.address)
+        }
+      }
+    }
+
+    return addresses;
   }
 };
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 1c5768bcaa..ac6f8129f8 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -2,6 +2,10 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     connect = require('connect'),
     open = require('open'),
+    tinylr = require('tiny-lr-fork'),
+    lr = require('connect-livereload'),
+    vfs = require('vinyl-fs'),
+    request = require('request'),
     Q = require('q'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
@@ -14,7 +18,7 @@ IonicServeTask.HELP_LINE = 'Start a local development server for easy app develo
 IonicServeTask.prototype = new IonicTask();
 
 IonicServeTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic serve [port] [options]\n');
+  process.stderr.write('\nUsage: ionic serve [http-port] [livereload-port] [options]\n');
   process.stderr.write('\nUse --nobrowser to disable auto browser launch\n');
 };
 
@@ -22,24 +26,67 @@ IonicServeTask.prototype.run = function(ionic) {
   var project = IonicProject.load();
 
   // Grab the name of the app
-  this.port = argv._[1] || '8100';
+  this.port = argv._[1] || 8100;
+  this.liveReloadPort = argv._[2] || 35729;
 
   this.launchBrowser = typeof argv['nobrowser'] === 'undefined';
+  this.runLivereload = typeof argv['nolivereload'] === 'undefined';
 
-  this._start();
+  this._start(ionic);
 };
 
-IonicServeTask.prototype._start = function() {
-  var self = this;
+IonicServeTask.prototype._changed = function(path) {
+  // Cleanup the path a bit
+  var pwd = process.cwd()
+  path = path.replace(pwd + '/', '');
 
-  console.log('Running local development server at', ('http://0.0.0.0:' + this.port).info.bold);
+  console.log('Changed', path);
 
-  setTimeout(function() {
-    if(self.launchBrowser) {
-      open('http://localhost:' + self.port);
+  var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
+    path: '/changed',
+    method: 'POST',
+    body: JSON.stringify({
+      files: [path]
+    })
+  }, function(err, res, body) {
+    if(err) {
+      console.error('Unable to update live reload:', err);
     }
   });
-  connect().use(connect.static('www')).listen(this.port);
+};
+
+IonicServeTask.prototype._start = function(ionic) {
+  var self = this;
+
+  var app = connect();
+
+  if(this.runLivereload) {
+    vfs.watch('www/**/*', {
+    }, function(f) {
+      self._changed(f.path);
+    });
+
+    server = tinylr();
+    server.listen(this.liveReloadPort, function(err) {
+      if(err) {
+        ionic.fail('Unable to start server:', err);
+      } else {
+        console.log('Running live reload server at', ('http://0.0.0.0:' + self.liveReloadPort).info.bold);
+        if(self.launchBrowser) {
+          open('http://localhost:' + self.port);
+        }
+      }
+    });
+
+    app.use(require('connect-livereload')({
+      port: this.liveReloadPort
+    }))
+  }
+
+  app.use(connect.static('www'))
+    .listen(this.port);
+  
+  console.log('Running dev server at', ('http://0.0.0.0:' + this.port).info.bold);
 };
 
 module.exports = IonicServeTask;
diff --git a/package.json b/package.json
index cdc985d42d..c6652a11f4 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ionic",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "preferGlobal": true,
-  "description": "A tool for creating and building Ionic Framework mobile apps.",
+  "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
   "bin": {
     "ionic": "bin/ionic"
@@ -35,6 +35,9 @@
     "q": "^1.0.1",
     "npm": "^1.4.6",
     "connect": "^2.14.5",
-    "open": "0.0.5"
+    "open": "0.0.5",
+    "tiny-lr-fork": "0.0.5",
+    "connect-livereload": "^0.4.0",
+    "vinyl-fs": "^0.1.4"
   }
 }

From 60b53d8276f11f4ff6990aa28048fa64abd6ad7a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 29 Apr 2014 14:43:06 -0500
Subject: [PATCH 0107/1100] Version and info

---
 lib/ionic.js       | 8 +++++++-
 lib/ionic/start.js | 1 +
 package.json       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index c4b7b2c61d..ed0654e997 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -30,7 +30,8 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     unzip = require('unzip'),
     colors = require('colors'),
     spawn = require('child_process').spawn,
-    Q = require('q');
+    Q = require('q'),
+    settings = require('../package.json')
 
 
 colors.setTheme({
@@ -175,6 +176,11 @@ Ionic = {
   },
 
   run: function() {
+    if(argv.version) {
+      console.log('Ionic CLI version ' + settings.version);
+      process.exit(0);
+    }
+
     var task = this._tryBuildingTask();
     if(!task) {
       return this._printGenericUsage();
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 7b9d7c79a8..567de82265 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -174,6 +174,7 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\n * Build your app:', 'ionic build [platform]'.info.bold);
   console.log('\n * Simulate your app:', 'ionic emulate [platform]'.info.bold);
   console.log('\n * Run your app on a device:', 'ionic run [platform]'.info.bold);
+  console.log('\n * Develop in the browser with live reload:', 'ionic serve'.info.bold);
   console.log('\n\nFor more help, visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold);
 };
 
diff --git a/package.json b/package.json
index c6652a11f4..03356c04db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From af86a7a1a1d0b82960297f8fca610470ca1ca372 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sun, 11 May 2014 17:03:40 -0500
Subject: [PATCH 0108/1100] Fixed login and upload

---
 lib/ionic.js        |  4 ++--
 lib/ionic/login.js  |  2 +-
 lib/ionic/upload.js | 31 ++++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ed0654e997..0304ab98d6 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -114,8 +114,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  //IONIC_DASH: 'http://apps.ionicframework.com/',
-  IONIC_DASH: 'http://127.0.0.1:8002/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
+  //IONIC_DASH: 'http://localhost:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 1b11ea70b0..69faedac1d 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -38,7 +38,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     schema.shift();
   }
 
-  console.log('To continue, please login to your Ionic Platform account (Create a free account here: ' + ionic.IONIC_DASH + 'signup)');
+  console.log('To continue, please login to your Ionic account.\nDon\'t have one? Create a one here: ' + (ionic.IONIC_DASH + 'signup').info.bold + '\n');
 
   prompt.override = argv;
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index c90a541b67..9af0f1a85e 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -45,7 +45,11 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
     zip.on('close', function() {
       console.log('Done');
-      console.log('Uploading...');
+      if(project.get('app_id')) {
+        console.log('Uploading app (id: ' + project.get('app_id') + ')');
+      } else {
+        console.log('Uploading app.');
+      }
 
       var form = new FormData();
       form.append('name', project.get('name'));
@@ -57,7 +61,8 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
       var params = parseUrl(url);
 
       form.submit({
-        host: params.host,
+        hostname: params.hostname,
+        port: params.port,
         path: params.path,
         headers: form.getHeaders({
           cookie: jar.cookies.map(function (c) {
@@ -70,9 +75,14 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
           ionic.fail("Error uploading: " + err);
         }
 
-        console.log('Done uploading'.info.bold);
-        
         if(response.statusCode == 302) {
+          if(response.headers.location.indexOf('login?next=') >= 0) {
+            console.error('Session expired. Please log in again and run this command again.');
+            q.reject('not_logged_in');
+            return;
+          }
+          console.log('Done!'.info.bold);
+        
           var redirectPath = parseUrl(response.headers.location);
           project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
           project.save();
@@ -80,8 +90,17 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
           if(callback) {
             callback();
           };
-        } else {
+        } else if(response.statusCode === 200) {
+          console.log('Got response', response.statusCode);
           callback && callback();
+        } else {
+          if(response.headers['content-type'] == 'application/json') {
+            response.on('data', function(chunk) {
+              console.log(String(chunk));
+            });
+          }
+          console.error('Unable to upload. HTTP response:', response.statusCode);
+          q.reject(response);
         }
 
         q.resolve(callback);
@@ -94,6 +113,8 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     if(!callback) {
       process.exit(0);
     }
+  }, function(err) {
+    process.exit(1);
   });
 };
 

From d9944a752320d8a5ef386de151635333b9d5196d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sun, 11 May 2014 17:03:58 -0500
Subject: [PATCH 0109/1100] Version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 03356c04db..cc685c4aaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 29199e5fb8f8ed21cc292d429fdc78d89f6e39f6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 14 May 2014 10:05:41 -0500
Subject: [PATCH 0110/1100] Added keyboard plugin by default

---
 lib/ionic.js       |  4 ++--
 lib/ionic/start.js | 33 +++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0304ab98d6..3fe3689bf5 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -114,8 +114,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
-  //IONIC_DASH: 'http://localhost:8000/',
+  //IONIC_DASH: 'http://apps.ionicframework.com/',
+  IONIC_DASH: 'http://localhost:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 567de82265..e21c5fb5b7 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -96,6 +96,24 @@ IonicStartTask.prototype._fetchWrapper = function() {
   return q.promise;
 };
 
+IonicStartTask.prototype._installCordovaPlugins = function() {
+  var q = Q.defer();
+
+  console.log('Initializing cordova project.'.info.bold);
+  exec('cordova plugin add org.apache.cordova.device && ' +
+       'cordova plugin add org.apache.cordova.console && ' +
+       'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard'
+       , function(err, stdout, stderr) {
+    if(err) {
+      q.reject(stderr);
+    } else {
+      q.resolve(stdout);
+    }
+  });
+
+  return q.promise;
+};
+
 IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var self = this;
 
@@ -129,16 +147,11 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
         // Clean up start template folder
         rm('-rf', self.targetPath + '/' + repoFolderName + '/');
 
-        console.log('Initializing cordova project.'.info.bold);
-        exec('cordova plugin add org.apache.cordova.device && ' + 
-             'cordova plugin add org.apache.cordova.console'
-             , function(err, stdout, stderr) {
-          if(err) {
-            pluginQ.reject(stderr);
-          } else {
-            pluginQ.resolve(stdout);
-          }
-        })
+        self._installCordovaPlugins().then(function(output) {
+          pluginQ.resolve(stdout);
+        }, function(err) {
+          pluginQ.reject(err);
+        });
 
         pluginQ.promise.then(function() {
           self._printQuickHelp(self.appName);

From bd36f49b6ea6cc8bcb175badc4f183702f1a6c7d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 14 May 2014 10:06:11 -0500
Subject: [PATCH 0111/1100] v bump

---
 lib/ionic.js | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 3fe3689bf5..0304ab98d6 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -114,8 +114,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  //IONIC_DASH: 'http://apps.ionicframework.com/',
-  IONIC_DASH: 'http://localhost:8000/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
+  //IONIC_DASH: 'http://localhost:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/package.json b/package.json
index cc685c4aaf..413a0f89a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From fb5468087c0d874f0b558603fb7ebb9284e6c913 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter@drifty.com>
Date: Tue, 20 May 2014 13:12:12 -0500
Subject: [PATCH 0112/1100] USERPROFILE should take priority over HOMEPATH on
 Windows

---
 lib/ionic/config.js  | 2 +-
 lib/ionic/private.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index b1c2e648e6..14ede659a1 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -2,7 +2,7 @@ var fs = require('fs'),
     path = require('path'),
     ionic = require('../ionic');
 
-var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+var home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
 
 module.exports = {
   CONFIG_FILE: '.ionic/ionic.config',
diff --git a/lib/ionic/private.js b/lib/ionic/private.js
index e58d810c4f..68a83c7952 100644
--- a/lib/ionic/private.js
+++ b/lib/ionic/private.js
@@ -2,7 +2,7 @@ var fs = require('fs'),
     path = require('path'),
     ionic = require('../ionic');
 
-var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+var home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
 
 module.exports = {
   PRIVATE_PATH: '.ionic/',

From 703205cda20c3f45bc04c0b9a54ae74ba18cac05 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 21 May 2014 15:34:55 -0500
Subject: [PATCH 0113/1100] Bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 413a0f89a6..731b282ce5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d408435ab227395bbd4a1837987cb9f7b44253d3 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 22 May 2014 14:50:46 -0500
Subject: [PATCH 0114/1100] Auto create project file

---
 lib/ionic/project.js | 12 ++++++++++++
 package.json         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index 8390466d82..ebf6130b4d 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -15,14 +15,26 @@ module.exports = {
     if(fs.existsSync(this.file)) {
       this.data = JSON.parse(fs.readFileSync(this.file))
     } else {
+      if(fs.existsSync('www')) {
+        var parts = path.resolve('./').split(path.sep);
+        var dirname = parts[parts.length-1];
+        console.log('We have a www folder in the', dirname, 'project');
+        this.create(dirname);
+        this.save('./');
+      }
+      /*
       Ionic.fail('Could not find your ' + this.file + ' file!'+
         ' Please run this command in the root of your ionic project.');
+      */
     }
     return this;
   },
   create: function(name) {
     this.file = this.PROJECT_FILE;
     this.data = this.PROJECT_DEFAULT;
+    if(name) {
+      this.set('name', name);
+    }
     return this;
   },
   save: function(targetPath) {
diff --git a/package.json b/package.json
index 731b282ce5..96a419daa4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 8b306097952386c764f6a2da4feb93163e615b1e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 22 May 2014 14:57:58 -0500
Subject: [PATCH 0115/1100] License tweak

---
 lib/ionic.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0304ab98d6..a4f3ba0349 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -11,7 +11,7 @@ http://ionicframework.com/
 A utility for starting and administering Ionic based mobile app projects.
 Licensed under the MIT license. See LICENSE For more.
 
-Copyright 2013 Drifty (http://drifty.com/)
+Copyright 2014 Drifty (http://drifty.com/)
 */
                    
 var IonicStartTask = require('./ionic/start').IonicStartTask,
@@ -114,8 +114,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
-  //IONIC_DASH: 'http://localhost:8000/',
+  //IONIC_DASH: 'http://apps.ionicframework.com/',
+  IONIC_DASH: 'http://localhost:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {

From d9781e425463bc844e0270d513a6fb520aa78650 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 22 May 2014 15:00:06 -0500
Subject: [PATCH 0116/1100] Paderp

---
 lib/ionic.js | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index a4f3ba0349..c95f4f6007 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -114,8 +114,8 @@ var TASKS = [
 ];
 
 Ionic = {
-  //IONIC_DASH: 'http://apps.ionicframework.com/',
-  IONIC_DASH: 'http://localhost:8000/',
+  IONIC_DASH: 'http://apps.ionicframework.com/',
+  //IONIC_DASH: 'http://localhost:8000/',
   IONIC_COOKIES: 'ionic.cookies',
   IONIC_API: 'api/v1/',  
   _tryBuildingTask: function() {
diff --git a/package.json b/package.json
index 96a419daa4..c02d9aaa19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From b2d1cf9d2f094aac67b6e99e0fbc4605c72791b9 Mon Sep 17 00:00:00 2001
From: Mike Hartington <mhartington@hannainst.com>
Date: Wed, 28 May 2014 16:19:46 -0400
Subject: [PATCH 0117/1100] Added serve and template description

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 87439694e8..29122bc7b1 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,20 @@ $ sudo npm install -g ionic
 ## Starting an Ionic App
 
 ```bash
-$ ionic start myApp
+$ ionic start myApp [template]
 ```
+There are three choices of templates.
+
+* Side-Menu (sidemenu)
+* Tabs (tabs)
+* Blank (blank)
+ 
+## Testing in a Browser
+
+```bash
+$ ionic serve
+```
+
 
 ## Adding a platform target
 

From 087a5d5a3bcd99fa82c3ea3830b95b6bc6464844 Mon Sep 17 00:00:00 2001
From: Ryan Schumacher <j.r.schumacher@gmail.com>
Date: Wed, 11 Jun 2014 14:10:38 -0400
Subject: [PATCH 0118/1100] Update language of failure with live reload

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index ac6f8129f8..e8614755a3 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -69,7 +69,7 @@ IonicServeTask.prototype._start = function(ionic) {
     server = tinylr();
     server.listen(this.liveReloadPort, function(err) {
       if(err) {
-        ionic.fail('Unable to start server:', err);
+        ionic.fail('Unable to start live reload server:', err);
       } else {
         console.log('Running live reload server at', ('http://0.0.0.0:' + self.liveReloadPort).info.bold);
         if(self.launchBrowser) {

From fd3ae5f90d389735177e481680a13da4fbf60a30 Mon Sep 17 00:00:00 2001
From: Perry Govier <phoenix_fire_7@hotmail.com>
Date: Tue, 24 Jun 2014 10:43:34 -0500
Subject: [PATCH 0119/1100] fixing typo in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 29122bc7b1..ce6a934579 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,4 @@ $ ionic run ios
 
 Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
 
-Note: we occasionally anonymous usage statistics to the Ionic team to make the tool better.
+Note: we occasionally collect anonymous usage statistics to the Ionic team to make the tool better.

From 361878fcf48506cf39e6caf2a81461abdae37f53 Mon Sep 17 00:00:00 2001
From: Perry Govier <phoenix_fire_7@hotmail.com>
Date: Tue, 24 Jun 2014 10:44:53 -0500
Subject: [PATCH 0120/1100] when fixing a typo, it is often best to read the
 whole sentence

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ce6a934579..20031cea44 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,4 @@ $ ionic run ios
 
 Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
 
-Note: we occasionally collect anonymous usage statistics to the Ionic team to make the tool better.
+Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.

From 45297dcb85b9ec8ce56d4b3eb89a51e61dbd6c61 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 9 Jul 2014 11:23:33 -0500
Subject: [PATCH 0121/1100] ionic package

---
 lib/ionic.js         |  69 +++--
 lib/ionic/config.js  |  10 +-
 lib/ionic/login.js   |  70 ++---
 lib/ionic/package.js | 670 ++++++++++++++++++++++++++++++-------------
 lib/ionic/private.js |  67 -----
 lib/ionic/project.js |  20 +-
 lib/ionic/store.js   |  55 ++++
 lib/ionic/upload.js  |  84 +++---
 package.json         |  35 ++-
 9 files changed, 680 insertions(+), 400 deletions(-)
 delete mode 100644 lib/ionic/private.js
 create mode 100644 lib/ionic/store.js

diff --git a/lib/ionic.js b/lib/ionic.js
index c95f4f6007..6604d4a192 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -1,9 +1,9 @@
 /*
- _             _      
-(_)           (_)     
- _  ___  _ __  _  ___ 
+ _             _
+(_)           (_)
+ _  ___  _ __  _  ___
 | |/ _ \| '_ \| |/ __|
-| | (_) | | | | | (__ 
+| | (_) | | | | | (__
 |_|\___/|_| |_|_|\___|
 
 http://ionicframework.com/
@@ -13,7 +13,7 @@ Licensed under the MIT license. See LICENSE For more.
 
 Copyright 2014 Drifty (http://drifty.com/)
 */
-                   
+
 var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicPlatformTask = require('./ionic/platform').IonicPlatformTask,
     IonicRunTask = require('./ionic/run').IonicRunTask,
@@ -31,25 +31,25 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     colors = require('colors'),
     spawn = require('child_process').spawn,
     Q = require('q'),
-    settings = require('../package.json')
+    settings = require('../package.json');
 
 
 colors.setTheme({
-    silly: 'rainbow',
-    input: 'grey',
-    small: 'grey',
-    verbose: 'cyan',
-    prompt: 'grey',
-    info: 'white',
-    data: 'grey',
-    help: 'cyan',
-    warn: 'yellow',
-    debug: 'blue',
-    error: 'red'
+  silly: 'rainbow',
+  input: 'grey',
+  small: 'grey',
+  verbose: 'cyan',
+  prompt: 'grey',
+  info: 'white',
+  data: 'grey',
+  help: 'cyan',
+  warn: 'yellow',
+  debug: 'blue',
+  error: 'red'
 });
 
 
-var fs = require('fs'), 
+var fs = require('fs'),
     argv = require('optimist').argv;
 
 var TASKS = [
@@ -64,7 +64,7 @@ var TASKS = [
     name: 'start',
     usage: 'appname',
     task: IonicStartTask
-  }, 
+  },
   {
     title: 'emulate',
     name: 'emulate',
@@ -102,7 +102,6 @@ var TASKS = [
     usage: '',
     task: IonicUploadTask
   },
-  /*
   {
     title: 'package',
     name: 'package',
@@ -110,16 +109,15 @@ var TASKS = [
     usage: 'mode platform',
     task: IonicPackageTask
   }
-  */
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com/',
-  //IONIC_DASH: 'http://localhost:8000/',
-  IONIC_COOKIES: 'ionic.cookies',
-  IONIC_API: 'api/v1/',  
+  IONIC_DASH: 'http://apps.ionicframework.com',
+  //IONIC_DASH: 'http://localhost:8000',
+  IONIC_API: '/api/v1/',
+  PRIVATE_PATH: '.ionic',
   _tryBuildingTask: function() {
-    if(argv._.length == 0) {
+    if(argv._.length === 0) {
       return false;
     }
     var taskName = argv._[0];
@@ -138,7 +136,7 @@ Ionic = {
           var alt = t.alt[j];
           if(alt === name) {
             return t;
-          }   
+          }
         }
       }
     }
@@ -186,23 +184,24 @@ Ionic = {
       return this._printGenericUsage();
     }
 
-    console.log('Running', task.title.info.bold, 'task...')
+    console.log('\nRunning', task.title.info.bold, 'task...');
 
     var taskObj = new task.task();
     taskObj.run(this);
   },
 
   fail: function(msg) {
-    process.stderr.write('ERROR: ');
-    process.stderr.write(msg.error.bold + '\nExiting.\n');
+    process.stderr.write(msg.error.bold);
+    process.stderr.write('\n\n');
     process.exit(1);
   },
 
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {
     var q = Q.defer();
+    var child;
     console.log('\nRUNNING:'.info.bold, cmd, args.join(' '));
     try {
-      var child = spawn(cmd, args);
+      child = spawn(cmd, args);
     } catch(e) {
     }
     child.stdout.setEncoding('utf8');
@@ -241,7 +240,7 @@ Ionic = {
 
     var tmpFolder = os.tmpdir();
     var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
-    var tempZipFileStream = fs.createWriteStream(tempZipFilePath)
+    var tempZipFileStream = fs.createWriteStream(tempZipFilePath);
 
     var unzipRepo = function(fileName) {
       var readStream = fs.createReadStream(fileName);
@@ -269,11 +268,11 @@ Ionic = {
   getLocalIps: function() {
     var interfaces = os.networkInterfaces();
     var addresses = [];
-    for (k in interfaces) {
-      for (k2 in interfaces[k]) {
+    for (var k in interfaces) {
+      for (var k2 in interfaces[k]) {
         var address = interfaces[k][k2];
         if (address.family == 'IPv4' && !address.internal) {
-          addresses.push(address.address)
+          addresses.push(address.address);
         }
       }
     }
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 14ede659a1..f2474fba5f 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -8,7 +8,7 @@ module.exports = {
   CONFIG_FILE: '.ionic/ionic.config',
   load: function() {
     this.file = this.CONFIG_FILE;
-    if(fs.existsSync(path.join(home,this.file))) {      
+    if(fs.existsSync(path.join(home,this.file))) {
       this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
     } else {
       this.data = {};
@@ -16,7 +16,7 @@ module.exports = {
     return this;
   },
   save: function() {
-    if(!this.data) { 
+    if(!this.data) {
       return;
     }
     try {
@@ -28,7 +28,7 @@ module.exports = {
       }
       fs.writeFileSync(p, JSON.stringify(this.data, null, 2));
     } catch(e) {
-      console.error('Unable to save settings file:', e);
+      console.error( ('Unable to save settings file: ' + e).red );
     }
   },
   get: function(k) {
@@ -39,7 +39,7 @@ module.exports = {
       this.data = {};
     }
     this.data[k] = v;
-    
+
     this.save();
-  }  
+  }
 };
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 69faedac1d..0c2290789b 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -3,10 +3,10 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     IonicProject = require('./project'),
+    IonicStore = require('./store').IonicStore,
     IonicTask = require('./task').IonicTask;
 
-var IonicLoginTask = function() {
-}
+var IonicLoginTask = function() {};
 
 IonicLoginTask.HELP_LINE = 'Login to the Ionic Platform';
 
@@ -14,9 +14,10 @@ IonicLoginTask.prototype = new IonicTask();
 
 IonicLoginTask.prototype.run = function(ionic, callback) {
   var self = this;
+
   var schema = [{
     name: 'email',
-    pattern: /^[A-z0-9!#$%&'*+\/=?^_{|}~-]+(?:\.[A-z0-9!#$%&'*+\/=?^_{|}~-]+)*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$/,
+    pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
     message: 'Email for your Ionic Platform login',
     required: true
   }, {
@@ -31,20 +32,15 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
   if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
     this.email = argv._[1].toLowerCase();
     schema.shift();
-  } 
-  // Assume project email is login email if it exists
-  else if(project.get('email')) {
-    this.email = project.get('email');
-    schema.shift();
   }
 
-  console.log('To continue, please login to your Ionic account.\nDon\'t have one? Create a one here: ' + (ionic.IONIC_DASH + 'signup').info.bold + '\n');
+  console.log('\nTo continue, please login to your Ionic account.'.bold.green);
+  console.log('Don\'t have one? Create a one at: '.grey + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
 
   prompt.override = argv;
 
   prompt.start();
 
-
   prompt.get(schema, function (err, result) {
     if(err) {
       ionic.fail('Error logging in: ' + err);
@@ -55,48 +51,44 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     }
     self.password = result.password;
 
-    if(!project.get('email')) {
-      project.set('email');
-    }
-    
     var jar = request.jar();
     request({
-      url: ionic.IONIC_DASH + 'login',
+      url: ionic.IONIC_DASH + '/login',
       jar: jar
-    }, 
+    },
     function(err, response, body) {
-      if(err || jar.cookies.length == 0) {
+      if(err || jar.cookies.length === 0) {
         ionic.fail('Error logging in: ' + err);
       }
 
       request({
         method: 'POST',
-        url: ionic.IONIC_DASH + 'login', 
-        jar: jar, 
+        url: ionic.IONIC_DASH + '/login',
+        jar: jar,
         form: {
           username: self.email,
           password: self.password,
           csrfmiddlewaretoken: jar.cookies[0].value
         }
       },
-      function (err, response, body) { 
+      function (err, response, body) {
         if(err) {
           ionic.fail('Error logging in: ' + err);
         }
         // Should be a 304 redirect status code if correct
         if(response.statusCode == 200) {
-          ionic.fail('Email or Password incorrect.  Please visit '+ ionic.IONIC_DASH +' for help.')
+          ionic.fail('Email or Password incorrect.  Please visit '+ ionic.IONIC_DASH +' for help.');
         }
-        
-        var err = fs.writeFileSync(ionic.IONIC_COOKIES, JSON.stringify(jar, null, 2));
-        if(err) {
-          ionic.fail('Error writing ' + ionic.IONIC_COOKIES + ': ' + err);
-        }
-        
-        console.log('Logged in! :)');
+
+        self.cookieData.set(ionic.IONIC_DASH, jar);
+        self.cookieData.save();
+
+        console.log('Logged in! :)'.green);
 
         if(callback) {
           callback(jar);
+          project.set('email', self.email);
+          project.save();
         }
       });
     });
@@ -104,22 +96,20 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 };
 
 IonicLoginTask.prototype.get = function(ionic, callback) {
-  var self = this;
-
-  if(fs.existsSync(ionic.IONIC_COOKIES)) {
-    var jar = JSON.parse(fs.readFileSync(ionic.IONIC_COOKIES));
-    if(jar.cookies && jar.cookies.length > 0) {
-      for(i in jar.cookies) {
-        var cookie = jar.cookies[i];
-        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
-          callback(jar);
-          return;
-        }
+  this.cookieData = new IonicStore('cookies');
+  var jar = this.cookieData.get(ionic.IONIC_DASH);
+
+  if(jar && jar.cookies && jar.cookies.length) {
+    for(var i in jar.cookies) {
+      var cookie = jar.cookies[i];
+      if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+        callback(jar);
+        return;
       }
     }
   }
 
   this.run(ionic, callback);
-}
+};
 
 exports.IonicLoginTask = IonicLoginTask;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 68f9629cb9..9ec8f31a94 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,246 +1,530 @@
 var fs = require('fs'),
+    http = require('http'),
     path = require('path'),
     parseUrl = require('url').parse,
+    spawn = require("child_process").spawn,
     argv = require('optimist').argv,
     prompt = require('prompt'),
     shelljs = require('shelljs/global'),
-    FormData = require('form-data'),    
+    FormData = require('form-data'),
     IonicProject = require('./project'),
-    IonicProjectPrivate = require('./private'),
+    IonicStore = require('./store').IonicStore,
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicLoginTask = require('./login').IonicLoginTask;
 
-var IonicPackageTask = function() {
-}
+var IonicPackageTask = function() {};
 
-IonicPackageTask.HELP_LINE = 'Package an Ionic project using the Ionic Platform Build service (requires login)';
+IonicPackageTask.HELP_LINE = 'Package an app using the Ionic Platform Build service (requires login)';
 
 IonicPackageTask.prototype = new IonicTask();
 
+
 IonicPackageTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic package mode(debug|release) platform [more platforms,...]\n');
-}
+  process.stderr.write('\nUsage:\nionic package mode[debug|release] platform[ios,android]\n');
+};
+
 
 IonicPackageTask.prototype.run = function(ionic) {
+  var self = this;
+  self.ionic = ionic;
+
+  self.project = IonicProject.load();
+
+  if(argv['clear-signing'] || argv.c) {
+    self.clearSigning();
+    return;
+  }
+
+  self.loadProject();
+
+  var login = new IonicLoginTask();
+  login.get(self.ionic, function(jar) {
+    self.jar = jar;
+
+    self.loadAppSigning(function(){
+      self.packagePlatforms(self.platforms);
+    });
+  });
+
+};
+
+
+IonicPackageTask.prototype.clearSigning = function() {
+  var self = this;
+  console.log('Clearing app signing and credential information...'.yellow);
+
+  var appId = self.project.get('app_id');
+
+  if(!appId) {
+    self.ionic.fail('App Id is not known');
+  }
+
+  var login = new IonicLoginTask();
+  login.get(self.ionic, function(jar) {
+    var options = {
+      url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + appId + '/signing/clear',
+      headers: {
+        cookie: jar.cookies.map(function (c) {
+          return c.name + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      }
+    };
+
+    request(options, function(err, response, body) {
+      if(err) {
+        self.ionic.fail("Error clearing app signing: " + err);
+      }
+      console.log( ('App (' + appId + ') signing and credential information cleared\n').green );
+    });
+  });
+};
+
+
+IonicPackageTask.prototype.loadProject = function() {
+  console.log( ("Loading " + this.project.get('name')).bold.yellow );
+
   if(argv._.length < 3) {
     IonicPackageTask.prototype._printUsage();
-    ionic.fail('No platforms or build mode specified, exiting.');
+    this.ionic.fail('No platforms or build mode specified.');
   }
 
-  var mode = argv._[1].toLowerCase();
-  if(mode != 'debug' && mode != 'release') {
+  this.mode = argv._[1].toLowerCase();
+  if(this.mode != 'debug' && this.mode != 'release') {
     IonicPackageTask.prototype._printUsage();
-    ionic.fail('Package build mode must be debug or release, exiting.');
+    this.ionic.fail('Package build mode must be "debug" or "release".');
   }
 
-  var platforms = argv._.slice(2);
+  this.platforms = argv._.slice(2);
 
-  if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
+  if(this.platforms.length < 1) {
+    this.ionic.fail('No platforms specified.');
   }
+};
 
-  var upload = new IonicUploadTask();
-  upload.run(ionic, function() {
 
-    var login = new IonicLoginTask();
-    login.get(ionic, function(jar) {
+IonicPackageTask.prototype.loadPlugins = function() {
+  var self = this;
+  var parseString = require('xml2js').parseString;
+  var cp = spawn("cordova", ['plugins']);
 
-      var project = IonicProject.load();
-      var projectPrivate = IonicProjectPrivate.load(project.get('app_id'));
+  cp.stdout.on("data", function (c) {
+    self.plugins = [];
 
-      console.log('Grabbing plugins...');
-      var plugins = [];
-      var pluginExec = exec('cordova plugins');
-      if(pluginExec.code != 0 ) {
-        process.stderr.write('Unable to read cordova plugin list. Please see console for more info.\n');
-      } else {
-        pluginExec.output = pluginExec.output.replace(/'/g, '"');
-        plugins = JSON.parse(pluginExec.output);
-      }
+    var pluginNames = JSON.parse(c.toString().replace(/'/g, '"'));
+
+    for(var x=0; x<pluginNames.length; x++) {
+      var pluginName = pluginNames[x];
+
+      try {
+        var pluginXmlPath = path.resolve('./plugins/' + pluginNames[x] + '/plugin.xml');
 
-      for(var i = 0; i < platforms.length; i++) {
-        var platform = platforms[i];
-
-        prompt.override = argv;
-        prompt.start();
-        var properties = {};
-
-        // Just prompt for some build properties
-        switch (platform) {
-          case 'android':
-            // Android debug doesn't require anything
-            if(mode == 'release') {
-              properties = {
-                android_keystore: {
-                  description: 'Android Keystore File (.keystore)',
-                  message: 'Relative path to your release keystore file (eg. release.keystore)',
-                  required: true
-                }, 
-                android_keystore_alias: {
-                  description: 'Keystore Alias',
-                  message: 'Alias of the Keystore',
-                  required: true
-                },
-                android_keystore_password: {
-                  description: 'Keystore Password',
-                  message: 'Password of the Keystore',
-                  hidden: true,
-                  required: true
-                }, 
-                android_key_password: {
-                  description: 'Key Password (optional)',
-                  message: 'Password for Key (usually same as Keystore Password and if left blank will use it)',
-                  hidden: true,
-                }
-              };
+        if(fs.existsSync(pluginXmlPath)) {
+          var xml = fs.readFileSync(pluginXmlPath, { encoding: 'utf8' });
+
+          parseString(xml, function (err, result) {
+            if(err) {
+              console.log( ('Plugin parse xml error:' + err).red );
+              return;
             }
 
-            break;
-          case 'ios':
-             properties = {
-                ios_certificate: {
-                  description: 'iOS Certificate File (.p12)',
-                  message: 'Relative path to your certificate file (eg. cert.p12)',
-                  required: true
-                }, 
-                ios_certificate_password: {
-                  description: 'Certificate Password',
-                  message: 'Password of the Certificate',
-                  hidden: true,
-                  required: true
-                }, 
-                ios_profile: {
-                  description: 'iOS Mobile Provisioning Profile (.mobileprovision)',
-                  message: 'Relative path to your Mobile Provisioning Profile (eg. my.mobileprovision)',
-                  required: true
-                }, 
-              };
-            break;
-          default:
-            process.stderr.write('\nUnknown platform: "'+platform+'"\nSupported platforms currently are "ios" and "android"\n\n');
-            continue;
+            if(result && result.plugin && result.plugin.repo && result.plugin.repo.length) {
+              pluginName = result.plugin.repo[0];
+            }
+          });
         }
+      } catch(e) {
+        console.log( (pluginName + ' plugin error:' + e).red );
+      }
 
-        // Should we just not add this since it's optional?
-        // properties.package_name = {
-        //   description: 'Package Name (eg. com.mycompany.app) optional',
-        //   message: 'Package Name (eg. com.mycompany.app) optional',
-        // };
+      self.plugins.push(pluginName);
+    }
 
-        // Don't prompt for properties we already have in the config
-        for (var property in properties) {
-          if(projectPrivate.get(property)) {
-            delete properties[property];
-          }
+  });
+
+};
+
+
+IonicPackageTask.prototype.loadAppSigning = function(callback) {
+  var self = this;
+
+  if(!self.project.get('app_id')) {
+    // if its the first load we won't have an appId yet
+    callback();
+    return;
+  }
+
+  var privateData = new IonicStore(self.project.get('app_id'));
+  var cck = privateData.get('cck');
+  if(!cck) {
+    callback();
+    return;
+  }
+
+  var options = {
+    url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/signing',
+    headers: {
+      cookie: self.jar.cookies.map(function (c) {
+        return c.name + "=" + encodeURIComponent(c.value);
+      }).join("; "),
+      cck: cck
+    }
+  };
+
+  request(options, function(err, response, body) {
+    if(!err && response.statusCode == 200) {
+
+      try {
+        self.signing = JSON.parse(body);
+
+        if(!self.signing) {
+          self.ionic.fail("Invalid app signing information");
         }
 
-        prompt.get({properties: properties}, function (err, result) {
-          if(err) {
-            ionic.fail('Error packaging: ' + err);
-          }
+      } catch(e) {
+        self.ionic.fail("Error parsing app signing: " + e);
+      }
 
-          // Overwrite any empty properties with prompt responses
-          for (var property in properties) {
-            if(result[property] && !projectPrivate.get(property)) {
-              projectPrivate.set(property, result[property]);
-            }
-          }
-          projectPrivate.save(project.get('app_id'));
+    }
 
-          console.log('Packaging ' + platform + ' app...');
+    callback();
+  });
+};
 
-          var form = new FormData();
-          form.append('email', project.get('email'));
-          form.append('name', project.get('name'));
-          form.append('platform', platform);
-          form.append('build_mode', mode);
-          form.append('csrfmiddlewaretoken', jar.cookies[0].value);
 
-          for (var i = 0; i < plugins.length; i++) {
-            form.append('plugin_' + i, plugins[i]);
-          };
+IonicPackageTask.prototype.packagePlatforms = function(platforms) {
+  var self = this;
 
-          // Add the platform specific project properties to the post
-          for (var property in projectPrivate.get()) {
-            if(property.indexOf(platform) == 0) {
-              form.append(property, projectPrivate.get(property));
-            }
+  prompt.override = argv;
+  prompt.start();
+
+  var promptProperties = self.buildPromptProperties(platforms);
+
+  prompt.get({properties: promptProperties}, function (err, promptResult) {
+    if(err) {
+      self.ionic.fail('Error packaging: ' + err);
+    }
+
+    self.loadPlugins();
+
+    var upload = new IonicUploadTask();
+    upload.run(self.ionic, function() {
+      for(var x=0; x<platforms.length; x++) {
+        var form = self.buildPostRequest(platforms[x], promptProperties, promptResult);
+        self.submitPostRequest(form, platforms[x]);
+      }
+    });
+
+  });
+};
+
+
+IonicPackageTask.prototype.buildPromptProperties = function(platforms) {
+  // Just prompt for some build properties
+  var promptProperties = {};
+
+  for(var x=0; x<platforms.length; x++) {
+
+    if(platforms[x] == 'android') {
+
+      // Android debug doesn't require anything
+      if(this.mode == 'release') {
+
+        promptProperties.android_keystore_file = {
+          description: 'Android Keystore File (.keystore)',
+          message: 'Please provide a local path to your release keystore file (eg. release.keystore)',
+          required: true,
+          conform: fileExists,
+          isFile: true
+        };
+
+        promptProperties.android_keystore_alias = {
+          description: 'Keystore Alias',
+          message: 'Alias of the Keystore',
+          required: true
+        };
+
+        promptProperties.android_keystore_password = {
+          description: 'Keystore Password',
+          message: 'Password of the Keystore',
+          hidden: true,
+          required: true
+        };
+
+        promptProperties.android_key_password = {
+          description: 'Key Password (optional)',
+          message: 'Password for Key (usually same as Keystore Password and if left blank it will use it)',
+          hidden: true
+        };
+      }
+
+    } else if(platforms[x] == 'ios') {
+      // iOS
+      promptProperties.ios_certificate_file = {
+        description: 'iOS Certificate File (.p12)',
+        message: 'Please provide a local path to your iOS certificate file (eg. cert.p12)',
+        required: true,
+        conform: fileExists,
+        isFile: true
+      };
+
+      promptProperties.ios_certificate_password = {
+        description: 'Certificate Password',
+        message: 'Password of the Certificate',
+        hidden: true,
+        required: true
+      };
+
+      promptProperties.ios_profile_file = {
+        description: 'iOS Mobile Provisioning Profile (.mobileprovision)',
+        message: 'Please provide a local path to your iOS Mobile Provisioning Profile (eg. my.mobileprovision)',
+        required: true,
+        conform: fileExists,
+        isFile: true
+      };
+
+    }
+
+  }
+
+  // Don't prompt for properties we already have stored on the server
+  if(this.signing){
+    for (var propertyName in promptProperties) {
+      if(this.signing['is_valid_' + propertyName]) {
+        delete promptProperties[propertyName];
+      }
+    }
+  }
+
+  return promptProperties;
+};
+
+
+IonicPackageTask.prototype.buildPostRequest = function(platform, promptProperties, promptResult) {
+  var form = new FormData();
+
+  form.append('email', this.project.get('email'));
+  form.append('name', this.project.get('name'));
+  form.append('platform', platform);
+  form.append('build_mode', this.mode);
+  form.append('csrfmiddlewaretoken', this.jar.cookies[0].value);
+
+  for (var i = 0; i < this.plugins.length; i++) {
+    form.append('plugin_' + i, this.plugins[i]);
+  }
+
+  for(var propertyName in promptResult) {
+    var promptValue = promptResult[propertyName];
+    if( !promptValue ) continue;
+
+    if(promptProperties[propertyName].isFile) {
+      try {
+        promptValue = promptValue.replace(/\\ /g, ' ').trim();
+        form.append(propertyName, fs.createReadStream( path.resolve(promptValue) ) );
+      } catch(e) {
+        this.ionic.fail("Error loading " + path.resolve(promptValue.trim()));
+      }
+    } else {
+      form.append(propertyName, promptValue);
+    }
+  }
+
+  var configFilePath = path.resolve('./config.xml');
+  if(fs.existsSync(configFilePath)){
+    var xmlString = fs.readFileSync(configFilePath, { encoding: 'utf8' });
+    form.append('config_file', xmlString);
+  }
+
+  return form;
+};
+
+
+IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
+  var self = this;
+  var params = parseUrl(self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/package');
+
+  var privateData = new IonicStore(this.project.get('app_id'));
+
+  console.log( (platform + ' package building...').bold.grey );
+
+  form.submit({
+    protocol: params.protocol,
+    hostname: params.hostname,
+    port: params.port,
+    path: params.path,
+    headers: form.getHeaders({
+      cookie: self.jar.cookies.map(function (c) {
+        return c.name + "=" + encodeURIComponent(c.value);
+      }).join("; "),
+      cck: privateData.get('cck')
+    })
+  },
+  function(err, response) {
+    if(err) {
+      self.ionic.fail("Error packaging " + platform + ": " + err);
+    }
+
+    response.setEncoding('utf8');
+    response.on("data", function(data) {
+      try {
+        var d = JSON.parse(data);
+
+        if(d.errors && d.errors.length) {
+          for (var j = 0; j < d.errors.length; j++) {
+            process.stderr.write(d.errors[j] + '\n');
           }
-          
-          // Gimmie dem sweet sweet files
-          switch(platform) {
-            case 'android':
-              if(mode == 'release') {
-                var keystoreFilePath = path.resolve(projectPrivate.get('android_keystore'));
-                if(fs.existsSync(keystoreFilePath)) {
-                  form.append('android_keystore_file', fs.createReadStream(keystoreFilePath), {filename: 'www.zip'});
-                } else {
-                  projectPrivate.remove('android_keystore');
-                  projectPrivate.save(project.get('app_id'));
-                  process.stderr.write('\nCan\'t find file: "' + keystoreFilePath + '"\nSkipping build..."\n\n');
-                  return;
-                }
-              }
-              break;
-            case 'ios': 
-              var certificateFilePath = path.resolve(projectPrivate.get('ios_certificate'));
-              if(fs.existsSync(certificateFilePath)) {
-                form.append('ios_certificate_file', fs.createReadStream(certificateFilePath));
-              } else {
-                projectPrivate.remove('ios_certificate');
-                projectPrivate.save(project.get('app_id'));
-                process.stderr.write('\nCan\'t find file: "' + certificateFilePath + '"\nSkipping build..."\n\n');
-                return;
-              }
-              var profileFilePath = path.resolve(projectPrivate.get('ios_profile'));
-              if(fs.existsSync(profileFilePath)) {
-                form.append('ios_profile_file', fs.createReadStream(profileFilePath));
-              } else {
-                projectPrivate.remove('ios_profile');
-                projectPrivate.save(project.get('app_id'));
-                process.stderr.write('\nCan\'t find file: "' + profileFilePath + '"\nSkipping build..."\n\n');
-                return;
+        } else if(d.build_status_url) {
+          process.stderr.write('.');
+          setTimeout(function(){
+            var requestOptions = {
+              url: d.build_status_url,
+              headers: {
+                cookie: self.jar.cookies.map(function (c) {
+                  return c.name + "=" + encodeURIComponent(c.value);
+                }).join("; ")
               }
-              break;
-            default:
-              console.trace();
-              process.stderr.write('\nUnknown platform: "' + platform + '"\nWe should never get here"\n\n');
-              break;
-          }
+            };
+            pingBuildStatus(self.ionic, requestOptions, platform, 1);
+          }, 5000);
+        }
 
-          var url = ionic.IONIC_DASH + 'export/' + project.get('app_id');
-          var params = parseUrl(url);
-
-          form.submit({
-            host: params.host,
-            path: params.path,
-            headers: form.getHeaders({
-              cookie: jar.cookies.map(function (c) {
-                return c.name + "=" + encodeURIComponent(c.value)
-              }).join("; ")
-            })
-          }, function(err, response) {
-
-            response.setEncoding('utf8');
-            response.on("data", function(data) {
-              var json = JSON.parse(data);
-              if(json.errors) {
-                for (var j = 0; j < json.errors.length; j++) {
-                  process.stderr.write(json.errors[j]);
-                }
-              }              
-            });
+        if(d.cck) {
+          var privateData = new IonicStore(self.project.get('app_id'));
+          privateData.set('cck', d.cck);
+          privateData.save();
+        }
 
-            if(err) {
-              ionic.fail("Error packaging: " + err);
-            }
-            console.log('Done');
-          }); 
-        });
+        if(d.app_id) {
+          self.project.set('app_id', d.app_id);
+        }
+        if(d.email) {
+          self.project.set('email', d.email);
+        }
+        if(d.name) {
+          self.project.set('name', d.name);
+        }
+        self.project.save();
+
+      } catch(e) {
+        self.ionic.fail('Error submitPostRequest: ' + e);
       }
-    });  
+    });
+
   });
 };
 
+
+function pingBuildStatus(ionic, requestOptions, platform, attempt) {
+  process.stderr.clearLine();
+  process.stderr.cursorTo(0);
+
+  for(var x=0; x<attempt; x++) {
+    process.stderr.write('.');
+  }
+
+  request(requestOptions, function(err, response, body) {
+    if(err) {
+      ionic.fail("\nError pinging build status: " + err);
+    }
+
+    try {
+      var d = JSON.parse(body);
+
+      if(d.errors && d.errors.length) {
+        for(var x=0; x<d.errors.length; x++) {
+          console.log( ('\n' + d.errors[x]).bold.red );
+        }
+        return;
+      }
+
+      if(d.message) {
+        console.log( ('\n' + d.message).bold.red );
+      }
+
+      // STATUS_INITIALIZED = 0
+      // STATUS_QUEUED      = 1
+      // STATUS_BUILDING    = 2
+      // STATUS_SUCCESS     = 3
+      // STATUS_FAILED      = 4
+
+      if(d.status >= 0 && d.status < 3) {
+        // still queued/building
+        attempt++;
+
+        if(attempt > 60) {
+          ionic.fail("\nUnable to receive build status");
+        }
+
+        setTimeout(function(){
+          pingBuildStatus(ionic, requestOptions, platform, attempt);
+        }, 5000);
+
+      } else if(d.status == 4) {
+        console.log("Use 'ionic package --clear-signing' to clear app signing and credential data if needed.".bold.red);
+        ionic.fail("Build failed");
+      } else if(d.status == 3) {
+        downloadBuildPackage(platform, d);
+      } else {
+        ionic.fail("\nError receiving build status");
+      }
+
+    } catch(e) {
+      ionic.fail("\nError pinging build status: " + e);
+    }
+
+  });
+}
+
+
+function downloadBuildPackage(platform, data) {
+  console.log( ('\n\n' + platform + ' build complete, downloading package...').bold.grey );
+
+  var dirPath = path.resolve('./packages');
+  var filePath = path.resolve(dirPath + '/' + data.package_filename);
+
+  if(!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath);
+  }
+
+  var params = parseUrl(data.package_url);
+
+  var file = fs.createWriteStream(filePath);
+  var request = http.get({hostname: params.hostname, path: params.path, port: params.port, protocol: 'http:'}, function(response) {
+    response.pipe(file);
+    file.on('finish', function() {
+      file.close(function(){
+        console.log( ('Saved ' + platform + ' package: ' + filePath + '\n').bold.green );
+      });
+    });
+  }).on('response', function(res){
+
+    var ProgressBar = require('progress');
+    var bar = new ProgressBar('[:bar]  :percent  :etas', {
+      complete: '=',
+      incomplete: ' ',
+      width: 30,
+      total: parseInt(res.headers['content-length'], 10)
+    });
+
+    res.on('data', function (chunk) {
+      bar.tick(chunk.length);
+    });
+
+    res.on('end', function () {
+      console.log('\n');
+    });
+
+  }).on('error', function(err) {
+    fs.unlink(filePath);
+    console.error( (err).red );
+  });
+}
+
+
+function fileExists(filePath) {
+  // check if a file exists with a relative path or absolute path
+  filePath = filePath.replace(/\\ /g, ' ').trim();
+  return fs.existsSync(path.resolve(filePath));
+}
+
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/lib/ionic/private.js b/lib/ionic/private.js
deleted file mode 100644
index 68a83c7952..0000000000
--- a/lib/ionic/private.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var fs = require('fs'),
-    path = require('path'),
-    ionic = require('../ionic');
-
-var home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
-
-module.exports = {
-  PRIVATE_PATH: '.ionic/',
-  PRIVATE_EXT: '.project',
-  PRIVATE_DEFAULT: {
-    ios_certificate: '',
-    ios_certificate_password: '',
-    ios_profile: '',
-    android_keystore: '',
-    android_keystore_alias: '',
-    android_keystore_password: '',
-    android_key_password: ''
-  },
-  load: function(app_id) {
-    if(app_id) {
-      this.file = this.PRIVATE_PATH+app_id+this.PRIVATE_EXT;    
-      if(fs.existsSync(path.join(home,this.file))) {      
-        this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
-      } else {
-        this.data = this.PRIVATE_DEFAULT;
-      }
-    }
-    return this;
-  },
-  create: function() {
-    this.data = this.PRIVATE_DEFAULT;
-    return this;
-  },
-  save: function(app_id) {
-    if(!this.data) { 
-      console.trace();
-      console.error('This should never happen!'); 
-    }
-    if(app_id) {
-      this.file = this.PRIVATE_PATH+app_id+this.PRIVATE_EXT;  
-      try {
-        fs.writeFileSync(path.join(home,this.file), JSON.stringify(this.data, null, 2));
-      } catch(e) {
-        console.error('Unable to save private settings file:', e);
-      }
-    }
-  },
-  get: function(k) {
-    if(k) {
-      return this.data[k];
-    } else {
-      return this.data;
-    }
-  },
-  set: function(k, v) {
-    if(!this.data) {
-      this.data = PRIVATE_DEFAULT;
-    }
-    this.data[k] = v;
-  },
-  remove: function(k) {
-    if(!this.data) {
-      this.data = PRIVATE_DEFAULT;
-    }
-    this.data[k] = '';
-  }
-};
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index ebf6130b4d..5b58da3c72 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -8,24 +8,20 @@ module.exports = {
     name: '',
     email: '',
     app_id: '',
-    package_name: '',    
   },
   load: function() {
-    this.file = this.PROJECT_FILE;    
+    this.file = this.PROJECT_FILE;
+
     if(fs.existsSync(this.file)) {
-      this.data = JSON.parse(fs.readFileSync(this.file))
+      this.data = JSON.parse(fs.readFileSync(this.file));
+
     } else {
       if(fs.existsSync('www')) {
         var parts = path.resolve('./').split(path.sep);
         var dirname = parts[parts.length-1];
-        console.log('We have a www folder in the', dirname, 'project');
         this.create(dirname);
         this.save('./');
       }
-      /*
-      Ionic.fail('Could not find your ' + this.file + ' file!'+
-        ' Please run this command in the root of your ionic project.');
-      */
     }
     return this;
   },
@@ -38,9 +34,9 @@ module.exports = {
     return this;
   },
   save: function(targetPath) {
-    if(!this.data) { 
+    if(!this.data) {
       console.trace();
-      console.error('This should never happen!'); 
+      console.error('This should never happen!');
     }
     try {
       fs.writeFileSync((targetPath?targetPath + '/':'') + this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
@@ -60,13 +56,13 @@ module.exports = {
   },
   set: function(k, v) {
     if(!this.data) {
-      this.data = PROJECT_DEFAULT;
+      this.data = this.PROJECT_DEFAULT;
     }
     this.data[k] = v;
   },
   remove: function(k) {
     if(!this.data) {
-      this.data = PROJECT_DEFAULT;
+      this.data = this.PROJECT_DEFAULT;
     }
     this.data[k] = '';
   }
diff --git a/lib/ionic/store.js b/lib/ionic/store.js
new file mode 100644
index 0000000000..752864fe90
--- /dev/null
+++ b/lib/ionic/store.js
@@ -0,0 +1,55 @@
+var fs = require('fs'),
+    path = require('path');
+
+
+var IonicStore = function(fileName) {
+  this.data = {};
+
+  if(!fileName) return this;
+
+  this.fileName = fileName;
+  if(fileName.indexOf('.') < 0) {
+    this.fileName += '.data'
+  }
+
+  this.homeDir = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
+
+  this.privateDir = path.join(this.homeDir, '.ionic');
+
+  if(!fs.existsSync(this.privateDir)) {
+    fs.mkdirSync(this.privateDir);
+  }
+
+  this.filePath = path.join(this.privateDir, this.fileName);
+
+  try {
+    this.data = JSON.parse(fs.readFileSync(this.filePath));
+  } catch(e) {}
+
+  return this;
+};
+
+IonicStore.prototype.get = function(k) {
+  if(k) {
+    return this.data[k];
+  }
+  return this.data;
+};
+
+IonicStore.prototype.set = function(k, v) {
+  this.data[k] = v;
+};
+
+IonicStore.prototype.remove = function(k) {
+  delete this.data[k];
+};
+
+IonicStore.prototype.save = function() {
+  try {
+    fs.writeFileSync(this.filePath, JSON.stringify(this.data, null, 2));
+  } catch(e) {
+    console.error('Unable to save ionic data:', this.filePath, e);
+  }
+};
+
+exports.IonicStore = IonicStore;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 9af0f1a85e..32bb5ead03 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -10,8 +10,7 @@ var fs = require('fs'),
     IonicLoginTask = require('./login').IonicLoginTask,
     Q = require('q');
 
-var IonicUploadTask = function() {
-}
+var IonicUploadTask = function() {};
 
 IonicUploadTask.HELP_LINE = 'Upload an Ionic project to the Ionic Platform (requires login)';
 
@@ -23,12 +22,11 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
-    
-    console.log('Zipping...');
+    var TEMP_FILENAME = 'www.zip';
 
     IonicStats.t('upload', {});
 
-    var zip = fs.createWriteStream('www.zip');
+    var zip = fs.createWriteStream(TEMP_FILENAME);
 
     var archive = archiver('zip');
     archive.pipe(zip);
@@ -44,64 +42,72 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     });
 
     zip.on('close', function() {
-      console.log('Done');
       if(project.get('app_id')) {
-        console.log('Uploading app (id: ' + project.get('app_id') + ')');
+        console.log( ('\nUploading app (' + project.get('app_id') + ')...').bold.grey );
       } else {
-        console.log('Uploading app.');
+        console.log('\nUploading new app...'.bold.grey);
       }
 
       var form = new FormData();
       form.append('name', project.get('name'));
       form.append('csrfmiddlewaretoken', jar.cookies[0].value);
-      form.append('app_file', fs.createReadStream(path.resolve('www.zip')), {filename: 'www.zip', contentType: 'application/zip'});
-      // form.append('app_file', zip.toBuffer(), {filename: 'www.zip', contentType: 'application/zip'});
+      form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
 
-      var url = ionic.IONIC_DASH + 'projects/' + project.get('app_id');
+      var url = ionic.IONIC_DASH + ionic.IONIC_API + 'app/upload/' + project.get('app_id');
       var params = parseUrl(url);
 
       form.submit({
+        protocol: params.protocol,
         hostname: params.hostname,
         port: params.port,
         path: params.path,
         headers: form.getHeaders({
           cookie: jar.cookies.map(function (c) {
-            return c.name + "=" + encodeURIComponent(c.value)
+            return c.name + "=" + encodeURIComponent(c.value);
           }).join("; ")
         })
       }, function(err, response) {
-        rm('-f', 'www.zip');
+
+        rm('-f', TEMP_FILENAME);
         if(err) {
           ionic.fail("Error uploading: " + err);
         }
 
-        if(response.statusCode == 302) {
-          if(response.headers.location.indexOf('login?next=') >= 0) {
-            console.error('Session expired. Please log in again and run this command again.');
-            q.reject('not_logged_in');
-            return;
-          }
-          console.log('Done!'.info.bold);
-        
-          var redirectPath = parseUrl(response.headers.location);
-          project.set('app_id', redirectPath.pathname.match(/^\/projects\/(\w+)\/?$/)[1]);
-          project.save();
-
-          if(callback) {
-            callback();
-          };
-        } else if(response.statusCode === 200) {
-          console.log('Got response', response.statusCode);
-          callback && callback();
-        } else {
-          if(response.headers['content-type'] == 'application/json') {
-            response.on('data', function(chunk) {
-              console.log(String(chunk));
-            });
+        response.setEncoding('utf8');
+        response.on("data", function(data) {
+          try {
+            var d = JSON.parse(data);
+            if(d.errors && d.errors.length) {
+              for (var j = 0; j < d.errors.length; j++) {
+                console.log( (d.errors[j]).bold.error );
+              }
+              q.reject('upload_error');
+              ionic.fail('Unable to upload app');
+            }
+
+            if(response.statusCode == 200) {
+              // Success
+              project.set('app_id', d.app_id);
+              project.save();
+              console.log( ('Successfully uploaded (' + project.get('app_id') + ')\n').bold.grey );
+
+              if(callback) {
+                callback();
+              }
+
+            } else if(response.statusCode == 401) {
+              console.error( ('Session expired. Please log in again and run this command again.').red );
+              q.reject('not_logged_in');
+
+            } else {
+              q.reject('upload_error');
+            }
+
+          } catch(parseEx) {
+            q.reject('upload_error');
+            ionic.fail('Error upload response: ' + parseEx);
           }
-          console.error('Unable to upload. HTTP response:', response.statusCode);
-          q.reject(response);
-        }
+        });
 
         q.resolve(callback);
       });
diff --git a/package.json b/package.json
index c02d9aaa19..6c196a4b7f 100644
--- a/package.json
+++ b/package.json
@@ -19,25 +19,42 @@
     "type": "git",
     "url": "https://github.com/driftyco/ionic-cli.git"
   },
-  "author": "Max Lynch <max@drifty.com> and Peter Collins <peter@drifty.com>",
+  "contributors": [
+    {
+      "name": "Max Lynch",
+      "email": "max@drifty.com",
+      "web": "https://twitter.com/maxlynch"
+    },
+    {
+      "name": "Peter Collins",
+      "email": "peter@drifty.com",
+      "web": "https://twitter.com/SomethingNew2_0"
+    },
+    {
+      "name": "Adam Bradley",
+      "web": "https://twitter.com/adamdbradley"
+    }
+  ],
   "license": "MIT",
   "dependencies": {
     "archiver": "0.5.1",
+    "colors": "^0.6.2",
+    "connect": "^2.14.5",
+    "connect-livereload": "^0.4.0",
     "event-stream": "3.0.x",
     "form-data": "~0.1.0",
     "ncp": "0.4.2",
+    "npm": "^1.4.6",
+    "open": "0.0.5",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
+    "progress": "1.1.7",
+    "q": "^1.0.1",
     "request": "2.27.0",
     "shelljs": "0.2.6",
-    "unzip": "0.1.9",
-    "colors": "^0.6.2",
-    "q": "^1.0.1",
-    "npm": "^1.4.6",
-    "connect": "^2.14.5",
-    "open": "0.0.5",
     "tiny-lr-fork": "0.0.5",
-    "connect-livereload": "^0.4.0",
-    "vinyl-fs": "^0.1.4"
+    "vinyl-fs": "^0.1.4",
+    "unzip": "0.1.9",
+    "xml2js": "^0.4.4"
   }
 }

From 2ec45308e648ceb879c7b7d27925d98c2d03714b Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 10 Jul 2014 09:45:15 -0500
Subject: [PATCH 0122/1100] Master

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c196a4b7f..bbd034e4ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From f11a774a65b5d7728dc12a302cf1ed1f3e005491 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 11 Jul 2014 09:21:00 -0500
Subject: [PATCH 0123/1100] packaging an app

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 20031cea44..5b2be158dc 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ There are three choices of templates.
 * Side-Menu (sidemenu)
 * Tabs (tabs)
 * Blank (blank)
- 
+
 ## Testing in a Browser
 
 ```bash
@@ -49,8 +49,22 @@ $ ionic emulate ios
 
 ```bash
 $ ionic run ios
+
+
+## Packaging an app (beta)
+
+Using Ionic's service, you can compile and package your project into an app-store ready app without
+requiring native SDKs on your machine.
+
+```bash
+$ ionic package debug android
 ```
 
+The third argument can be either `debug` or `release`, and the last argument can be either `android` or `ios`.
+
+
+## Cordova Commands
+
 Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
 
 Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.

From 7d227350897d4fd49d06d92d79237baa05bcaa80 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 11 Jul 2014 09:26:41 -0500
Subject: [PATCH 0124/1100] fix broken md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5b2be158dc..158d3afd24 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ $ ionic emulate ios
 
 ```bash
 $ ionic run ios
+```
 
 
 ## Packaging an app (beta)

From b58092fe6551e427cbfa6d0b73b4cf2668c5fd89 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 11 Jul 2014 13:15:09 -0500
Subject: [PATCH 0125/1100] load plugins through package.json files

---
 lib/ionic/package.js | 54 +++++++++++++++-----------------------------
 lib/ionic/upload.js  |  7 +++++-
 package.json         |  5 ++--
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 9ec8f31a94..17321fed5a 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -104,44 +104,20 @@ IonicPackageTask.prototype.loadProject = function() {
 
 
 IonicPackageTask.prototype.loadPlugins = function() {
-  var self = this;
-  var parseString = require('xml2js').parseString;
-  var cp = spawn("cordova", ['plugins']);
-
-  cp.stdout.on("data", function (c) {
-    self.plugins = [];
-
-    var pluginNames = JSON.parse(c.toString().replace(/'/g, '"'));
+  this.plugins = [];
 
-    for(var x=0; x<pluginNames.length; x++) {
-      var pluginName = pluginNames[x];
-
-      try {
-        var pluginXmlPath = path.resolve('./plugins/' + pluginNames[x] + '/plugin.xml');
+  var pluginsPath = path.resolve('./plugins/');
+  var pluginDirs = fs.readdirSync(pluginsPath);
 
-        if(fs.existsSync(pluginXmlPath)) {
-          var xml = fs.readFileSync(pluginXmlPath, { encoding: 'utf8' });
-
-          parseString(xml, function (err, result) {
-            if(err) {
-              console.log( ('Plugin parse xml error:' + err).red );
-              return;
-            }
-
-            if(result && result.plugin && result.plugin.repo && result.plugin.repo.length) {
-              pluginName = result.plugin.repo[0];
-            }
-          });
-        }
-      } catch(e) {
-        console.log( (pluginName + ' plugin error:' + e).red );
+  for(var x=0; x<pluginDirs.length; x++) {
+    try {
+      var plugingPackage = path.resolve(pluginsPath + '/' + pluginDirs[x] + '/package.json');
+      var packageObj = JSON.parse( fs.readFileSync(plugingPackage, { encoding: 'utf8' }) );
+      if(packageObj.repo || packageObj.name) {
+        this.plugins.push(packageObj);
       }
-
-      self.plugins.push(pluginName);
-    }
-
-  });
-
+    } catch(e) {}
+  }
 };
 
 
@@ -310,7 +286,13 @@ IonicPackageTask.prototype.buildPostRequest = function(platform, promptPropertie
   form.append('csrfmiddlewaretoken', this.jar.cookies[0].value);
 
   for (var i = 0; i < this.plugins.length; i++) {
-    form.append('plugin_' + i, this.plugins[i]);
+    form.append('plugin_' + i, this.plugins[i].repo ? this.plugins[i].repo : this.plugins[i].name);
+    if(this.plugins[i].name) {
+      form.append('plugin_' + i + '_name', this.plugins[i].name);
+    }
+    if(this.plugins[i].version) {
+      form.append('plugin_' + i + '_version', this.plugins[i].version);
+    }
   }
 
   for(var propertyName in promptResult) {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 32bb5ead03..4a262354e7 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -92,7 +92,12 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
               console.log( ('Successfully uploaded (' + project.get('app_id') + ')\n').bold.grey );
 
               if(callback) {
-                callback();
+                try {
+                  callback();
+                } catch(callbackEx) {
+                  q.reject('upload_error');
+                  ionic.fail('Error upload callback: ' + callbackEx);
+                }
               }
 
             } else if(response.statusCode == 401) {
diff --git a/package.json b/package.json
index bbd034e4ed..9845a893ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -54,7 +54,6 @@
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
     "vinyl-fs": "^0.1.4",
-    "unzip": "0.1.9",
-    "xml2js": "^0.4.4"
+    "unzip": "0.1.9"
   }
 }

From 6ee1e9688b576a1fd5c16d1a9b4c01c4bd4748d4 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 12 Jul 2014 11:54:12 -0500
Subject: [PATCH 0126/1100] update config.xml from cmd args

---
 lib/ionic/package.js |   7 ++-
 lib/ionic/start.js   | 127 ++++++++++++++++++++++++++++---------------
 package.json         |   5 +-
 3 files changed, 91 insertions(+), 48 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 17321fed5a..745f2be9c0 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -82,7 +82,8 @@ IonicPackageTask.prototype.clearSigning = function() {
 
 
 IonicPackageTask.prototype.loadProject = function() {
-  console.log( ("Loading " + this.project.get('name')).bold.yellow );
+  var appName = this.project.get('name') || "app";
+  console.log( ("Loading " + appName).bold.yellow );
 
   if(argv._.length < 3) {
     IonicPackageTask.prototype._printUsage();
@@ -353,8 +354,10 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 
         if(d.errors && d.errors.length) {
           for (var j = 0; j < d.errors.length; j++) {
-            process.stderr.write(d.errors[j] + '\n');
+            console.log( d.errors[j].bold.error );
           }
+          console.log('');
+
         } else if(d.build_status_url) {
           process.stderr.write('.');
           setTimeout(function(){
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index e21c5fb5b7..2f10ba1771 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     colors = require('colors'),
     spawn = require('child_process').spawn,
     Q = require('q'),
+    xml2js = require('xml2js'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
@@ -28,8 +29,7 @@ fs.mkdirParent = function(dirPath, mode, callback) {
   });
 };
 
-var IonicStartTask = function() {
-}
+var IonicStartTask = function() {};
 
 // The URL for the cordova wrapper project
 IonicStartTask.WRAPPER_REPO_NAME = 'ionic-app-base';
@@ -39,23 +39,30 @@ IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
 IonicStartTask.prototype = new IonicTask();
 
 IonicStartTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic start appName [starterProject(blank,tabs,sidemenu)]\n');
+  process.stderr.write('\nUsage:  ionic start myapp\n');
+  process.stderr.write('\nCommand-line Flags/Options:\n\n')
+  process.stderr.write('   -t, --template <STARTER TEMPLATE> ...... starter template to use (tabs, sidemenu, blank)\n');
+  process.stderr.write('   -a, --app <APP NAME> ................... your app\'s name (Use quotes around the name)\n');
+  process.stderr.write('   -p, --package <PACKAGE NAME> ........... package name, such as "com.mycompany.myapp"\n');
 };
 
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No app name specified, exiting.');
+    this._printUsage();
+    ionic.fail('\nInvalid command');
   }
 
-  // Grab the name of the app
-  this.appName = argv._[1];
+  // Grab the app's relative directory name
+  this.appDirectory = argv._[1];
 
-  // Grab the target path from the command line, or use this as the app name
-  var targetPathName = this.appName;
+  // Grab the name of the app from -a or  --app. Defaults to appDirectory if none provided
+  this.appName = argv.a || argv.app || this.appDirectory;
+  this.packageName = argv.p || argv.package;
 
-  var starterProject = argv._[2] || 'tabs';
+  // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
+  var starterProject = argv.t || argv.template || argv._[2] || 'tabs';
 
-  this.targetPath = path.resolve(this.appName);
+  this.targetPath = path.resolve(this.appDirectory);
 
   // Make sure to create this, or ask them if they want to override it
   if(this._checkTargetPath() === false) {
@@ -68,7 +75,7 @@ IonicStartTask.prototype.run = function(ionic) {
   fs.mkdirSync(this.targetPath);
 
   this._fetchAndWriteSeed(starterProject.toLowerCase());
-  this._writeConfig(ionic);
+  this._writeProjectFile(ionic);
 
 };
 
@@ -102,18 +109,55 @@ IonicStartTask.prototype._installCordovaPlugins = function() {
   console.log('Initializing cordova project.'.info.bold);
   exec('cordova plugin add org.apache.cordova.device && ' +
        'cordova plugin add org.apache.cordova.console && ' +
-       'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard'
-       , function(err, stdout, stderr) {
-    if(err) {
-      q.reject(stderr);
-    } else {
-      q.resolve(stdout);
-    }
+       'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard',
+       function(err, stdout, stderr) {
+          if(err) {
+            q.reject(stderr);
+          } else {
+            q.resolve(stdout);
+          }
   });
 
   return q.promise;
 };
 
+IonicStartTask.prototype._updateConfigXml = function() {
+  var self = this;
+  console.log('Update config.xml'.info.bold);
+
+  try {
+    var configXmlPath = self.targetPath + '/config.xml';
+    var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
+
+    var parseString = xml2js.parseString;
+    parseString(configString, function (err, jsonConfig) {
+      if(err) {
+        Ionic.fail('Error parsing config.xml: ' + err);
+      }
+
+      if(!self.packageName) {
+        var packageName = self.appDirectory + Math.round((Math.random() * 899999) + 100000);
+        self.packageName = 'com.ionicframework.' + packageName.replace(/\./g, '');
+      }
+
+      jsonConfig.widget.$.id = self.packageName.replace(/ /g, '').replace(/-/g, '').replace(/_/g, '').toLowerCase().trim();
+      jsonConfig.widget.name = [ self.appName ];
+
+      var xmlBuilder = new xml2js.Builder();
+      configString = xmlBuilder.buildObject(jsonConfig);
+
+      fs.writeFile(configXmlPath, configString, function(err) {
+        if(err) {
+          Ionic.fail('Error saving config.xml file: ' + err);
+        }
+      });
+    });
+
+  } catch(e) {
+    Ionic.fail('Error updating config.xml file: ' + e);
+  }
+};
+
 IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var self = this;
 
@@ -137,34 +181,29 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       var pluginQ = Q.defer();
       // Install dependencies for the starter project
 
-      //Ionic.spawnPromise('npm', ['install', '--quiet']).then(function() {
-        // Move the content of this repo into the www folder
-        cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
+      // Move the content of this repo into the www folder
+      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
 
-        // Copy the root config file to the www folder
-        // cp(self.targetPath + '/config.xml', 'www');
+      // Clean up start template folder
+      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
 
-        // Clean up start template folder
-        rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+      // update the config.xml file from cmd line args
+      self._updateConfigXml();
 
-        self._installCordovaPlugins().then(function(output) {
-          pluginQ.resolve(stdout);
-        }, function(err) {
-          pluginQ.reject(err);
-        });
-
-        pluginQ.promise.then(function() {
-          self._printQuickHelp(self.appName);
-        }, function(err) {
-          Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
-        });
+      self._installCordovaPlugins().then(function(output) {
+        pluginQ.resolve(stdout);
+      }, function(err) {
+        pluginQ.reject(err);
+      });
 
-        IonicStats.t('start', {});
-      /*
-      }).fail(function(err, stderr) {;
-        Ionic.fail('Unable to install Ionic dependencies. Please make sure you\'ve installed cordova, and gulp globally by running:\nsudo npm install -g cordova gulp. Error:\n'.error.bold + err + '\n' + stderr);
+      pluginQ.promise.then(function() {
+        self._printQuickHelp(self.appDirectory);
+      }, function(err) {
+        Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
       });
-      */
+
+      IonicStats.t('start', {});
+
     }).catch(function(err) {
       console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode, err);
       console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
@@ -191,13 +230,13 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\n\nFor more help, visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold);
 };
 
-IonicStartTask.prototype._writeConfig = function(ionic) {
-  var project = IonicProject.create();  
+IonicStartTask.prototype._writeProjectFile = function(ionic) {
+  var project = IonicProject.create();
   project.set('name', this.appName);
   project.save(this.targetPath);
 };
 
-IonicStartTask.prototype._checkTargetPath = function() { 
+IonicStartTask.prototype._checkTargetPath = function() {
   if(fs.existsSync(this.targetPath)) {
     process.stderr.write('The directory '.error.bold + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.\n'.error.bold);
     return false;
diff --git a/package.json b/package.json
index 9845a893ef..e70bf44935 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -53,7 +53,8 @@
     "request": "2.27.0",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
+    "unzip": "0.1.9",
     "vinyl-fs": "^0.1.4",
-    "unzip": "0.1.9"
+    "xml2js": "^0.4.4"
   }
 }

From 53a866ba01855d085210f34720a3581003f1318f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Sat, 12 Jul 2014 18:33:31 -0500
Subject: [PATCH 0127/1100] start cmd line options

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 158d3afd24..d18c0c0637 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,18 @@ $ sudo npm install -g ionic
 ```bash
 $ ionic start myApp [template]
 ```
-There are three choices of templates.
+
+There are three choices of templates:
 
 * Side-Menu (sidemenu)
 * Tabs (tabs)
 * Blank (blank)
+ 
+Command-line flags/options:
+
+    -a, --app <APP NAME> ................... your app's name (Use quotes around the name)
+    -p, --package <PACKAGE NAME> ........... package name, such as "com.mycompany.myapp"
+
 
 ## Testing in a Browser
 

From 6fad60218f1f433953024e83d7d4bfcd693d19dd Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 11:39:02 -0500
Subject: [PATCH 0128/1100] package improvements, added cmd line opts

---
 README.md             |   2 +-
 lib/ionic.js          | 215 +++++++++++++++++++++++++++-----
 lib/ionic/build.js    |  14 +--
 lib/ionic/emulate.js  |  14 +--
 lib/ionic/login.js    | 183 +++++++++++++++------------
 lib/ionic/package.js  | 281 +++++++++++++++++++++++++-----------------
 lib/ionic/platform.js |  45 ++++---
 lib/ionic/project.js  |   3 +-
 lib/ionic/run.js      |  14 +--
 lib/ionic/serve.js    |  46 ++++---
 lib/ionic/start.js    |  25 ++--
 lib/ionic/store.js    |   2 +-
 lib/ionic/upload.js   |   8 +-
 package.json          |   2 +-
 14 files changed, 538 insertions(+), 316 deletions(-)

diff --git a/README.md b/README.md
index d18c0c0637..09bcb96306 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful. Use `ionic --help` for detailed task information.
 
 ## Installing
 
diff --git a/lib/ionic.js b/lib/ionic.js
index 6604d4a192..96d419a3fd 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -53,61 +53,109 @@ var fs = require('fs'),
     argv = require('optimist').argv;
 
 var TASKS = [
+  {
+    title: 'start',
+    name: 'start',
+    summary: 'Starts a new Ionic project in the specified PATH',
+    args: {
+      '<PATH>': 'directory for the new project',
+      '[TEMPLATE]': 'Starter template to use (tabs, sidemenu, blank)'
+    },
+    options: {
+      '--app-name|-a': 'Human readable app\'s name (Use quotes around the name)',
+      '--id|-i': 'Package name set as <widget id> config'
+    },
+    task: IonicStartTask
+  },
   {
     title: 'serve',
     name: 'serve',
-    usage: '',
+    summary: 'Start a local development server for app dev and testing',
+    args: {
+      '[http-port]': '',
+      '[livereload-port]': ''
+    },
+    options: {
+      '--nobrowser|-b': 'Disable auto browser launch',
+      '--nolivereload|-r': 'Do not start live reload'
+    },
     task: IonicServeTask
   },
   {
-    title: 'start',
-    name: 'start',
-    usage: 'appname',
-    task: IonicStartTask
+    title: 'platform',
+    name: 'platform',
+    summary: 'Add platform target for building an Ionic app',
+    args: {
+      '<PLATFORM>': ''
+    },
+    task: IonicPlatformTask
   },
   {
     title: 'emulate',
     name: 'emulate',
-    usage: 'emulate',
+    summary: 'Emulate an Ionic project on a simulator or emulator',
+    args: {
+      '<PLATFORM>': ''
+    },
     task: IonicEmulateTask
   },
   {
     title: 'run',
     name: 'run',
-    usage: 'run',
+    summary: 'Run an ionic project on a connected device',
+    args: {
+      '<PLATFORM>': ''
+    },
     task: IonicRunTask
   },
   {
     title: 'build',
     name: 'build',
-    usage: 'build',
+    summary: 'Locally build an ionic project for a given platform',
+    args: {
+      '<PLATFORM>': ''
+    },
     task: IonicBuildTask
   },
   {
-    title: 'platform',
-    name: 'platform',
-    usage: 'platform',
-    task: IonicPlatformTask
-  },
-  {
-    title: 'login',
-    name: 'login',
-    usage: '[email]',
-    task: IonicLoginTask
+    title: 'package',
+    name: 'package',
+    alt: ['pack'],
+    summary: 'Package an app using the Ionic Build service',
+    args: {
+      '<PLATFORM>': '"ios" or "android"',
+      '<MODE>': '"debug" or "release"'
+    },
+    options: {
+      '--android-keystore-file|-k': 'Android keystore file',
+      '--android-keystore-alias|-a': 'Android keystore alias',
+      '--android-keystore-password|-w': 'Android keystore password',
+      '--android-key-password|-r': 'Android key password',
+      '--ios-certificate-file|-c': 'iOS certificate file',
+      '--ios-certificate-password|-d': 'iOS certificate password',
+      '--ios-profile-file|-f': 'iOS profile file',
+      '--output|-o': 'Path to save the packaged app',
+      '--clear-signing|-l': 'Clear out all signing data from Ionic server',
+      '--email|-e': 'Ionic account email',
+      '--password|-p': 'Ionic account password'
+    },
+    task: IonicPackageTask
   },
   {
     title: 'upload',
     name: 'upload',
+    summary: 'Upload an app to your Ionic account',
+    options: {
+      '--email|-e': 'Ionic account email',
+      '--password|-p': 'Ionic account password'
+    },
     alt: ['up'],
-    usage: '',
     task: IonicUploadTask
   },
   {
-    title: 'package',
-    name: 'package',
-    alt: ['pack'],
-    usage: 'mode platform',
-    task: IonicPackageTask
+    title: 'login',
+    name: 'login',
+    task: IonicLoginTask
   }
 ];
 
@@ -142,13 +190,101 @@ Ionic = {
     }
   },
 
-  _printGenericUsage: function() {
+  printUsage: function(d) {
+    var w = function(s) {
+      process.stdout.write(s);
+    };
+
+    w('\n');
+
+    var rightColumn = 45;
+    var dots = '';
+    var indent = '';
+    var x, arg;
+
+    var taskArgs = d.name;
+
+    for(arg in d.args) {
+      taskArgs += ' ' + arg;
+    }
+
+    w(taskArgs.green);
+
+    while( (taskArgs + dots).length < rightColumn + 1) {
+      dots += '.';
+    }
+
+    w(' ' + dots.grey + '  ');
+
+    w(d.summary);
+
+    for(arg in d.args) {
+      if( !d.args[arg] ) continue;
+      var argLine = arg;
+
+      indent = '';
+      w('\n');
+      while(indent.length < rightColumn) {
+        indent += ' ';
+      }
+      w( (indent + '    ' + argLine + ' = ' + d.args[arg]).grey );
+    }
+
+    indent = '';
+    while(indent.length < d.name.length + 1) {
+      indent += ' ';
+    }
+
+    for(var opt in d.options) {
+      w('\n');
+      dots = '';
+
+      var optLine = indent + '[' + opt + ']  ';
+
+      w(optLine.yellow);
+
+      while( (dots.length + optLine.length - 2) < rightColumn) {
+        dots += '.';
+      }
+      w(dots.grey + '  ');
+
+      w(d.options[opt].grey);
+    }
+
+    w('\n');
+  },
+
+  _printAvailableTasks: function() {
+    this._printIonic();
+    process.stderr.write('\nUsage: ionic task args\n\n===============\n\n');
+    process.stderr.write('Available tasks: '.bold);
+    process.stderr.write('(use --help or -h for more info)\n\n');
+
+    for(var i = 0; i < TASKS.length; i++) {
+      var task = TASKS[i];
+      if(task.summary) {
+        var name = '   ' + task.name + '  ';
+        var dots = '';
+        while((name + dots).length < 20) {
+          dots += '.';
+        }
+        process.stderr.write(name.green + dots.grey + '  ' + task.summary + '\n');
+      }
+    }
+
+    process.stderr.write('\n');
+    process.exit(1);
+  },
+
+  _printHelpLines: function() {
     this._printIonic();
-    process.stderr.write('Usage: ionic task args\n\n===============\n\nAvailable tasks:\n\n');
+    process.stderr.write('\n===================\n');
 
     for(var i = 0; i < TASKS.length; i++) {
       var task = TASKS[i];
-      process.stderr.write('  ' + task.name + ' - ' + task.task.HELP_LINE + '\n');
+      if(task.summary) {
+        this.printUsage(task);
+      }
     }
 
     process.stderr.write('\n');
@@ -174,25 +310,38 @@ Ionic = {
   },
 
   run: function() {
-    if(argv.version) {
+    if(argv.version || argv.v) {
       console.log('Ionic CLI version ' + settings.version);
       process.exit(0);
     }
 
+    if(argv.help || argv.h) {
+      return this._printHelpLines();
+    }
+
     var task = this._tryBuildingTask();
     if(!task) {
-      return this._printGenericUsage();
+      return this._printAvailableTasks();
     }
 
-    console.log('\nRunning', task.title.info.bold, 'task...');
-
     var taskObj = new task.task();
     taskObj.run(this);
   },
 
-  fail: function(msg) {
+  fail: function(msg, taskHelp) {
     process.stderr.write(msg.error.bold);
-    process.stderr.write('\n\n');
+    process.stderr.write('\n');
+    if(taskHelp) {
+      for(var i = 0; i < TASKS.length; i++) {
+        var task = TASKS[i];
+        if(task.name == taskHelp) {
+          this.printUsage(task);
+          process.stderr.write('\n');
+          break;
+        }
+      }
+    }
+    process.stderr.write('\n');
     process.exit(1);
   },
 
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 04e871ed02..60a91c6d8c 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -9,27 +9,19 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
 
-var IonicBuildTask = function() {
-}
-
-IonicBuildTask.HELP_LINE = 'Locally build an ionic project for a given platform';
+var IonicBuildTask = function() {};
 
 IonicBuildTask.prototype = new IonicTask();
 
-IonicBuildTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic build platform [more platforms,...]\n');
-}
-
 IonicBuildTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    IonicBuildTask.prototype._printUsage();
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'build');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'build');
   }
 
   IonicStats.t('build', { 'platform': platforms.join(',') });
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 0c1934b12e..ca30dffb5c 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -10,29 +10,21 @@ var fs = require('fs'),
 
 var argv = require('optimist').argv;
 
-var IonicEmulateTask = function() {
-}
-
-IonicEmulateTask.HELP_LINE = 'Emulate an ionic project on a simulator or emulator.';
+var IonicEmulateTask = function() {};
 
 IonicEmulateTask.prototype = new IonicTask();
 
-IonicEmulateTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic emulate [platform]\n');
-}
-
 IonicEmulateTask.prototype.run = function(ionic) {
   var patform;
 
   if(argv._.length < 2) {
-    IonicEmulateTask.prototype._printUsage();
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'emulate');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'emulate');
   }
 
   IonicStats.t('emulate', { 'platform': platforms.join(',') });
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 0c2290789b..7504c07ff7 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -8,108 +8,139 @@ var fs = require('fs'),
 
 var IonicLoginTask = function() {};
 
-IonicLoginTask.HELP_LINE = 'Login to the Ionic Platform';
-
 IonicLoginTask.prototype = new IonicTask();
 
-IonicLoginTask.prototype.run = function(ionic, callback) {
-  var self = this;
+IonicLoginTask.prototype.get = function(ionic, callback) {
 
-  var schema = [{
-    name: 'email',
-    pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
-    message: 'Email for your Ionic Platform login',
-    required: true
-  }, {
-    name: 'password',
-    hidden: true,
-    required: true
-  }];
-
-  var project = IonicProject.load();
-
-  // Grab the email for login
-  if(argv._.length >= 2 && schema[0].pattern.test(argv._[1])) {
-    this.email = argv._[1].toLowerCase();
-    schema.shift();
+  if(ionic.jar) {
+    // already in memory
+    callback(ionic.jar);
+    return;
   }
 
-  console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-  console.log('Don\'t have one? Create a one at: '.grey + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
+  this.email = argv.email || argv.e || process.env.IONIC_EMAIL;
+  this.password = argv.password || argv.p || process.env.IONIC_PASSWORD;
 
-  prompt.override = argv;
+  if(!this.email && this.password) {
+    ionic.fail('--email or -e command line flag, or IONIC_EMAIL environment variable required');
+  }
+  if(this.email && !this.password) {
+    ionic.fail('--password or -p command line flag, or IONIC_PASSWORD environment variable required');
+  }
 
-  prompt.start();
+  if(!this.email && !this.password) {
+    // did not include cmd line flags, check for existing cookies
+    this.cookieData = new IonicStore('cookies');
+    var jar = this.cookieData.get(ionic.IONIC_DASH);
 
-  prompt.get(schema, function (err, result) {
-    if(err) {
-      ionic.fail('Error logging in: ' + err);
+    if(jar && jar.cookies && jar.cookies.length) {
+      for(var i in jar.cookies) {
+        var cookie = jar.cookies[i];
+        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+          ionic.jar = jar;
+          callback(jar);
+          return;
+        }
+      }
     }
+  }
+
+  this.run(ionic, callback);
+};
+
+IonicLoginTask.prototype.run = function(ionic, callback) {
+  var self = this;
+
+  if(!this.email && !this.password) {
+
+    var schema = [{
+      name: 'email',
+      pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
+      description: 'Email:',
+      required: true
+    }, {
+      name: 'password',
+      description: 'Password:',
+      hidden: true,
+      required: true
+    }];
+
+    // prompt for log
+    console.log('\nTo continue, please login to your Ionic account.'.bold.green);
+    console.log('Don\'t have one? Create a one at: '.grey + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
+
+    prompt.override = argv;
+    prompt.message = '';
+    prompt.delimiter = '';
+    prompt.start();
+
+    prompt.get(schema, function (err, result) {
+      if(err) {
+        ionic.fail('Error logging in: ' + err);
+      }
+
+      self.email = result.email;
+      self.password = result.password;
+
+      self.requestLogIn(ionic, callback, true);
+    });
+
+  } else {
+    // cmd line flag were added, use those instead of a prompt
+    self.requestLogIn(ionic, callback, false);
+  }
 
-    if(!self.email) {
-      self.email = result.email.toLowerCase();
+};
+
+IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
+  var self = this;
+
+  var jar = request.jar();
+  request({
+    url: ionic.IONIC_DASH + '/login',
+    jar: jar
+  },
+  function(err, response, body) {
+    if(err || jar.cookies.length === 0) {
+      ionic.fail('Error logging in: ' + err);
     }
-    self.password = result.password;
 
-    var jar = request.jar();
     request({
+      method: 'POST',
       url: ionic.IONIC_DASH + '/login',
-      jar: jar
+      jar: jar,
+      form: {
+        username: self.email.toString().toLowerCase(),
+        password: self.password,
+        csrfmiddlewaretoken: jar.cookies[0].value
+      }
     },
-    function(err, response, body) {
-      if(err || jar.cookies.length === 0) {
+    function (err, response, body) {
+      if(err) {
         ionic.fail('Error logging in: ' + err);
       }
 
-      request({
-        method: 'POST',
-        url: ionic.IONIC_DASH + '/login',
-        jar: jar,
-        form: {
-          username: self.email,
-          password: self.password,
-          csrfmiddlewaretoken: jar.cookies[0].value
-        }
-      },
-      function (err, response, body) {
-        if(err) {
-          ionic.fail('Error logging in: ' + err);
-        }
-        // Should be a 304 redirect status code if correct
-        if(response.statusCode == 200) {
-          ionic.fail('Email or Password incorrect.  Please visit '+ ionic.IONIC_DASH +' for help.');
-        }
+      // Should be a 302 redirect status code if correct
+      if(response.statusCode != 302) {
+        ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH +' for help.');
+      }
 
+      if(saveCookies) {
+        // save cookies
         self.cookieData.set(ionic.IONIC_DASH, jar);
         self.cookieData.save();
+      }
 
-        console.log('Logged in! :)'.green);
-
-        if(callback) {
-          callback(jar);
-          project.set('email', self.email);
-          project.save();
-        }
-      });
-    });
-  });
-};
+      // save in memory
+      ionic.jar = jar;
 
-IonicLoginTask.prototype.get = function(ionic, callback) {
-  this.cookieData = new IonicStore('cookies');
-  var jar = this.cookieData.get(ionic.IONIC_DASH);
+      console.log('Logged in! :)'.green);
 
-  if(jar && jar.cookies && jar.cookies.length) {
-    for(var i in jar.cookies) {
-      var cookie = jar.cookies[i];
-      if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+      if(callback) {
         callback(jar);
-        return;
       }
-    }
-  }
-
-  this.run(ionic, callback);
+    });
+  });
 };
 
 exports.IonicLoginTask = IonicLoginTask;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 745f2be9c0..a94e065aa7 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -15,92 +15,58 @@ var fs = require('fs'),
 
 var IonicPackageTask = function() {};
 
-IonicPackageTask.HELP_LINE = 'Package an app using the Ionic Platform Build service (requires login)';
-
 IonicPackageTask.prototype = new IonicTask();
 
-
-IonicPackageTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage:\nionic package mode[debug|release] platform[ios,android]\n');
-};
-
-
 IonicPackageTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
 
   self.project = IonicProject.load();
+  self.inputFiles = {};
+  self.inputValues = {};
+  self.useCmdArgs = false;
 
-  if(argv['clear-signing'] || argv.c) {
+  if(argv['clear-signing'] || argv.l) {
     self.clearSigning();
     return;
   }
 
   self.loadProject();
 
+  this.getCmdLineOptions();
+
   var login = new IonicLoginTask();
   login.get(self.ionic, function(jar) {
     self.jar = jar;
 
     self.loadAppSigning(function(){
-      self.packagePlatforms(self.platforms);
+      self.initPlatforms();
     });
   });
 
 };
 
 
-IonicPackageTask.prototype.clearSigning = function() {
-  var self = this;
-  console.log('Clearing app signing and credential information...'.yellow);
-
-  var appId = self.project.get('app_id');
-
-  if(!appId) {
-    self.ionic.fail('App Id is not known');
-  }
-
-  var login = new IonicLoginTask();
-  login.get(self.ionic, function(jar) {
-    var options = {
-      url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + appId + '/signing/clear',
-      headers: {
-        cookie: jar.cookies.map(function (c) {
-          return c.name + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      }
-    };
-
-    request(options, function(err, response, body) {
-      if(err) {
-        self.ionic.fail("Error clearing app signing: " + err);
-      }
-      console.log( ('App (' + appId + ') signing and credential information cleared\n').green );
-    });
-  });
-};
-
-
 IonicPackageTask.prototype.loadProject = function() {
   var appName = this.project.get('name') || "app";
-  console.log( ("Loading " + appName).bold.yellow );
+  console.log( ('Loading ' + appName + '...').bold.yellow );
 
   if(argv._.length < 3) {
-    IonicPackageTask.prototype._printUsage();
-    this.ionic.fail('No platforms or build mode specified.');
+    this.ionic.fail('No platforms or build mode specified.', 'package');
   }
 
   this.mode = argv._[1].toLowerCase();
   if(this.mode != 'debug' && this.mode != 'release') {
-    IonicPackageTask.prototype._printUsage();
-    this.ionic.fail('Package build mode must be "debug" or "release".');
+    this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
   }
 
   this.platforms = argv._.slice(2);
 
   if(this.platforms.length < 1) {
-    this.ionic.fail('No platforms specified.');
+    this.ionic.fail('No platforms specified.', 'package');
   }
+
+  this.loadPlugins();
 };
 
 
@@ -122,9 +88,48 @@ IonicPackageTask.prototype.loadPlugins = function() {
 };
 
 
+IonicPackageTask.prototype.getCmdLineOptions = function() {
+  var self = this;
+
+  function getCmdArgValue(propertyName, shortName) {
+    var value = argv[propertyName] || argv[shortName];
+    if(value) {
+      self.inputValues[propertyName] = value;
+      self.useCmdArgs = true;
+    }
+  }
+
+  function getCmdArgFile(propertyName, shortName) {
+    var value = argv[propertyName] || argv[shortName];
+    if(value) {
+      if(!fileExists(value)) {
+        self.ionic.fail("Unable to find file: " + argv[propertyName]);
+      }
+      self.inputFiles[propertyName] = value;
+      self.useCmdArgs = true;
+    }
+  }
+
+  getCmdArgValue('android-keystore-alias', 'a');
+  getCmdArgValue('android-keystore-password', 'w');
+  getCmdArgValue('android-key-password', 'r');
+  getCmdArgValue('ios-certificate-password', 'd');
+
+  getCmdArgFile('android-keystore-file', 'k');
+  getCmdArgFile('ios-certificate-file', 'c');
+  getCmdArgFile('ios-profile-file', 'f');
+};
+
+
 IonicPackageTask.prototype.loadAppSigning = function(callback) {
   var self = this;
 
+  if(self.useCmdArgs) {
+    // if they used cmd line args, don't bother checking
+    callback();
+    return;
+  }
+
   if(!self.project.get('app_id')) {
     // if its the first load we won't have an appId yet
     callback();
@@ -134,6 +139,7 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
   var privateData = new IonicStore(self.project.get('app_id'));
   var cck = privateData.get('cck');
   if(!cck) {
+    // if there's no client key don't bother
     callback();
     return;
   }
@@ -149,8 +155,11 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
   };
 
   request(options, function(err, response, body) {
-    if(!err && response.statusCode == 200) {
+    if(err) {
+      self.ionic.fail("Error loading app signing info: " + err);
+    }
 
+    if(response.statusCode == 200) {
       try {
         self.signing = JSON.parse(body);
 
@@ -161,7 +170,6 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
       } catch(e) {
         self.ionic.fail("Error parsing app signing: " + e);
       }
-
     }
 
     callback();
@@ -169,92 +177,107 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
 };
 
 
-IonicPackageTask.prototype.packagePlatforms = function(platforms) {
+IonicPackageTask.prototype.initPlatforms = function() {
   var self = this;
 
-  prompt.override = argv;
-  prompt.start();
+  if(self.useCmdArgs) {
+    self.packagePlatforms();
 
-  var promptProperties = self.buildPromptProperties(platforms);
+  } else {
+    prompt.override = argv;
+    prompt.message = '';
+    prompt.delimiter = '';
+    prompt.start();
 
-  prompt.get({properties: promptProperties}, function (err, promptResult) {
-    if(err) {
-      self.ionic.fail('Error packaging: ' + err);
-    }
+    var promptProperties = self.buildPromptProperties();
+
+    prompt.get({properties: promptProperties}, function (err, promptResult) {
+      if(err) {
+        self.ionic.fail('Error packaging: ' + err);
+      }
 
-    self.loadPlugins();
+      for(var propertyName in promptResult) {
+        var promptValue = promptResult[propertyName];
+        if( !promptValue ) continue;
 
-    var upload = new IonicUploadTask();
-    upload.run(self.ionic, function() {
-      for(var x=0; x<platforms.length; x++) {
-        var form = self.buildPostRequest(platforms[x], promptProperties, promptResult);
-        self.submitPostRequest(form, platforms[x]);
+        if(promptProperties[propertyName].isFile) {
+          self.inputFiles[propertyName] = promptValue;
+        } else {
+          self.inputValues[propertyName] = promptValue;
+        }
       }
+
+      self.packagePlatforms();
     });
+  }
 
+};
+
+IonicPackageTask.prototype.packagePlatforms = function() {
+  var self = this;
+  var upload = new IonicUploadTask();
+
+  upload.run(self.ionic, function() {
+    for(var x=0; x<self.platforms.length; x++) {
+      var form = self.buildPostRequest(self.platforms[x]);
+      self.submitPostRequest(form, self.platforms[x]);
+    }
   });
 };
 
 
-IonicPackageTask.prototype.buildPromptProperties = function(platforms) {
+IonicPackageTask.prototype.buildPromptProperties = function() {
   // Just prompt for some build properties
   var promptProperties = {};
 
-  for(var x=0; x<platforms.length; x++) {
+  for(var x=0; x<this.platforms.length; x++) {
 
-    if(platforms[x] == 'android') {
+    if(this.platforms[x] == 'android') {
 
       // Android debug doesn't require anything
       if(this.mode == 'release') {
 
-        promptProperties.android_keystore_file = {
-          description: 'Android Keystore File (.keystore)',
-          message: 'Please provide a local path to your release keystore file (eg. release.keystore)',
+        promptProperties['android-keystore-file']= {
+          description: 'Android Keystore File (.keystore):',
           required: true,
           conform: fileExists,
           isFile: true
         };
 
-        promptProperties.android_keystore_alias = {
-          description: 'Keystore Alias',
-          message: 'Alias of the Keystore',
+        promptProperties['android-keystore-alias'] = {
+          description: 'Keystore Alias:',
           required: true
         };
 
-        promptProperties.android_keystore_password = {
-          description: 'Keystore Password',
-          message: 'Password of the Keystore',
+        promptProperties['android-keystore-password'] = {
+          description: 'Keystore Password:',
           hidden: true,
           required: true
         };
 
-        promptProperties.android_key_password = {
-          description: 'Key Password (optional)',
-          message: 'Password for Key (usually same as Keystore Password and if left blank it will use it)',
+        promptProperties['android-key-password'] = {
+          description: 'Key Password (optional):',
           hidden: true
         };
       }
 
-    } else if(platforms[x] == 'ios') {
+    } else if(this.platforms[x] == 'ios') {
       // iOS
-      promptProperties.ios_certificate_file = {
-        description: 'iOS Certificate File (.p12)',
-        message: 'Please provide a local path to your iOS certificate file (eg. cert.p12)',
+      promptProperties['ios-certificate-file'] = {
+        description: 'iOS Certificate File (.p12):',
         required: true,
         conform: fileExists,
         isFile: true
       };
 
-      promptProperties.ios_certificate_password = {
-        description: 'Certificate Password',
-        message: 'Password of the Certificate',
+      promptProperties['ios-certificate-password'] = {
+        description: 'Certificate Password:',
         hidden: true,
         required: true
       };
 
-      promptProperties.ios_profile_file = {
-        description: 'iOS Mobile Provisioning Profile (.mobileprovision)',
-        message: 'Please provide a local path to your iOS Mobile Provisioning Profile (eg. my.mobileprovision)',
+      promptProperties['ios-profile-file'] = {
+        description: 'iOS Mobile Provisioning Profile (.mobileprovision):',
         required: true,
         conform: fileExists,
         isFile: true
@@ -267,7 +290,7 @@ IonicPackageTask.prototype.buildPromptProperties = function(platforms) {
   // Don't prompt for properties we already have stored on the server
   if(this.signing){
     for (var propertyName in promptProperties) {
-      if(this.signing['is_valid_' + propertyName]) {
+      if(this.signing['is_valid_' + propertyName.replace(/-/g, '_')]) {
         delete promptProperties[propertyName];
       }
     }
@@ -277,7 +300,7 @@ IonicPackageTask.prototype.buildPromptProperties = function(platforms) {
 };
 
 
-IonicPackageTask.prototype.buildPostRequest = function(platform, promptProperties, promptResult) {
+IonicPackageTask.prototype.buildPostRequest = function(platform) {
   var form = new FormData();
 
   form.append('email', this.project.get('email'));
@@ -296,19 +319,19 @@ IonicPackageTask.prototype.buildPostRequest = function(platform, promptPropertie
     }
   }
 
-  for(var propertyName in promptResult) {
-    var promptValue = promptResult[propertyName];
-    if( !promptValue ) continue;
+  for(var propertyName in this.inputValues) {
+    form.append(propertyName.replace(/-/g, '_'), this.inputValues[propertyName]);
+  }
 
-    if(promptProperties[propertyName].isFile) {
-      try {
-        promptValue = promptValue.replace(/\\ /g, ' ').trim();
-        form.append(propertyName, fs.createReadStream( path.resolve(promptValue) ) );
-      } catch(e) {
-        this.ionic.fail("Error loading " + path.resolve(promptValue.trim()));
-      }
-    } else {
-      form.append(propertyName, promptValue);
+  for(propertyName in this.inputFiles) {
+    var inputFile = this.inputFiles[propertyName];
+    if( !inputFile ) continue;
+
+    try {
+      inputFile = inputFile.replace(/\\ /g, ' ').trim();
+      form.append(propertyName.replace(/-/g, '_'), fs.createReadStream( path.resolve(inputFile) ) );
+    } catch(e) {
+      this.ionic.fail("Error loading " + path.resolve(inputFile));
     }
   }
 
@@ -328,7 +351,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 
   var privateData = new IonicStore(this.project.get('app_id'));
 
-  console.log( (platform + ' package building...').bold.grey );
+  console.log( (platform + ' ' + self.mode + ' package building...').bold.grey );
 
   form.submit({
     protocol: params.protocol,
@@ -382,9 +405,6 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
         if(d.app_id) {
           self.project.set('app_id', d.app_id);
         }
-        if(d.email) {
-          self.project.set('email', d.email);
-        }
         if(d.name) {
           self.project.set('name', d.name);
         }
@@ -399,6 +419,37 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 };
 
 
+IonicPackageTask.prototype.clearSigning = function() {
+  var self = this;
+  console.log('Clearing app signing and credential information...'.yellow);
+
+  var appId = self.project.get('app_id');
+
+  if(!appId) {
+    self.ionic.fail('App Id is not known');
+  }
+
+  var login = new IonicLoginTask();
+  login.get(self.ionic, function(jar) {
+    var options = {
+      url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + appId + '/signing/clear',
+      headers: {
+        cookie: jar.cookies.map(function (c) {
+          return c.name + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      }
+    };
+
+    request(options, function(err, response, body) {
+      if(err) {
+        self.ionic.fail("Error clearing app signing: " + err);
+      }
+      console.log( ('App (' + appId + ') signing and credential information cleared\n').green );
+    });
+  });
+};
+
+
 function pingBuildStatus(ionic, requestOptions, platform, attempt) {
   process.stderr.clearLine();
   process.stderr.cursorTo(0);
@@ -464,11 +515,15 @@ function pingBuildStatus(ionic, requestOptions, platform, attempt) {
 function downloadBuildPackage(platform, data) {
   console.log( ('\n\n' + platform + ' build complete, downloading package...').bold.grey );
 
-  var dirPath = path.resolve('./packages');
-  var filePath = path.resolve(dirPath + '/' + data.package_filename);
+  var filePath = argv.output;
 
-  if(!fs.existsSync(dirPath)) {
-    fs.mkdirSync(dirPath);
+  if(!filePath) {
+    var dirPath = path.resolve('./packages');
+    filePath = path.resolve(dirPath + '/' + data.package_filename);
+
+    if(!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath);
+    }
   }
 
   var params = parseUrl(data.package_url);
@@ -500,7 +555,11 @@ function downloadBuildPackage(platform, data) {
     });
 
   }).on('error', function(err) {
-    fs.unlink(filePath);
+    try {
+      fs.unlink(filePath);
+    } catch(e) {
+      console.error( (e).red );
+    }
     console.error( (err).red );
   });
 }
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index 671c76ff8a..fd91a80780 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -9,41 +9,48 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
 
-var IonicPlatformTask = function() {
-}
-
-IonicPlatformTask.HELP_LINE = 'Configure platform targets for building an Ionic app';
+var IonicPlatformTask = function() {};
 
 IonicPlatformTask.prototype = new IonicTask();
 
-IonicPlatformTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic platform [more platforms,...]\nSupported platforms currently "ios" and "android"\n\n');
-}
-
 IonicPlatformTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    IonicPlatformTask.prototype._printUsage();
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'platform');
   }
 
   // Grab the name of the app
-  var platforms = argv._.slice(1);
+  var argPlatforms = argv._.slice(1);
+
+  var cordovaArgs = ['add', 'remove', 'rm', 'list', 'ls', 'update', 'up'];
+  var cordovaArg = 'add';
+  var platforms = [];
+
+  for(var y=0; y<argPlatforms.length; y++) {
+    var addPlatform = true;
+    for(var x=0; x<cordovaArgs.length; x++) {
+      if(argPlatforms[y].toLowerCase() == cordovaArgs[x]) {
+        cordovaArg = argPlatforms[y].toLowerCase();
+        addPlatform = false;
+      }
+    }
+    if(addPlatform) {
+      platforms.push(argPlatforms[y].toLowerCase());
+    }
+  }
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'platform');
   }
 
-  if(platforms[0].toLowerCase() == 'add') {
-    platforms.shift();
+  if(cordovaArg == 'add') {
+    IonicStats.t('platform', { 'platform': platforms.join(',') });
   }
 
-  IonicStats.t('platform', { 'platform': platforms.join(',') });
-
   for(var i = 0; i < platforms.length; i++) {
     var platform = platforms[i].toLowerCase();
-    console.log('Adding platform', platform);
-    if(exec("cordova platform add " + platform).code !== 0) {
-      process.stderr.write('Unable to add platform ' + platform + '. Please see console for more info.\n');
+    console.log(cordovaArg, 'platform', platform);
+    if(exec("cordova platform " + cordovaArg + " " + platform).code !== 0) {
+      console.log( ('Unable to ' + cordovaArg + ' platform ' + platform + '.\n').bold.red );
     }
   }
 };
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index 5b58da3c72..366a2c4e89 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -6,8 +6,7 @@ module.exports = {
   PROJECT_FILE: 'ionic.project',
   PROJECT_DEFAULT: {
     name: '',
-    email: '',
-    app_id: '',
+    app_id: ''
   },
   load: function() {
     this.file = this.PROJECT_FILE;
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index e5142956c9..51ccd6130f 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -9,27 +9,19 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
 
-var IonicRunTask = function() {
-}
-
-IonicRunTask.HELP_LINE = 'Run an ionic project on a connected device.';
+var IonicRunTask = function() {};
 
 IonicRunTask.prototype = new IonicTask();
 
-IonicRunTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic run platform [more platforms,...]\n');
-}
-
 IonicRunTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    IonicRunTask.prototype._printUsage();
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'run');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified, exiting.');
+    ionic.fail('No platforms specified.', 'run');
   }
 
   IonicStats.t('run', { 'platform': platforms.join(',') });
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index ac6f8129f8..d7a0e0d08d 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -11,17 +11,10 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
 
-var IonicServeTask = function() {}
-
-IonicServeTask.HELP_LINE = 'Start a local development server for easy app development and testing';
+var IonicServeTask = function() {};
 
 IonicServeTask.prototype = new IonicTask();
 
-IonicServeTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage: ionic serve [http-port] [livereload-port] [options]\n');
-  process.stderr.write('\nUse --nobrowser to disable auto browser launch\n');
-};
-
 IonicServeTask.prototype.run = function(ionic) {
   var project = IonicProject.load();
 
@@ -29,15 +22,15 @@ IonicServeTask.prototype.run = function(ionic) {
   this.port = argv._[1] || 8100;
   this.liveReloadPort = argv._[2] || 35729;
 
-  this.launchBrowser = typeof argv['nobrowser'] === 'undefined';
-  this.runLivereload = typeof argv['nolivereload'] === 'undefined';
+  this.launchBrowser = !argv.nobrowser && !argv.b;
+  this.runLivereload = !argv.nolivereload && !argv.r;
 
   this._start(ionic);
 };
 
 IonicServeTask.prototype._changed = function(path) {
   // Cleanup the path a bit
-  var pwd = process.cwd()
+  var pwd = process.cwd();
   path = path.replace(pwd + '/', '');
 
   console.log('Changed', path);
@@ -57,7 +50,6 @@ IonicServeTask.prototype._changed = function(path) {
 
 IonicServeTask.prototype._start = function(ionic) {
   var self = this;
-
   var app = connect();
 
   if(this.runLivereload) {
@@ -71,22 +63,42 @@ IonicServeTask.prototype._start = function(ionic) {
       if(err) {
         ionic.fail('Unable to start server:', err);
       } else {
-        console.log('Running live reload server at', ('http://0.0.0.0:' + self.liveReloadPort).info.bold);
+        console.log('Running live reload server at', (self.host(self.liveReloadPort).info.bold) );
         if(self.launchBrowser) {
-          open('http://localhost:' + self.port);
+          open( self.host(self.port) );
         }
       }
     });
 
     app.use(require('connect-livereload')({
       port: this.liveReloadPort
-    }))
+    }));
   }
 
   app.use(connect.static('www'))
     .listen(this.port);
-  
-  console.log('Running dev server at', ('http://0.0.0.0:' + this.port).info.bold);
+
+  console.log('Running dev server at', ( this.host(this.port) ).info.bold);
+};
+
+
+IonicServeTask.prototype.host = function(port) {
+  var address = 'localhost';
+
+  try {
+    var os = require('os');
+    var ifaces = os.networkInterfaces();
+
+    for (var dev in ifaces) {
+      ifaces[dev].forEach(function(details){
+        if (details.family == 'IPv4' && !details.internal) {
+          address = details.address;
+        }
+      });
+    }
+  } catch(e) {}
+
+  return 'http://' + address + ':' + port;
 };
 
 module.exports = IonicServeTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 2f10ba1771..fcfc675460 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -34,33 +34,28 @@ var IonicStartTask = function() {};
 // The URL for the cordova wrapper project
 IonicStartTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
-IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
-
 IonicStartTask.prototype = new IonicTask();
 
-IonicStartTask.prototype._printUsage = function() {
-  process.stderr.write('\nUsage:  ionic start myapp\n');
-  process.stderr.write('\nCommand-line Flags/Options:\n\n')
-  process.stderr.write('   -t, --template <STARTER TEMPLATE> ...... starter template to use (tabs, sidemenu, blank)\n');
-  process.stderr.write('   -a, --app <APP NAME> ................... your app\'s name (Use quotes around the name)\n');
-  process.stderr.write('   -p, --package <PACKAGE NAME> ........... package name, such as "com.mycompany.myapp"\n');
-};
-
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    this._printUsage();
-    ionic.fail('\nInvalid command');
+    ionic.fail('Invalid command', 'start');
   }
 
   // Grab the app's relative directory name
   this.appDirectory = argv._[1];
 
   // Grab the name of the app from -a or  --app. Defaults to appDirectory if none provided
-  this.appName = argv.a || argv.app || this.appDirectory;
-  this.packageName = argv.p || argv.package;
+  this.appName = argv['app-name'] || argv.a;
+  if(!this.appName) {
+    var appNameSplit = this.appDirectory.split('/');
+    appNameSplit = appNameSplit[ appNameSplit.length -1 ].split('\\');
+    this.appName = appNameSplit[ appNameSplit.length -1 ];
+  }
+
+  this.packageName = argv.id || argv.i;
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
-  var starterProject = argv.t || argv.template || argv._[2] || 'tabs';
+  var starterProject = argv.template || argv.t || argv._[2] || 'tabs';
 
   this.targetPath = path.resolve(this.appDirectory);
 
diff --git a/lib/ionic/store.js b/lib/ionic/store.js
index 752864fe90..0743efc0c8 100644
--- a/lib/ionic/store.js
+++ b/lib/ionic/store.js
@@ -9,7 +9,7 @@ var IonicStore = function(fileName) {
 
   this.fileName = fileName;
   if(fileName.indexOf('.') < 0) {
-    this.fileName += '.data'
+    this.fileName += '.data';
   }
 
   this.homeDir = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 4a262354e7..08ac6ee9e3 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -12,8 +12,6 @@ var fs = require('fs'),
 
 var IonicUploadTask = function() {};
 
-IonicUploadTask.HELP_LINE = 'Upload an Ionic project to the Ionic Platform (requires login)';
-
 IonicUploadTask.prototype = new IonicTask();
 
 IonicUploadTask.prototype.run = function(ionic, callback) {
@@ -42,11 +40,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     });
 
     zip.on('close', function() {
-      if(project.get('app_id')) {
-        console.log( ('\nUploading app (' + project.get('app_id') + ')...').bold.grey );
-      } else {
-        console.log('\nUploading new app...'.bold.grey);
-      }
+      console.log('\nUploading app...'.bold.grey);
 
       var form = new FormData();
       form.append('name', project.get('name'));
diff --git a/package.json b/package.json
index e70bf44935..b403524295 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.0.17",
+  "version": "1.1.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ac98c44f816d20cb64d6513cb53160ed64eb4a7b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 11:46:44 -0500
Subject: [PATCH 0129/1100] version # in printout

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 96d419a3fd..0911f82f18 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -301,7 +301,7 @@ Ionic = {
     w('  _  ___  _ __  _  ___ \n');
     w(' | |/ _ \\| \'_ \\| |/ __|\n');
     w(' | | (_) | | | | | (__ \n');
-    w(' |_|\\___/|_| |_|_|\\___|\n');
+    w(' |_|\\___/|_| |_|_|\\___|   v'+ settings.version + '\n');
 
   },
 

From 3e0e96da3453b9bad846ebd62fd8c5090aa89917 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 11:50:50 -0500
Subject: [PATCH 0130/1100] 1.1.0-beta1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b403524295..95065829ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0",
+  "version": "1.1.0-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 8a7b792ed62337efde3c46d78e5fada7bf0f84be Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 12:07:11 -0500
Subject: [PATCH 0131/1100] fix order of package args

---
 lib/ionic.js | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0911f82f18..6d2cc29d29 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -123,8 +123,8 @@ var TASKS = [
     alt: ['pack'],
     summary: 'Package an app using the Ionic Build service',
     args: {
-      '<PLATFORM>': '"ios" or "android"',
-      '<MODE>': '"debug" or "release"'
+      '<MODE>': '"debug" or "release"',
+      '<PLATFORM>': '"ios" or "android"'
     },
     options: {
       '--android-keystore-file|-k': 'Android keystore file',
diff --git a/package.json b/package.json
index 95065829ec..61e7c55546 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta1",
+  "version": "1.1.0-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6084491436872d79554ad4c8da3d0d7ff76d61c2 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 12:34:20 -0500
Subject: [PATCH 0132/1100] fix cookieData

---
 lib/ionic.js       | 2 +-
 lib/ionic/login.js | 2 +-
 package.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 6d2cc29d29..5b10a38354 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -62,7 +62,7 @@ var TASKS = [
       '[TEMPLATE]': 'Starter template to use (tabs, sidemenu, blank)'
     },
     options: {
-      '--app-name|-a': 'Human readable app\'s name (Use quotes around the name)',
+      '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name set as <widget id> config'
     },
     task: IonicStartTask
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 7504c07ff7..a2d3983eef 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -11,6 +11,7 @@ var IonicLoginTask = function() {};
 IonicLoginTask.prototype = new IonicTask();
 
 IonicLoginTask.prototype.get = function(ionic, callback) {
+  this.cookieData = new IonicStore('cookies');
 
   if(ionic.jar) {
     // already in memory
@@ -30,7 +31,6 @@ IonicLoginTask.prototype.get = function(ionic, callback) {
 
   if(!this.email && !this.password) {
     // did not include cmd line flags, check for existing cookies
-    this.cookieData = new IonicStore('cookies');
     var jar = this.cookieData.get(ionic.IONIC_DASH);
 
     if(jar && jar.cookies && jar.cookies.length) {
diff --git a/package.json b/package.json
index 61e7c55546..bd6dfbe450 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta2",
+  "version": "1.1.0-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 9b0b5caf0029de865111045ca08e8ed17f897f8a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 12:42:34 -0500
Subject: [PATCH 0133/1100] fix cookieData store save

---
 lib/ionic/login.js | 3 +++
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index a2d3983eef..43deb50b83 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -127,6 +127,9 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
 
       if(saveCookies) {
         // save cookies
+        if(!self.cookieData) {
+          self.cookieData = new IonicStore('cookies');
+        }
         self.cookieData.set(ionic.IONIC_DASH, jar);
         self.cookieData.save();
       }
diff --git a/package.json b/package.json
index bd6dfbe450..ac6e047701 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta3",
+  "version": "1.1.0-beta4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From db4fe047b780147e880f2f10a211199b556c5085 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 13:32:42 -0500
Subject: [PATCH 0134/1100] make sure there's a www directory

---
 lib/ionic/serve.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index d7a0e0d08d..6d52b8b08c 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,4 +1,5 @@
 var fs = require('fs'),
+    path = require('path'),
     argv = require('optimist').argv,
     connect = require('connect'),
     open = require('open'),
@@ -28,18 +29,18 @@ IonicServeTask.prototype.run = function(ionic) {
   this._start(ionic);
 };
 
-IonicServeTask.prototype._changed = function(path) {
+IonicServeTask.prototype._changed = function(filePath) {
   // Cleanup the path a bit
   var pwd = process.cwd();
-  path = path.replace(pwd + '/', '');
+  filePath = filePath.replace(pwd + '/', '');
 
-  console.log('Changed', path);
+  console.log( ('  changed: ' + filePath).green );
 
   var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
     path: '/changed',
     method: 'POST',
     body: JSON.stringify({
-      files: [path]
+      files: [filePath]
     })
   }, function(err, res, body) {
     if(err) {
@@ -52,6 +53,10 @@ IonicServeTask.prototype._start = function(ionic) {
   var self = this;
   var app = connect();
 
+  if (!fs.existsSync( path.resolve('www') )) {
+    ionic.fail('"www" directory cannot be found. Make sure the working directory is an Ionic project.');
+  }
+
   if(this.runLivereload) {
     vfs.watch('www/**/*', {
     }, function(f) {

From bec0c92b7d59ce14d64dd42a7c8d42eaee52044b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 13:45:10 -0500
Subject: [PATCH 0135/1100] do not require email, package arg order doesn't
 matter

---
 lib/ionic/package.js | 38 ++++++++++++++++++++++++--------------
 package.json         |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index a94e065aa7..7ff3e2e30e 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -55,12 +55,19 @@ IonicPackageTask.prototype.loadProject = function() {
     this.ionic.fail('No platforms or build mode specified.', 'package');
   }
 
-  this.mode = argv._[1].toLowerCase();
+  this.mode = argv._[2].toLowerCase();
   if(this.mode != 'debug' && this.mode != 'release') {
-    this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
+    // ionic package debug android
+    this.mode = argv._[1].toLowerCase();
+    this.platforms = argv._.slice(2);
+  } else {
+    // ionic package android debug
+    this.platforms = [ argv._[1].toLowerCase() ];
   }
 
-  this.platforms = argv._.slice(2);
+  if(this.mode != 'debug' && this.mode != 'release') {
+    this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
+  }
 
   if(this.platforms.length < 1) {
     this.ionic.fail('No platforms specified.', 'package');
@@ -73,17 +80,21 @@ IonicPackageTask.prototype.loadProject = function() {
 IonicPackageTask.prototype.loadPlugins = function() {
   this.plugins = [];
 
-  var pluginsPath = path.resolve('./plugins/');
-  var pluginDirs = fs.readdirSync(pluginsPath);
+  try {
+    var pluginsPath = path.resolve('./plugins/');
+    var pluginDirs = fs.readdirSync(pluginsPath);
 
-  for(var x=0; x<pluginDirs.length; x++) {
-    try {
-      var plugingPackage = path.resolve(pluginsPath + '/' + pluginDirs[x] + '/package.json');
-      var packageObj = JSON.parse( fs.readFileSync(plugingPackage, { encoding: 'utf8' }) );
-      if(packageObj.repo || packageObj.name) {
-        this.plugins.push(packageObj);
-      }
-    } catch(e) {}
+    for(var x=0; x<pluginDirs.length; x++) {
+      try {
+        var plugingPackage = path.resolve(pluginsPath + '/' + pluginDirs[x] + '/package.json');
+        var packageObj = JSON.parse( fs.readFileSync(plugingPackage, { encoding: 'utf8' }) );
+        if(packageObj.repo || packageObj.name) {
+          this.plugins.push(packageObj);
+        }
+      } catch(e) {}
+    }
+  } catch(pluginError) {
+    this.ionic.fail('Unable to find plugin directory. Make sure the working directory is an Ionic project.');
   }
 };
 
@@ -303,7 +314,6 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 IonicPackageTask.prototype.buildPostRequest = function(platform) {
   var form = new FormData();
 
-  form.append('email', this.project.get('email'));
   form.append('name', this.project.get('name'));
   form.append('platform', platform);
   form.append('build_mode', this.mode);
diff --git a/package.json b/package.json
index ac6e047701..29088a502f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta4",
+  "version": "1.1.0-beta5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 67da9f058206699707f749b7ffe1e401245cd495 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 14:03:40 -0500
Subject: [PATCH 0136/1100] update keywords

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 29088a502f..b057fac894 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,10 @@
   "keywords": [
     "ionic",
     "ionic framework",
+    "ionicframework",
     "mobile",
-    "html5",
+    "app",
+    "hybrid",
     "cordova",
     "phonegap"
   ],

From cdcdafe28013523d8e39d346e182d88adf436123 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 15:11:04 -0500
Subject: [PATCH 0137/1100] no-email flag, ~ resolve path

---
 lib/ionic.js         |  3 ++-
 lib/ionic/package.js | 35 ++++++++++++++++++++++++++---------
 package.json         |  2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 5b10a38354..3200524889 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -63,7 +63,7 @@ var TASKS = [
     },
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name set as <widget id> config'
+      '--id|-i': 'Package name set in the <widget id> config, ie: com.mycompany.myapp'
     },
     task: IonicStartTask
   },
@@ -135,6 +135,7 @@ var TASKS = [
       '--ios-certificate-password|-d': 'iOS certificate password',
       '--ios-profile-file|-f': 'iOS profile file',
       '--output|-o': 'Path to save the packaged app',
+      '--no-email|-n': 'Do not send a build package email',
       '--clear-signing|-l': 'Clear out all signing data from Ionic server',
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password'
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 7ff3e2e30e..089b0d38ff 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -73,6 +73,8 @@ IonicPackageTask.prototype.loadProject = function() {
     this.ionic.fail('No platforms specified.', 'package');
   }
 
+  this.buildStatusEmail = (!argv['no-email'] && !argv.n);
+
   this.loadPlugins();
 };
 
@@ -81,12 +83,12 @@ IonicPackageTask.prototype.loadPlugins = function() {
   this.plugins = [];
 
   try {
-    var pluginsPath = path.resolve('./plugins/');
+    var pluginsPath = resolvePath('./plugins/');
     var pluginDirs = fs.readdirSync(pluginsPath);
 
     for(var x=0; x<pluginDirs.length; x++) {
       try {
-        var plugingPackage = path.resolve(pluginsPath + '/' + pluginDirs[x] + '/package.json');
+        var plugingPackage = resolvePath(pluginsPath + '/' + pluginDirs[x] + '/package.json');
         var packageObj = JSON.parse( fs.readFileSync(plugingPackage, { encoding: 'utf8' }) );
         if(packageObj.repo || packageObj.name) {
           this.plugins.push(packageObj);
@@ -249,6 +251,7 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
       if(this.mode == 'release') {
 
         promptProperties['android-keystore-file']= {
+          name: 'android-keystore-file',
           description: 'Android Keystore File (.keystore):',
           required: true,
           conform: fileExists,
@@ -256,17 +259,20 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
         };
 
         promptProperties['android-keystore-alias'] = {
+          name: 'android-keystore-alias',
           description: 'Keystore Alias:',
           required: true
         };
 
         promptProperties['android-keystore-password'] = {
+          name: 'android-keystore-password',
           description: 'Keystore Password:',
           hidden: true,
           required: true
         };
 
         promptProperties['android-key-password'] = {
+          name: 'android-key-password',
           description: 'Key Password (optional):',
           hidden: true
         };
@@ -275,6 +281,7 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
     } else if(this.platforms[x] == 'ios') {
       // iOS
       promptProperties['ios-certificate-file'] = {
+        name: 'ios-certificate-file',
         description: 'iOS Certificate File (.p12):',
         required: true,
         conform: fileExists,
@@ -282,12 +289,14 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
       };
 
       promptProperties['ios-certificate-password'] = {
+        name: 'ios-certificate-password',
         description: 'Certificate Password:',
         hidden: true,
         required: true
       };
 
       promptProperties['ios-profile-file'] = {
+        name: 'ios-profile-file',
         description: 'iOS Mobile Provisioning Profile (.mobileprovision):',
         required: true,
         conform: fileExists,
@@ -314,7 +323,8 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 IonicPackageTask.prototype.buildPostRequest = function(platform) {
   var form = new FormData();
 
-  form.append('name', this.project.get('name'));
+  form.append('build_status_email', this.buildStatusEmail.toString());
+  form.append('name', this.project.get('name') || '');
   form.append('platform', platform);
   form.append('build_mode', this.mode);
   form.append('csrfmiddlewaretoken', this.jar.cookies[0].value);
@@ -339,13 +349,13 @@ IonicPackageTask.prototype.buildPostRequest = function(platform) {
 
     try {
       inputFile = inputFile.replace(/\\ /g, ' ').trim();
-      form.append(propertyName.replace(/-/g, '_'), fs.createReadStream( path.resolve(inputFile) ) );
+      form.append(propertyName.replace(/-/g, '_'), fs.createReadStream( resolvePath(inputFile) ) );
     } catch(e) {
-      this.ionic.fail("Error loading " + path.resolve(inputFile));
+      this.ionic.fail("Error loading " + resolvePath(inputFile));
     }
   }
 
-  var configFilePath = path.resolve('./config.xml');
+  var configFilePath = resolvePath('./config.xml');
   if(fs.existsSync(configFilePath)){
     var xmlString = fs.readFileSync(configFilePath, { encoding: 'utf8' });
     form.append('config_file', xmlString);
@@ -528,8 +538,8 @@ function downloadBuildPackage(platform, data) {
   var filePath = argv.output;
 
   if(!filePath) {
-    var dirPath = path.resolve('./packages');
-    filePath = path.resolve(dirPath + '/' + data.package_filename);
+    var dirPath = resolvePath('./packages');
+    filePath = resolvePath(dirPath + '/' + data.package_filename);
 
     if(!fs.existsSync(dirPath)) {
       fs.mkdirSync(dirPath);
@@ -578,7 +588,14 @@ function downloadBuildPackage(platform, data) {
 function fileExists(filePath) {
   // check if a file exists with a relative path or absolute path
   filePath = filePath.replace(/\\ /g, ' ').trim();
-  return fs.existsSync(path.resolve(filePath));
+  return fs.existsSync(resolvePath(filePath));
+}
+
+function resolvePath (p) {
+  if (p.substr(0, 1) === '~') {
+    p = process.env.HOME + p.substr(1);
+  }
+  return path.resolve(p);
 }
 
 exports.IonicPackageTask = IonicPackageTask;
diff --git a/package.json b/package.json
index b057fac894..0c89e605b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta5",
+  "version": "1.1.0-beta6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From fd4a3433db7b727fde417c2e6bb177f99c52282d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 15:18:20 -0500
Subject: [PATCH 0138/1100] v1.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0c89e605b6..3f6115f7d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0-beta6",
+  "version": "1.1.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 19e3ad1753506d0d1e0a0d23bbf49e59bef3ec88 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 18 Jul 2014 15:22:10 -0500
Subject: [PATCH 0139/1100] fix start cmd options

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 09bcb96306..9c2fa70028 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ There are three choices of templates:
 * Side-Menu (sidemenu)
 * Tabs (tabs)
 * Blank (blank)
- 
+
 Command-line flags/options:
 
-    -a, --app <APP NAME> ................... your app's name (Use quotes around the name)
-    -p, --package <PACKAGE NAME> ........... package name, such as "com.mycompany.myapp"
+    --app-name, -a  ........................  Human readable name for the app (Use quotes around the name)
+    --id, -i  ..............................  Package name set in the <widget id> config, ie: com.mycompany.myapp
 
 
 ## Testing in a Browser

From d7c0b9a55d04501080a0de9f12ddd360769d5878 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Sat, 19 Jul 2014 13:32:30 -0500
Subject: [PATCH 0140/1100] Update serve.js

---
 lib/ionic/serve.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 6d52b8b08c..90a4a71243 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -19,7 +19,6 @@ IonicServeTask.prototype = new IonicTask();
 IonicServeTask.prototype.run = function(ionic) {
   var project = IonicProject.load();
 
-  // Grab the name of the app
   this.port = argv._[1] || 8100;
   this.liveReloadPort = argv._[2] || 35729;
 

From a10db157a41384f05cfd73837dbc0c3f0f0abc1d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Sat, 19 Jul 2014 13:32:48 -0500
Subject: [PATCH 0141/1100] Update platform.js

---
 lib/ionic/platform.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index fd91a80780..c7cd0476a9 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -18,7 +18,6 @@ IonicPlatformTask.prototype.run = function(ionic) {
     ionic.fail('No platforms specified.', 'platform');
   }
 
-  // Grab the name of the app
   var argPlatforms = argv._.slice(1);
 
   var cordovaArgs = ['add', 'remove', 'rm', 'list', 'ls', 'update', 'up'];

From a118acd7f6293d6a5a07a31a0972735e420240e1 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 19 Jul 2014 21:34:56 -0500
Subject: [PATCH 0142/1100] fix promise resolve

---
 lib/ionic.js       |  2 +-
 lib/ionic/start.js | 20 +++++++++++++-------
 package.json       |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 3200524889..6867733e13 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -63,7 +63,7 @@ var TASKS = [
     },
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name set in the <widget id> config, ie: com.mycompany.myapp'
+      '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp'
     },
     task: IonicStartTask
   },
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index fcfc675460..23c5c5e054 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -186,7 +186,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       self._updateConfigXml();
 
       self._installCordovaPlugins().then(function(output) {
-        pluginQ.resolve(stdout);
+        pluginQ.resolve();
       }, function(err) {
         pluginQ.reject(err);
       });
@@ -206,7 +206,11 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     });
 
   }, function(err) {
-    Ionic.fail('Unable to grab wrapper project:'.error.bold, err);
+    Ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
+
+  }).catch(function(err) {
+    console.error('Error: Unable to fetch wrapper: HTTP:'.error.bold,  err.statusCode, err);
+    Ionic.fail('');
   });
 
 };
@@ -217,12 +221,14 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\n * cd into your project:', ('$ cd ' + projectDirectory).info.bold);
   console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
   console.log('    Note: iOS development requires OS X currently'.small);
-  console.log('    See the Android Platform Guid for full Android installation instructions: https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
-  console.log('\n * Build your app:', 'ionic build [platform]'.info.bold);
-  console.log('\n * Simulate your app:', 'ionic emulate [platform]'.info.bold);
-  console.log('\n * Run your app on a device:', 'ionic run [platform]'.info.bold);
+  console.log('    See the Android Platform Guid for full Android installation instructions:'.small);
+  console.log('    https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
+  console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
+  console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
+  console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);
   console.log('\n * Develop in the browser with live reload:', 'ionic serve'.info.bold);
-  console.log('\n\nFor more help, visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold);
+  console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.info.bold);
+  console.log('\n\nFor more help use', 'ionic --help'.info.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold, '\n');
 };
 
 IonicStartTask.prototype._writeProjectFile = function(ionic) {
diff --git a/package.json b/package.json
index 3f6115f7d3..3c6ab7c240 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.0",
+  "version": "1.1.1-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a38b6b6d99f4946a59918c0c15a955d6e935fd8f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 19 Jul 2014 22:19:11 -0500
Subject: [PATCH 0143/1100] check latest npm version

---
 lib/ionic.js | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 6867733e13..071d9aa1ce 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -312,8 +312,7 @@ Ionic = {
 
   run: function() {
     if(argv.version || argv.v) {
-      console.log('Ionic CLI version ' + settings.version);
-      process.exit(0);
+      return this.version();
     }
 
     if(argv.help || argv.h) {
@@ -346,6 +345,36 @@ Ionic = {
     process.exit(1);
   },
 
+  version: function() {
+    process.stderr.write('Installed Ionic CLI version: ' + settings.version + '\n');
+    process.stderr.write('Latest npm version: ');
+
+    try {
+      var child = spawn('npm', ['show', 'ionic', 'version']);
+      child.stdout.setEncoding('utf8');
+      child.stdout.on('data', function(npmVersion) {
+        process.stderr.write(npmVersion.trim() + '\n');
+
+        if(npmVersion.trim() != settings.version.trim()) {
+          process.stderr.write('Use ' + 'npm update -g ionic'.bold + ' to update to the latest version\n\n');
+        }
+
+      });
+      child.stderr.on('data', function(data) {
+        process.stderr.clearLine();
+        process.stderr.cursorTo(0);
+        process.stderr.write('Error loading current npm version: ' + data);
+      });
+      child.on('error', function(err) {
+        process.stderr.clearLine();
+        process.stderr.cursorTo(0);
+        process.stderr.write('Error loading current npm version: ' + err);
+      });
+    } catch(e) {
+      console.log(e)
+    }
+  },
+
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {
     var q = Q.defer();
     var child;
@@ -355,7 +384,6 @@ Ionic = {
     } catch(e) {
     }
     child.stdout.setEncoding('utf8');
-    child.stderr.setEncoding('utf8');
     child.stdout.on('data', function(data) {
       process.stdout.write(data);
       onStdOut && onStdOut(data);

From e7b95e0b09b612f1bd9bdbc31274a4dae0f6905e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 19 Jul 2014 22:47:51 -0500
Subject: [PATCH 0144/1100] more error catching

---
 lib/ionic.js       | 13 ++++++++++---
 lib/ionic/start.js |  2 ++
 package.json       |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 071d9aa1ce..e9160a534f 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -427,6 +427,9 @@ Ionic = {
       writeStream.on('close', function() {
         q.resolve(repoFolderName);
       });
+      writeStream.on('error', function(err) {
+        q.reject(err);
+      });
       readStream.pipe(writeStream);
     };
 
@@ -435,9 +438,13 @@ Ionic = {
         q.reject(res);
         return;
       }
-      tempZipFileStream.write(body);
-      tempZipFileStream.close();
-      unzipRepo(tempZipFilePath);
+      try {
+        tempZipFileStream.write(body);
+        tempZipFileStream.close();
+        unzipRepo(tempZipFilePath);
+      } catch(e) {
+        q.reject(e);
+      }
     });
 
     return q.promise;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 23c5c5e054..38347ee4aa 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -93,6 +93,8 @@ IonicStartTask.prototype._fetchWrapper = function() {
     q.resolve(self.targetPath);
   }, function(err) {
     q.reject(err);
+  }).catch(function(err) {
+    Ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
   });
 
   return q.promise;
diff --git a/package.json b/package.json
index 3c6ab7c240..2c7376feae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.1-beta1",
+  "version": "1.1.1-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 3adb15900ebc504ced2b8746f4e2f2b598deeafe Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 19 Jul 2014 23:37:39 -0500
Subject: [PATCH 0145/1100] --no-cordova option

---
 lib/ionic.js       |  7 ++++---
 lib/ionic/start.js | 44 ++++++++++++++++++++++++++++++--------------
 package.json       |  2 +-
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index e9160a534f..407d98b85e 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -63,7 +63,8 @@ var TASKS = [
     },
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp'
+      '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp',
+      '--no-cordova|-n': 'Do not create an app targeted for Cordova'
     },
     task: IonicStartTask
   },
@@ -353,10 +354,10 @@ Ionic = {
       var child = spawn('npm', ['show', 'ionic', 'version']);
       child.stdout.setEncoding('utf8');
       child.stdout.on('data', function(npmVersion) {
-        process.stderr.write(npmVersion.trim() + '\n');
+        process.stderr.write(npmVersion.trim() + '\n\n');
 
         if(npmVersion.trim() != settings.version.trim()) {
-          process.stderr.write('Use ' + 'npm update -g ionic'.bold + ' to update to the latest version\n\n');
+          process.stderr.write(' * Use ' + 'npm update -g ionic'.info.bold + ' to update to the latest version\n\n');
         }
 
       });
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 38347ee4aa..0956a07249 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -53,6 +53,7 @@ IonicStartTask.prototype.run = function(ionic) {
   }
 
   this.packageName = argv.id || argv.i;
+  this.isCordovaProject = (argv.cordova !== false && !argv.n);
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
   var starterProject = argv.template || argv.t || argv._[2] || 'tabs';
@@ -90,6 +91,14 @@ IonicStartTask.prototype._fetchWrapper = function() {
     rm('-rf', self.targetPath + '/' + repoFolderName + '/');
     cd(self.targetPath);
 
+    if(!self.isCordovaProject) {
+      // remove any cordova files/directories if they only want the www
+      var cordovaFiles = ['hooks/', 'platforms/', 'plugins/', 'config.xml'];
+      for(var x=0; x<cordovaFiles.length; x++) {
+        rm('-rf', self.targetPath + '/' + cordovaFiles[x]);
+      }
+    }
+
     q.resolve(self.targetPath);
   }, function(err) {
     q.reject(err);
@@ -184,14 +193,18 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       // Clean up start template folder
       rm('-rf', self.targetPath + '/' + repoFolderName + '/');
 
-      // update the config.xml file from cmd line args
-      self._updateConfigXml();
+      if(self.isCordovaProject) {
+        // update the config.xml file from cmd line args
+        self._updateConfigXml();
 
-      self._installCordovaPlugins().then(function(output) {
+        self._installCordovaPlugins().then(function(output) {
+          pluginQ.resolve();
+        }, function(err) {
+          pluginQ.reject(err);
+        });
+      } else {
         pluginQ.resolve();
-      }, function(err) {
-        pluginQ.reject(err);
-      });
+      }
 
       pluginQ.promise.then(function() {
         self._printQuickHelp(self.appDirectory);
@@ -221,15 +234,18 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   console.log('\nYour Ionic project is ready to go!'.green.bold);
   console.log('\nSome quick tips:');
   console.log('\n * cd into your project:', ('$ cd ' + projectDirectory).info.bold);
-  console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
-  console.log('    Note: iOS development requires OS X currently'.small);
-  console.log('    See the Android Platform Guid for full Android installation instructions:'.small);
-  console.log('    https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
-  console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
-  console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
-  console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);
   console.log('\n * Develop in the browser with live reload:', 'ionic serve'.info.bold);
-  console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.info.bold);
+
+  if(this.isCordovaProject) {
+    console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
+    console.log('    Note: iOS development requires OS X currently'.small);
+    console.log('    See the Android Platform Guid for full Android installation instructions:'.small);
+    console.log('    https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
+    console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
+    console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
+    console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);
+    console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.info.bold);
+  }
   console.log('\n\nFor more help use', 'ionic --help'.info.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold, '\n');
 };
 
diff --git a/package.json b/package.json
index 2c7376feae..85cdfed33d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.1-beta2",
+  "version": "1.1.1-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From fba948f4d505126185b30c06dbb1df533c01587d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 21 Jul 2014 10:45:56 -0500
Subject: [PATCH 0146/1100] fix latest version print out

---
 lib/ionic.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 407d98b85e..98ade02569 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -348,32 +348,18 @@ Ionic = {
 
   version: function() {
     process.stderr.write('Installed Ionic CLI version: ' + settings.version + '\n');
-    process.stderr.write('Latest npm version: ');
 
     try {
       var child = spawn('npm', ['show', 'ionic', 'version']);
       child.stdout.setEncoding('utf8');
       child.stdout.on('data', function(npmVersion) {
-        process.stderr.write(npmVersion.trim() + '\n\n');
-
+        process.stderr.write('Latest npm version: ' + npmVersion.trim() + '\n\n');
         if(npmVersion.trim() != settings.version.trim()) {
           process.stderr.write(' * Use ' + 'npm update -g ionic'.info.bold + ' to update to the latest version\n\n');
         }
 
       });
-      child.stderr.on('data', function(data) {
-        process.stderr.clearLine();
-        process.stderr.cursorTo(0);
-        process.stderr.write('Error loading current npm version: ' + data);
-      });
-      child.on('error', function(err) {
-        process.stderr.clearLine();
-        process.stderr.cursorTo(0);
-        process.stderr.write('Error loading current npm version: ' + err);
-      });
-    } catch(e) {
-      console.log(e)
-    }
+    } catch(e) {}
   },
 
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {

From 7aa51514aa601d63ea144f8f06773808269f7221 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 21 Jul 2014 14:24:11 -0500
Subject: [PATCH 0147/1100] print latest version on all tasks

---
 lib/ionic.js          | 53 +++++++++++++++++++++++++++++++++++--------
 lib/ionic/build.js    |  6 ++---
 lib/ionic/emulate.js  |  6 ++---
 lib/ionic/login.js    | 12 +++++-----
 lib/ionic/package.js  | 38 +++++++++++++++----------------
 lib/ionic/platform.js |  4 ++--
 lib/ionic/run.js      |  6 ++---
 lib/ionic/serve.js    |  8 +++++--
 lib/ionic/start.js    | 18 +++++++--------
 lib/ionic/upload.js   | 10 ++++----
 package.json          |  2 +-
 11 files changed, 100 insertions(+), 63 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 98ade02569..2410678240 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -275,7 +275,7 @@ Ionic = {
     }
 
     process.stderr.write('\n');
-    process.exit(1);
+    this.processExit(1);
   },
 
   _printHelpLines: function() {
@@ -290,7 +290,7 @@ Ionic = {
     }
 
     process.stderr.write('\n');
-    process.exit(1);
+    this.processExit(1);
   },
 
   _printIonic: function() {
@@ -312,6 +312,14 @@ Ionic = {
   },
 
   run: function() {
+    var self = this;
+
+    self.checkLatestVersion();
+
+    process.on('exit', function(){
+      self.printVersionWarning();
+    });
+
     if(argv.version || argv.v) {
       return this.version();
     }
@@ -343,23 +351,48 @@ Ionic = {
       }
     }
     process.stderr.write('\n');
-    process.exit(1);
+    this.processExit(1);
   },
 
   version: function() {
     process.stderr.write('Installed Ionic CLI version: ' + settings.version + '\n');
+  },
 
-    try {
+  checkLatestVersion: function() {
+    this.latestVersion = Q.defer();
+    var self = this;
+
+    if(settings.version.indexOf('beta') > -1) {
+      // don't bother if its a beta version
+      this.latestVersion.resolve();
+    } else {
+      // check the latest version in npm
       var child = spawn('npm', ['show', 'ionic', 'version']);
       child.stdout.setEncoding('utf8');
       child.stdout.on('data', function(npmVersion) {
-        process.stderr.write('Latest npm version: ' + npmVersion.trim() + '\n\n');
-        if(npmVersion.trim() != settings.version.trim()) {
-          process.stderr.write(' * Use ' + 'npm update -g ionic'.info.bold + ' to update to the latest version\n\n');
-        }
-
+        self.npmVersion = npmVersion.trim();
+        self.latestVersion.resolve();
       });
-    } catch(e) {}
+      child.stdout.on('error', function() {
+        self.latestVersion.resolve();
+      });
+    }
+  },
+
+  printVersionWarning: function() {
+    if(this.npmVersion && this.npmVersion != settings.version.trim()) {
+      process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
+      process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
+      process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
+      process.stdout.write( ' * Use '.yellow + 'npm update -g ionic'.info.bold + ' to update to the latest version\n\n'.yellow );
+      this.npmVersion = null;
+    }
+  },
+
+  processExit: function(code) {
+    this.latestVersion.promise.then(function(){
+      process.exit(code);
+    });
   },
 
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 60a91c6d8c..ca2396bfec 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -15,13 +15,13 @@ IonicBuildTask.prototype = new IonicTask();
 
 IonicBuildTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No platforms specified.', 'build');
+    return ionic.fail('No platforms specified.', 'build');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified.', 'build');
+    return ionic.fail('No platforms specified.', 'build');
   }
 
   IonicStats.t('build', { 'platform': platforms.join(',') });
@@ -30,7 +30,7 @@ IonicBuildTask.prototype.run = function(ionic) {
     var platform = platforms[i];
     console.log('Building platform', platform);
     if(exec("cordova build " + platform).code !== 0) {
-      ionic.fail('Unable to build app on platform ' + platform + '. Please see console for more info.');
+      return ionic.fail('Unable to build app on platform ' + platform + '. Please see console for more info.');
     }
   }
 };
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index ca30dffb5c..1798615f93 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -18,13 +18,13 @@ IonicEmulateTask.prototype.run = function(ionic) {
   var patform;
 
   if(argv._.length < 2) {
-    ionic.fail('No platforms specified.', 'emulate');
+    return ionic.fail('No platforms specified.', 'emulate');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified.', 'emulate');
+    return ionic.fail('No platforms specified.', 'emulate');
   }
 
   IonicStats.t('emulate', { 'platform': platforms.join(',') });
@@ -33,7 +33,7 @@ IonicEmulateTask.prototype.run = function(ionic) {
     platform = platforms[i];
     console.log('Emulating app on platform', platform);
     if(exec("cordova emulate " + platform).code !== 0) {
-      ionic.fail('Unable to emulate app on platform ' + platform + '. Please see console for more info.');
+      return ionic.fail('Unable to emulate app on platform ' + platform + '. Please see console for more info.');
     }
   }
 };
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 43deb50b83..1b918a411a 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -23,10 +23,10 @@ IonicLoginTask.prototype.get = function(ionic, callback) {
   this.password = argv.password || argv.p || process.env.IONIC_PASSWORD;
 
   if(!this.email && this.password) {
-    ionic.fail('--email or -e command line flag, or IONIC_EMAIL environment variable required');
+    return ionic.fail('--email or -e command line flag, or IONIC_EMAIL environment variable required');
   }
   if(this.email && !this.password) {
-    ionic.fail('--password or -p command line flag, or IONIC_PASSWORD environment variable required');
+    return ionic.fail('--password or -p command line flag, or IONIC_PASSWORD environment variable required');
   }
 
   if(!this.email && !this.password) {
@@ -76,7 +76,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 
     prompt.get(schema, function (err, result) {
       if(err) {
-        ionic.fail('Error logging in: ' + err);
+        return ionic.fail('Error logging in: ' + err);
       }
 
       self.email = result.email;
@@ -102,7 +102,7 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
   },
   function(err, response, body) {
     if(err || jar.cookies.length === 0) {
-      ionic.fail('Error logging in: ' + err);
+      return ionic.fail('Error logging in: ' + err);
     }
 
     request({
@@ -117,12 +117,12 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
     },
     function (err, response, body) {
       if(err) {
-        ionic.fail('Error logging in: ' + err);
+        return ionic.fail('Error logging in: ' + err);
       }
 
       // Should be a 302 redirect status code if correct
       if(response.statusCode != 302) {
-        ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH +' for help.');
+        return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH +' for help.');
       }
 
       if(saveCookies) {
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 089b0d38ff..3f57ac1fb1 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -52,7 +52,7 @@ IonicPackageTask.prototype.loadProject = function() {
   console.log( ('Loading ' + appName + '...').bold.yellow );
 
   if(argv._.length < 3) {
-    this.ionic.fail('No platforms or build mode specified.', 'package');
+    return this.ionic.fail('No platforms or build mode specified.', 'package');
   }
 
   this.mode = argv._[2].toLowerCase();
@@ -66,11 +66,11 @@ IonicPackageTask.prototype.loadProject = function() {
   }
 
   if(this.mode != 'debug' && this.mode != 'release') {
-    this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
+    return this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
   }
 
   if(this.platforms.length < 1) {
-    this.ionic.fail('No platforms specified.', 'package');
+    return this.ionic.fail('No platforms specified.', 'package');
   }
 
   this.buildStatusEmail = (!argv['no-email'] && !argv.n);
@@ -96,7 +96,7 @@ IonicPackageTask.prototype.loadPlugins = function() {
       } catch(e) {}
     }
   } catch(pluginError) {
-    this.ionic.fail('Unable to find plugin directory. Make sure the working directory is an Ionic project.');
+    return this.ionic.fail('Unable to find plugin directory. Make sure the working directory is an Ionic project.');
   }
 };
 
@@ -116,7 +116,7 @@ IonicPackageTask.prototype.getCmdLineOptions = function() {
     var value = argv[propertyName] || argv[shortName];
     if(value) {
       if(!fileExists(value)) {
-        self.ionic.fail("Unable to find file: " + argv[propertyName]);
+        return self.ionic.fail("Unable to find file: " + argv[propertyName]);
       }
       self.inputFiles[propertyName] = value;
       self.useCmdArgs = true;
@@ -169,7 +169,7 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
 
   request(options, function(err, response, body) {
     if(err) {
-      self.ionic.fail("Error loading app signing info: " + err);
+      return self.ionic.fail("Error loading app signing info: " + err);
     }
 
     if(response.statusCode == 200) {
@@ -177,11 +177,11 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
         self.signing = JSON.parse(body);
 
         if(!self.signing) {
-          self.ionic.fail("Invalid app signing information");
+          return self.ionic.fail("Invalid app signing information");
         }
 
       } catch(e) {
-        self.ionic.fail("Error parsing app signing: " + e);
+        return self.ionic.fail("Error parsing app signing: " + e);
       }
     }
 
@@ -206,7 +206,7 @@ IonicPackageTask.prototype.initPlatforms = function() {
 
     prompt.get({properties: promptProperties}, function (err, promptResult) {
       if(err) {
-        self.ionic.fail('Error packaging: ' + err);
+        return self.ionic.fail('Error packaging: ' + err);
       }
 
       for(var propertyName in promptResult) {
@@ -351,7 +351,7 @@ IonicPackageTask.prototype.buildPostRequest = function(platform) {
       inputFile = inputFile.replace(/\\ /g, ' ').trim();
       form.append(propertyName.replace(/-/g, '_'), fs.createReadStream( resolvePath(inputFile) ) );
     } catch(e) {
-      this.ionic.fail("Error loading " + resolvePath(inputFile));
+      return this.ionic.fail("Error loading " + resolvePath(inputFile));
     }
   }
 
@@ -387,7 +387,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
   },
   function(err, response) {
     if(err) {
-      self.ionic.fail("Error packaging " + platform + ": " + err);
+      return self.ionic.fail("Error packaging " + platform + ": " + err);
     }
 
     response.setEncoding('utf8');
@@ -431,7 +431,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
         self.project.save();
 
       } catch(e) {
-        self.ionic.fail('Error submitPostRequest: ' + e);
+        return self.ionic.fail('Error submitPostRequest: ' + e);
       }
     });
 
@@ -446,7 +446,7 @@ IonicPackageTask.prototype.clearSigning = function() {
   var appId = self.project.get('app_id');
 
   if(!appId) {
-    self.ionic.fail('App Id is not known');
+    return self.ionic.fail('App Id is not known');
   }
 
   var login = new IonicLoginTask();
@@ -462,7 +462,7 @@ IonicPackageTask.prototype.clearSigning = function() {
 
     request(options, function(err, response, body) {
       if(err) {
-        self.ionic.fail("Error clearing app signing: " + err);
+        return self.ionic.fail("Error clearing app signing: " + err);
       }
       console.log( ('App (' + appId + ') signing and credential information cleared\n').green );
     });
@@ -480,7 +480,7 @@ function pingBuildStatus(ionic, requestOptions, platform, attempt) {
 
   request(requestOptions, function(err, response, body) {
     if(err) {
-      ionic.fail("\nError pinging build status: " + err);
+      return ionic.fail("\nError pinging build status: " + err);
     }
 
     try {
@@ -508,7 +508,7 @@ function pingBuildStatus(ionic, requestOptions, platform, attempt) {
         attempt++;
 
         if(attempt > 60) {
-          ionic.fail("\nUnable to receive build status");
+          return ionic.fail("\nUnable to receive build status");
         }
 
         setTimeout(function(){
@@ -517,15 +517,15 @@ function pingBuildStatus(ionic, requestOptions, platform, attempt) {
 
       } else if(d.status == 4) {
         console.log("Use 'ionic package --clear-signing' to clear app signing and credential data if needed.".bold.red);
-        ionic.fail("Build failed");
+        return ionic.fail("Build failed");
       } else if(d.status == 3) {
         downloadBuildPackage(platform, d);
       } else {
-        ionic.fail("\nError receiving build status");
+        return ionic.fail("\nError receiving build status");
       }
 
     } catch(e) {
-      ionic.fail("\nError pinging build status: " + e);
+      return ionic.fail("\nError pinging build status: " + e);
     }
 
   });
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index c7cd0476a9..b5b326ed5e 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -15,7 +15,7 @@ IonicPlatformTask.prototype = new IonicTask();
 
 IonicPlatformTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No platforms specified.', 'platform');
+    return ionic.fail('No platforms specified.', 'platform');
   }
 
   var argPlatforms = argv._.slice(1);
@@ -38,7 +38,7 @@ IonicPlatformTask.prototype.run = function(ionic) {
   }
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified.', 'platform');
+    return ionic.fail('No platforms specified.', 'platform');
   }
 
   if(cordovaArg == 'add') {
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 51ccd6130f..76c4752e32 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -15,13 +15,13 @@ IonicRunTask.prototype = new IonicTask();
 
 IonicRunTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('No platforms specified.', 'run');
+    return ionic.fail('No platforms specified.', 'run');
   }
 
   var platforms = argv._.slice(1);
 
   if(platforms.length < 1) {
-    ionic.fail('No platforms specified.', 'run');
+    return ionic.fail('No platforms specified.', 'run');
   }
 
   IonicStats.t('run', { 'platform': platforms.join(',') });
@@ -30,7 +30,7 @@ IonicRunTask.prototype.run = function(ionic) {
     var platform = platforms[i];
     console.log('Running app on platform', platform);
     if(exec("cordova run " + platform).code !== 0) {
-      ionic.fail('Unable to run app on platform ' + platform + '. Please see console for more info.');
+      return ionic.fail('Unable to run app on platform ' + platform + '. Please see console for more info.');
     }
   }
 };
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 2d17238155..448c63e3b8 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -26,6 +26,10 @@ IonicServeTask.prototype.run = function(ionic) {
   this.runLivereload = !argv.nolivereload && !argv.r;
 
   this._start(ionic);
+
+  ionic.latestVersion.promise.then(function(){
+    ionic.printVersionWarning();
+  });
 };
 
 IonicServeTask.prototype._changed = function(filePath) {
@@ -53,7 +57,7 @@ IonicServeTask.prototype._start = function(ionic) {
   var app = connect();
 
   if (!fs.existsSync( path.resolve('www') )) {
-    ionic.fail('"www" directory cannot be found. Make sure the working directory is an Ionic project.');
+    return ionic.fail('"www" directory cannot be found. Make sure the working directory is an Ionic project.');
   }
 
   if(this.runLivereload) {
@@ -65,7 +69,7 @@ IonicServeTask.prototype._start = function(ionic) {
     server = tinylr();
     server.listen(this.liveReloadPort, function(err) {
       if(err) {
-        ionic.fail('Unable to start live reload server:', err);
+        return ionic.fail('Unable to start live reload server:', err);
       } else {
         console.log('Running live reload server at', (self.host(self.liveReloadPort).info.bold) );
         if(self.launchBrowser) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0956a07249..f618ec0a25 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -38,7 +38,7 @@ IonicStartTask.prototype = new IonicTask();
 
 IonicStartTask.prototype.run = function(ionic) {
   if(argv._.length < 2) {
-    ionic.fail('Invalid command', 'start');
+    return ionic.fail('Invalid command', 'start');
   }
 
   // Grab the app's relative directory name
@@ -103,7 +103,7 @@ IonicStartTask.prototype._fetchWrapper = function() {
   }, function(err) {
     q.reject(err);
   }).catch(function(err) {
-    Ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
+    return Ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
   });
 
   return q.promise;
@@ -138,7 +138,7 @@ IonicStartTask.prototype._updateConfigXml = function() {
     var parseString = xml2js.parseString;
     parseString(configString, function (err, jsonConfig) {
       if(err) {
-        Ionic.fail('Error parsing config.xml: ' + err);
+        return Ionic.fail('Error parsing config.xml: ' + err);
       }
 
       if(!self.packageName) {
@@ -154,13 +154,13 @@ IonicStartTask.prototype._updateConfigXml = function() {
 
       fs.writeFile(configXmlPath, configString, function(err) {
         if(err) {
-          Ionic.fail('Error saving config.xml file: ' + err);
+          return Ionic.fail('Error saving config.xml file: ' + err);
         }
       });
     });
 
   } catch(e) {
-    Ionic.fail('Error updating config.xml file: ' + e);
+    return Ionic.fail('Error updating config.xml file: ' + e);
   }
 };
 
@@ -209,7 +209,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       pluginQ.promise.then(function() {
         self._printQuickHelp(self.appDirectory);
       }, function(err) {
-        Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+        return Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
       });
 
       IonicStats.t('start', {});
@@ -217,15 +217,15 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
     }).catch(function(err) {
       console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode, err);
       console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
-      Ionic.fail('');
+      return Ionic.fail('');
     });
 
   }, function(err) {
-    Ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
+    return Ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
 
   }).catch(function(err) {
     console.error('Error: Unable to fetch wrapper: HTTP:'.error.bold,  err.statusCode, err);
-    Ionic.fail('');
+    return Ionic.fail('');
   });
 
 };
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 08ac6ee9e3..05a14d5eee 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -35,7 +35,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
     archive.finalize(function(err, bytes) {
       if(err) {
-        ionic.fail("Error uploading: " + err);
+        return ionic.fail("Error uploading: " + err);
       }
     });
 
@@ -64,7 +64,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
         rm('-f', TEMP_FILENAME);
         if(err) {
-          ionic.fail("Error uploading: " + err);
+          return ionic.fail("Error uploading: " + err);
         }
 
         response.setEncoding('utf8');
@@ -76,7 +76,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
                 console.log( (d.errors[j]).bold.error );
               }
               q.reject('upload_error');
-              ionic.fail('Unable to upload app');
+              return ionic.fail('Unable to upload app');
             }
 
             if(response.statusCode == 200) {
@@ -90,7 +90,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
                   callback();
                 } catch(callbackEx) {
                   q.reject('upload_error');
-                  ionic.fail('Error upload callback: ' + callbackEx);
+                  return ionic.fail('Error upload callback: ' + callbackEx);
                 }
               }
 
@@ -104,7 +104,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
 
           } catch(parseEx) {
             q.reject('upload_error');
-            ionic.fail('Error upload response: ' + parseEx);
+            return ionic.fail('Error upload response: ' + parseEx);
           }
         });
 
diff --git a/package.json b/package.json
index 85cdfed33d..9fbb4efe91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.1-beta3",
+  "version": "1.1.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 254f955ac2648deaf335ae2aa35e74800c1f5263 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 21 Jul 2014 14:27:11 -0500
Subject: [PATCH 0148/1100] --no-cordova option

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9c2fa70028..e3bc7ffe56 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Command-line flags/options:
 
     --app-name, -a  ........................  Human readable name for the app (Use quotes around the name)
     --id, -i  ..............................  Package name set in the <widget id> config, ie: com.mycompany.myapp
+    --no-cordova, -n  ......................  Do not create an app targeted for Cordova
 
 
 ## Testing in a Browser

From 9c69de3e98511de810307b37577bd58b56918750 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 22 Jul 2014 17:06:25 -0500
Subject: [PATCH 0149/1100] Removed version check for now

---
 lib/ionic.js | 10 ++++++----
 package.json |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2410678240..158b1c032f 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -314,11 +314,11 @@ Ionic = {
   run: function() {
     var self = this;
 
-    self.checkLatestVersion();
+    //self.checkLatestVersion();
 
-    process.on('exit', function(){
-      self.printVersionWarning();
-    });
+    //process.on('exit', function(){
+      //self.printVersionWarning();
+    //});
 
     if(argv.version || argv.v) {
       return this.version();
@@ -390,9 +390,11 @@ Ionic = {
   },
 
   processExit: function(code) {
+    /*
     this.latestVersion.promise.then(function(){
       process.exit(code);
     });
+    */
   },
 
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {
diff --git a/package.json b/package.json
index 9fbb4efe91..8a9275b057 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 330fc4c442d0325ca0097c86dfbefe0412742a47 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 22 Jul 2014 17:13:24 -0500
Subject: [PATCH 0150/1100] V bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a9275b057..f57f2280b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ff3a59c1f22543a6316e5899b78bc6247bd04a9e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 22 Jul 2014 17:35:00 -0500
Subject: [PATCH 0151/1100] Bold formatting

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 158b1c032f..7092421cf5 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -270,7 +270,7 @@ Ionic = {
         while((name + dots).length < 20) {
           dots += '.';
         }
-        process.stderr.write(name.green + dots.grey + '  ' + task.summary + '\n');
+        process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary + '\n');
       }
     }
 

From 3ce81471efcd9dbb79b872cfc3605557ea54dd79 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 22 Jul 2014 22:34:09 -0500
Subject: [PATCH 0152/1100] use http api to check for latest ionic version

Prefer the http api over spawning `npm show ionic version` due to
possible npm version issues and the command line hassles.
---
 lib/ionic.js | 41 ++++++++++++++++++++++++-----------------
 package.json |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 7092421cf5..2d243e6ed3 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -24,6 +24,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
     IonicServeTask = require('./ionic/serve'),
     IonicProject = require('./ionic/project'),
+    IonicStore = require('./ionic/store').IonicStore,
     path = require('path'),
     request = require('request'),
     os = require('os'),
@@ -314,11 +315,11 @@ Ionic = {
   run: function() {
     var self = this;
 
-    //self.checkLatestVersion();
+    self.checkLatestVersion();
 
-    //process.on('exit', function(){
-      //self.printVersionWarning();
-    //});
+    process.on('exit', function(){
+      self.printVersionWarning();
+    });
 
     if(argv.version || argv.v) {
       return this.version();
@@ -362,21 +363,29 @@ Ionic = {
     this.latestVersion = Q.defer();
     var self = this;
 
-    if(settings.version.indexOf('beta') > -1) {
-      // don't bother if its a beta version
-      this.latestVersion.resolve();
-    } else {
-      // check the latest version in npm
-      var child = spawn('npm', ['show', 'ionic', 'version']);
-      child.stdout.setEncoding('utf8');
-      child.stdout.on('data', function(npmVersion) {
-        self.npmVersion = npmVersion.trim();
+    try {
+      // stay silent if it errors
+      var ionicConfig = new IonicStore('ionic.config');
+      var versionCheck = ionicConfig.get('versionCheck');
+      if(versionCheck && ((versionCheck + 86400000) > Date.now() )) {
+        // we've recently checked for the latest version, so don't bother again
         self.latestVersion.resolve();
-      });
-      child.stdout.on('error', function() {
+        return;
+      }
+
+      var proxy = process.env.PROXY || null;
+      request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
+        try {
+          self.npmVersion = JSON.parse(body).version;
+          ionicConfig.set('versionCheck', Date.now());
+          ionicConfig.save();
+        } catch(e) {}
         self.latestVersion.resolve();
       });
+    } catch(e) {
+      self.latestVersion.resolve();
     }
+
   },
 
   printVersionWarning: function() {
@@ -390,11 +399,9 @@ Ionic = {
   },
 
   processExit: function(code) {
-    /*
     this.latestVersion.promise.then(function(){
       process.exit(code);
     });
-    */
   },
 
   spawnPromise: function(cmd, args, onStdOut, onStdErr) {
diff --git a/package.json b/package.json
index f57f2280b1..d17e1a1114 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 12c45c77358ab083d6fc4ca141f30d1553c1506c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 24 Jul 2014 22:08:17 -0500
Subject: [PATCH 0153/1100] v1.1.5

---
 README.md             |  14 ++-
 lib/ionic.js          | 122 +++++++++++++-------
 lib/ionic/build.js    |  38 ------
 lib/ionic/cordova.js  |  21 ++++
 lib/ionic/emulate.js  |  41 -------
 lib/ionic/lib.js      | 260 ++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/login.js    |   9 +-
 lib/ionic/package.js  |  56 +++++----
 lib/ionic/platform.js |  57 ---------
 lib/ionic/run.js      |  38 ------
 lib/ionic/serve.js    |   2 +
 lib/ionic/start.js    |  33 +++---
 lib/ionic/stats.js    |  83 +++++++++++++-
 lib/ionic/upload.js   |   8 +-
 package.json          |   2 +-
 15 files changed, 520 insertions(+), 264 deletions(-)
 delete mode 100644 lib/ionic/build.js
 create mode 100644 lib/ionic/cordova.js
 delete mode 100644 lib/ionic/emulate.js
 create mode 100644 lib/ionic/lib.js
 delete mode 100644 lib/ionic/platform.js
 delete mode 100644 lib/ionic/run.js

diff --git a/README.md b/README.md
index e3bc7ffe56..2e6ed11ac3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful. Use `ionic --help` for detailed task information.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
+
+Use the `ionic --help` command for more detailed task information.
 
 ## Installing
 
@@ -25,7 +27,7 @@ Command-line flags/options:
 
     --app-name, -a  ........................  Human readable name for the app (Use quotes around the name)
     --id, -i  ..............................  Package name set in the <widget id> config, ie: com.mycompany.myapp
-    --no-cordova, -n  ......................  Do not create an app targeted for Cordova
+    --no-cordova, -w  ......................  Do not create an app targeted for Cordova
 
 
 ## Testing in a Browser
@@ -59,6 +61,14 @@ $ ionic emulate ios
 $ ionic run ios
 ```
 
+## Update Ionic lib
+
+Update Ionic library files, which are found in the `www/lib/ionic` directory.
+
+```bash
+$ ionic lib update
+```
+
 
 ## Packaging an app (beta)
 
diff --git a/lib/ionic.js b/lib/ionic.js
index 2d243e6ed3..57df79da29 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -15,13 +15,11 @@ Copyright 2014 Drifty (http://drifty.com/)
 */
 
 var IonicStartTask = require('./ionic/start').IonicStartTask,
-    IonicPlatformTask = require('./ionic/platform').IonicPlatformTask,
-    IonicRunTask = require('./ionic/run').IonicRunTask,
-    IonicEmulateTask = require('./ionic/emulate').IonicEmulateTask;
-    IonicBuildTask = require('./ionic/build').IonicBuildTask,
+    IonicCordovaTask = require('./ionic/cordova').IonicCordovaTask,
     IonicLoginTask = require('./ionic/login').IonicLoginTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
+    IonicLibTask = require('./ionic/lib').IonicLibTask,
     IonicServeTask = require('./ionic/serve'),
     IonicProject = require('./ionic/project'),
     IonicStore = require('./ionic/store').IonicStore,
@@ -65,7 +63,7 @@ var TASKS = [
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp',
-      '--no-cordova|-n': 'Do not create an app targeted for Cordova'
+      '--no-cordova|-w': 'Create a basic structure without Cordova requirements'
     },
     task: IonicStartTask
   },
@@ -90,7 +88,7 @@ var TASKS = [
     args: {
       '<PLATFORM>': ''
     },
-    task: IonicPlatformTask
+    task: IonicCordovaTask
   },
   {
     title: 'emulate',
@@ -99,7 +97,7 @@ var TASKS = [
     args: {
       '<PLATFORM>': ''
     },
-    task: IonicEmulateTask
+    task: IonicCordovaTask
   },
   {
     title: 'run',
@@ -108,7 +106,11 @@ var TASKS = [
     args: {
       '<PLATFORM>': ''
     },
-    task: IonicRunTask
+    options: {
+      '--debug|--release': '',
+      '--device|--emulator|--target=FOO': ''
+    },
+    task: IonicCordovaTask
   },
   {
     title: 'build',
@@ -117,7 +119,30 @@ var TASKS = [
     args: {
       '<PLATFORM>': ''
     },
-    task: IonicBuildTask
+    task: IonicCordovaTask
+  },
+  {
+    title: 'plugin add',
+    name: 'plugin',
+    summary: 'Add a Cordova plugin',
+    args: {
+      '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
+    },
+    options: {
+      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n\
+                                                 each of its subdirectories for the plugin before hitting the registry.'
+    },
+    task: IonicCordovaTask
+  },
+  {
+    title: 'prepare',
+    name: 'prepare',
+    task: IonicCordovaTask
+  },
+  {
+    title: 'compile',
+    name: 'compile',
+    task: IonicCordovaTask
   },
   {
     title: 'package',
@@ -155,6 +180,18 @@ var TASKS = [
     alt: ['up'],
     task: IonicUploadTask
   },
+  {
+    title: 'lib',
+    name: 'lib',
+    summary: 'Gets Ionic library version info or updates the Ionic library',
+    args: {
+      '[update]': 'Updates the Ionic Framework version in www/lib/ionic'
+    },
+    options: {
+      '--version|-v': 'Exact Ionic version, otherwise it will default to the latest'
+    },
+    task: IonicLibTask
+  },
   {
     title: 'login',
     name: 'login',
@@ -205,13 +242,13 @@ Ionic = {
     var indent = '';
     var x, arg;
 
-    var taskArgs = d.name;
+    var taskArgs = d.title;
 
     for(arg in d.args) {
       taskArgs += ' ' + arg;
     }
 
-    w(taskArgs.green);
+    w(taskArgs.green.bold);
 
     while( (taskArgs + dots).length < rightColumn + 1) {
       dots += '.';
@@ -219,7 +256,7 @@ Ionic = {
 
     w(' ' + dots.grey + '  ');
 
-    w(d.summary);
+    w(d.summary.bold);
 
     for(arg in d.args) {
       if( !d.args[arg] ) continue;
@@ -230,7 +267,7 @@ Ionic = {
       while(indent.length < rightColumn) {
         indent += ' ';
       }
-      w( (indent + '    ' + argLine + ' = ' + d.args[arg]).grey );
+      w( (indent + '    ' + argLine + ' ' + d.args[arg]).bold );
     }
 
     indent = '';
@@ -244,14 +281,16 @@ Ionic = {
 
       var optLine = indent + '[' + opt + ']  ';
 
-      w(optLine.yellow);
+      w(optLine.yellow.bold);
 
-      while( (dots.length + optLine.length - 2) < rightColumn) {
-        dots += '.';
-      }
-      w(dots.grey + '  ');
+      if(d.options[opt]) {
+        while( (dots.length + optLine.length - 2) < rightColumn) {
+          dots += '.';
+        }
+        w(dots.grey + '  ');
 
-      w(d.options[opt].grey);
+        w(d.options[opt].bold);
+      }
     }
 
     w('\n');
@@ -260,6 +299,11 @@ Ionic = {
   _printAvailableTasks: function() {
     this._printIonic();
     process.stderr.write('\nUsage: ionic task args\n\n===============\n\n');
+
+    if(process.argv.length > 2) {
+      process.stderr.write( (process.argv[2] + ' is not a valid task\n\n').bold.red );
+    }
+
     process.stderr.write('Available tasks: '.bold);
     process.stderr.write('(use --help or -h for more info)\n\n');
 
@@ -271,7 +315,7 @@ Ionic = {
         while((name + dots).length < 20) {
           dots += '.';
         }
-        process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary + '\n');
+        process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary.bold + '\n');
       }
     }
 
@@ -321,7 +365,7 @@ Ionic = {
       self.printVersionWarning();
     });
 
-    if(argv.version || argv.v) {
+    if( (argv.version || argv.v) && !argv._.length) {
       return this.version();
     }
 
@@ -339,6 +383,7 @@ Ionic = {
   },
 
   fail: function(msg, taskHelp) {
+    this.hasFailed = true;
     process.stderr.write(msg.error.bold);
     process.stderr.write('\n');
     if(taskHelp) {
@@ -356,7 +401,7 @@ Ionic = {
   },
 
   version: function() {
-    process.stderr.write('Installed Ionic CLI version: ' + settings.version + '\n');
+    process.stderr.write('v' + settings.version + '\n');
   },
 
   checkLatestVersion: function() {
@@ -439,11 +484,9 @@ Ionic = {
   fetchRepo: function(targetPath, repoName, repoUrl) {
     var q = Q.defer();
 
-    var proxy = process.env.PROXY || null;
-
     // The folder name the project will be downloaded and extracted to
     var repoFolderName = repoName + '-master';
-    console.log('\nDOWNLOADING:'.info.bold, repoUrl);
+    console.log('\nDownloading:'.info.bold, repoUrl);
 
     var tmpFolder = os.tmpdir();
     var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
@@ -462,6 +505,7 @@ Ionic = {
       readStream.pipe(writeStream);
     };
 
+    var proxy = process.env.PROXY || null;
     request({ url: repoUrl, encoding: null, proxy: proxy }, function(err, res, body) {
       if(res.statusCode !== 200) {
         q.reject(res);
@@ -474,25 +518,23 @@ Ionic = {
       } catch(e) {
         q.reject(e);
       }
+    }).on('response', function(res){
+      var ProgressBar = require('progress');
+      var bar = new ProgressBar('[:bar]  :percent  :etas', {
+        complete: '=',
+        incomplete: ' ',
+        width: 30,
+        total: parseInt(res.headers['content-length'], 10)
+      });
+
+      res.on('data', function (chunk) {
+        bar.tick(chunk.length);
+      });
     });
 
     return q.promise;
-  },
-
-  getLocalIps: function() {
-    var interfaces = os.networkInterfaces();
-    var addresses = [];
-    for (var k in interfaces) {
-      for (var k2 in interfaces[k]) {
-        var address = interfaces[k][k2];
-        if (address.family == 'IPv4' && !address.internal) {
-          addresses.push(address.address);
-        }
-      }
-    }
-
-    return addresses;
   }
+
 };
 
 exports.Ionic = Ionic;
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
deleted file mode 100644
index ca2396bfec..0000000000
--- a/lib/ionic/build.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var fs = require('fs'),
-    os = require('os'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
-
-var IonicBuildTask = function() {};
-
-IonicBuildTask.prototype = new IonicTask();
-
-IonicBuildTask.prototype.run = function(ionic) {
-  if(argv._.length < 2) {
-    return ionic.fail('No platforms specified.', 'build');
-  }
-
-  var platforms = argv._.slice(1);
-
-  if(platforms.length < 1) {
-    return ionic.fail('No platforms specified.', 'build');
-  }
-
-  IonicStats.t('build', { 'platform': platforms.join(',') });
-
-  for(var i = 0; i < platforms.length; i++) {
-    var platform = platforms[i];
-    console.log('Building platform', platform);
-    if(exec("cordova build " + platform).code !== 0) {
-      return ionic.fail('Unable to build app on platform ' + platform + '. Please see console for more info.');
-    }
-  }
-};
-
-exports.IonicBuildTask = IonicBuildTask;
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
new file mode 100644
index 0000000000..c9044a27c3
--- /dev/null
+++ b/lib/ionic/cordova.js
@@ -0,0 +1,21 @@
+var IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+
+var IonicCordovaTask = function() {};
+
+IonicCordovaTask.prototype = new IonicTask();
+
+IonicCordovaTask.prototype.run = function(ionic) {
+  var cmdName = process.argv[2].toLowerCase();
+  var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
+
+  var command = 'cordova ' + cmdName + ' ' + cmdArgs.join(' ');
+
+  if(exec(command).code !== 0) {
+    return ionic.fail('Error from ' + cmdName + ' command.', cmdName);
+  }
+
+  IonicStats.t();
+};
+
+exports.IonicCordovaTask = IonicCordovaTask;
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
deleted file mode 100644
index 1798615f93..0000000000
--- a/lib/ionic/emulate.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
-
-var argv = require('optimist').argv;
-
-var IonicEmulateTask = function() {};
-
-IonicEmulateTask.prototype = new IonicTask();
-
-IonicEmulateTask.prototype.run = function(ionic) {
-  var patform;
-
-  if(argv._.length < 2) {
-    return ionic.fail('No platforms specified.', 'emulate');
-  }
-
-  var platforms = argv._.slice(1);
-
-  if(platforms.length < 1) {
-    return ionic.fail('No platforms specified.', 'emulate');
-  }
-
-  IonicStats.t('emulate', { 'platform': platforms.join(',') });
-
-  for(var i = 0; i < platforms.length; i++) {
-    platform = platforms[i];
-    console.log('Emulating app on platform', platform);
-    if(exec("cordova emulate " + platform).code !== 0) {
-      return ionic.fail('Unable to emulate app on platform ' + platform + '. Please see console for more info.');
-    }
-  }
-};
-
-exports.IonicEmulateTask = IonicEmulateTask;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
new file mode 100644
index 0000000000..07aaedce43
--- /dev/null
+++ b/lib/ionic/lib.js
@@ -0,0 +1,260 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    path = require('path'),
+    unzip = require('unzip'),
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    colors = require('colors'),
+    Q = require('q'),
+    IonicTask = require('./task').IonicTask;
+    IonicStats = require('./stats').IonicStats;
+
+var IonicLibTask = function() {};
+
+IonicLibTask.prototype = new IonicTask();
+
+IonicLibTask.prototype.run = function(ionic) {
+  var self = this;
+  self.codeHost = 'http://code.ionicframework.com';
+  self.local = {};
+  self.latest = {};
+
+  if (!fs.existsSync( path.resolve('www') )) {
+    return ionic.fail('"www" directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'lib');
+  }
+
+  if(argv._.length > 1 && (argv._[1].toLowerCase() == 'update' || argv._[1].toLowerCase() == 'up')) {
+    this.updatePrompt();
+  } else {
+    // just version info
+    this.printLibVersions();
+  }
+
+};
+
+
+IonicLibTask.prototype.printLibVersions = function() {
+  var self = this;
+
+  var p = path.resolve('www/lib/ionic/version.json');
+  try {
+    self.local = require(p);
+    console.log('Local Ionic version: '.bold.green + self.local.version + '  (' + path.resolve('www/lib/ionic/') + ')');
+  } catch(e) {
+    console.log('Unable to load ionic lib version information'.bold.error);
+    console.log('Error loading: '.bold.error + p );
+  }
+
+  this.getLatestVersions().then(function(){
+    console.log('Latest Ionic version: '.bold.green + self.latest.version_number + '  (released ' + self.latest.release_date + ')');
+
+    if(self.local.version != self.latest.version_number) {
+      console.log(' * Local version is out of date'.yellow );
+    } else {
+      console.log(' * Local version up to date'.green );
+    }
+  });
+};
+
+
+IonicLibTask.prototype.getLatestVersions = function() {
+  var q = Q.defer();
+  var self = this;
+
+  var proxy = process.env.PROXY || null;
+  request({ url: self.codeHost + '/latest.json', proxy: proxy }, function(err, res, body) {
+    try {
+      self.latest = JSON.parse(body);
+      q.resolve();
+    } catch(e) {
+      console.log(e);
+      q.reject(e);
+    }
+  });
+
+  return q.promise;
+};
+
+
+IonicLibTask.prototype.updatePrompt = function() {
+  var self = this;
+  prompt.message = '';
+  prompt.delimiter = '';
+  prompt.start();
+
+  var libPath = path.resolve('www/lib/ionic/');
+
+  console.log('Are you sure you want replace '.green + libPath.info + ' with an updated version of Ionc?'.green);
+
+  var promptProperties = {
+    areYouSure: {
+      name: 'areYouSure',
+      description: '(yes/no):'.yellow.bold,
+      required: true
+    }
+  };
+
+  prompt.get({properties: promptProperties}, function (err, promptResult) {
+    if(err) {
+      return console.log('Error: ' + err);
+    }
+
+    var areYouSure = promptResult.areYouSure.toLowerCase().trim();
+    if(areYouSure == 'yes' || areYouSure == 'y') {
+      self.getLatest();
+    }
+  });
+};
+
+
+IonicLibTask.prototype.getLatest = function() {
+  var self = this;
+
+  var dirPath = path.resolve('www/lib/');
+  if(!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath);
+  }
+
+  dirPath = path.resolve('www/lib/ionic/');
+  deleteFolderRecursive(dirPath);
+  if(!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath);
+  }
+
+  var version = argv.version || argv.v;
+  if(version && version !== true && version !== false) {
+    // get specific version
+    var archivePath = '/' + version + '/ionic-v' + version + '.zip';
+    self.downloadZip(archivePath, version);
+
+  } else {
+    // get the latest version
+    this.getLatestVersions().then(function(){
+      console.log('Latest version: '.bold.green + self.latest.version_number + '  (released ' + self.latest.release_date + ')');
+
+      self.downloadZip(self.latest.archive, self.latest.version_number);
+
+    }).catch(function(err) {
+      console.log('Error: ' + err);
+    });
+  }
+
+};
+
+
+IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
+  var self = this;
+
+  var versionZip = self.codeHost + archivePath;
+  self.tmpZipPath = path.resolve('www/lib/ionic/ionic.zip');
+
+  console.log('Downloading: '.green.bold + versionZip);
+
+  var file = fs.createWriteStream(self.tmpZipPath);
+  var proxy = process.env.PROXY || null;
+  request({ url: versionZip, encoding: null, proxy: proxy }, function(err, res, body) {
+    if(err) {
+      console.log(err)
+      return;
+    }
+    if(res.statusCode == 404) {
+      console.log( ('Invalid version: ' + versionNumber).bold.red );
+      try {
+        file.close();
+        fs.unlink(self.tmpZipPath);
+      } catch(e) {
+        console.error( (e).red );
+      }
+      return;
+    }
+    if(res.statusCode >= 400) {
+      console.log('Unable to download zip (' + res.statusCode + ')');
+      return;
+    }
+    try {
+      file.write(body);
+      file.close(function(){
+        self.updateFiles();
+      })
+    } catch(e) {
+      console.error( (e).red );
+    }
+  }).on('response', function(res){
+
+    var ProgressBar = require('progress');
+    var bar = new ProgressBar('[:bar]  :percent  :etas', {
+      complete: '=',
+      incomplete: ' ',
+      width: 30,
+      total: parseInt(res.headers['content-length'], 10)
+    });
+
+    res.on('data', function (chunk) {
+      bar.tick(chunk.length);
+    });
+
+  }).on('error', function(err) {
+    try {
+      fs.unlink(self.tmpZipPath);
+    } catch(e) {
+      console.error( (e).red );
+    }
+    console.error( (err).red );
+  });
+
+};
+
+
+IonicLibTask.prototype.updateFiles = function() {
+  var self = this;
+  var ionicLibDir = path.resolve('www/lib/ionic/');
+  var readStream = fs.createReadStream(self.tmpZipPath);
+
+  try {
+    var writeStream = unzip.Extract({ path: ionicLibDir });
+    writeStream.on('close', function() {
+      try{
+        var newVersion = require(path.resolve('www/lib/ionic/version.json')).version;
+
+        console.log('Ionic version updated to: '.bold.green + newVersion.bold );
+        IonicStats.t();
+
+      } catch(e) {
+        console.log('Error loading version info'.bold);
+      }
+      try {
+        fs.unlink(self.tmpZipPath);
+      } catch(e) {}
+    });
+    writeStream.on('error', function(err) {
+      console.log('Error: ' + err);
+    });
+    readStream.pipe(writeStream);
+
+    readStream.on('error', function(err){
+      console.log('Error: ' + err);
+    });
+
+  } catch(err) {
+    console.log('Error: ' + err);
+  }
+};
+
+
+function deleteFolderRecursive(path) {
+  if( fs.existsSync(path) ) {
+    fs.readdirSync(path).forEach(function(file,index){
+      var curPath = path + "/" + file;
+      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+        deleteFolderRecursive(curPath);
+      } else { // delete file
+        fs.unlinkSync(curPath);
+      }
+    });
+    fs.rmdirSync(path);
+  }
+}
+
+
+exports.IonicLibTask = IonicLibTask;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 1b918a411a..c61adaa799 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -56,18 +56,18 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
     var schema = [{
       name: 'email',
       pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
-      description: 'Email:',
+      description: 'Email:'.yellow.bold,
       required: true
     }, {
       name: 'password',
-      description: 'Password:',
+      description: 'Password:'.yellow.bold,
       hidden: true,
       required: true
     }];
 
     // prompt for log
     console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-    console.log('Don\'t have one? Create a one at: '.grey + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
+    console.log('Don\'t have one? Create a one at: '.bold + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
 
     prompt.override = argv;
     prompt.message = '';
@@ -113,7 +113,8 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
         username: self.email.toString().toLowerCase(),
         password: self.password,
         csrfmiddlewaretoken: jar.cookies[0].value
-      }
+      },
+      proxy: process.env.PROXY || null
     },
     function (err, response, body) {
       if(err) {
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 3f57ac1fb1..5de1e6da39 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,8 +1,7 @@
 var fs = require('fs'),
-    http = require('http'),
+    request = require('request'),
     path = require('path'),
     parseUrl = require('url').parse,
-    spawn = require("child_process").spawn,
     argv = require('optimist').argv,
     prompt = require('prompt'),
     shelljs = require('shelljs/global'),
@@ -11,6 +10,7 @@ var fs = require('fs'),
     IonicStore = require('./store').IonicStore,
     IonicTask = require('./task').IonicTask,
     IonicUploadTask = require('./upload').IonicUploadTask,
+    IonicStats = require('./stats').IonicStats,
     IonicLoginTask = require('./login').IonicLoginTask;
 
 var IonicPackageTask = function() {};
@@ -26,6 +26,8 @@ IonicPackageTask.prototype.run = function(ionic) {
   self.inputValues = {};
   self.useCmdArgs = false;
 
+  IonicStats.t();
+
   if(argv['clear-signing'] || argv.l) {
     self.clearSigning();
     return;
@@ -35,6 +37,8 @@ IonicPackageTask.prototype.run = function(ionic) {
 
   this.getCmdLineOptions();
 
+  if(self.ionic.hasFailed) return;
+
   var login = new IonicLoginTask();
   login.get(self.ionic, function(jar) {
     self.jar = jar;
@@ -49,7 +53,7 @@ IonicPackageTask.prototype.run = function(ionic) {
 
 IonicPackageTask.prototype.loadProject = function() {
   var appName = this.project.get('name') || "app";
-  console.log( ('Loading ' + appName + '...').bold.yellow );
+  console.log( ('Loading ' + appName + '...').bold.green );
 
   if(argv._.length < 3) {
     return this.ionic.fail('No platforms or build mode specified.', 'package');
@@ -164,7 +168,8 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
         return c.name + "=" + encodeURIComponent(c.value);
       }).join("; "),
       cck: cck
-    }
+    },
+    proxy: process.env.PROXY || null
   };
 
   request(options, function(err, response, body) {
@@ -252,7 +257,7 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 
         promptProperties['android-keystore-file']= {
           name: 'android-keystore-file',
-          description: 'Android Keystore File (.keystore):',
+          description: 'Android Keystore File (.keystore):'.yellow.bold,
           required: true,
           conform: fileExists,
           isFile: true
@@ -260,20 +265,20 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 
         promptProperties['android-keystore-alias'] = {
           name: 'android-keystore-alias',
-          description: 'Keystore Alias:',
+          description: 'Keystore Alias:'.yellow.bold.yellow.bold,
           required: true
         };
 
         promptProperties['android-keystore-password'] = {
           name: 'android-keystore-password',
-          description: 'Keystore Password:',
+          description: 'Keystore Password:'.yellow.bold,
           hidden: true,
           required: true
         };
 
         promptProperties['android-key-password'] = {
           name: 'android-key-password',
-          description: 'Key Password (optional):',
+          description: 'Key Password (optional):'.yellow.bold,
           hidden: true
         };
       }
@@ -282,7 +287,7 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
       // iOS
       promptProperties['ios-certificate-file'] = {
         name: 'ios-certificate-file',
-        description: 'iOS Certificate File (.p12):',
+        description: 'iOS Certificate File (.p12):'.yellow.bold,
         required: true,
         conform: fileExists,
         isFile: true
@@ -290,14 +295,14 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 
       promptProperties['ios-certificate-password'] = {
         name: 'ios-certificate-password',
-        description: 'Certificate Password:',
+        description: 'Certificate Password:'.yellow.bold,
         hidden: true,
         required: true
       };
 
       promptProperties['ios-profile-file'] = {
         name: 'ios-profile-file',
-        description: 'iOS Mobile Provisioning Profile (.mobileprovision):',
+        description: 'iOS Mobile Provisioning Profile (.mobileprovision):'.yellow.bold,
         required: true,
         conform: fileExists,
         isFile: true
@@ -371,7 +376,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 
   var privateData = new IonicStore(this.project.get('app_id'));
 
-  console.log( (platform + ' ' + self.mode + ' package building...').bold.grey );
+  console.log( (platform + ' ' + self.mode + ' building...').bold );
 
   form.submit({
     protocol: params.protocol,
@@ -441,7 +446,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 
 IonicPackageTask.prototype.clearSigning = function() {
   var self = this;
-  console.log('Clearing app signing and credential information...'.yellow);
+  console.log('Clearing app signing and credential information...'.yellow.bold);
 
   var appId = self.project.get('app_id');
 
@@ -457,14 +462,15 @@ IonicPackageTask.prototype.clearSigning = function() {
         cookie: jar.cookies.map(function (c) {
           return c.name + "=" + encodeURIComponent(c.value);
         }).join("; ")
-      }
+      },
+      proxy: process.env.PROXY || null
     };
 
     request(options, function(err, response, body) {
       if(err) {
         return self.ionic.fail("Error clearing app signing: " + err);
       }
-      console.log( ('App (' + appId + ') signing and credential information cleared\n').green );
+      console.log( ('App (' + appId + ') signing and credential information cleared\n').green.bold );
     });
   });
 };
@@ -533,7 +539,7 @@ function pingBuildStatus(ionic, requestOptions, platform, attempt) {
 
 
 function downloadBuildPackage(platform, data) {
-  console.log( ('\n\n' + platform + ' build complete, downloading package...').bold.grey );
+  console.log( ('\n\n' + platform + ' build complete, downloading package...').bold );
 
   var filePath = argv.output;
 
@@ -546,16 +552,22 @@ function downloadBuildPackage(platform, data) {
     }
   }
 
-  var params = parseUrl(data.package_url);
-
   var file = fs.createWriteStream(filePath);
-  var request = http.get({hostname: params.hostname, path: params.path, port: params.port, protocol: 'http:'}, function(response) {
-    response.pipe(file);
-    file.on('finish', function() {
+
+  var proxy = process.env.PROXY || null;
+  request({ url: data.package_url, proxy: proxy }, function(err, res, body) {
+    if(res.statusCode !== 200) {
+      console.error( (err).red );
+      return;
+    }
+    try {
+      file.write(body);
       file.close(function(){
         console.log( ('Saved ' + platform + ' package: ' + filePath + '\n').bold.green );
       });
-    });
+    } catch(e) {
+      q.reject(e);
+    }
   }).on('response', function(res){
 
     var ProgressBar = require('progress');
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
deleted file mode 100644
index b5b326ed5e..0000000000
--- a/lib/ionic/platform.js
+++ /dev/null
@@ -1,57 +0,0 @@
-var fs = require('fs'),
-    os = require('os'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
-
-var IonicPlatformTask = function() {};
-
-IonicPlatformTask.prototype = new IonicTask();
-
-IonicPlatformTask.prototype.run = function(ionic) {
-  if(argv._.length < 2) {
-    return ionic.fail('No platforms specified.', 'platform');
-  }
-
-  var argPlatforms = argv._.slice(1);
-
-  var cordovaArgs = ['add', 'remove', 'rm', 'list', 'ls', 'update', 'up'];
-  var cordovaArg = 'add';
-  var platforms = [];
-
-  for(var y=0; y<argPlatforms.length; y++) {
-    var addPlatform = true;
-    for(var x=0; x<cordovaArgs.length; x++) {
-      if(argPlatforms[y].toLowerCase() == cordovaArgs[x]) {
-        cordovaArg = argPlatforms[y].toLowerCase();
-        addPlatform = false;
-      }
-    }
-    if(addPlatform) {
-      platforms.push(argPlatforms[y].toLowerCase());
-    }
-  }
-
-  if(platforms.length < 1) {
-    return ionic.fail('No platforms specified.', 'platform');
-  }
-
-  if(cordovaArg == 'add') {
-    IonicStats.t('platform', { 'platform': platforms.join(',') });
-  }
-
-  for(var i = 0; i < platforms.length; i++) {
-    var platform = platforms[i].toLowerCase();
-    console.log(cordovaArg, 'platform', platform);
-    if(exec("cordova platform " + cordovaArg + " " + platform).code !== 0) {
-      console.log( ('Unable to ' + cordovaArg + ' platform ' + platform + '.\n').bold.red );
-    }
-  }
-};
-
-exports.IonicPlatformTask = IonicPlatformTask;
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
deleted file mode 100644
index 76c4752e32..0000000000
--- a/lib/ionic/run.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var fs = require('fs'),
-    os = require('os'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
-    IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
-
-var IonicRunTask = function() {};
-
-IonicRunTask.prototype = new IonicTask();
-
-IonicRunTask.prototype.run = function(ionic) {
-  if(argv._.length < 2) {
-    return ionic.fail('No platforms specified.', 'run');
-  }
-
-  var platforms = argv._.slice(1);
-
-  if(platforms.length < 1) {
-    return ionic.fail('No platforms specified.', 'run');
-  }
-
-  IonicStats.t('run', { 'platform': platforms.join(',') });
-
-  for(var i = 0; i < platforms.length; i++) {
-    var platform = platforms[i];
-    console.log('Running app on platform', platform);
-    if(exec("cordova run " + platform).code !== 0) {
-      return ionic.fail('Unable to run app on platform ' + platform + '. Please see console for more info.');
-    }
-  }
-};
-
-exports.IonicRunTask = IonicRunTask;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 448c63e3b8..2faaec0462 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -27,6 +27,8 @@ IonicServeTask.prototype.run = function(ionic) {
 
   this._start(ionic);
 
+  if(ionic.hasFailed) return;
+
   ionic.latestVersion.promise.then(function(){
     ionic.printVersionWarning();
   });
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f618ec0a25..d4b64f47e3 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     ncp = require('ncp').ncp,
     path = require('path'),
     shelljs = require('shelljs/global'),
-    unzip = require('unzip'),
     argv = require('optimist').argv,
     colors = require('colors'),
     spawn = require('child_process').spawn,
@@ -37,8 +36,10 @@ IonicStartTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 IonicStartTask.prototype = new IonicTask();
 
 IonicStartTask.prototype.run = function(ionic) {
+  this.ionic = ionic;
+
   if(argv._.length < 2) {
-    return ionic.fail('Invalid command', 'start');
+    return this.ionic.fail('Invalid command', 'start');
   }
 
   // Grab the app's relative directory name
@@ -53,7 +54,7 @@ IonicStartTask.prototype.run = function(ionic) {
   }
 
   this.packageName = argv.id || argv.i;
-  this.isCordovaProject = (argv.cordova !== false && !argv.n);
+  this.isCordovaProject = (argv.cordova !== false && !argv.w);
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
   var starterProject = argv.template || argv.t || argv._[2] || 'tabs';
@@ -71,6 +72,9 @@ IonicStartTask.prototype.run = function(ionic) {
   fs.mkdirSync(this.targetPath);
 
   this._fetchAndWriteSeed(starterProject.toLowerCase());
+
+  if(ionic.hasFailed) return;
+
   this._writeProjectFile(ionic);
 
 };
@@ -103,7 +107,7 @@ IonicStartTask.prototype._fetchWrapper = function() {
   }, function(err) {
     q.reject(err);
   }).catch(function(err) {
-    return Ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
+    return self.ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
   });
 
   return q.promise;
@@ -129,7 +133,7 @@ IonicStartTask.prototype._installCordovaPlugins = function() {
 
 IonicStartTask.prototype._updateConfigXml = function() {
   var self = this;
-  console.log('Update config.xml'.info.bold);
+  console.log('\nUpdate config.xml'.info.bold);
 
   try {
     var configXmlPath = self.targetPath + '/config.xml';
@@ -138,7 +142,7 @@ IonicStartTask.prototype._updateConfigXml = function() {
     var parseString = xml2js.parseString;
     parseString(configString, function (err, jsonConfig) {
       if(err) {
-        return Ionic.fail('Error parsing config.xml: ' + err);
+        return self.ionic.fail('Error parsing config.xml: ' + err);
       }
 
       if(!self.packageName) {
@@ -154,13 +158,13 @@ IonicStartTask.prototype._updateConfigXml = function() {
 
       fs.writeFile(configXmlPath, configString, function(err) {
         if(err) {
-          return Ionic.fail('Error saving config.xml file: ' + err);
+          return self.ionic.fail('Error saving config.xml file: ' + err);
         }
       });
     });
 
   } catch(e) {
-    return Ionic.fail('Error updating config.xml file: ' + e);
+    return self.ionic.fail('Error updating config.xml file: ' + e);
   }
 };
 
@@ -168,7 +172,6 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
   var self = this;
 
   // First, grab the wrapper project.
-
   var wrapperPromise = this._fetchWrapper();
 
   wrapperPromise.then(function() {
@@ -197,6 +200,8 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
         // update the config.xml file from cmd line args
         self._updateConfigXml();
 
+        if(self.ionic.hasFailed) return;
+
         self._installCordovaPlugins().then(function(output) {
           pluginQ.resolve();
         }, function(err) {
@@ -209,23 +214,23 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       pluginQ.promise.then(function() {
         self._printQuickHelp(self.appDirectory);
       }, function(err) {
-        return Ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+        return self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
       });
 
-      IonicStats.t('start', {});
+      IonicStats.t();
 
     }).catch(function(err) {
       console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode, err);
       console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
-      return Ionic.fail('');
+      return self.ionic.fail('');
     });
 
   }, function(err) {
-    return Ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
+    return self.ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
 
   }).catch(function(err) {
     console.error('Error: Unable to fetch wrapper: HTTP:'.error.bold,  err.statusCode, err);
-    return Ionic.fail('');
+    return self.ionic.fail('');
   });
 
 };
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index b4823afbee..b6a808a549 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -1,5 +1,5 @@
 var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, os, IonicConfig;
-var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, 
+var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
         __slice = Array.prototype.slice;
 
 path = require('path'),
@@ -518,7 +518,84 @@ var ionicConfig = IonicConfig.load();
 
 
 exports.IonicStats = {
-  t: function(e, d) {
+  t: function(additionalData) {
+    try {
+
+      if(process.argv.length < 3) return;
+
+      var cmdName = process.argv[2].toLowerCase();
+      var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []); // skip the cmdName
+
+      var statsData = additionalData || {};
+      var platforms = [];
+      var x, y, cmd;
+
+      // update any aliases with the full cmd so there's a common property
+      var aliasMap = {
+        'rm': 'remove',
+        'ls': 'list',
+        'up': 'update',
+        '-w': '--no-cordova',
+        '-b': '--nobrowser',
+        '-r': '--nolivereload',
+        '-l': '--clear-signing',
+        '-n': '--no-email'
+      };
+      for(x=0; x<cmdArgs.length; x++) {
+        for(y in aliasMap) {
+          if(cmdArgs[x].toLowerCase() == y) {
+            cmdArgs[x] = aliasMap[y];
+          }
+        }
+      }
+
+      var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator'.split(' ');
+
+      // collect only certain args, skip over everything else
+      for(x=0; x<cmdArgs.length; x++) {
+        cmd = cmdArgs[x].toLowerCase();
+
+        // gather what platforms this is targeting
+        for(y=0; y<platformWhitelist.length; y++) {
+          if(cmd == platformWhitelist[y]) {
+            platforms.push(cmd); // group them together
+            statsData[cmd] = true; // also give them their own property
+            break;
+          }
+        }
+        // gather only args that are in our list of valid stat args
+        for(y=0; y<argsWhitelist.length; y++) {
+          if(cmd == argsWhitelist[y]) {
+            statsData[cmd] = true;
+            break;
+          }
+        }
+      }
+
+      // create a platform property only when there is 1 or more
+      if(platforms.length) {
+        statsData.platform = platforms.sort().join(',');
+      }
+
+      // add which ionic lib version they're using
+      try {
+        statsData.ionic_version = require( path.resolve('www/lib/ionic/version.json') ).version;
+      } catch(e2) {}
+
+      // add which cli version is being used
+      try {
+        statsData.cli_version = require('../../package.json').version;
+      } catch(e2) {}
+
+      IonicStats.mp(cmdName, statsData);
+      //console.log(cmdName, statsData);
+
+    } catch(e) {
+      console.log( ('Error stats: ' + e) );
+    }
+  },
+  mp: function(e, d) {
     var unique_id = ionicConfig.get('ank');
     if(!unique_id) {
       this.createId();
@@ -538,4 +615,4 @@ exports.IonicStats = {
 
     ionicConfig.set('ank', uuid);
   }
-}
+};
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 05a14d5eee..612e586ae9 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -22,7 +22,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
   login.get(ionic, function(jar) {
     var TEMP_FILENAME = 'www.zip';
 
-    IonicStats.t('upload', {});
+    IonicStats.t();
 
     var zip = fs.createWriteStream(TEMP_FILENAME);
 
@@ -40,7 +40,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
     });
 
     zip.on('close', function() {
-      console.log('\nUploading app...'.bold.grey);
+      console.log('\nUploading app...'.bold.green);
 
       var form = new FormData();
       form.append('name', project.get('name'));
@@ -83,7 +83,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
               // Success
               project.set('app_id', d.app_id);
               project.save();
-              console.log( ('Successfully uploaded (' + project.get('app_id') + ')\n').bold.grey );
+              console.log( ('Successfully uploaded (' + project.get('app_id') + ')\n').bold );
 
               if(callback) {
                 try {
@@ -95,7 +95,7 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
               }
 
             } else if(response.statusCode == 401) {
-              console.error( ('Session expired. Please log in again and run this command again.').red );
+              console.error( ('Session expired. Please log in again and run this command again.').red.bold );
               q.reject('not_logged_in');
 
             } else {
diff --git a/package.json b/package.json
index d17e1a1114..e7b91e07a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 758ea009f4fdebebaa55bd5388e4f106ea308a24 Mon Sep 17 00:00:00 2001
From: Jaune Sarmiento <hawnecarlo@gmail.com>
Date: Sat, 26 Jul 2014 00:16:20 +0800
Subject: [PATCH 0154/1100] Fix typo in `ionic start` quick tips

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index d4b64f47e3..f3e7ad2d4d 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -244,7 +244,7 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
   if(this.isCordovaProject) {
     console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
     console.log('    Note: iOS development requires OS X currently'.small);
-    console.log('    See the Android Platform Guid for full Android installation instructions:'.small);
+    console.log('    See the Android Platform Guide for full Android installation instructions:'.small);
     console.log('    https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
     console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
     console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);

From 2a9796a7a6e82d3cc790d76c9d259074f45462dc Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 25 Jul 2014 11:55:46 -0500
Subject: [PATCH 0155/1100] typo fix

---
 lib/ionic/lib.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 07aaedce43..7322243c55 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -85,7 +85,7 @@ IonicLibTask.prototype.updatePrompt = function() {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  console.log('Are you sure you want replace '.green + libPath.info + ' with an updated version of Ionc?'.green);
+  console.log('Are you sure you want to replace '.green.bold + libPath.info.bold + ' with an updated version of Ionc?'.green.bold);
 
   var promptProperties = {
     areYouSure: {
@@ -97,7 +97,7 @@ IonicLibTask.prototype.updatePrompt = function() {
 
   prompt.get({properties: promptProperties}, function (err, promptResult) {
     if(err) {
-      return console.log('Error: ' + err);
+      return console.log(err);
     }
 
     var areYouSure = promptResult.areYouSure.toLowerCase().trim();

From 46e5f2ca3e3c7f97e908fdb1eac333d0a9a4e62e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 25 Jul 2014 13:18:41 -0500
Subject: [PATCH 0156/1100] no version checking for betas

---
 lib/ionic.js       | 6 ++++++
 lib/ionic/stats.js | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 57df79da29..ff2ffb4355 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -409,6 +409,12 @@ Ionic = {
     var self = this;
 
     try {
+      if(settings.version.indexOf('beta') > -1) {
+        // don't bother checking if its a beta
+        self.latestVersion.resolve();
+        return;
+      }
+
       // stay silent if it errors
       var ionicConfig = new IonicStore('ionic.config');
       var versionCheck = ionicConfig.get('versionCheck');
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index b6a808a549..d5869665bf 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -586,6 +586,7 @@ exports.IonicStats = {
       // add which cli version is being used
       try {
         statsData.cli_version = require('../../package.json').version;
+        if(statsData.cli_version.indexOf('beta') > -1) return;
       } catch(e2) {}
 
       IonicStats.mp(cmdName, statsData);

From c2e4a1dbc7846e8258872ad4c183c73e2da48c0f Mon Sep 17 00:00:00 2001
From: Alexis THOMAS <ath0mas@users.noreply.github.com>
Date: Sun, 27 Jul 2014 18:30:51 +0200
Subject: [PATCH 0157/1100] Replace link to specific version of Cordova docs

Cordova docs link set to "edge" instead of 3.4.0 or 3.5.0 or newer to come
---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f3e7ad2d4d..2d213c4c7d 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -245,7 +245,7 @@ IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
     console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
     console.log('    Note: iOS development requires OS X currently'.small);
     console.log('    See the Android Platform Guide for full Android installation instructions:'.small);
-    console.log('    https://cordova.apache.org/docs/en/3.4.0/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
+    console.log('    https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
     console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
     console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
     console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);

From b8bb829556b1697f6b87c42112d9c099abb3e41f Mon Sep 17 00:00:00 2001
From: Alexis THOMAS <ath0mas@users.noreply.github.com>
Date: Sun, 27 Jul 2014 19:09:46 +0200
Subject: [PATCH 0158/1100] Typo in update prompt

---
 lib/ionic/lib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 7322243c55..3b7ef046d3 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -85,7 +85,7 @@ IonicLibTask.prototype.updatePrompt = function() {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  console.log('Are you sure you want to replace '.green.bold + libPath.info.bold + ' with an updated version of Ionc?'.green.bold);
+  console.log('Are you sure you want to replace '.green.bold + libPath.info.bold + ' with an updated version of Ionic?'.green.bold);
 
   var promptProperties = {
     areYouSure: {

From 5524eebe0aeef0ee10fe1d14a7233a63b618d7d9 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Sun, 27 Jul 2014 18:40:41 -0500
Subject: [PATCH 0159/1100] Options

---
 lib/ionic.js | 11 ++++++++++-
 package.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ff2ffb4355..2cfc100f7b 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -57,8 +57,9 @@ var TASKS = [
     name: 'start',
     summary: 'Starts a new Ionic project in the specified PATH',
     args: {
+      '[options]': 'any flags for the command',
       '<PATH>': 'directory for the new project',
-      '[TEMPLATE]': 'Starter template to use (tabs, sidemenu, blank)'
+      '[template]': 'Starter template to use (tabs, sidemenu, blank)'
     },
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
@@ -72,6 +73,7 @@ var TASKS = [
     name: 'serve',
     summary: 'Start a local development server for app dev and testing',
     args: {
+      '[options]': '',
       '[http-port]': '',
       '[livereload-port]': ''
     },
@@ -86,6 +88,7 @@ var TASKS = [
     name: 'platform',
     summary: 'Add platform target for building an Ionic app',
     args: {
+      '[options]': '',
       '<PLATFORM>': ''
     },
     task: IonicCordovaTask
@@ -95,6 +98,7 @@ var TASKS = [
     name: 'emulate',
     summary: 'Emulate an Ionic project on a simulator or emulator',
     args: {
+      '[options]': '',
       '<PLATFORM>': ''
     },
     task: IonicCordovaTask
@@ -104,6 +108,7 @@ var TASKS = [
     name: 'run',
     summary: 'Run an ionic project on a connected device',
     args: {
+      '[options]': '',
       '<PLATFORM>': ''
     },
     options: {
@@ -117,6 +122,7 @@ var TASKS = [
     name: 'build',
     summary: 'Locally build an ionic project for a given platform',
     args: {
+      '[options]': '',
       '<PLATFORM>': ''
     },
     task: IonicCordovaTask
@@ -126,6 +132,7 @@ var TASKS = [
     name: 'plugin',
     summary: 'Add a Cordova plugin',
     args: {
+      '[options]': '',
       '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
     },
     options: {
@@ -150,6 +157,7 @@ var TASKS = [
     alt: ['pack'],
     summary: 'Package an app using the Ionic Build service',
     args: {
+      '[options]': '',
       '<MODE>': '"debug" or "release"',
       '<PLATFORM>': '"ios" or "android"'
     },
@@ -185,6 +193,7 @@ var TASKS = [
     name: 'lib',
     summary: 'Gets Ionic library version info or updates the Ionic library',
     args: {
+      '[options]': '',
       '[update]': 'Updates the Ionic Framework version in www/lib/ionic'
     },
     options: {
diff --git a/package.json b/package.json
index e7b91e07a1..0384d97976 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From aff090b1a6a039418a8cebc6ab672cdeaabb2444 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 29 Jul 2014 14:11:04 -0500
Subject: [PATCH 0160/1100] network error, error handling for progress bar

---
 lib/ionic.js         | 4 +++-
 lib/ionic/lib.js     | 4 +++-
 lib/ionic/package.js | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2cfc100f7b..9219ae1ddc 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -543,7 +543,9 @@ Ionic = {
       });
 
       res.on('data', function (chunk) {
-        bar.tick(chunk.length);
+        try {
+          bar.tick(chunk.length);
+        } catch(e){}
       });
     });
 
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 7322243c55..46770022cd 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -191,7 +191,9 @@ IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
     });
 
     res.on('data', function (chunk) {
-      bar.tick(chunk.length);
+      try {
+        bar.tick(chunk.length);
+      } catch(e){}
     });
 
   }).on('error', function(err) {
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 5de1e6da39..32a3171f2d 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -579,7 +579,9 @@ function downloadBuildPackage(platform, data) {
     });
 
     res.on('data', function (chunk) {
-      bar.tick(chunk.length);
+      try {
+        bar.tick(chunk.length);
+      } catch(e){}
     });
 
     res.on('end', function () {

From a76dce5f1af4300cd42db994cb78ab2c72d7b210 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 2 Aug 2014 23:02:36 -0500
Subject: [PATCH 0161/1100] prefix CLI to cli version output

closes #55
---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 9219ae1ddc..a2c0a64a0c 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -357,7 +357,7 @@ Ionic = {
     w('  _  ___  _ __  _  ___ \n');
     w(' | |/ _ \\| \'_ \\| |/ __|\n');
     w(' | | (_) | | | | | (__ \n');
-    w(' |_|\\___/|_| |_|_|\\___|   v'+ settings.version + '\n');
+    w(' |_|\\___/|_| |_|_|\\___|  CLI v'+ settings.version + '\n');
 
   },
 

From be0885fd9f3fcdfad3a36782dff742f9db99f3f8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 2 Aug 2014 23:18:26 -0500
Subject: [PATCH 0162/1100] insert `add` cmd when missing from `platform` cmds

Closes #54
---
 lib/ionic/cordova.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index c9044a27c3..d93ea9cd3c 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -9,6 +9,27 @@ IonicCordovaTask.prototype.run = function(ionic) {
   var cmdName = process.argv[2].toLowerCase();
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
 
+  // backwards compatibility prior to fully wrapping cordova cmds
+  if(cmdName == 'platform') {
+    // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
+    // if a cordova platform cmd isn't the cmd then automatically insert `add`
+    var hasCordovaCmd = false;
+    var validCommands = 'add remove rm list ls update up check'.split(' ');
+    var cmdArg, x, y;
+    for(x=0; x<cmdArgs.length; x++) {
+      cmdArg = cmdArgs[x].toLowerCase();
+      for(y=0; y<validCommands.length; y++) {
+        if(cmdArg == validCommands[y]) {
+          hasCordovaCmd = true;
+          break;
+        }
+      }
+    }
+    if(!hasCordovaCmd) {
+      cmdArgs.unshift('add');
+    }
+  }
+
   var command = 'cordova ' + cmdName + ' ' + cmdArgs.join(' ');
 
   if(exec(command).code !== 0) {

From c2b534e5c4151cb65a6bedd192d0ae6774b7410a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 4 Aug 2014 11:43:57 -0500
Subject: [PATCH 0163/1100] set platform body class from cordova hook

---
 .../after_prepare/010_add_platform_class.js   | 92 +++++++++++++++++++
 lib/ionic/cordova.js                          | 72 ++++++++++++++-
 package.json                                  |  2 +-
 3 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100755 lib/hooks/after_prepare/010_add_platform_class.js

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
new file mode 100755
index 0000000000..fc1f8ef3cf
--- /dev/null
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+
+// Add Platform Class
+// v1.0
+// Automatically adds the platform class to the body tag
+// after the `prepare` command. This speeds up device rendering
+// the correct layout/style for the specific platform.
+
+var fs = require('fs');
+var path = require('path');
+
+var rootdir = process.argv[2];
+
+function addPlatformBodyTag(indexPath, platform) {
+  // add the platform class to the body tag
+  try {
+    var platformClass = 'platform-' + platform;
+    var cordovaClass = 'platform-cordova platform-webview';
+
+    var html = fs.readFileSync(indexPath, 'utf8');
+
+    var bodyTag = findBodyTag(html);
+    if(!bodyTag) return; // no opening body tag, something's wrong
+
+    if(bodyTag.indexOf(platformClass) > -1) return; // already added
+
+    var newBodyTag = bodyTag;
+
+    var classAttr = findClassAttr(bodyTag);
+    if(classAttr) {
+      // body tag has existing class attribute, add the classname
+      var endingQuote = classAttr.substring(classAttr.length-1);
+      var newClassAttr = classAttr.substring(0, classAttr.length-1);
+      newClassAttr += ' ' + platformClass + ' ' + cordovaClass + endingQuote;
+      newBodyTag = bodyTag.replace(classAttr, newClassAttr);
+
+    } else {
+      // add class attribute tot he body tag
+      newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">')
+    }
+
+    html = html.replace(bodyTag, newBodyTag);
+
+    fs.writeFileSync(indexPath, html, 'utf8');
+
+    process.stdout.write('add to body class: ' + platformClass + '\n');
+  } catch(e) {
+    process.stdout.write(e);
+  }
+}
+
+function findBodyTag(html) {
+  // get the body tag
+  try{
+    return html.match(/<body (.*?)>/gi)[0];
+  }catch(e){}
+}
+
+function findClassAttr(bodyTag) {
+  // get the body tag's class attribute
+  try{
+    return bodyTag.match(/ class=["|'](.*?)["|']/gi)[0];
+  }catch(e){}
+}
+
+if (rootdir) {
+
+  // go through each of the platform directories that have been prepared
+  var platforms = (process.env.CORDOVA_PLATFORMS ? process.env.CORDOVA_PLATFORMS.split(',') : []);
+
+  for(var x=0; x<platforms.length; x++) {
+    // open up the index.html file at the www root
+    try {
+      var platform = platforms[x].trim().toLowerCase();
+      var indexPath;
+
+      if(platform == 'android') {
+        indexPath = path.join('platforms', platform, 'assets', 'www', 'index.html');
+      } else {
+        indexPath = path.join('platforms', platform, 'www', 'index.html');
+      }
+
+      if(fs.existsSync(indexPath)) {
+        addPlatformBodyTag(indexPath, platform);
+      }
+
+    } catch(e) {
+      process.stdout.write(e);
+    }
+  }
+
+}
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index d93ea9cd3c..6b0d964fa9 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,5 +1,7 @@
 var IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    fs = require('fs'),
+    path = require('path');
 
 var IonicCordovaTask = function() {};
 
@@ -29,6 +31,7 @@ IonicCordovaTask.prototype.run = function(ionic) {
       cmdArgs.unshift('add');
     }
   }
+  this.addHooks();
 
   var command = 'cordova ' + cmdName + ' ' + cmdArgs.join(' ');
 
@@ -39,4 +42,71 @@ IonicCordovaTask.prototype.run = function(ionic) {
   IonicStats.t();
 };
 
+
+IonicCordovaTask.prototype.addHooks = function() {
+  // Add hooks which this Ionic project doesn't already have
+  // note: hook scripts must be executable!
+
+  if( !fs.existsSync(path.join('www')) ) {
+    // don't both doing any of this if they aren't
+    // in the correct working directory, which would have `www`
+    return;
+  }
+
+  // loop through all the hook directories added to the ionic-cli
+  var cliHooksPath = path.join(__filename, '../../hooks');
+  fs.readdir(cliHooksPath, function(err, files){
+    if(err) return;
+    for(var x=0; x<files.length; x++) {
+      if(files[x].indexOf('.') > -1) continue;
+      addcliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
+    }
+  });
+
+  function addcliHookDirectory(cliHookPath, hookDirectoryName) {
+    fs.readdir(cliHookPath, function(err, files){
+      // loop through each of the scripts in the ionic-cli hook directory
+      if(err) return;
+      for(var x=0; x<files.length; x++) {
+        var hookFilename = files[x];
+        if(hookFilename.indexOf('.js') === -1) return;
+
+        // check if this hook script has already been added to this ionic project
+        var projectHookPath = path.join('hooks', hookDirectoryName, hookFilename);
+        if( !fs.existsSync(projectHookPath) ) {
+          addHookScript(cliHookPath, hookDirectoryName, hookFilename);
+        }
+      }
+    });
+  }
+
+  function addHookScript(cliHookPath, hookDirectoryName, hookFilename) {
+    // add the root hooks directory if the project doesn't have it
+    try {
+      var projectHookPath = path.join('hooks');
+      if( !fs.existsSync(projectHookPath) ) {
+        fs.mkdirSync(projectHookPath);
+      }
+
+      // add the hook directory (ie: after_prepare) if the project doesn't have it
+      projectHookPath = path.join(projectHookPath, hookDirectoryName);
+      if( !fs.existsSync(projectHookPath) ) {
+        fs.mkdirSync(projectHookPath);
+      }
+
+      // copy the hook script to the project
+      var cliScript = path.join(cliHookPath, hookFilename);
+      var projectScript = path.join(projectHookPath, hookFilename);
+      fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
+
+      // make the script file executable
+      fs.chmodSync(projectScript, '755');
+
+    } catch(e) {
+      console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);
+    }
+  }
+
+};
+
 exports.IonicCordovaTask = IonicCordovaTask;
diff --git a/package.json b/package.json
index 0384d97976..4f394bd4bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d8257bf79ad4dcc8fc9c2f1cd1e340a45f584eaf Mon Sep 17 00:00:00 2001
From: ibes <mail@der-sebi.de>
Date: Tue, 5 Aug 2014 09:26:25 +0200
Subject: [PATCH 0164/1100] Update 010_add_platform_class.js

---
 lib/hooks/after_prepare/010_add_platform_class.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index fc1f8ef3cf..cdfb187492 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -35,7 +35,7 @@ function addPlatformBodyTag(indexPath, platform) {
       newBodyTag = bodyTag.replace(classAttr, newClassAttr);
 
     } else {
-      // add class attribute tot he body tag
+      // add class attribute to the body tag
       newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">')
     }
 

From fb7902a60e24dde30e25fea5d94e0dbe66a5f674 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 5 Aug 2014 14:47:09 -0500
Subject: [PATCH 0165/1100] spawn cordova commands

---
 lib/ionic/cordova.js | 20 +++++++++++++++-----
 package.json         |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 6b0d964fa9..dd6732a24b 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,7 +1,9 @@
 var IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
-    path = require('path');
+    path = require('path'),
+    spawn = require('child_process').spawn,
+    colors = require('colors');
 
 var IonicCordovaTask = function() {};
 
@@ -33,11 +35,19 @@ IonicCordovaTask.prototype.run = function(ionic) {
   }
   this.addHooks();
 
-  var command = 'cordova ' + cmdName + ' ' + cmdArgs.join(' ');
+  cmdArgs.unshift(cmdName);
 
-  if(exec(command).code !== 0) {
-    return ionic.fail('Error from ' + cmdName + ' command.', cmdName);
-  }
+  var cordovaCmd = spawn('cordova', cmdArgs);
+
+  cordovaCmd.stdout.on('data', function (data) {
+    process.stdout.write(data);
+  });
+
+  cordovaCmd.stderr.on('data', function (data) {
+    if(data) {
+      process.stderr.write(data.toString().error.bold);
+    }
+  });
 
   IonicStats.t();
 };
diff --git a/package.json b/package.json
index 4f394bd4bb..ff0a9d20ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.7",
+  "version": "1.1.8-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 61b09feb40783a32abe8ad925f5f840ed8da93ec Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 5 Aug 2014 15:06:16 -0500
Subject: [PATCH 0166/1100] use IP when only one IPV4 internal=false address

https://github.com/driftyco/ionic/issues/1892
---
 lib/ionic/serve.js | 6 +++---
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 2faaec0462..a4bc185953 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -93,7 +93,7 @@ IonicServeTask.prototype._start = function(ionic) {
 
 
 IonicServeTask.prototype.host = function(port) {
-  var address = 'localhost';
+  var addresses = [];
 
   try {
     var os = require('os');
@@ -102,13 +102,13 @@ IonicServeTask.prototype.host = function(port) {
     for (var dev in ifaces) {
       ifaces[dev].forEach(function(details){
         if (details.family == 'IPv4' && !details.internal) {
-          address = details.address;
+          addresses.push(details.address);
         }
       });
     }
   } catch(e) {}
 
-  return 'http://' + address + ':' + port;
+  return 'http://' + (addresses.length === 1 ? addresses[0] : 'localhost') + ':' + port;
 };
 
 module.exports = IonicServeTask;
diff --git a/package.json b/package.json
index ff0a9d20ed..206464bd1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8-beta1",
+  "version": "1.1.8-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From fc922932171b699cdc9f9358b801a98ad3c9a593 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 5 Aug 2014 16:01:36 -0500
Subject: [PATCH 0167/1100] update bower file

---
 lib/ionic/lib.js | 30 ++++++++++++++++++++++++++++++
 package.json     |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 824930247f..263f50d70c 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -219,6 +219,8 @@ IonicLibTask.prototype.updateFiles = function() {
       try{
         var newVersion = require(path.resolve('www/lib/ionic/version.json')).version;
 
+        self.updateBowerFile(newVersion);
+
         console.log('Ionic version updated to: '.bold.green + newVersion.bold );
         IonicStats.t();
 
@@ -244,6 +246,34 @@ IonicLibTask.prototype.updateFiles = function() {
 };
 
 
+IonicLibTask.prototype.updateBowerFile = function(newVersion) {
+  try {
+    var bowerFilePath = path.resolve('bower.json');
+    var bowerData;
+
+    if( fs.existsSync(bowerFilePath) ) {
+      bowerData = require(bowerFilePath);
+    } else {
+      bowerData = {
+        "name": "HelloIonic",
+        "private": "true"
+      };
+    }
+
+    if(!bowerData.devDependencies) bowerData.devDependencies = {};
+
+    bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
+
+    var file = fs.createWriteStream(bowerFilePath);
+    file.write( JSON.stringify(bowerData, null, 2) );
+    file.close();
+
+  } catch(e) {
+    console.log( ('Bower file error: ' + e).error.bold );
+  }
+};
+
+
 function deleteFolderRecursive(path) {
   if( fs.existsSync(path) ) {
     fs.readdirSync(path).forEach(function(file,index){
diff --git a/package.json b/package.json
index 206464bd1c..daf5793d1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8-beta2",
+  "version": "1.1.8-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e4c9a984a01b04e97e21f7bd1b988e95fc9b9dad Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 5 Aug 2014 16:15:10 -0500
Subject: [PATCH 0168/1100] handle network errors

Closes #62
---
 lib/ionic.js     | 2 +-
 lib/ionic/lib.js | 6 ++----
 package.json     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index a2c0a64a0c..0dcccd39d1 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -522,7 +522,7 @@ Ionic = {
 
     var proxy = process.env.PROXY || null;
     request({ url: repoUrl, encoding: null, proxy: proxy }, function(err, res, body) {
-      if(res.statusCode !== 200) {
+      if(!res || res.statusCode !== 200) {
         q.reject(res);
         return;
       }
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 263f50d70c..e4599f56b7 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -68,8 +68,8 @@ IonicLibTask.prototype.getLatestVersions = function() {
       self.latest = JSON.parse(body);
       q.resolve();
     } catch(e) {
-      console.log(e);
-      q.reject(e);
+      console.log('Error loading latest version information'.bold.error );
+      q.reject();
     }
   });
 
@@ -135,8 +135,6 @@ IonicLibTask.prototype.getLatest = function() {
 
       self.downloadZip(self.latest.archive, self.latest.version_number);
 
-    }).catch(function(err) {
-      console.log('Error: ' + err);
     });
   }
 
diff --git a/package.json b/package.json
index daf5793d1f..d03dc32df5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8-beta3",
+  "version": "1.1.8-beta4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 13502fbd16bfa059cff8f6af20a1ff7c76fa8836 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 6 Aug 2014 09:31:13 -0500
Subject: [PATCH 0169/1100] set app name in bower.json

---
 lib/ionic/bower.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/lib.js   | 41 +++++++----------------------------------
 lib/ionic/start.js |  3 +++
 3 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 lib/ionic/bower.js

diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
new file mode 100644
index 0000000000..0f7ca0b7c4
--- /dev/null
+++ b/lib/ionic/bower.js
@@ -0,0 +1,45 @@
+var fs = require('fs'),
+         path = require('path'),
+         colors = require('colors');
+
+exports.IonicBower = {
+
+  setIonicVersion: function(newVersion) {
+    var bowerData = this.getData();
+    if(!bowerData.devDependencies) bowerData.devDependencies = {};
+    bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
+    this.saveData(bowerData);
+  },
+
+  setAppName: function(newAppName) {
+    var bowerData = this.getData();
+    bowerData.name = newAppName;
+    this.saveData(bowerData);
+  },
+
+  getData: function() {
+    var bowerFilePath = path.resolve('bower.json');
+
+    if( fs.existsSync(bowerFilePath) ) {
+      return require(bowerFilePath);
+    }
+
+    return {
+      "name": "HelloIonic",
+      "private": "true"
+    };
+  },
+
+  saveData: function(bowerData) {
+    try {
+      var bowerFilePath = path.resolve('bower.json');
+
+      var file = fs.createWriteStream(bowerFilePath);
+      file.write( JSON.stringify(bowerData, null, 2) );
+      file.close();
+    } catch(e) {
+      console.log( ('Error saving ' + bowerFilePath + ': ' + e).error.bold );
+    }
+  }
+
+};
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index e4599f56b7..bfee7c84b1 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -7,7 +7,7 @@ var fs = require('fs'),
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
-    IonicTask = require('./task').IonicTask;
+    IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
 
 var IonicLibTask = function() {};
@@ -153,7 +153,7 @@ IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
   var proxy = process.env.PROXY || null;
   request({ url: versionZip, encoding: null, proxy: proxy }, function(err, res, body) {
     if(err) {
-      console.log(err)
+      console.log(err);
       return;
     }
     if(res.statusCode == 404) {
@@ -174,7 +174,7 @@ IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
       file.write(body);
       file.close(function(){
         self.updateFiles();
-      })
+      });
     } catch(e) {
       console.error( (e).red );
     }
@@ -217,13 +217,14 @@ IonicLibTask.prototype.updateFiles = function() {
       try{
         var newVersion = require(path.resolve('www/lib/ionic/version.json')).version;
 
-        self.updateBowerFile(newVersion);
-
         console.log('Ionic version updated to: '.bold.green + newVersion.bold );
         IonicStats.t();
 
+        var ionicBower = require('./bower').IonicBower;
+        ionicBower.setIonicVersion(newVersion);
+
       } catch(e) {
-        console.log('Error loading version info'.bold);
+        console.log( ('Error loading version info: ' + e).error.bold );
       }
       try {
         fs.unlink(self.tmpZipPath);
@@ -244,34 +245,6 @@ IonicLibTask.prototype.updateFiles = function() {
 };
 
 
-IonicLibTask.prototype.updateBowerFile = function(newVersion) {
-  try {
-    var bowerFilePath = path.resolve('bower.json');
-    var bowerData;
-
-    if( fs.existsSync(bowerFilePath) ) {
-      bowerData = require(bowerFilePath);
-    } else {
-      bowerData = {
-        "name": "HelloIonic",
-        "private": "true"
-      };
-    }
-
-    if(!bowerData.devDependencies) bowerData.devDependencies = {};
-
-    bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
-
-    var file = fs.createWriteStream(bowerFilePath);
-    file.write( JSON.stringify(bowerData, null, 2) );
-    file.close();
-
-  } catch(e) {
-    console.log( ('Bower file error: ' + e).error.bold );
-  }
-};
-
-
 function deleteFolderRecursive(path) {
   if( fs.existsSync(path) ) {
     fs.readdirSync(path).forEach(function(file,index){
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 2d213c4c7d..c8782e7c63 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -212,6 +212,9 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       }
 
       pluginQ.promise.then(function() {
+        var ionicBower = require('./bower').IonicBower;
+        ionicBower.setAppName(self.appName);
+
         self._printQuickHelp(self.appDirectory);
       }, function(err) {
         return self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');

From c716a1473d7f68b54c342c6cade0524625f04977 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 6 Aug 2014 10:09:01 -0500
Subject: [PATCH 0170/1100] update lib w/ bower when using bower

---
 lib/ionic.js     |  4 +++-
 lib/ionic/lib.js | 51 +++++++++++++++++++++++++++++++++++++-----------
 package.json     |  2 +-
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0dcccd39d1..5b341998e7 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -450,10 +450,12 @@ Ionic = {
 
   printVersionWarning: function() {
     if(this.npmVersion && this.npmVersion != settings.version.trim()) {
+      process.stdout.write('\n-------------------------\n'.red);
       process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
       process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
       process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
-      process.stdout.write( ' * Use '.yellow + 'npm update -g ionic'.info.bold + ' to update to the latest version\n\n'.yellow );
+      process.stdout.write( ' * Run '.yellow + 'npm update -g ionic'.info.bold + ' to update\n'.yellow );
+      process.stdout.write('-------------------------\n\n'.red);
       this.npmVersion = null;
     }
   },
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index bfee7c84b1..9d0ded7b68 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     colors = require('colors'),
+    spawn = require('child_process').spawn,
     Q = require('q'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
@@ -19,13 +20,16 @@ IonicLibTask.prototype.run = function(ionic) {
   self.codeHost = 'http://code.ionicframework.com';
   self.local = {};
   self.latest = {};
+  self.usesBower = false;
 
   if (!fs.existsSync( path.resolve('www') )) {
     return ionic.fail('"www" directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'lib');
   }
 
+  this.loadVersionData();
+
   if(argv._.length > 1 && (argv._[1].toLowerCase() == 'update' || argv._[1].toLowerCase() == 'up')) {
-    this.updatePrompt();
+    this.updateLibVersion();
   } else {
     // just version info
     this.printLibVersions();
@@ -34,17 +38,25 @@ IonicLibTask.prototype.run = function(ionic) {
 };
 
 
-IonicLibTask.prototype.printLibVersions = function() {
-  var self = this;
+IonicLibTask.prototype.loadVersionData = function() {
+  this.versionFilePath = path.resolve('www/lib/ionic/version.json');
+  if( !fs.existsSync(this.versionFilePath) ) {
+    this.versionFilePath = path.resolve('www/lib/ionic/bower.json');
+    this.usesBower = fs.existsSync(this.versionFilePath);
+  }
 
-  var p = path.resolve('www/lib/ionic/version.json');
   try {
-    self.local = require(p);
-    console.log('Local Ionic version: '.bold.green + self.local.version + '  (' + path.resolve('www/lib/ionic/') + ')');
+    this.local = require(this.versionFilePath);
   } catch(e) {
     console.log('Unable to load ionic lib version information'.bold.error);
-    console.log('Error loading: '.bold.error + p );
   }
+};
+
+
+IonicLibTask.prototype.printLibVersions = function() {
+  var self = this;
+
+  console.log('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
 
   this.getLatestVersions().then(function(){
     console.log('Latest Ionic version: '.bold.green + self.latest.version_number + '  (released ' + self.latest.release_date + ')');
@@ -77,8 +89,25 @@ IonicLibTask.prototype.getLatestVersions = function() {
 };
 
 
-IonicLibTask.prototype.updatePrompt = function() {
+IonicLibTask.prototype.updateLibVersion = function() {
   var self = this;
+
+  if(self.usesBower) {
+    var bowerCmd = spawn('bower', ['update', 'ionic']);
+
+    bowerCmd.stdout.on('data', function (data) {
+      process.stdout.write(data);
+    });
+
+    bowerCmd.stderr.on('data', function (data) {
+      if(data) {
+        process.stderr.write(data.toString().error.bold);
+      }
+    });
+
+    return;
+  }
+
   prompt.message = '';
   prompt.delimiter = '';
   prompt.start();
@@ -215,13 +244,13 @@ IonicLibTask.prototype.updateFiles = function() {
     var writeStream = unzip.Extract({ path: ionicLibDir });
     writeStream.on('close', function() {
       try{
-        var newVersion = require(path.resolve('www/lib/ionic/version.json')).version;
+        self.loadVersionData();
 
-        console.log('Ionic version updated to: '.bold.green + newVersion.bold );
+        console.log('Ionic version updated to: '.bold.green + self.local.version.bold );
         IonicStats.t();
 
         var ionicBower = require('./bower').IonicBower;
-        ionicBower.setIonicVersion(newVersion);
+        ionicBower.setIonicVersion(self.local.version);
 
       } catch(e) {
         console.log( ('Error loading version info: ' + e).error.bold );
diff --git a/package.json b/package.json
index d03dc32df5..51e893fa42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8-beta4",
+  "version": "1.1.8-beta5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From c39070209802e5d9e5bd32577e6b337689dbfe86 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 6 Aug 2014 10:13:05 -0500
Subject: [PATCH 0171/1100] v1.1.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 51e893fa42..c96e0f0d6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8-beta5",
+  "version": "1.1.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 3542e9a490d70d9d2b95b65fb85a188d232b23ef Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 6 Aug 2014 10:20:13 -0500
Subject: [PATCH 0172/1100] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e6ed11ac3..4618f97515 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,9 @@ $ ionic run ios
 
 ## Update Ionic lib
 
-Update Ionic library files, which are found in the `www/lib/ionic` directory.
+Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
+by the project, this command will automatically run `bower update`, otherwise this command updates 
+the local static files from Ionic's CDN.
 
 ```bash
 $ ionic lib update

From 0cd183bbbd8a5e516d1a5ddb09041afacfecf150 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 6 Aug 2014 10:20:30 -0500
Subject: [PATCH 0173/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4618f97515..0edc636d0c 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ $ ionic run ios
 ## Update Ionic lib
 
 Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
-by the project, this command will automatically run `bower update`, otherwise this command updates 
+by the project, this command will automatically run `bower update ionic`, otherwise this command updates 
 the local static files from Ionic's CDN.
 
 ```bash

From ddc60c524cd823e86f83c2ed58c0b8c04d3fb6fc Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 6 Aug 2014 11:01:59 -0500
Subject: [PATCH 0174/1100] ionic serve description

---
 README.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0edc636d0c..4c55aacd1d 100644
--- a/README.md
+++ b/README.md
@@ -25,17 +25,24 @@ There are three choices of templates:
 
 Command-line flags/options:
 
-    --app-name, -a  ........................  Human readable name for the app (Use quotes around the name)
-    --id, -i  ..............................  Package name set in the <widget id> config, ie: com.mycompany.myapp
-    --no-cordova, -w  ......................  Do not create an app targeted for Cordova
+    --app-name, -a  ......  Human readable name for the app (Use quotes around the name)
+    --id, -i  ............  Package name set in the <widget id> config, ie: com.mycompany.myapp
+    --no-cordova, -w  ....  Do not create an app targeted for Cordova
 
 
 ## Testing in a Browser
 
+Start a local development server for app dev and testing. This is also useful to test within a device browser which is connected to the same wireless network. Additionally, LiveReload is installed which is used to monitor changes in the file system. As soon as you save a file, it is preprocessed as needed, and the browser is refreshed automatically.
+
 ```bash
-$ ionic serve
+$ ionic serve [http-port] [livereload-port] [options]
 ```
 
+Command-line flags/options:
+
+    [--nobrowser|-b]  ......  Disable launching a browser
+    [--nolivereload|-r]  ...  Do not start live reload
+
 
 ## Adding a platform target
 

From 4e5bb2403f9214d393231ffb0d7d161599bbfb9d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 6 Aug 2014 11:05:17 -0500
Subject: [PATCH 0175/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c55aacd1d..11bd1cd8c1 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Command-line flags/options:
 
 ## Testing in a Browser
 
-Start a local development server for app dev and testing. This is also useful to test within a device browser which is connected to the same wireless network. Additionally, LiveReload is installed which is used to monitor changes in the file system. As soon as you save a file, it is preprocessed as needed, and the browser is refreshed automatically.
+Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically.
 
 ```bash
 $ ionic serve [http-port] [livereload-port] [options]

From f48afd86c5500414c0970cd0fd6affdd2235150f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 7 Aug 2014 21:39:32 -0500
Subject: [PATCH 0176/1100] fix windows cordova cmd issues

---
 lib/ionic/cordova.js | 4 ++--
 package.json         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index dd6732a24b..2d97530118 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     path = require('path'),
-    spawn = require('child_process').spawn,
+    exec = require('child_process').exec,
     colors = require('colors');
 
 var IonicCordovaTask = function() {};
@@ -37,7 +37,7 @@ IonicCordovaTask.prototype.run = function(ionic) {
 
   cmdArgs.unshift(cmdName);
 
-  var cordovaCmd = spawn('cordova', cmdArgs);
+  var cordovaCmd = exec('cordova ' + cmdArgs.join(' '));
 
   cordovaCmd.stdout.on('data', function (data) {
     process.stdout.write(data);
diff --git a/package.json b/package.json
index c96e0f0d6c..0b4d072aa0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.8",
+  "version": "1.1.9-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6b4c3d861c268cf7fc86f71d298008297c76dd02 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 7 Aug 2014 21:40:04 -0500
Subject: [PATCH 0177/1100] get version data from ionic-bower for scss files

---
 lib/ionic/bower.js |   8 ++-
 lib/ionic/lib.js   | 169 ++++++++++++++++++++++++++++-----------------
 2 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index 0f7ca0b7c4..82e447f6d5 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -20,9 +20,11 @@ exports.IonicBower = {
   getData: function() {
     var bowerFilePath = path.resolve('bower.json');
 
-    if( fs.existsSync(bowerFilePath) ) {
-      return require(bowerFilePath);
-    }
+    try {
+      if( fs.existsSync(bowerFilePath) ) {
+        return require(bowerFilePath);
+      }
+    } catch(e){}
 
     return {
       "name": "HelloIonic",
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 9d0ded7b68..b0656b40d0 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -6,7 +6,7 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     colors = require('colors'),
-    spawn = require('child_process').spawn,
+    exec = require('child_process').exec,
     Q = require('q'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
@@ -19,7 +19,7 @@ IonicLibTask.prototype.run = function(ionic) {
   var self = this;
   self.codeHost = 'http://code.ionicframework.com';
   self.local = {};
-  self.latest = {};
+  self.versionData = {};
   self.usesBower = false;
 
   if (!fs.existsSync( path.resolve('www') )) {
@@ -58,10 +58,10 @@ IonicLibTask.prototype.printLibVersions = function() {
 
   console.log('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
 
-  this.getLatestVersions().then(function(){
-    console.log('Latest Ionic version: '.bold.green + self.latest.version_number + '  (released ' + self.latest.release_date + ')');
+  this.getVersionData('latest').then(function(){
+    console.log('Latest Ionic version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
 
-    if(self.local.version != self.latest.version_number) {
+    if(self.local.version != self.versionData.version_number) {
       console.log(' * Local version is out of date'.yellow );
     } else {
       console.log(' * Local version up to date'.green );
@@ -70,17 +70,39 @@ IonicLibTask.prototype.printLibVersions = function() {
 };
 
 
-IonicLibTask.prototype.getLatestVersions = function() {
+IonicLibTask.prototype.getVersionData = function(version) {
   var q = Q.defer();
   var self = this;
 
+  var url = self.codeHost;
+  if(version == 'latest') {
+    url += '/latest.json';
+  } else {
+    url += '/' + version + '/version.json';
+  }
+
   var proxy = process.env.PROXY || null;
-  request({ url: self.codeHost + '/latest.json', proxy: proxy }, function(err, res, body) {
+  request({ url: url, proxy: proxy }, function(err, res, body) {
     try {
-      self.latest = JSON.parse(body);
+      if(err || !res || !body) {
+        console.log('Unable to receive version data');
+        q.reject();
+        return;
+      }
+      if(res.statusCode == 404) {
+        console.log( ('Invalid version: ' + version).bold.red );
+        q.reject();
+        return;
+      }
+      if(res.statusCode >= 400) {
+        console.log('Unable to load version data');
+        q.reject();
+        return;
+      }
+      self.versionData = JSON.parse(body);
       q.resolve();
     } catch(e) {
-      console.log('Error loading latest version information'.bold.error );
+      console.log('Error loading '.bold.error + version.bold + ' version information'.bold.error );
       q.reject();
     }
   });
@@ -93,7 +115,7 @@ IonicLibTask.prototype.updateLibVersion = function() {
   var self = this;
 
   if(self.usesBower) {
-    var bowerCmd = spawn('bower', ['update', 'ionic']);
+    var bowerCmd = exec('bower update ionic');
 
     bowerCmd.stdout.on('data', function (data) {
       process.stdout.write(data);
@@ -146,47 +168,44 @@ IonicLibTask.prototype.getLatest = function() {
   }
 
   dirPath = path.resolve('www/lib/ionic/');
-  deleteFolderRecursive(dirPath);
   if(!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath);
   }
 
   var version = argv.version || argv.v;
-  if(version && version !== true && version !== false) {
-    // get specific version
-    var archivePath = '/' + version + '/ionic-v' + version + '.zip';
-    self.downloadZip(archivePath, version);
-
-  } else {
-    // get the latest version
-    this.getLatestVersions().then(function(){
-      console.log('Latest version: '.bold.green + self.latest.version_number + '  (released ' + self.latest.release_date + ')');
-
-      self.downloadZip(self.latest.archive, self.latest.version_number);
-
-    });
+  if(version === true || !version) {
+    version = 'latest';
   }
 
+  this.getVersionData(version).then(function(){
+    if(version == 'latest') {
+      console.log('Latest version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+    } else {
+      console.log('Version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+    }
+    self.downloadZip(self.versionData.version_number);
+  });
+
 };
 
 
-IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
+IonicLibTask.prototype.downloadZip = function(version) {
   var self = this;
 
-  var versionZip = self.codeHost + archivePath;
+  var archivePath = 'https://github.com/driftyco/ionic-bower/archive/v' + version + '.zip';
   self.tmpZipPath = path.resolve('www/lib/ionic/ionic.zip');
 
-  console.log('Downloading: '.green.bold + versionZip);
+  console.log('Downloading: '.green.bold + archivePath);
 
   var file = fs.createWriteStream(self.tmpZipPath);
   var proxy = process.env.PROXY || null;
-  request({ url: versionZip, encoding: null, proxy: proxy }, function(err, res, body) {
+  request({ url: archivePath, encoding: null, proxy: proxy }, function(err, res, body) {
     if(err) {
       console.log(err);
       return;
     }
     if(res.statusCode == 404) {
-      console.log( ('Invalid version: ' + versionNumber).bold.red );
+      console.log( ('Invalid version: ' + version).bold.red );
       try {
         file.close();
         fs.unlink(self.tmpZipPath);
@@ -235,58 +254,82 @@ IonicLibTask.prototype.downloadZip = function(archivePath, versionNumber) {
 };
 
 
-IonicLibTask.prototype.updateFiles = function() {
+IonicLibTask.prototype.updateFiles = function(version) {
   var self = this;
-  var ionicLibDir = path.resolve('www/lib/ionic/');
+  var ionicLibDir = path.resolve('www/lib/ionic');
   var readStream = fs.createReadStream(self.tmpZipPath);
 
   try {
-    var writeStream = unzip.Extract({ path: ionicLibDir });
-    writeStream.on('close', function() {
-      try{
-        self.loadVersionData();
 
-        console.log('Ionic version updated to: '.bold.green + self.local.version.bold );
-        IonicStats.t();
+    function onEntry(entry) {
+      var libEntryPath = entry.path.replace('ionic-bower-' + self.versionData.version_number + '/', ionicLibDir + '/');
 
-        var ionicBower = require('./bower').IonicBower;
-        ionicBower.setIonicVersion(self.local.version);
+      if( /bower.json|readme/gi.test(entry.path) ) {
+        entry.autodrain();
+        return;
+      }
 
-      } catch(e) {
-        console.log( ('Error loading version info: ' + e).error.bold );
+      if(entry.type == 'Directory') {
+        if( !fs.existsSync(libEntryPath) ) {
+          fs.mkdirSync(libEntryPath);
+        }
+      } else {
+        var writeStream = fs.createWriteStream(libEntryPath);
+        writeStream.on('error', function(err) {
+          console.log( ('Error writing, ' + libEntryPath + ': ' + err).bold.red );
+        });
+        entry.pipe(writeStream);
       }
-      try {
-        fs.unlink(self.tmpZipPath);
-      } catch(e) {}
-    });
-    writeStream.on('error', function(err) {
-      console.log('Error: ' + err);
-    });
-    readStream.pipe(writeStream);
+
+      entry.autodrain();
+    }
+
+    readStream.pipe(unzip.Parse())
+      .on('entry', onEntry)
+      .on('close', function(){
+        try{
+          console.log('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
+          IonicStats.t();
+
+          self.writeVersionData();
+
+          var ionicBower = require('./bower').IonicBower;
+          ionicBower.setIonicVersion(self.versionData.version_number);
+
+        } catch(e) {
+          console.log( ('Error loading version info: ' + e).error.bold );
+        }
+      });
 
     readStream.on('error', function(err){
       console.log('Error: ' + err);
     });
 
+    readStream.on('close', function(err){
+      try {
+        fs.unlink(self.tmpZipPath);
+      } catch(e){}
+    });
+
   } catch(err) {
     console.log('Error: ' + err);
   }
 };
 
-
-function deleteFolderRecursive(path) {
-  if( fs.existsSync(path) ) {
-    fs.readdirSync(path).forEach(function(file,index){
-      var curPath = path + "/" + file;
-      if(fs.lstatSync(curPath).isDirectory()) { // recurse
-        deleteFolderRecursive(curPath);
-      } else { // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
+IonicLibTask.prototype.writeVersionData = function() {
+  try {
+    var versionData = {
+      "version": this.versionData.version_number || this.versionData.version,
+      "codename": this.versionData.version_codename || this.versionData.codename,
+      "date": this.versionData.release_date || this.versionData.date
+    };
+
+    var file = fs.createWriteStream( path.resolve('www/lib/ionic/version.json') );
+    file.write( JSON.stringify(versionData, null, 2) );
+    file.close();
+  } catch(e) {
+    console.log( ('Error writing version data: ' + e).error.bold );
   }
-}
-
+};
 
 exports.IonicLibTask = IonicLibTask;

From c65760db79bdad46184718551416b2d8d4f8a1eb Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 9 Aug 2014 23:20:51 -0500
Subject: [PATCH 0178/1100] ionic setup sass

---
 README.md          |  12 +++++
 lib/ionic.js       |  20 ++++++--
 lib/ionic/bower.js |   4 +-
 lib/ionic/login.js |   2 +-
 lib/ionic/serve.js |  27 +++++++++-
 lib/ionic/setup.js | 123 +++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 179 insertions(+), 9 deletions(-)
 create mode 100644 lib/ionic/setup.js

diff --git a/README.md b/README.md
index 2e6ed11ac3..ca06471175 100644
--- a/README.md
+++ b/README.md
@@ -87,3 +87,15 @@ The third argument can be either `debug` or `release`, and the last argument can
 Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
 
 Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.
+
+
+## Using Sass
+
+By default, starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, Ionic projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Please follow these steps if you would like to use Sass for an Ionic project:
+
+1) Run `npm install` from the working directory of an Ionic project. This will install the [gulp.js](http://gulpjs.com/) build system and a few handy tasks, such as [gulp-sass](https://www.npmjs.org/package/gulp-sass) and [gulp-minify-css](https://www.npmjs.org/package/gulp-minify-css).
+2) Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
+3) Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
+4) Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
+5) In the `ionic.project` file, add the JavaScript property `sass: true` to the object.
+
diff --git a/lib/ionic.js b/lib/ionic.js
index 5b341998e7..d8f7613f85 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -20,6 +20,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicUploadTask = require('./ionic/upload').IonicUploadTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
     IonicLibTask = require('./ionic/lib').IonicLibTask,
+    IonicSetupTask = require('./ionic/setup').IonicSetupTask,
     IonicServeTask = require('./ionic/serve'),
     IonicProject = require('./ionic/project'),
     IonicStore = require('./ionic/store').IonicStore,
@@ -137,7 +138,7 @@ var TASKS = [
     },
     options: {
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n\
-                                                 each of its subdirectories for the plugin before hitting the registry.'
+                                                   each of its subdirectories for the plugin before hitting the registry.'
     },
     task: IonicCordovaTask
   },
@@ -201,6 +202,15 @@ var TASKS = [
     },
     task: IonicLibTask
   },
+  {
+    title: 'setup',
+    name: 'setup',
+    summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
+    args: {
+      '[sass]': 'Setup the project to use Sass CSS precompiling'
+    },
+    task: IonicSetupTask
+  },
   {
     title: 'login',
     name: 'login',
@@ -209,7 +219,7 @@ var TASKS = [
 ];
 
 Ionic = {
-  IONIC_DASH: 'http://apps.ionicframework.com',
+  IONIC_DASH: 'https://ionic.io',
   //IONIC_DASH: 'http://localhost:8000',
   IONIC_API: '/api/v1/',
   PRIVATE_PATH: '.ionic',
@@ -246,7 +256,7 @@ Ionic = {
 
     w('\n');
 
-    var rightColumn = 45;
+    var rightColumn = 47;
     var dots = '';
     var indent = '';
     var x, arg;
@@ -265,7 +275,9 @@ Ionic = {
 
     w(' ' + dots.grey + '  ');
 
-    w(d.summary.bold);
+    if(d.summary) {
+      w(d.summary.bold);
+    }
 
     for(arg in d.args) {
       if( !d.args[arg] ) continue;
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index 82e447f6d5..9ceab6e83f 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -1,6 +1,6 @@
 var fs = require('fs'),
-         path = require('path'),
-         colors = require('colors');
+    path = require('path'),
+    colors = require('colors');
 
 exports.IonicBower = {
 
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index c61adaa799..61f4de86d4 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -123,7 +123,7 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
 
       // Should be a 302 redirect status code if correct
       if(response.statusCode != 302) {
-        return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH +' for help.');
+        return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH.white +' for help.'.red);
       }
 
       if(saveCookies) {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index a4bc185953..f62c14d40c 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -8,6 +8,7 @@ var fs = require('fs'),
     vfs = require('vinyl-fs'),
     request = require('request'),
     Q = require('q'),
+    spawn = require('child_process').spawn,
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
@@ -24,6 +25,7 @@ IonicServeTask.prototype.run = function(ionic) {
 
   this.launchBrowser = !argv.nobrowser && !argv.b;
   this.runLivereload = !argv.nolivereload && !argv.r;
+  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.s;
 
   this._start(ionic);
 
@@ -62,6 +64,20 @@ IonicServeTask.prototype._start = function(ionic) {
     return ionic.fail('"www" directory cannot be found. Make sure the working directory is an Ionic project.');
   }
 
+  if(this.watchSass) {
+    var childProcess = spawn('gulp', ['watch']);
+
+    childProcess.stdout.on('data', function (data) {
+      process.stdout.write(data);
+    });
+
+    childProcess.stderr.on('data', function (data) {
+      if(data) {
+        process.stderr.write(data.toString().yellow);
+      }
+    });
+  }
+
   if(this.runLivereload) {
     vfs.watch('www/**/*', {
     }, function(f) {
@@ -73,7 +89,7 @@ IonicServeTask.prototype._start = function(ionic) {
       if(err) {
         return ionic.fail('Unable to start live reload server:', err);
       } else {
-        console.log('Running live reload server at', (self.host(self.liveReloadPort).info.bold) );
+        console.log('Running live reload server:'.green.bold, (self.host(self.liveReloadPort).bold) );
         if(self.launchBrowser) {
           open( self.host(self.port) );
         }
@@ -88,7 +104,14 @@ IonicServeTask.prototype._start = function(ionic) {
   app.use(connect.static('www'))
     .listen(this.port);
 
-  console.log('Running dev server at', ( this.host(this.port) ).info.bold);
+  console.log('Running dev server:'.green.bold, ( this.host(this.port) ).bold);
+
+  process.stdin.on('readable', function() {
+    var chunk = process.stdin.read();
+    if (chunk !== null && /exit|quit|close|stop/gi.test(chunk)) {
+      process.exit();
+    }
+  });
 };
 
 
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
new file mode 100644
index 0000000000..cc835892be
--- /dev/null
+++ b/lib/ionic/setup.js
@@ -0,0 +1,123 @@
+var IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats,
+    fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    exec = require('child_process').exec,
+    Q = require('q'),
+    IonicProject = require('./project'),
+    colors = require('colors');
+
+var IonicSetupTask = function() {};
+
+IonicSetupTask.prototype = new IonicTask();
+
+IonicSetupTask.prototype.run = function(ionic) {
+  if( argv._.length < 2 ) {
+    return ionic.fail('Missing setup task command.', 'setup');
+  }
+
+  var tasks = argv._.slice(1);
+
+  for(var x=0; x<tasks.length; x++) {
+    if(tasks[x].toLowerCase() == 'sass') {
+      this.sassSetup(ionic);
+    } else {
+      return ionic.fail('Invalid setup task command: ' + tasks[x], 'setup');
+    }
+  }
+
+  IonicStats.t();
+};
+
+
+IonicSetupTask.prototype.sassSetup = function(ionic) {
+  this.npmInstall().then(function(){
+
+    var indexPath = path.resolve('www/index.html');
+    var lines, line, keepLine, activeRemoving;
+    var cleanedLines = [];
+
+    try {
+      lines = fs.readFileSync(indexPath, 'utf8').split('\n');
+    } catch(e) {
+      return ionic.fail('Error loading ' + indexPath);
+    }
+
+    try {
+      var activeRemoving = false;
+
+      for(x=0; x<lines.length; x++) {
+        line = lines[x];
+        keepLine = true;
+
+        if( /<!--(.*?) sass (.*?)/gi.test(line) ) {
+          line = '    <!-- compiled css output -->';
+          activeRemoving = true;
+        } else if (activeRemoving && /(.*?)-->(.*?)/gi.test(line) ) {
+          keepLine = false;
+          activeRemoving = false;
+        } else if( /lib\/ionic\/css\/ionic.css|css\/style.css/gi.test(line) ) {
+          keepLine = false;
+        }
+
+        if(keepLine) {
+          cleanedLines.push(line);
+        }
+      }
+
+      var project = IonicProject.load();
+      project.set('sass', true);
+      project.save();
+
+      fs.writeFileSync(indexPath, cleanedLines.join('\n'), 'utf8');
+
+      console.log('Updated '.green.bold + indexPath.bold + ' <link href>'.yellow.bold + ' references to sass compiled css'.green.bold);
+
+      console.log('\nIonic project ready to use Sass!'.green.bold);
+      console.log(' * Customize the app using'.yellow.bold, 'scss/ionic.app.scss'.bold);
+      console.log(' * Run'.yellow.bold, 'ionic serve'.bold, 'to compile to CSS and start a local dev server'.yellow.bold);
+      console.log('');
+
+    } catch(e) {
+      return ionic.fail('Error parsing ' + indexPath + ': ' + e);
+    }
+
+  });
+};
+
+
+IonicSetupTask.prototype.npmInstall = function() {
+  var q = Q.defer();
+
+  var childProcess = exec('npm install');
+
+  childProcess.stdout.on('data', function (data) {
+    process.stdout.write(data);
+  });
+
+  childProcess.stderr.on('data', function (data) {
+    if(data) {
+      data = data.toString();
+      if( !/no repository field/gi.test(data) ) {
+        process.stderr.write(data.yellow);
+      }
+    }
+  });
+
+  childProcess.on('exit', function(code){
+    process.stderr.write('\n');
+    if(code === 0) {
+      console.log('Successful '.green.bold + 'npm install'.bold);
+      q.resolve();
+    } else {
+      console.log( 'Error running '.error.bold + 'npm install'.bold );
+      q.reject()
+    }
+  });
+
+  return q.promise;
+};
+
+
+exports.IonicSetupTask = IonicSetupTask;

From 71ac69cd5ad81f26fbac6a21299b771cec70d9ec Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 9 Aug 2014 23:22:15 -0500
Subject: [PATCH 0179/1100] v1.1.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b4d072aa0..f152434f79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.9-beta1",
+  "version": "1.1.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 93d5aae155fd2897a01a393d3719868502772dd8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Mon, 11 Aug 2014 09:22:44 -0500
Subject: [PATCH 0180/1100] Update README.md

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ae892be806..67329e6840 100644
--- a/README.md
+++ b/README.md
@@ -102,9 +102,9 @@ Note: we occasionally send anonymous usage statistics to the Ionic team to make
 
 By default, starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, Ionic projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Please follow these steps if you would like to use Sass for an Ionic project:
 
-1) Run `npm install` from the working directory of an Ionic project. This will install the [gulp.js](http://gulpjs.com/) build system and a few handy tasks, such as [gulp-sass](https://www.npmjs.org/package/gulp-sass) and [gulp-minify-css](https://www.npmjs.org/package/gulp-minify-css).
-2) Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
-3) Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
-4) Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
-5) In the `ionic.project` file, add the JavaScript property `sass: true` to the object.
+1. Run `npm install` from the working directory of an Ionic project. This will install [gulp.js](http://gulpjs.com/) and a few handy tasks, such as [gulp-sass](https://www.npmjs.org/package/gulp-sass) and [gulp-minify-css](https://www.npmjs.org/package/gulp-minify-css).
+2. Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
+3. Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
+4. Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
+5. In the `ionic.project` file, add the JavaScript property `sass: true` to the object.
 

From 24e88dcbf6151bcdc0b34bbea87e236a99821708 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Mon, 11 Aug 2014 09:32:03 -0500
Subject: [PATCH 0181/1100] Update README.md

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 67329e6840..04da02ce8f 100644
--- a/README.md
+++ b/README.md
@@ -100,11 +100,17 @@ Note: we occasionally send anonymous usage statistics to the Ionic team to make
 
 ## Using Sass
 
-By default, starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, Ionic projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Please follow these steps if you would like to use Sass for an Ionic project:
+By default, starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, Ionic projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Below are two ways to setup Sass for your Ionic project (the `ionic setup sass` command simply does the manual steps for you). Once Sass has been setup for your Ionic project, then the `ionic serve` command will also watch for Sass changes.
+
+#### Setup Sass Automatically
+
+    ionic setup sass
+
+
+#### Setup Sass Manually
 
 1. Run `npm install` from the working directory of an Ionic project. This will install [gulp.js](http://gulpjs.com/) and a few handy tasks, such as [gulp-sass](https://www.npmjs.org/package/gulp-sass) and [gulp-minify-css](https://www.npmjs.org/package/gulp-minify-css).
 2. Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 3. Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 4. Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
 5. In the `ionic.project` file, add the JavaScript property `sass: true` to the object.
-

From 6c7419cf38e29478d5e84b2cd59e44f781249428 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Mon, 11 Aug 2014 09:47:54 -0500
Subject: [PATCH 0182/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04da02ce8f..7b755fcea9 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Command-line flags/options:
 
 ## Testing in a Browser
 
-Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically.
+Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/edit/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
 
 ```bash
 $ ionic serve [http-port] [livereload-port] [options]

From 338b53dfdbe8831fe37ebb3b7b0967938c0c7a40 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Mon, 11 Aug 2014 09:48:22 -0500
Subject: [PATCH 0183/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b755fcea9..8d43e2a2d9 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Command-line flags/options:
 
 ## Testing in a Browser
 
-Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/edit/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
+Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
 
 ```bash
 $ ionic serve [http-port] [livereload-port] [options]

From 24a00409ea38d73f5c184f0dd4edb0ad5e6343f0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 11 Aug 2014 11:32:24 -0500
Subject: [PATCH 0184/1100] setup sass

---
 lib/ionic.js       |  3 ++-
 lib/ionic/setup.js | 12 +++++++++++-
 lib/ionic/start.js | 16 ++++++++++++++--
 lib/ionic/stats.js |  5 +++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d8f7613f85..7c56cf9ac4 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -65,7 +65,8 @@ var TASKS = [
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp',
-      '--no-cordova|-w': 'Create a basic structure without Cordova requirements'
+      '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
+      '--sass|-s': 'Setup the project to use Sass CSS precompiling'
     },
     task: IonicStartTask
   },
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index cc835892be..4ec4002b85 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -32,6 +32,8 @@ IonicSetupTask.prototype.run = function(ionic) {
 
 
 IonicSetupTask.prototype.sassSetup = function(ionic) {
+  var q = Q.defer();
+
   this.npmInstall().then(function(){
 
     var indexPath = path.resolve('www/index.html');
@@ -41,6 +43,7 @@ IonicSetupTask.prototype.sassSetup = function(ionic) {
     try {
       lines = fs.readFileSync(indexPath, 'utf8').split('\n');
     } catch(e) {
+      q.reject(e);
       return ionic.fail('Error loading ' + indexPath);
     }
 
@@ -76,14 +79,21 @@ IonicSetupTask.prototype.sassSetup = function(ionic) {
 
       console.log('\nIonic project ready to use Sass!'.green.bold);
       console.log(' * Customize the app using'.yellow.bold, 'scss/ionic.app.scss'.bold);
-      console.log(' * Run'.yellow.bold, 'ionic serve'.bold, 'to compile to CSS and start a local dev server'.yellow.bold);
+      console.log(' * Run'.yellow.bold, 'ionic serve'.bold, 'to start a local dev server and watch/compile Sass to CSS'.yellow.bold);
       console.log('');
 
+      q.resolve();
+
     } catch(e) {
+      q.reject(e);
       return ionic.fail('Error parsing ' + indexPath + ': ' + e);
     }
 
+  }, function(e){
+    q.reject(e);
   });
+
+  return q.promise;
 };
 
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index c8782e7c63..e17ae2cd95 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     spawn = require('child_process').spawn,
     Q = require('q'),
     xml2js = require('xml2js'),
+    setup = require('./setup'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
@@ -63,7 +64,6 @@ IonicStartTask.prototype.run = function(ionic) {
 
   // Make sure to create this, or ask them if they want to override it
   if(this._checkTargetPath() === false) {
-    process.stderr.write('\nExiting.\n');
     process.exit(1);
   }
 
@@ -188,6 +188,7 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
       var npmQ = Q.defer();
       var gulpQ = Q.defer();
       var pluginQ = Q.defer();
+      var q = Q.defer();
       // Install dependencies for the starter project
 
       // Move the content of this repo into the www folder
@@ -215,7 +216,18 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
         var ionicBower = require('./bower').IonicBower;
         ionicBower.setAppName(self.appName);
 
-        self._printQuickHelp(self.appDirectory);
+        if(argv.sass) {
+          console.log('setup sass'.green.bold);
+          var setupTask = new setup.IonicSetupTask();
+          q = setupTask.sassSetup(self.ionic)
+        } else {
+          q.resolve();
+        }
+
+        q.then(function(){
+          self._printQuickHelp(self.appDirectory);
+        });
+
       }, function(err) {
         return self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
       });
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index d5869665bf..ffd7ab3041 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -539,7 +539,8 @@ exports.IonicStats = {
         '-b': '--nobrowser',
         '-r': '--nolivereload',
         '-l': '--clear-signing',
-        '-n': '--no-email'
+        '-n': '--no-email',
+        '-s': '--sass'
       };
       for(x=0; x<cmdArgs.length; x++) {
         for(y in aliasMap) {
@@ -550,7 +551,7 @@ exports.IonicStats = {
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator --sass'.split(' ');
 
       // collect only certain args, skip over everything else
       for(x=0; x<cmdArgs.length; x++) {

From a2c88fb8e6281a5c5440a2d0af2d822112e6fe9e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 11 Aug 2014 11:33:21 -0500
Subject: [PATCH 0185/1100] api login

---
 lib/ionic/login.js  | 65 +++++++++++++++++++--------------------------
 lib/ionic/upload.js | 14 +++++++---
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 61f4de86d4..83b8823c25 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -97,53 +97,42 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
 
   var jar = request.jar();
   request({
-    url: ionic.IONIC_DASH + '/login',
-    jar: jar
+    method: 'POST',
+    url: ionic.IONIC_DASH + ionic.IONIC_API + '/user/login',
+    jar: jar,
+    form: {
+      username: self.email.toString().toLowerCase(),
+      password: self.password
+    },
+    proxy: process.env.PROXY || null
   },
-  function(err, response, body) {
-    if(err || jar.cookies.length === 0) {
+  function (err, response, body) {
+    if(err) {
       return ionic.fail('Error logging in: ' + err);
     }
 
-    request({
-      method: 'POST',
-      url: ionic.IONIC_DASH + '/login',
-      jar: jar,
-      form: {
-        username: self.email.toString().toLowerCase(),
-        password: self.password,
-        csrfmiddlewaretoken: jar.cookies[0].value
-      },
-      proxy: process.env.PROXY || null
-    },
-    function (err, response, body) {
-      if(err) {
-        return ionic.fail('Error logging in: ' + err);
-      }
-
-      // Should be a 302 redirect status code if correct
-      if(response.statusCode != 302) {
-        return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH.white +' for help.'.red);
-      }
+    // Should be a 302 redirect status code if correct
+    if(response.statusCode != 200) {
+      return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH.white +' for help.'.red);
+    }
 
-      if(saveCookies) {
-        // save cookies
-        if(!self.cookieData) {
-          self.cookieData = new IonicStore('cookies');
-        }
-        self.cookieData.set(ionic.IONIC_DASH, jar);
-        self.cookieData.save();
+    if(saveCookies) {
+      // save cookies
+      if(!self.cookieData) {
+        self.cookieData = new IonicStore('cookies');
       }
+      self.cookieData.set(ionic.IONIC_DASH, jar);
+      self.cookieData.save();
+    }
 
-      // save in memory
-      ionic.jar = jar;
+    // save in memory
+    ionic.jar = jar;
 
-      console.log('Logged in! :)'.green);
+    console.log('Logged in! :)'.green);
 
-      if(callback) {
-        callback(jar);
-      }
-    });
+    if(callback) {
+      callback(jar);
+    }
   });
 };
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 612e586ae9..e0400a4f6a 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -70,6 +70,16 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
         response.setEncoding('utf8');
         response.on("data", function(data) {
           try {
+
+            if(response.statusCode == 401) {
+              q.reject('not_logged_in');
+              return ionic.fail('Session expired (401). Please log in and run this command again.');
+
+            } else if(response.statusCode == 403) {
+              q.reject('forbidden');
+              return ionic.fail('Forbidden upload (403)');
+            }
+
             var d = JSON.parse(data);
             if(d.errors && d.errors.length) {
               for (var j = 0; j < d.errors.length; j++) {
@@ -94,10 +104,6 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
                 }
               }
 
-            } else if(response.statusCode == 401) {
-              console.error( ('Session expired. Please log in again and run this command again.').red.bold );
-              q.reject('not_logged_in');
-
             } else {
               q.reject('upload_error');
             }

From b49d1792dd376a389fa6f6e20f23a85e49c66c48 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 12 Aug 2014 16:19:01 -0500
Subject: [PATCH 0186/1100] cli version in fail msg

---
 .gitignore   | 1 +
 lib/ionic.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ccc574f1f2..d0acd17ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.sw*
 *.cookies
 node_modules/
+.idea/
diff --git a/lib/ionic.js b/lib/ionic.js
index 7c56cf9ac4..b163fb7332 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -407,7 +407,7 @@ Ionic = {
   fail: function(msg, taskHelp) {
     this.hasFailed = true;
     process.stderr.write(msg.error.bold);
-    process.stderr.write('\n');
+    process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
     if(taskHelp) {
       for(var i = 0; i < TASKS.length; i++) {
         var task = TASKS[i];

From 44835e31c8a9a5a6fb903e75eb3f56304068e8b3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 15 Aug 2014 10:07:32 -0500
Subject: [PATCH 0187/1100] build sass on setup

---
 lib/ionic/setup.js | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 4ec4002b85..68263d22ec 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -33,6 +33,7 @@ IonicSetupTask.prototype.run = function(ionic) {
 
 IonicSetupTask.prototype.sassSetup = function(ionic) {
   var q = Q.defer();
+  var self = this;
 
   this.npmInstall().then(function(){
 
@@ -82,7 +83,9 @@ IonicSetupTask.prototype.sassSetup = function(ionic) {
       console.log(' * Run'.yellow.bold, 'ionic serve'.bold, 'to start a local dev server and watch/compile Sass to CSS'.yellow.bold);
       console.log('');
 
-      q.resolve();
+      self.buildSass().then(function(){
+        q.resolve();
+      });
 
     } catch(e) {
       q.reject(e);
@@ -97,6 +100,36 @@ IonicSetupTask.prototype.sassSetup = function(ionic) {
 };
 
 
+IonicSetupTask.prototype.buildSass = function() {
+  var q = Q.defer();
+
+  var childProcess = exec('gulp sass');
+
+  childProcess.stdout.on('data', function (data) {
+    process.stdout.write(data);
+  });
+
+  childProcess.stderr.on('data', function (data) {
+    if(data) {
+      process.stderr.write(data.toString().yellow);
+    }
+  });
+
+  childProcess.on('exit', function(code){
+    process.stderr.write('\n');
+    if(code === 0) {
+      console.log('Successful '.green.bold + 'sass build'.bold);
+      q.resolve();
+    } else {
+      console.log( 'Error running '.error.bold + 'gulp sass'.bold );
+      q.reject()
+    }
+  });
+
+  return q.promise;
+};
+
+
 IonicSetupTask.prototype.npmInstall = function() {
   var q = Q.defer();
 

From a987653e07c3498b7216d896c6015942dd993756 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 15 Aug 2014 22:28:20 -0500
Subject: [PATCH 0188/1100] lower case start template name

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index e17ae2cd95..0c82cdf427 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -58,7 +58,7 @@ IonicStartTask.prototype.run = function(ionic) {
   this.isCordovaProject = (argv.cordova !== false && !argv.w);
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
-  var starterProject = argv.template || argv.t || argv._[2] || 'tabs';
+  var starterProject = (argv.template || argv.t || argv._[2] || 'tabs').toLowerCase();
 
   this.targetPath = path.resolve(this.appDirectory);
 

From 2805b39b148a05ab24541b7d92cb7f630538d7b1 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 18 Aug 2014 09:41:17 -0500
Subject: [PATCH 0189/1100] rm /www/Readme.md

---
 lib/ionic/start.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0c82cdf427..26f71b674d 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -216,6 +216,10 @@ IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
         var ionicBower = require('./bower').IonicBower;
         ionicBower.setAppName(self.appName);
 
+        try {
+          fs.unlinkSync(self.targetPath + '/www/README.md');
+        } catch(e) {}
+
         if(argv.sass) {
           console.log('setup sass'.green.bold);
           var setupTask = new setup.IonicSetupTask();

From ba8c9620bb488bc355db80bb0ca43e2755c12a22 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 18 Aug 2014 09:41:33 -0500
Subject: [PATCH 0190/1100] gulp sass on watch

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index f62c14d40c..617fb85a7f 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -65,7 +65,7 @@ IonicServeTask.prototype._start = function(ionic) {
   }
 
   if(this.watchSass) {
-    var childProcess = spawn('gulp', ['watch']);
+    var childProcess = spawn('gulp', ['sass','watch']);
 
     childProcess.stdout.on('data', function (data) {
       process.stdout.write(data);

From bca11f48276d2619cc1f03a6c9fa6ecdeabd5b1e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 18 Aug 2014 09:41:48 -0500
Subject: [PATCH 0191/1100] 1.1.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f152434f79..85b51b8be3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 62eba5e718ee40e90634a626057197e6b1ac0737 Mon Sep 17 00:00:00 2001
From: Steven Pautz <spautz@gmail.com>
Date: Mon, 18 Aug 2014 11:00:16 -0400
Subject: [PATCH 0192/1100] Update after_prepare hook to match <body> tags
 which have no attributes. Fixes #74

---
 lib/hooks/after_prepare/010_add_platform_class.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index cdfb187492..edd86c9065 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -52,7 +52,7 @@ function addPlatformBodyTag(indexPath, platform) {
 function findBodyTag(html) {
   // get the body tag
   try{
-    return html.match(/<body (.*?)>/gi)[0];
+    return html.match(/<body(?=[\s>])(.*?)>/gi)[0];
   }catch(e){}
 }
 

From 96496ea58f713737aebdd0ef89a5bd025d8ec426 Mon Sep 17 00:00:00 2001
From: Jamieson Warner <jamiesonwarner@gmail.com>
Date: Tue, 26 Aug 2014 15:41:08 -0500
Subject: [PATCH 0193/1100] remove double slash from api login calls

---
 lib/ionic/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 83b8823c25..ce1109faae 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -98,7 +98,7 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
   var jar = request.jar();
   request({
     method: 'POST',
-    url: ionic.IONIC_DASH + ionic.IONIC_API + '/user/login',
+    url: ionic.IONIC_DASH + ionic.IONIC_API + 'user/login',
     jar: jar,
     form: {
       username: self.email.toString().toLowerCase(),

From 03bdf23418c0457be98e95ac2d9944b59b7bb2b0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 28 Aug 2014 00:22:39 -0500
Subject: [PATCH 0194/1100] start ionic apps from codepen url

---
 lib/ionic.js       |  19 +-
 lib/ionic/start.js | 425 ++++++++++++++++++++++++++++++++-------------
 package.json       |   2 +-
 3 files changed, 312 insertions(+), 134 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index b163fb7332..caf294ca6a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -406,8 +406,10 @@ Ionic = {
 
   fail: function(msg, taskHelp) {
     this.hasFailed = true;
-    process.stderr.write(msg.error.bold);
-    process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
+    if(msg) {
+      process.stderr.write(msg.error.bold);
+      process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
+    }
     if(taskHelp) {
       for(var i = 0; i < TASKS.length; i++) {
         var task = TASKS[i];
@@ -509,17 +511,16 @@ Ionic = {
     return q.promise;
   },
   /**
-   * Fetch a repo from GitHub, unzip it to a specific folder.
+   * Download a zip file, unzip it to a specific folder.
    */
-  fetchRepo: function(targetPath, repoName, repoUrl) {
+  fetchArchive: function(targetPath, archiveUrl) {
     var q = Q.defer();
 
     // The folder name the project will be downloaded and extracted to
-    var repoFolderName = repoName + '-master';
-    console.log('\nDownloading:'.info.bold, repoUrl);
+    console.log('\nDownloading:'.info.bold, archiveUrl);
 
     var tmpFolder = os.tmpdir();
-    var tempZipFilePath = path.join(tmpFolder, repoName + new Date().getTime() + '.zip');
+    var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
     var tempZipFileStream = fs.createWriteStream(tempZipFilePath);
 
     var unzipRepo = function(fileName) {
@@ -527,7 +528,7 @@ Ionic = {
 
       var writeStream = unzip.Extract({ path: targetPath });
       writeStream.on('close', function() {
-        q.resolve(repoFolderName);
+        q.resolve();
       });
       writeStream.on('error', function(err) {
         q.reject(err);
@@ -536,7 +537,7 @@ Ionic = {
     };
 
     var proxy = process.env.PROXY || null;
-    request({ url: repoUrl, encoding: null, proxy: proxy }, function(err, res, body) {
+    request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
       if(!res || res.statusCode !== 200) {
         q.reject(res);
         return;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 26f71b674d..9c71169b12 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -14,20 +14,6 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
 
-fs.mkdirParent = function(dirPath, mode, callback) {
-  //Call the standard fs.mkdir
-  fs.mkdir(dirPath, mode, function(error) {
-    //When it fail in this way, do the custom steps
-    if (error && error.errno === 34) {
-      //Create all the parents recursively
-      fs.mkdirParent(path.dirname(dirPath), mode, callback);
-      //And then the directory
-      fs.mkdirParent(dirPath, mode, callback);
-    }
-    //Manually run the callback since we used our own callback to do all these
-    callback && callback(error);
-  });
-};
 
 var IonicStartTask = function() {};
 
@@ -54,43 +40,66 @@ IonicStartTask.prototype.run = function(ionic) {
     this.appName = appNameSplit[ appNameSplit.length -1 ];
   }
 
+  // get a packge name, like com.ionic.myapp
   this.packageName = argv.id || argv.i;
   this.isCordovaProject = (argv.cordova !== false && !argv.w);
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
-  var starterProject = (argv.template || argv.t || argv._[2] || 'tabs').toLowerCase();
+  this.template = (argv.template || argv.t || argv._[2] || 'tabs');
 
+  // figure out the full path
   this.targetPath = path.resolve(this.appDirectory);
 
-  // Make sure to create this, or ask them if they want to override it
-  if(this._checkTargetPath() === false) {
-    process.exit(1);
-  }
-
-  console.log('Creating Ionic app in folder', this.targetPath, 'based on', starterProject.info.bold, 'project');
+  console.log('Creating Ionic app in folder', this.targetPath, 'based on', this.template.info.bold, 'project');
 
-  fs.mkdirSync(this.targetPath);
+  // Make sure to create this
+  if( fs.existsSync(this.targetPath) ) {
+    // check if its empty first
+    if( fs.readdirSync(this.targetPath).length ) {
+      // only freak if target path already has files in it
+      return this.ionic.fail('The directory '.error.bold + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.'.error.bold);
+    }
+  } else {
+    // create the app directory
+    fs.mkdirSync(this.targetPath);
+  }
 
-  this._fetchAndWriteSeed(starterProject.toLowerCase());
+  // kick it all off
+  this.startApp();
+};
 
-  if(ionic.hasFailed) return;
 
-  this._writeProjectFile(ionic);
+IonicStartTask.prototype.startApp = function() {
+  var self = this;
 
+  self.fetchWrapper()
+    .then(function(){
+      return self.fetchSeed();
+    })
+    .then(function(){
+      return self.initCordova();
+    })
+    .then(function(){
+      return self.setupSass();
+    })
+    .then(function(){
+      return self.finalize();
+    })
+    .catch(function(err) {
+      console.error('Error: Unable to initalize app: '.error.bold, err);
+      return self.ionic.fail('');
+    });
 };
 
-IonicStartTask.prototype._getStarterUrl = function(repo) {
-  return 'https://github.com/driftyco/' + repo + '/archive/master.zip' ;
-};
 
-IonicStartTask.prototype._fetchWrapper = function() {
+IonicStartTask.prototype.fetchWrapper = function() {
   var q = Q.defer();
   var self = this;
 
-  var repoName = IonicStartTask.WRAPPER_REPO_NAME;
   var repoUrl = 'https://github.com/driftyco/' + IonicStartTask.WRAPPER_REPO_NAME + '/archive/master.zip';
 
-  Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
+  Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
+    var repoFolderName = IonicStartTask.WRAPPER_REPO_NAME + '-master';
     cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
     rm('-rf', self.targetPath + '/' + repoFolderName + '/');
     cd(self.targetPath);
@@ -113,25 +122,148 @@ IonicStartTask.prototype._fetchWrapper = function() {
   return q.promise;
 };
 
-IonicStartTask.prototype._installCordovaPlugins = function() {
+
+IonicStartTask.prototype.fetchSeed = function() {
+
+  if(this.template.toLowerCase().indexOf('codepen') > -1) {
+    this.seedType = 'codepen';
+    return this.fetchCodepen();
+  }
+
+  this.seedType = 'ionic-starter';
+  return this.fetchIonicStarter();
+};
+
+
+IonicStartTask.prototype.fetchCodepen = function() {
+  // Edit Url:  http://codepen.io/ionic/pen/gblny
+  // Download:  http://codepen.io/ionic/share/zip/gblny/
+  var self = this;
+  var splt = self.template.split('?')[0].split('#')[0].split('/');
+  var wwwPath = path.join(self.targetPath, 'www');
+  var codepenId = splt[ splt.length - 1 ];
+  if(!codepenId) {
+    codepenId = splt[ splt.length - 2 ];
+  }
+
+  console.log('\nDownloading Codepen:'.info.bold, codepenId);
+
+  var qHTML = Q.defer();
+  var qCSS = Q.defer();
+  var qJS = Q.defer();
+
+  var htmlUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.html';
+  var cssUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.css';
+  var jsUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.js';
+
+  var proxy = process.env.PROXY || null;
+
+  request({ url: htmlUrl, proxy: proxy }, function(err, res, html) {
+    if(!err && res && res.statusCode === 200 && html) {
+      html = '<!DOCTYPE html>\n' + html;
+
+      var resources = '    <link href="css/style.css" rel="stylesheet">\n' +
+                      '    <script src="js/app.js"></script>\n\n' +
+                      '  </head>';
+
+      html = html.replace(/<\/head>/i, '\n' + resources);
+
+      fs.writeFileSync(path.join(wwwPath, 'index.html'), html, 'utf8');
+    }
+    qHTML.resolve();
+  });
+
+  request({ url: cssUrl, proxy: proxy }, function(err, res, css) {
+    if(!err && res && res.statusCode === 200 && css) {
+      var cssPath = path.join(wwwPath, 'css');
+      if(!fs.existsSync(cssPath)) {
+        fs.mkdirSync(cssPath);
+      }
+      css = css.replace("cursor: url('http://ionicframework.com/img/finger.png'), auto;", '');
+      fs.writeFileSync(path.join(cssPath, 'style.css'), css, 'utf8');
+    }
+    qCSS.resolve();
+  });
+
+  request({ url: jsUrl, proxy: proxy }, function(err, res, js) {
+    if(!err && res && res.statusCode === 200 && js) {
+      var jsPath = path.join(wwwPath, 'js');
+      if(!fs.existsSync(jsPath)) {
+        fs.mkdirSync(jsPath);
+      }
+      fs.writeFileSync(path.join(jsPath, 'app.js'), js, 'utf8');
+    }
+    qJS.resolve();
+  });
+
+  return Q.all([qHTML.promise, qCSS.promise, qJS.promise]);
+};
+
+
+IonicStartTask.prototype.fetchIonicStarter = function() {
+  var self = this;
   var q = Q.defer();
 
-  console.log('Initializing cordova project.'.info.bold);
-  exec('cordova plugin add org.apache.cordova.device && ' +
-       'cordova plugin add org.apache.cordova.console && ' +
-       'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard',
-       function(err, stdout, stderr) {
-          if(err) {
-            q.reject(stderr);
-          } else {
-            q.resolve(stdout);
-          }
+  // Get the starter project repo name:
+  var repoName = 'ionic-starter-' + self.template;
+
+  // Get the URL for the starter project repo:
+  var repoUrl = 'https://github.com/driftyco/' + repoName + '/archive/master.zip';
+
+  Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
+
+    var repoFolderName = repoName + '-master';
+
+    // Move the content of this repo into the www folder
+    cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
+
+    // Clean up start template folder
+    rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+
+    q.resolve();
+
+  }).catch(function(err) {
+    console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode);
+    console.error('Valid project types are "blank", "tabs", or "sidemenu"'.error.bold);
+    console.error('More info available at: http://ionicframework.com/getting-started/'.error.bold);
+    return self.ionic.fail('');
   });
 
   return q.promise;
 };
 
-IonicStartTask.prototype._updateConfigXml = function() {
+
+IonicStartTask.prototype.initCordova = function() {
+  var q = Q.defer();
+
+  if(this.isCordovaProject) {
+    // update the config.xml file from cmd line args
+    this.updateConfigXml();
+
+    if(this.ionic.hasFailed) return;
+
+    console.log('Initializing cordova project.'.info.bold);
+    exec('cordova plugin add org.apache.cordova.device && ' +
+         'cordova plugin add org.apache.cordova.console && ' +
+         'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard',
+         function(err, stdout, stderr) {
+            if(err) {
+              this.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+              q.reject(stderr);
+            } else {
+              q.resolve(stdout);
+            }
+    });
+
+  } else {
+    q.resolve();
+  }
+
+  return q.promise;
+};
+
+
+IonicStartTask.prototype.updateConfigXml = function() {
   var self = this;
   console.log('\nUpdate config.xml'.info.bold);
 
@@ -168,123 +300,168 @@ IonicStartTask.prototype._updateConfigXml = function() {
   }
 };
 
-IonicStartTask.prototype._fetchAndWriteSeed = function(projectType) {
-  var self = this;
 
-  // First, grab the wrapper project.
-  var wrapperPromise = this._fetchWrapper();
+IonicStartTask.prototype.setupSass = function() {
+  if(argv.sass) {
+    // auto setup sass if they set the option
+    console.log('setup sass'.green.bold);
+    var setupTask = new setup.IonicSetupTask();
+    return setupTask.sassSetup(this.ionic);
+  }
+
+  // didn't ask to setup sass, so resolve it
+  var q = Q.defer();
+  q.resolve();
+  return q.promise;
+};
 
-  wrapperPromise.then(function() {
-    // Get the starter project repo name:
-    var repoName = 'ionic-starter-' + projectType;
 
-    // The folder name the project will be downloaded and extracted to
-    var repoFolderName = repoName + '-master';
+IonicStartTask.prototype.updateLibFiles = function() {
+  var libPath = argv.lib || argv.l || 'lib/ionic';
 
-    // Get the URL for the starter project repo:
-    var repoUrl = self._getStarterUrl(repoName);
+  if(libPath == 'lib' && this.seedType == 'ionic-starter') {
+    // don't bother if it still will be the default
+    return;
+  }
 
-    Ionic.fetchRepo(self.targetPath, repoName, repoUrl).then(function(repoFolderName) {
-      var npmQ = Q.defer();
-      var gulpQ = Q.defer();
-      var pluginQ = Q.defer();
-      var q = Q.defer();
-      // Install dependencies for the starter project
+  var libFiles = 'ionic.css ionic.min.css ionic.js ionic.min.js ionic.bundle.js ionic.bundle.min.js ionic-angular.js ionic-angular.min.js'.split(' ');
 
-      // Move the content of this repo into the www folder
-      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
+  function changeLibPath(originalUrl) {
+    var splt = originalUrl.split('/');
+    var newUrl = [ libPath ];
+    var filename = splt[ splt.length - 1 ];
 
-      // Clean up start template folder
-      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+    if(filename.indexOf('.css') > -1) {
+      newUrl.push('css');
+    } else if(filename.indexOf('.js') > -1) {
+      newUrl.push('js');
+    }
 
-      if(self.isCordovaProject) {
-        // update the config.xml file from cmd line args
-        self._updateConfigXml();
+    newUrl.push(filename);
 
-        if(self.ionic.hasFailed) return;
+    return newUrl.join('/');
+  }
 
-        self._installCordovaPlugins().then(function(output) {
-          pluginQ.resolve();
-        }, function(err) {
-          pluginQ.reject(err);
-        });
+  function replaceResource(html, originalTag) {
+    originalTag = originalTag.replace(/'/g, '"');
+    var splt = originalTag.split('"');
+    var newTagArray = [];
+
+    for(var x=0; x<splt.length; x++) {
+      if( isLibFile(splt[x]) ) {
+        newTagArray.push( changeLibPath(splt[x]) );
       } else {
-        pluginQ.resolve();
+        newTagArray.push( splt[x] );
       }
+    }
 
-      pluginQ.promise.then(function() {
-        var ionicBower = require('./bower').IonicBower;
-        ionicBower.setAppName(self.appName);
+    var newTag = newTagArray.join('"');
 
-        try {
-          fs.unlinkSync(self.targetPath + '/www/README.md');
-        } catch(e) {}
+    return html.replace(originalTag, newTag);
+  }
 
-        if(argv.sass) {
-          console.log('setup sass'.green.bold);
-          var setupTask = new setup.IonicSetupTask();
-          q = setupTask.sassSetup(self.ionic)
-        } else {
-          q.resolve();
-        }
+  function isLibFile(tag) {
+    tag = tag.toLowerCase();
+    for(var x=0; x<libFiles.length; x++) {
+      if( tag.indexOf(libFiles[x]) > -1 ) {
+        return true;
+      }
+    }
+  }
 
-        q.then(function(){
-          self._printQuickHelp(self.appDirectory);
-        });
+  function getLibTags(html) {
+    var resourceTags = [];
+    var libTags = [];
 
-      }, function(err) {
-        return self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
-      });
+    try{
+      resourceTags = resourceTags.concat( html.match(/<script (.*?)>/gi) );
+    }catch(e){}
 
-      IonicStats.t();
+    try{
+      resourceTags = resourceTags.concat( html.match(/<link (.*?)>/gi) );
+    }catch(e){}
 
-    }).catch(function(err) {
-      console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode, err);
-      console.error('Valid project types are blank, tabs, or sidemenu (or see more on our starter page: http://ionicframework.com/getting-started/)'.error.bold);
-      return self.ionic.fail('');
-    });
+    for(var x=0; x<resourceTags.length; x++) {
+      if( isLibFile(resourceTags[x]) ) {
+        libTags.push(resourceTags[x]);
+      }
+    }
 
-  }, function(err) {
-    return self.ionic.fail( ('Unable to grab wrapper project: ' + err).error.bold );
+    return libTags;
+  }
 
-  }).catch(function(err) {
-    console.error('Error: Unable to fetch wrapper: HTTP:'.error.bold,  err.statusCode, err);
-    return self.ionic.fail('');
-  });
+  try {
+    var indexPath = path.join(this.targetPath, 'www', 'index.html');
+    var html = fs.readFileSync(indexPath, 'utf8');
+
+    var libTags = getLibTags(html);
+
+    for(var x=0; x<libTags.length; x++) {
+      var originalTag = libTags[x];
+
+      html = replaceResource(html, originalTag);
+    }
+
+    fs.writeFileSync(indexPath, html, 'utf8');
+
+  } catch(e) {
+    this.ionic.fail('Error updating lib files: ' + e);
+  }
+};
+
+
+IonicStartTask.prototype.finalize = function() {
+
+  this.updateLibFiles();
 
+  try {
+    // create the ionic.project file and
+    // set the app name
+    var project = IonicProject.create();
+    project.set('name', this.appName);
+    project.save(this.targetPath);
+  } catch(e){}
+
+  try {
+    // update the app name in the bower.json file
+    var ionicBower = require('./bower').IonicBower;
+    ionicBower.setAppName(this.appName);
+  } catch(e) {}
+
+  try {
+    // remove the README file in the www root because it
+    // doesn't make sense because its the README for the repo
+    // and not helper text while developing an app
+    fs.unlinkSync(this.targetPath + '/www/README.md');
+  } catch(e) {}
+
+  this.printQuickHelp();
 };
 
-IonicStartTask.prototype._printQuickHelp = function(projectDirectory) {
-  console.log('\nYour Ionic project is ready to go!'.green.bold);
-  console.log('\nSome quick tips:');
-  console.log('\n * cd into your project:', ('$ cd ' + projectDirectory).info.bold);
+
+IonicStartTask.prototype.printQuickHelp = function() {
+  console.log('\nYour Ionic project is ready to go!'.green.bold, 'Some quick tips:');
+
+  console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).info.bold);
+
+  if(!argv.sass) {
+    console.log('\n * Setup this project to use Sass:', 'ionic setup sass'.info.bold);
+  }
+
   console.log('\n * Develop in the browser with live reload:', 'ionic serve'.info.bold);
 
   if(this.isCordovaProject) {
     console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
     console.log('    Note: iOS development requires OS X currently'.small);
     console.log('    See the Android Platform Guide for full Android installation instructions:'.small);
-    console.log('    https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html#Android%20Platform%20Guide'.small);
+    console.log('    https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html'.small);
     console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
     console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
     console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);
     console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.info.bold);
   }
-  console.log('\n\nFor more help use', 'ionic --help'.info.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs'.info.bold, '\n');
+  console.log('\nFor more help use', 'ionic --help'.info.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs\n'.info.bold);
 };
 
-IonicStartTask.prototype._writeProjectFile = function(ionic) {
-  var project = IonicProject.create();
-  project.set('name', this.appName);
-  project.save(this.targetPath);
-};
-
-IonicStartTask.prototype._checkTargetPath = function() {
-  if(fs.existsSync(this.targetPath)) {
-    process.stderr.write('The directory '.error.bold + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.\n'.error.bold);
-    return false;
-  }
-  return true;
-};
 
 exports.IonicStartTask = IonicStartTask;
diff --git a/package.json b/package.json
index 85b51b8be3..0655d1e22c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.10",
+  "version": "1.1.11-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 57e82a08557090af51fc129e521be8769213a4ad Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 28 Aug 2014 10:32:04 -0500
Subject: [PATCH 0195/1100] move inline templates to an external file

---
 lib/ionic/start.js | 119 ++++++++++++++++++++++++++++++++++-----------
 package.json       |   2 +-
 2 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9c71169b12..8040262ad0 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -136,44 +136,39 @@ IonicStartTask.prototype.fetchSeed = function() {
 
 
 IonicStartTask.prototype.fetchCodepen = function() {
-  // Edit Url:  http://codepen.io/ionic/pen/gblny
-  // Download:  http://codepen.io/ionic/share/zip/gblny/
   var self = this;
-  var splt = self.template.split('?')[0].split('#')[0].split('/');
-  var wwwPath = path.join(self.targetPath, 'www');
-  var codepenId = splt[ splt.length - 1 ];
-  if(!codepenId) {
-    codepenId = splt[ splt.length - 2 ];
-  }
+  var codepenUrl = this.template.split('?')[0].split('#')[0];
+  var wwwPath = path.join(this.targetPath, 'www');
 
-  console.log('\nDownloading Codepen:'.info.bold, codepenId);
+  console.log('\nDownloading Codepen:'.info.bold, codepenUrl);
 
   var qHTML = Q.defer();
   var qCSS = Q.defer();
   var qJS = Q.defer();
 
-  var htmlUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.html';
-  var cssUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.css';
-  var jsUrl = 'http://codepen.io/ionic/pen/' + codepenId + '.js';
-
   var proxy = process.env.PROXY || null;
 
-  request({ url: htmlUrl, proxy: proxy }, function(err, res, html) {
+  request({ url: codepenUrl + '.html', proxy: proxy }, function(err, res, html) {
     if(!err && res && res.statusCode === 200 && html) {
-      html = '<!DOCTYPE html>\n' + html;
+
+      if(html.indexOf('<!DOCTYPE html>') < 0) {
+        html = '<!DOCTYPE html>\n' + html;
+      }
 
       var resources = '    <link href="css/style.css" rel="stylesheet">\n' +
-                      '    <script src="js/app.js"></script>\n\n' +
+                      '    <script src="js/app.js"></script>\n' +
                       '  </head>';
 
       html = html.replace(/<\/head>/i, '\n' + resources);
 
+      html = self.convertTemplates(html);
+
       fs.writeFileSync(path.join(wwwPath, 'index.html'), html, 'utf8');
     }
     qHTML.resolve();
   });
 
-  request({ url: cssUrl, proxy: proxy }, function(err, res, css) {
+  request({ url: codepenUrl + '.css', proxy: proxy }, function(err, res, css) {
     if(!err && res && res.statusCode === 200 && css) {
       var cssPath = path.join(wwwPath, 'css');
       if(!fs.existsSync(cssPath)) {
@@ -185,7 +180,7 @@ IonicStartTask.prototype.fetchCodepen = function() {
     qCSS.resolve();
   });
 
-  request({ url: jsUrl, proxy: proxy }, function(err, res, js) {
+  request({ url: codepenUrl + '.js', proxy: proxy }, function(err, res, js) {
     if(!err && res && res.statusCode === 200 && js) {
       var jsPath = path.join(wwwPath, 'js');
       if(!fs.existsSync(jsPath)) {
@@ -200,6 +195,64 @@ IonicStartTask.prototype.fetchCodepen = function() {
 };
 
 
+IonicStartTask.prototype.convertTemplates = function(html) {
+  var templates = [];
+  var self = this;
+
+  try {
+    var scripts = html.match(/<script [\s\S]*?<\/script>/gi);
+    scripts.forEach(function(scriptElement){
+      if(scriptElement.indexOf('text/ng-template') > -1) {
+
+        var lines = scriptElement.split('\n');
+        for(var x=0; x<lines.length; x++) {
+          try {
+            if(lines[x].substr(0, 6) === '      ') {
+              lines[x] = lines[x].substr(6);
+            }
+          } catch(lE){}
+        }
+        var data = lines.join('\n');
+
+        var id = data.match(/ id=["|'](.*?)["|']/i)[0];
+        id = id.replace(/'/g, '"').split('"')[1];
+
+        data = data.replace(/<script [\s\S]*?>/gi, '');
+        data = data.replace(/<\/script>/gi, '');
+        data = data.trim();
+
+        templates.push({
+          path: id,
+          scriptElement: scriptElement,
+          html: data
+        });
+
+      }
+    });
+  }catch(e){}
+
+  try {
+
+    templates.forEach(function(tmpl){
+
+      var tmpPath = path.join(self.targetPath, 'www', path.dirname(tmpl.path));
+      if(!fs.existsSync(tmpPath)) {
+        fs.mkdirSync(tmpPath)
+      }
+
+      tmpPath = path.join(self.targetPath, 'www', tmpl.path);
+      fs.writeFileSync(tmpPath, tmpl.html, 'utf8');
+
+      html = html.replace( tmpl.scriptElement, '' );
+      html = html.replace( /    \n    \n/g, '' );
+    });
+
+  }catch(e){}
+
+  return html;
+};
+
+
 IonicStartTask.prototype.fetchIonicStarter = function() {
   var self = this;
   var q = Q.defer();
@@ -326,6 +379,17 @@ IonicStartTask.prototype.updateLibFiles = function() {
 
   var libFiles = 'ionic.css ionic.min.css ionic.js ionic.min.js ionic.bundle.js ionic.bundle.min.js ionic-angular.js ionic-angular.min.js'.split(' ');
 
+  function isLibFile(tag) {
+    if(tag) {
+      tag = tag.toLowerCase();
+      for(var x=0; x<libFiles.length; x++) {
+        if( tag.indexOf(libFiles[x]) > -1 ) {
+          return true;
+        }
+      }
+    }
+  }
+
   function changeLibPath(originalUrl) {
     var splt = originalUrl.split('/');
     var newUrl = [ libPath ];
@@ -360,15 +424,6 @@ IonicStartTask.prototype.updateLibFiles = function() {
     return html.replace(originalTag, newTag);
   }
 
-  function isLibFile(tag) {
-    tag = tag.toLowerCase();
-    for(var x=0; x<libFiles.length; x++) {
-      if( tag.indexOf(libFiles[x]) > -1 ) {
-        return true;
-      }
-    }
-  }
-
   function getLibTags(html) {
     var resourceTags = [];
     var libTags = [];
@@ -414,13 +469,21 @@ IonicStartTask.prototype.finalize = function() {
 
   this.updateLibFiles();
 
+  try {
+    var packageFilePath = path.resolve('package.json');
+    var packageData = require(packageFilePath);
+    packageData.name = encodeURIComponent( this.appName.toLowerCase().replace(/\s+/g, '-') );
+    packageData.description = this.appName + ': An Ionic project';
+    fs.writeFileSync(packageFilePath, JSON.stringify(packageData, null, 2), 'utf8');
+  } catch(e) {}
+
   try {
     // create the ionic.project file and
     // set the app name
     var project = IonicProject.create();
     project.set('name', this.appName);
     project.save(this.targetPath);
-  } catch(e){}
+  } catch(e) {}
 
   try {
     // update the app name in the bower.json file
diff --git a/package.json b/package.json
index 0655d1e22c..65ed3ac00e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.11-beta1",
+  "version": "1.1.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 8208d8335236b43f15463c8328e8217af758ab5a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 28 Aug 2014 14:30:11 -0500
Subject: [PATCH 0196/1100] prompt to replace existing directory

---
 lib/ionic/start.js | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 8040262ad0..b9aaa202e7 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,6 +5,7 @@ var fs = require('fs'),
     path = require('path'),
     shelljs = require('shelljs/global'),
     argv = require('optimist').argv,
+    prompt = require('prompt'),
     colors = require('colors'),
     spawn = require('child_process').spawn,
     Q = require('q'),
@@ -24,6 +25,7 @@ IonicStartTask.prototype = new IonicTask();
 
 IonicStartTask.prototype.run = function(ionic) {
   this.ionic = ionic;
+  var self = this;
 
   if(argv._.length < 2) {
     return this.ionic.fail('Invalid command', 'start');
@@ -54,18 +56,41 @@ IonicStartTask.prototype.run = function(ionic) {
 
   // Make sure to create this
   if( fs.existsSync(this.targetPath) ) {
-    // check if its empty first
-    if( fs.readdirSync(this.targetPath).length ) {
-      // only freak if target path already has files in it
-      return this.ionic.fail('The directory '.error.bold + this.targetPath + ' already exists, please remove it if you would like to create a new ionic project there.'.error.bold);
-    }
+    // prompt for log
+    console.log('\nThe directory'.error.bold, this.targetPath, 'already exists.'.error.bold);
+    console.log('Would you like to overwrite the directory with this new project?');
+
+    var promptProperties = {
+      areYouSure: {
+        name: 'areYouSure',
+        description: '(yes/no):'.yellow.bold,
+        required: true
+      }
+    };
+
+    prompt.override = argv;
+    prompt.message = '';
+    prompt.delimiter = '';
+    prompt.start();
+
+    prompt.get({properties: promptProperties}, function (err, promptResult) {
+      if(err) {
+        return console.log(err);
+      }
+
+      var areYouSure = promptResult.areYouSure.toLowerCase().trim();
+      if(areYouSure == 'yes' || areYouSure == 'y') {
+        rm('-rf', self.targetPath);
+        self.startApp();
+      }
+    });
+
   } else {
     // create the app directory
     fs.mkdirSync(this.targetPath);
+    this.startApp();
   }
 
-  // kick it all off
-  this.startApp();
 };
 
 

From 95bdc7c80b1c6302becf576d69fb538724b0799e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 28 Aug 2014 15:30:16 -0500
Subject: [PATCH 0197/1100] include cordova.js script when cordova project

---
 lib/ionic/start.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index b9aaa202e7..9f06ea1ace 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -181,8 +181,13 @@ IonicStartTask.prototype.fetchCodepen = function() {
       }
 
       var resources = '    <link href="css/style.css" rel="stylesheet">\n' +
-                      '    <script src="js/app.js"></script>\n' +
-                      '  </head>';
+                      '    <script src="js/app.js"></script>\n';
+
+      if(self.isCordovaProject) {
+        resources += '    <script src="cordova.js"></script>\n';
+      }
+
+      resources += '  </head>';
 
       html = html.replace(/<\/head>/i, '\n' + resources);
 

From a4f1e251b8e7338015c25940d817d8240d9f580b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 29 Aug 2014 12:17:31 -0500
Subject: [PATCH 0198/1100] update help printout

---
 lib/ionic.js | 56 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index caf294ca6a..2a6013b341 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -60,11 +60,13 @@ var TASKS = [
     args: {
       '[options]': 'any flags for the command',
       '<PATH>': 'directory for the new project',
-      '[template]': 'Starter template to use (tabs, sidemenu, blank)'
+      '[template]': 'Template name, ex: tabs, sidemenu, blank\n' +
+                    'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
+                    'Defaults to Ionic "tabs" starter template'
     },
     options: {
       '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name for <widget id> config, ie: com.mycompany.myapp',
+      '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
       '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
       '--sass|-s': 'Setup the project to use Sass CSS precompiling'
     },
@@ -76,7 +78,7 @@ var TASKS = [
     summary: 'Start a local development server for app dev and testing',
     args: {
       '[options]': '',
-      '[http-port]': '',
+      '[port]': '',
       '[livereload-port]': ''
     },
     options: {
@@ -138,8 +140,8 @@ var TASKS = [
       '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
     },
     options: {
-      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n\
-                                                   each of its subdirectories for the plugin before hitting the registry.'
+      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n' +
+                                  'subdirectories for the plugin before using the registry.'
     },
     task: IonicCordovaTask
   },
@@ -157,7 +159,7 @@ var TASKS = [
     title: 'package',
     name: 'package',
     alt: ['pack'],
-    summary: 'Package an app using the Ionic Build service',
+    summary: 'Package an app using the Ionic Build service' + '  (beta)'.yellow,
     args: {
       '[options]': '',
       '<MODE>': '"debug" or "release"',
@@ -193,13 +195,13 @@ var TASKS = [
   {
     title: 'lib',
     name: 'lib',
-    summary: 'Gets Ionic library version info or updates the Ionic library',
+    summary: 'Ionic library version info or updates the Ionic library',
     args: {
       '[options]': '',
-      '[update]': 'Updates the Ionic Framework version in www/lib/ionic'
+      '[update]': 'Updates the Ionic Framework in www/lib/ionic'
     },
     options: {
-      '--version|-v': 'Exact Ionic version, otherwise it will default to the latest'
+      '--version|-v': 'Ionic version, otherwise it will default to the latest'
     },
     task: IonicLibTask
   },
@@ -257,7 +259,7 @@ Ionic = {
 
     w('\n');
 
-    var rightColumn = 47;
+    var rightColumn = 41;
     var dots = '';
     var indent = '';
     var x, arg;
@@ -282,14 +284,28 @@ Ionic = {
 
     for(arg in d.args) {
       if( !d.args[arg] ) continue;
-      var argLine = arg;
 
       indent = '';
       w('\n');
       while(indent.length < rightColumn) {
         indent += ' ';
       }
-      w( (indent + '    ' + argLine + ' ' + d.args[arg]).bold );
+      w( (indent + '    ' + arg + ' ').bold );
+
+      var argDescs = d.args[arg].split('\n');
+      var argIndent = indent + '    ';
+
+      for(x=0; x<arg.length + 1; x++) {
+        argIndent += ' ';
+      }
+
+      for(x=0; x<argDescs.length; x++) {
+        if(x===0) {
+          w( argDescs[x].bold );
+        } else {
+          w( '\n' + argIndent + argDescs[x].bold );
+        }
+      }
     }
 
     indent = '';
@@ -297,6 +313,11 @@ Ionic = {
       indent += ' ';
     }
 
+    var optIndent = indent;
+    while(optIndent.length < rightColumn + 4) {
+      optIndent += ' ';
+    }
+
     for(var opt in d.options) {
       w('\n');
       dots = '';
@@ -311,7 +332,14 @@ Ionic = {
         }
         w(dots.grey + '  ');
 
-        w(d.options[opt].bold);
+        var optDescs = d.options[opt].split('\n');
+        for(x=0; x<optDescs.length; x++) {
+          if(x===0) {
+            w( optDescs[x].bold );
+          } else {
+            w( '\n' + optIndent + optDescs[x].bold );
+          }
+        }
       }
     }
 
@@ -347,7 +375,7 @@ Ionic = {
 
   _printHelpLines: function() {
     this._printIonic();
-    process.stderr.write('\n===================\n');
+    process.stderr.write('\n=======================\n');
 
     for(var i = 0; i < TASKS.length; i++) {
       var task = TASKS[i];

From f033ba4fb8d9fe9daadb6b02d9c2f0f52b57a331 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 29 Aug 2014 12:18:00 -0500
Subject: [PATCH 0199/1100] fix obj reference

---
 lib/ionic/start.js | 4 +++-
 package.json       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9f06ea1ace..0e7083060f 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -317,6 +317,7 @@ IonicStartTask.prototype.fetchIonicStarter = function() {
 
 
 IonicStartTask.prototype.initCordova = function() {
+  var self = this;
   var q = Q.defer();
 
   if(this.isCordovaProject) {
@@ -331,7 +332,8 @@ IonicStartTask.prototype.initCordova = function() {
          'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard',
          function(err, stdout, stderr) {
             if(err) {
-              this.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. Try updating (npm install -g cordova), removing this project folder, and trying again.');
+              self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. ' +
+                              'Try updating (npm install -g cordova), removing this project folder, and trying again.');
               q.reject(stderr);
             } else {
               q.resolve(stdout);
diff --git a/package.json b/package.json
index 65ed3ac00e..5f3e09afe1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.11",
+  "version": "1.1.12-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From bd8f695b60527188abba2e38d3ea0d4a2dd60779 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 29 Aug 2014 13:48:36 -0500
Subject: [PATCH 0200/1100] use cordova plugin add com.ionic.keyboard

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0e7083060f..c7338606aa 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -329,7 +329,7 @@ IonicStartTask.prototype.initCordova = function() {
     console.log('Initializing cordova project.'.info.bold);
     exec('cordova plugin add org.apache.cordova.device && ' +
          'cordova plugin add org.apache.cordova.console && ' +
-         'cordova plugin add https://github.com/driftyco/ionic-plugins-keyboard',
+         'cordova plugin add com.ionic.keyboard',
          function(err, stdout, stderr) {
             if(err) {
               self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. ' +

From a5a386380ce28334841bca5812dbaa3fa00dba93 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 29 Aug 2014 13:48:48 -0500
Subject: [PATCH 0201/1100] 1.1.12

---
 README.md    | 25 +++++++++++++++++--------
 package.json |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8d43e2a2d9..445e299d73 100644
--- a/README.md
+++ b/README.md
@@ -14,19 +14,28 @@ $ sudo npm install -g ionic
 ## Starting an Ionic App
 
 ```bash
-$ ionic start myApp [template]
+$ ionic start myapp [template]
 ```
 
-There are three choices of templates:
+Starter templates can either come from a named template, or from any Codepen URL.
 
-* Side-Menu (sidemenu)
-* Tabs (tabs)
-* Blank (blank)
+Named template starters:
+
+* [tabs](https://github.com/driftyco/ionic-starter-tabs) (Default)
+* [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
+* [blank](https://github.com/driftyco/ionic-starter-blank)
+
+Codepen URL starters:
+
+* Any Codepen url, ex: [http://codepen.io/ionic/pen/odqCz](http://codepen.io/ionic/pen/odqCz)
+* [Ionic Codepen Demos](http://codepen.io/ionic/public-list/)
 
 Command-line flags/options:
 
-    --app-name, -a  ......  Human readable name for the app (Use quotes around the name)
-    --id, -i  ............  Package name set in the <widget id> config, ie: com.mycompany.myapp
+    --app-name, -a  ......  Human readable name for the app
+                            (Use quotes around the name)
+    --id, -i  ............  Package name set in the <widget id> config
+                            ex: com.mycompany.myapp
     --no-cordova, -w  ....  Do not create an app targeted for Cordova
 
 
@@ -71,7 +80,7 @@ $ ionic run ios
 ## Update Ionic lib
 
 Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
-by the project, this command will automatically run `bower update ionic`, otherwise this command updates 
+by the project, this command will automatically run `bower update ionic`, otherwise this command updates
 the local static files from Ionic's CDN.
 
 ```bash
diff --git a/package.json b/package.json
index 5f3e09afe1..06a22f33fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.12-beta1",
+  "version": "1.1.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ee8238b3e5088cd94fa5f773f0b8c882932de218 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 30 Aug 2014 21:16:51 -0500
Subject: [PATCH 0202/1100] fix start stats

---
 lib/ionic.js       | 8 ++++++++
 lib/ionic/start.js | 2 ++
 lib/ionic/stats.js | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2a6013b341..bf0dd6f2f1 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -423,6 +423,14 @@ Ionic = {
       return this._printHelpLines();
     }
 
+    if(argv['stats-opt-out']) {
+      var ionicConfig = new IonicStore('ionic.config');
+      ionicConfig.set('statsOptOut', true);
+      ionicConfig.save();
+      console.log('Successful stats opt-out');
+      return;
+    }
+
     var task = this._tryBuildingTask();
     if(!task) {
       return this._printAvailableTasks();
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index c7338606aa..b933496bfe 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -531,6 +531,8 @@ IonicStartTask.prototype.finalize = function() {
   } catch(e) {}
 
   this.printQuickHelp();
+
+  IonicStats.t();
 };
 
 
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index ffd7ab3041..7c47ecd853 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -523,6 +523,10 @@ exports.IonicStats = {
 
       if(process.argv.length < 3) return;
 
+      if( ionicConfig.get('statsOptOut') === true ) {
+        return;
+      }
+
       var cmdName = process.argv[2].toLowerCase();
       var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []); // skip the cmdName
 

From 86d3e1c86d2778511ee1a6af7acac058bfd502e4 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 31 Aug 2014 01:17:53 -0500
Subject: [PATCH 0203/1100] live reload for run command

---
 README.md            |  12 +++
 lib/ionic.js         |   5 +-
 lib/ionic/cordova.js | 181 ++++++++++++++++++++++++++++++++++++++++++-
 lib/ionic/serve.js   |  73 ++++++++++-------
 package.json         |   2 +-
 5 files changed, 239 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 445e299d73..9195d8ee84 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,18 @@ $ ionic emulate ios
 $ ionic run ios
 ```
 
+Command-line flags/options:
+
+    [--live-reload|-l]  ...  Live reload app dev files from the device (beta)
+    [--debug|--release]
+
+### Live Reload Within Cordova
+
+The `run` command will deploy the app to the specified platform devices and emulators. You can also run __live reload__ on the specified platform device by adding the `--live-reload` option. The `run` command's live reload functionality is similar to `ionic serve`, but instead of using a standard browser, the Cordova app itself is watching for any changes to its files and reloading when needed. This reduces the requirement to constantly rebuild the Cordova app for small changes. However, any changes to plugins will still require a full rebuild.
+
+In order for live reload to work, symlinks are automatically created and added to the `www` root, and the `<content src="index.html">` node in the config.xml file is updated to point to the dev server created by Ionic's CLI. On exit (by typing "exit" or using ctrl+c), the app's original settings will be restored and the symlinks should automatically be deleted. __Currently in beta__
+
+
 ## Update Ionic lib
 
 Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
diff --git a/lib/ionic.js b/lib/ionic.js
index bf0dd6f2f1..4142cfd653 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -21,7 +21,7 @@ var IonicStartTask = require('./ionic/start').IonicStartTask,
     IonicPackageTask = require('./ionic/package').IonicPackageTask,
     IonicLibTask = require('./ionic/lib').IonicLibTask,
     IonicSetupTask = require('./ionic/setup').IonicSetupTask,
-    IonicServeTask = require('./ionic/serve'),
+    IonicServeTask = require('./ionic/serve').IonicServeTask,
     IonicProject = require('./ionic/project'),
     IonicStore = require('./ionic/store').IonicStore,
     path = require('path'),
@@ -116,6 +116,7 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
+      '--live-reload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -159,7 +160,7 @@ var TASKS = [
     title: 'package',
     name: 'package',
     alt: ['pack'],
-    summary: 'Package an app using the Ionic Build service' + '  (beta)'.yellow,
+    summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
     args: {
       '[options]': '',
       '<MODE>': '"debug" or "release"',
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 2d97530118..27569334bd 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,6 +1,8 @@
 var IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
+    argv = require('optimist').argv,
+    xml2js = require('xml2js'),
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors');
@@ -10,9 +12,17 @@ var IonicCordovaTask = function() {};
 IonicCordovaTask.prototype = new IonicTask();
 
 IonicCordovaTask.prototype.run = function(ionic) {
+  var self = this;
+  self.ionic = ionic;
   var cmdName = process.argv[2].toLowerCase();
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
 
+  self.isLiveReload = (cmdName == 'run' && (argv.livereload || argv['live-reload'] || argv.l));
+
+  if(self.isLiveReload) {
+    self.setupLiveReload();
+  }
+
   // backwards compatibility prior to fully wrapping cordova cmds
   if(cmdName == 'platform') {
     // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
@@ -37,22 +47,187 @@ IonicCordovaTask.prototype.run = function(ionic) {
 
   cmdArgs.unshift(cmdName);
 
-  var cordovaCmd = exec('cordova ' + cmdArgs.join(' '));
+  var cordovaProcess = exec('cordova ' + cmdArgs.join(' '));
 
-  cordovaCmd.stdout.on('data', function (data) {
+  cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);
   });
 
-  cordovaCmd.stderr.on('data', function (data) {
+  cordovaProcess.stderr.on('data', function (data) {
     if(data) {
       process.stderr.write(data.toString().error.bold);
     }
   });
 
+  cordovaProcess.on('exit', function(){
+    if(self.isLiveReload) {
+      self.wwwSymlinks(true);
+      self.setConfigXml({
+        resetContent: true
+      });
+    }
+  });
+
+  if(self.isLiveReload) {
+    if (process.platform === 'win32'){
+      // emit SIGINT on windows
+      var readline = require ('readline'),
+          rl = readline.createInterface ({
+               input: process.stdin,
+               output: process.stdout
+          });
+
+      rl.on ('SIGINT', function (){
+        process.emit('SIGINT');
+      });
+    }
+
+    process.on('SIGINT', function(){
+      // doing this so the exit event fires on Cmd + c
+      process.exit();
+    });
+    process.on('exit', function() {
+      // remove the symlinks
+      self.wwwSymlinks(false);
+    });
+  }
+
   IonicStats.t();
 };
 
 
+IonicCordovaTask.prototype.setupLiveReload = function() {
+  console.log('Setup Live Reload'.green.bold);
+
+  var serve = new require('./serve');
+  var serveTask = new serve.IonicServeTask();
+  serveTask.loadSettings();
+  serveTask.runLivereload = true;
+  serveTask.launchBrowser = false;
+  serveTask.start(this.ionic);
+
+  this.setConfigXml({
+    devServer: serveTask.devServer
+  });
+};
+
+
+IonicCordovaTask.prototype.setConfigXml = function(options) {
+  var self = this;
+  var madeChange = false;
+
+  try {
+    var configXmlPath = path.resolve('config.xml');
+    var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
+
+    var parseString = xml2js.parseString;
+    parseString(configString, function (err, jsonConfig) {
+      if(err) {
+        return self.ionic.fail('Error parsing config.xml: ' + err);
+      }
+
+      if(options.devServer) {
+        if( !jsonConfig.widget.content[0].$['original-src'] ) {
+          jsonConfig.widget.content[0].$['original-src'] = jsonConfig.widget.content[0].$.src;
+          madeChange = true;
+        }
+        if(jsonConfig.widget.content[0].$.src !== options.devServer) {
+          jsonConfig.widget.content[0].$.src = options.devServer;
+          madeChange = true;
+        }
+
+      } else if(options.resetContent) {
+        if( jsonConfig.widget.content[0].$['original-src'] ) {
+          jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
+          delete jsonConfig.widget.content[0].$['original-src'];
+          madeChange = true;
+        }
+      }
+
+      if(madeChange) {
+        var xmlBuilder = new xml2js.Builder();
+        configString = xmlBuilder.buildObject(jsonConfig);
+
+        fs.writeFileSync(configXmlPath, configString);
+      }
+
+    });
+
+  } catch(e) {
+    return self.ionic.fail('Error updating config.xml file: ' + e);
+  }
+};
+
+
+IonicCordovaTask.prototype.wwwSymlinks = function(createSymlinks) {
+  var platformCordovaJs, platformPluginJs, platformPluginsDir;
+
+  var wwwCordovaJs = path.resolve( path.join('www', 'cordova.js') );
+  var wwwPluginJs = path.resolve( path.join('www', 'cordova_plugins.js') );
+  var wwwPluginsDir = path.resolve( path.join('www', 'plugins') );
+
+  if(createSymlinks) {
+
+    var platform;
+    var platforms = 'android ios'.split(' ');
+    for(var x=0; x<platforms.length; x++) {
+      for(var y=0; y<process.argv.length; y++) {
+        if(platforms[x] == process.argv[y].toLowerCase()) {
+          platform = process.argv[y].toLowerCase();
+        }
+      }
+    }
+
+    if(platform == 'ios') {
+      console.log('Create symlinks to iOS platform build directory');
+      platformCordovaJs = path.resolve( path.join('platforms', 'ios', 'www', 'cordova.js') );
+      platformPluginJs = path.resolve( path.join('platforms', 'ios', 'www', 'cordova_plugins.js') );
+      platformPluginsDir = path.resolve( path.join('platforms', 'ios', 'www', 'plugins') );
+
+    } else if(platform == 'android') {
+      console.log('Create symlinks to Android platform build directory');
+      platformCordovaJs = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'cordova.js') );
+      platformPluginJs = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'cordova_plugins.js') );
+      platformPluginsDir = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'plugins') );
+    }
+
+    if( fs.existsSync(platformCordovaJs) && !fs.existsSync(wwwCordovaJs) ) {
+      console.log('Create symlink: www/cordova.js');
+      fs.symlinkSync(platformCordovaJs, wwwCordovaJs);
+    }
+
+    if( fs.existsSync(platformPluginJs) && !fs.existsSync(wwwPluginJs) ) {
+      console.log('Create symlink: www/cordova_plugins.js');
+      fs.symlinkSync(platformPluginJs, wwwPluginJs);
+    }
+
+    if( fs.existsSync(platformPluginsDir) && !fs.existsSync(wwwPluginsDir) ) {
+      console.log('Create symlink: www/plugins');
+      fs.symlinkSync(platformPluginsDir, wwwPluginsDir);
+    }
+
+  } else {
+    // delete the symlinks
+    console.log('');
+    try {
+      fs.unlinkSync(wwwCordovaJs);
+      console.log('Removed symlink: www/cordova.js');
+    }catch(e){}
+
+    try {
+      fs.unlinkSync(wwwPluginJs);
+      console.log('Removed symlink: www/cordova_plugins.js');
+    }catch(e){}
+
+    try {
+      fs.unlinkSync(wwwPluginsDir);
+      console.log('Removed symlink: www/plugins');
+    }catch(e){}
+  }
+
+};
+
+
 IonicCordovaTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 617fb85a7f..7d611eb11a 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -13,21 +13,20 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask;
     IonicStats = require('./stats').IonicStats;
 
+var DEFAULT_HTTP_PORT = 8100;
+var DEFAULT_LIVE_RELOAD_PORT = 35729;
+
 var IonicServeTask = function() {};
 
 IonicServeTask.prototype = new IonicTask();
 
 IonicServeTask.prototype.run = function(ionic) {
-  var project = IonicProject.load();
 
-  this.port = argv._[1] || 8100;
-  this.liveReloadPort = argv._[2] || 35729;
+  this.port = argv._[1] || DEFAULT_HTTP_PORT;
+  this.liveReloadPort = argv._[2] || DEFAULT_LIVE_RELOAD_PORT;
 
-  this.launchBrowser = !argv.nobrowser && !argv.b;
-  this.runLivereload = !argv.nolivereload && !argv.r;
-  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.s;
-
-  this._start(ionic);
+  this.loadSettings();
+  this.start(ionic);
 
   if(ionic.hasFailed) return;
 
@@ -36,27 +35,19 @@ IonicServeTask.prototype.run = function(ionic) {
   });
 };
 
-IonicServeTask.prototype._changed = function(filePath) {
-  // Cleanup the path a bit
-  var pwd = process.cwd();
-  filePath = filePath.replace(pwd + '/', '');
 
-  console.log( ('  changed: ' + filePath).green );
+IonicServeTask.prototype.loadSettings = function() {
+  var project = IonicProject.load();
 
-  var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
-    path: '/changed',
-    method: 'POST',
-    body: JSON.stringify({
-      files: [filePath]
-    })
-  }, function(err, res, body) {
-    if(err) {
-      console.error('Unable to update live reload:', err);
-    }
-  });
+  this.port = argv.port || DEFAULT_HTTP_PORT;
+  this.liveReloadPort = argv.livereloadport || argv['live-reload-port'] || DEFAULT_LIVE_RELOAD_PORT;
+
+  this.launchBrowser = !argv.nobrowser && !argv.b;
+  this.runLivereload = !argv.nolivereload && !argv.r;
+  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.s;
 };
 
-IonicServeTask.prototype._start = function(ionic) {
+IonicServeTask.prototype.start = function(ionic) {
   var self = this;
   var app = connect();
 
@@ -84,12 +75,14 @@ IonicServeTask.prototype._start = function(ionic) {
       self._changed(f.path);
     });
 
+    self.liveReloadServer = self.host(self.liveReloadPort);
+
     server = tinylr();
     server.listen(this.liveReloadPort, function(err) {
       if(err) {
         return ionic.fail('Unable to start live reload server:', err);
       } else {
-        console.log('Running live reload server:'.green.bold, (self.host(self.liveReloadPort).bold) );
+        console.log('Running live reload server:'.green.bold, self.liveReloadServer.bold );
         if(self.launchBrowser) {
           open( self.host(self.port) );
         }
@@ -101,10 +94,12 @@ IonicServeTask.prototype._start = function(ionic) {
     }));
   }
 
+  this.devServer = this.host(this.port);
+
   app.use(connect.static('www'))
     .listen(this.port);
 
-  console.log('Running dev server:'.green.bold, ( this.host(this.port) ).bold);
+  console.log('Running dev server:'.green.bold, this.devServer.bold);
 
   process.stdin.on('readable', function() {
     var chunk = process.stdin.read();
@@ -115,6 +110,27 @@ IonicServeTask.prototype._start = function(ionic) {
 };
 
 
+IonicServeTask.prototype._changed = function(filePath) {
+  // Cleanup the path a bit
+  var pwd = process.cwd();
+  filePath = filePath.replace(pwd + '/', '');
+
+  console.log( ('  changed: ' + filePath).green );
+
+  var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
+    path: '/changed',
+    method: 'POST',
+    body: JSON.stringify({
+      files: [filePath]
+    })
+  }, function(err, res, body) {
+    if(err) {
+      console.error('Unable to update live reload:', err);
+    }
+  });
+};
+
+
 IonicServeTask.prototype.host = function(port) {
   var addresses = [];
 
@@ -123,6 +139,7 @@ IonicServeTask.prototype.host = function(port) {
     var ifaces = os.networkInterfaces();
 
     for (var dev in ifaces) {
+      if(!dev || dev.indexOf('box') > -1) continue;
       ifaces[dev].forEach(function(details){
         if (details.family == 'IPv4' && !details.internal) {
           addresses.push(details.address);
@@ -134,4 +151,4 @@ IonicServeTask.prototype.host = function(port) {
   return 'http://' + (addresses.length === 1 ? addresses[0] : 'localhost') + ':' + port;
 };
 
-module.exports = IonicServeTask;
+exports.IonicServeTask = IonicServeTask;
diff --git a/package.json b/package.json
index 06a22f33fd..8ca102be71 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From bdeaba3167eab0c0f0f67316538622efe1dc8738 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 31 Aug 2014 01:21:58 -0500
Subject: [PATCH 0204/1100] update

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9195d8ee84..0d00ccc88d 100644
--- a/README.md
+++ b/README.md
@@ -82,11 +82,11 @@ Command-line flags/options:
     [--live-reload|-l]  ...  Live reload app dev files from the device (beta)
     [--debug|--release]
 
-### Live Reload Within Cordova
+### Live Reload Within Cordova (beta)
 
 The `run` command will deploy the app to the specified platform devices and emulators. You can also run __live reload__ on the specified platform device by adding the `--live-reload` option. The `run` command's live reload functionality is similar to `ionic serve`, but instead of using a standard browser, the Cordova app itself is watching for any changes to its files and reloading when needed. This reduces the requirement to constantly rebuild the Cordova app for small changes. However, any changes to plugins will still require a full rebuild.
 
-In order for live reload to work, symlinks are automatically created and added to the `www` root, and the `<content src="index.html">` node in the config.xml file is updated to point to the dev server created by Ionic's CLI. On exit (by typing "exit" or using ctrl+c), the app's original settings will be restored and the symlinks should automatically be deleted. __Currently in beta__
+In order for live reload to work, symlinks are automatically created and added to the `www` root, and the `<content src="index.html">` node in the config.xml file is updated to point to the dev server created by Ionic's CLI. On exit (by typing "exit" or using ctrl+c), the app's original settings will be restored and the symlinks will be removed. __Currently in beta.__
 
 
 ## Update Ionic lib

From 5dea143c3e7ffe561633768d81b95a3cd9df1b79 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 2 Sep 2014 15:17:22 -0500
Subject: [PATCH 0205/1100] app live reload

---
 README.md            |  48 ++++++----
 lib/ionic.js         |  53 ++++++-----
 lib/ionic/cordova.js | 108 +++--------------------
 lib/ionic/lib.js     |   3 +-
 lib/ionic/serve.js   | 206 ++++++++++++++++++++++++++++++++++++++++---
 lib/ionic/start.js   |  44 ++++++++-
 package.json         |   4 +-
 7 files changed, 316 insertions(+), 150 deletions(-)

diff --git a/README.md b/README.md
index 0d00ccc88d..2f2157598d 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,12 @@ Use the `ionic --help` command for more detailed task information.
 ## Installing
 
 ```bash
-$ sudo npm install -g ionic
+$ npm install -g ionic
 ```
 
+Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo`.
+
+
 ## Starting an Ionic App
 
 ```bash
@@ -32,7 +35,7 @@ Codepen URL starters:
 
 Command-line flags/options:
 
-    --app-name, -a  ......  Human readable name for the app
+    --appname, -a  .......  Human readable name for the app
                             (Use quotes around the name)
     --id, -i  ............  Package name set in the <widget id> config
                             ex: com.mycompany.myapp
@@ -44,13 +47,17 @@ Command-line flags/options:
 Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
 
 ```bash
-$ ionic serve [http-port] [livereload-port] [options]
+$ ionic serve [options]
 ```
 
 Command-line flags/options:
 
-    [--nobrowser|-b]  ......  Disable launching a browser
-    [--nolivereload|-r]  ...  Do not start live reload
+    [--consolelogs|-c] ......  Print app console logs to Ionic CLI
+    [--serverlogs|-s] .......  Print dev server logs to Ionic CLI
+    [--port|-p] .............  Dev server HTTP port (8100 default)
+    [--livereload-port|-i] ..  Live Reload port (35729 default)
+    [--nobrowser|-b] ........  Disable launching a browser
+    [--nolivereload|-r] .....  Do not start live reload
 
 
 ## Adding a platform target
@@ -65,28 +72,37 @@ $ ionic platform ios android
 $ ionic build ios
 ```
 
-## Emulating your app
-
-```bash
-$ ionic emulate ios
-```
-
 ## Running your app
 
+Deploys the Ionic app on specified platform devices.
+
 ```bash
-$ ionic run ios
+$ ionic run ios [options]
 ```
 
 Command-line flags/options:
 
-    [--live-reload|-l]  ...  Live reload app dev files from the device (beta)
+    [--livereload|-l] .......  Live Reload app dev files from the device (beta)
+    [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)
+    [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
+    [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
+    [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
     [--debug|--release]
 
-### Live Reload Within Cordova (beta)
+### Live Reload App During Development (beta)
 
-The `run` command will deploy the app to the specified platform devices and emulators. You can also run __live reload__ on the specified platform device by adding the `--live-reload` option. The `run` command's live reload functionality is similar to `ionic serve`, but instead of using a standard browser, the Cordova app itself is watching for any changes to its files and reloading when needed. This reduces the requirement to constantly rebuild the Cordova app for small changes. However, any changes to plugins will still require a full rebuild.
+The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network.
 
-In order for live reload to work, symlinks are automatically created and added to the `www` root, and the `<content src="index.html">` node in the config.xml file is updated to point to the dev server created by Ionic's CLI. On exit (by typing "exit" or using ctrl+c), the app's original settings will be restored and the symlinks will be removed. __Currently in beta.__
+With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
+
+
+## Emulating your app
+
+Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`. Live reload options are the same as the `run` options listed above.
+
+```bash
+$ ionic emulate ios [options]
+```
 
 
 ## Update Ionic lib
diff --git a/lib/ionic.js b/lib/ionic.js
index 4142cfd653..d38f10792c 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -77,13 +77,15 @@ var TASKS = [
     name: 'serve',
     summary: 'Start a local development server for app dev and testing',
     args: {
-      '[options]': '',
-      '[port]': '',
-      '[livereload-port]': ''
+      '[options]': ''
     },
     options: {
-      '--nobrowser|-b': 'Disable auto browser launch',
-      '--nolivereload|-r': 'Do not start live reload'
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI',
+      '--port|-p': 'Dev server HTTP port (8100 default)',
+      '--livereload-port|-r': 'Live Reload port (35729 default)',
+      '--nobrowser|-b': 'Disable launching a browser',
+      '--nolivereload': 'Do not start live reload'
     },
     task: IonicServeTask
   },
@@ -98,25 +100,38 @@ var TASKS = [
     task: IonicCordovaTask
   },
   {
-    title: 'emulate',
-    name: 'emulate',
-    summary: 'Emulate an Ionic project on a simulator or emulator',
+    title: 'run',
+    name: 'run',
+    summary: 'Run an Ionic project on a connected device',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
     },
+    options: {
+      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload required)',
+      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
+      '--debug|--release': '',
+      '--device|--emulator|--target=FOO': ''
+    },
     task: IonicCordovaTask
   },
   {
-    title: 'run',
-    name: 'run',
-    summary: 'Run an ionic project on a connected device',
+    title: 'emulate',
+    name: 'emulate',
+    summary: 'Emulate an Ionic project on a simulator or emulator',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
     },
     options: {
-      '--live-reload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload required)',
+      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -125,7 +140,7 @@ var TASKS = [
   {
     title: 'build',
     name: 'build',
-    summary: 'Locally build an ionic project for a given platform',
+    summary: 'Locally build an Ionic project for a given platform',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
@@ -196,13 +211,13 @@ var TASKS = [
   {
     title: 'lib',
     name: 'lib',
-    summary: 'Ionic library version info or updates the Ionic library',
+    summary: 'Gets Ionic library version or updates the Ionic library',
     args: {
       '[options]': '',
       '[update]': 'Updates the Ionic Framework in www/lib/ionic'
     },
     options: {
-      '--version|-v': 'Ionic version, otherwise it will default to the latest'
+      '--version|-v': 'Spcific Ionic version, otherwise it defaults to the latest'
     },
     task: IonicLibTask
   },
@@ -349,7 +364,7 @@ Ionic = {
 
   _printAvailableTasks: function() {
     this._printIonic();
-    process.stderr.write('\nUsage: ionic task args\n\n===============\n\n');
+    process.stderr.write('\nUsage: ionic task args\n\n=======================\n\n');
 
     if(process.argv.length > 2) {
       process.stderr.write( (process.argv[2] + ' is not a valid task\n\n').bold.red );
@@ -403,10 +418,6 @@ Ionic = {
 
   },
 
-  _loadTaskRunner: function(which) {
-
-  },
-
   run: function() {
     var self = this;
 
@@ -462,7 +473,7 @@ Ionic = {
   },
 
   version: function() {
-    process.stderr.write('v' + settings.version + '\n');
+    process.stderr.write(settings.version + '\n');
   },
 
   checkLatestVersion: function() {
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 27569334bd..5db1181e6f 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -17,7 +17,18 @@ IonicCordovaTask.prototype.run = function(ionic) {
   var cmdName = process.argv[2].toLowerCase();
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
 
-  self.isLiveReload = (cmdName == 'run' && (argv.livereload || argv['live-reload'] || argv.l));
+  // clean out any cmds that may confuse cordova
+  var port = argv.port || argv.p || '';
+  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.i || '';
+  if(port || liveReloadPort) {
+    for(var x=0; x<cmdArgs.length; x++) {
+      if(cmdArgs[x] == port || cmdArgs[x] == liveReloadPort) {
+        cmdArgs[x] = '';
+      }
+    }
+  }
+
+  self.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
   if(self.isLiveReload) {
     self.setupLiveReload();
@@ -61,37 +72,12 @@ IonicCordovaTask.prototype.run = function(ionic) {
 
   cordovaProcess.on('exit', function(){
     if(self.isLiveReload) {
-      self.wwwSymlinks(true);
       self.setConfigXml({
         resetContent: true
       });
     }
   });
 
-  if(self.isLiveReload) {
-    if (process.platform === 'win32'){
-      // emit SIGINT on windows
-      var readline = require ('readline'),
-          rl = readline.createInterface ({
-               input: process.stdin,
-               output: process.stdout
-          });
-
-      rl.on ('SIGINT', function (){
-        process.emit('SIGINT');
-      });
-    }
-
-    process.on('SIGINT', function(){
-      // doing this so the exit event fires on Cmd + c
-      process.exit();
-    });
-    process.on('exit', function() {
-      // remove the symlinks
-      self.wwwSymlinks(false);
-    });
-  }
-
   IonicStats.t();
 };
 
@@ -104,6 +90,7 @@ IonicCordovaTask.prototype.setupLiveReload = function() {
   serveTask.loadSettings();
   serveTask.runLivereload = true;
   serveTask.launchBrowser = false;
+  serveTask.isPlatformServe = true;
   serveTask.start(this.ionic);
 
   this.setConfigXml({
@@ -159,75 +146,6 @@ IonicCordovaTask.prototype.setConfigXml = function(options) {
 };
 
 
-IonicCordovaTask.prototype.wwwSymlinks = function(createSymlinks) {
-  var platformCordovaJs, platformPluginJs, platformPluginsDir;
-
-  var wwwCordovaJs = path.resolve( path.join('www', 'cordova.js') );
-  var wwwPluginJs = path.resolve( path.join('www', 'cordova_plugins.js') );
-  var wwwPluginsDir = path.resolve( path.join('www', 'plugins') );
-
-  if(createSymlinks) {
-
-    var platform;
-    var platforms = 'android ios'.split(' ');
-    for(var x=0; x<platforms.length; x++) {
-      for(var y=0; y<process.argv.length; y++) {
-        if(platforms[x] == process.argv[y].toLowerCase()) {
-          platform = process.argv[y].toLowerCase();
-        }
-      }
-    }
-
-    if(platform == 'ios') {
-      console.log('Create symlinks to iOS platform build directory');
-      platformCordovaJs = path.resolve( path.join('platforms', 'ios', 'www', 'cordova.js') );
-      platformPluginJs = path.resolve( path.join('platforms', 'ios', 'www', 'cordova_plugins.js') );
-      platformPluginsDir = path.resolve( path.join('platforms', 'ios', 'www', 'plugins') );
-
-    } else if(platform == 'android') {
-      console.log('Create symlinks to Android platform build directory');
-      platformCordovaJs = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'cordova.js') );
-      platformPluginJs = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'cordova_plugins.js') );
-      platformPluginsDir = path.resolve( path.join('platforms', 'android', 'assets', 'www', 'plugins') );
-    }
-
-    if( fs.existsSync(platformCordovaJs) && !fs.existsSync(wwwCordovaJs) ) {
-      console.log('Create symlink: www/cordova.js');
-      fs.symlinkSync(platformCordovaJs, wwwCordovaJs);
-    }
-
-    if( fs.existsSync(platformPluginJs) && !fs.existsSync(wwwPluginJs) ) {
-      console.log('Create symlink: www/cordova_plugins.js');
-      fs.symlinkSync(platformPluginJs, wwwPluginJs);
-    }
-
-    if( fs.existsSync(platformPluginsDir) && !fs.existsSync(wwwPluginsDir) ) {
-      console.log('Create symlink: www/plugins');
-      fs.symlinkSync(platformPluginsDir, wwwPluginsDir);
-    }
-
-  } else {
-    // delete the symlinks
-    console.log('');
-    try {
-      fs.unlinkSync(wwwCordovaJs);
-      console.log('Removed symlink: www/cordova.js');
-    }catch(e){}
-
-    try {
-      fs.unlinkSync(wwwPluginJs);
-      console.log('Removed symlink: www/cordova_plugins.js');
-    }catch(e){}
-
-    try {
-      fs.unlinkSync(wwwPluginsDir);
-      console.log('Removed symlink: www/plugins');
-    }catch(e){}
-  }
-
-};
-
-
 IonicCordovaTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index b0656b40d0..57372c0212 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -17,7 +17,6 @@ IonicLibTask.prototype = new IonicTask();
 
 IonicLibTask.prototype.run = function(ionic) {
   var self = this;
-  self.codeHost = 'http://code.ionicframework.com';
   self.local = {};
   self.versionData = {};
   self.usesBower = false;
@@ -74,7 +73,7 @@ IonicLibTask.prototype.getVersionData = function(version) {
   var q = Q.defer();
   var self = this;
 
-  var url = self.codeHost;
+  var url = 'http://code.ionicframework.com';
   if(version == 'latest') {
     url += '/latest.json';
   } else {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 7d611eb11a..1194024d23 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -2,6 +2,9 @@ var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
     connect = require('connect'),
+    finalhandler = require('finalhandler'),
+    http = require('http'),
+    serveStatic = require('serve-static'),
     open = require('open'),
     tinylr = require('tiny-lr-fork'),
     lr = require('connect-livereload'),
@@ -21,9 +24,8 @@ var IonicServeTask = function() {};
 IonicServeTask.prototype = new IonicTask();
 
 IonicServeTask.prototype.run = function(ionic) {
-
-  this.port = argv._[1] || DEFAULT_HTTP_PORT;
-  this.liveReloadPort = argv._[2] || DEFAULT_LIVE_RELOAD_PORT;
+  this.port = argv._[1];
+  this.liveReloadPort = argv._[2];
 
   this.loadSettings();
   this.start(ionic);
@@ -39,12 +41,14 @@ IonicServeTask.prototype.run = function(ionic) {
 IonicServeTask.prototype.loadSettings = function() {
   var project = IonicProject.load();
 
-  this.port = argv.port || DEFAULT_HTTP_PORT;
-  this.liveReloadPort = argv.livereloadport || argv['live-reload-port'] || DEFAULT_LIVE_RELOAD_PORT;
+  this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
+  this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
 
   this.launchBrowser = !argv.nobrowser && !argv.b;
   this.runLivereload = !argv.nolivereload && !argv.r;
-  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.s;
+  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
+  this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
+  this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
 };
 
 IonicServeTask.prototype.start = function(ionic) {
@@ -77,8 +81,8 @@ IonicServeTask.prototype.start = function(ionic) {
 
     self.liveReloadServer = self.host(self.liveReloadPort);
 
-    server = tinylr();
-    server.listen(this.liveReloadPort, function(err) {
+    var lrServer = tinylr();
+    lrServer.listen(this.liveReloadPort, function(err) {
       if(err) {
         return ionic.fail('Unable to start live reload server:', err);
       } else {
@@ -94,10 +98,76 @@ IonicServeTask.prototype.start = function(ionic) {
     }));
   }
 
+  if(this.printConsoleLogs) {
+    self.consoleServer = self.host(self.consoleLogPort);
+
+  }
+
   this.devServer = this.host(this.port);
 
-  app.use(connect.static('www'))
-    .listen(this.port);
+  // Serve up the www folder by default
+  var serve = serveStatic('www');
+
+  // Create static server
+  var server = http.createServer(function(req, res){
+    var done = finalhandler(req, res);
+
+    var platformUrl = getPlatformUrl(req);
+    if(platformUrl) {
+      var platformWWW = getPlatformWWW(req);
+
+      if(self.isPlatformServe) {
+        fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
+          res.setHeader('Content-Type', 'application/javascript');
+          if (err) {
+            self.serverLog(req.url + '  (Error ' + platformWWW + ')');
+            res.statusCode = 404;
+            res.end('// 404');
+          } else {
+            self.serverLog(req.url + '  (' + platformWWW + ')');
+            res.end(buf);
+          }
+        });
+      } else {
+        self.serverLog(req.url + '  (mocked)');
+        res.setHeader('Content-Type', 'application/javascript');
+        res.end('// mocked cordova.js response to prevent 404 errors during development');
+      }
+      return;
+    }
+
+    if(self.printConsoleLogs) {
+
+      if(req.url === '/__ionic-cli/console') {
+        self.consoleLog(req);
+        res.end('');
+        return;
+      }
+
+      if(req.url === '/') {
+        fs.readFile( path.resolve('www/index.html'), 'utf8', function (err, buf) {
+          res.setHeader('Content-Type', 'text/html');
+          if (err) {
+            self.serverLog(req.url + ' : ERROR!');
+            res.end(err.toString());
+          } else {
+            self.serverLog(req.url);
+            res.end( insertConsoleLogScript(buf.toString('utf8')) );
+          }
+        });
+        return;
+      }
+
+    }
+
+    // root www directory file
+    self.serverLog(req.url);
+    serve(req, res, done);
+  });
+
+  // Listen
+  app.use(server);
+  app.listen(this.port);
 
   console.log('Running dev server:'.green.bold, this.devServer.bold);
 
@@ -110,12 +180,126 @@ IonicServeTask.prototype.start = function(ionic) {
 };
 
 
+IonicServeTask.prototype.serverLog = function(msg) {
+  if(this.printServerLogs) {
+    console.log( ('serve: ' + msg).yellow );
+  }
+};
+
+
+IonicServeTask.prototype.consoleLog = function(req) {
+  var body = '';
+
+  req.on('data', function (data) {
+    if(data) body += data;
+  });
+
+  req.on('end', function () {
+    if(!body) return;
+
+    try {
+      var log = JSON.parse(body);
+
+      var msg = log.index + '  ';
+      while(msg.length < 4) {
+        msg += ' ';
+      }
+
+      msg += log.method;
+      while(msg.length < 14) {
+        msg += ' ';
+      }
+      msg += log.args.join(', ');
+
+      if(log.method == 'error' || log.method == 'exception') msg = msg.red;
+      else if(log.method == 'warn') msg = msg.yellow;
+      else if(log.method == 'info') msg = msg.green;
+      else if(log.method == 'debug') msg = msg.blue;
+
+      console.log(msg);
+    }catch(e){}
+  });
+};
+
+
+function getPlatformUrl(req) {
+  if(req.url == '/cordova.js' || req.url == '/cordova_plugins.js' || req.url.indexOf('/plugins/') === 0) {
+    return req.url;
+  }
+}
+
+
+function getPlatformWWW(req) {
+  var platformPath = 'www';
+
+  if(req && req.headers && req.headers['user-agent']) {
+    var ua = req.headers['user-agent'].toLowerCase();
+    if(ua.indexOf('iphone') > -1 || ua.indexOf('ipad') > -1 || ua.indexOf('ipod') > -1) {
+      platformPath = path.join('platforms', 'ios', 'www');
+
+    } else if(ua.indexOf('android') > -1) {
+      platformPath = path.join('platforms', 'android', 'assets', 'www');
+    }
+  }
+
+  return platformPath;
+}
+
+
+function insertConsoleLogScript(html) {
+  try{
+    var headTag = html.match(/<head>/gi)[0];
+
+    return html.replace(headTag, headTag + '\n\
+    <script>\n\
+      // Injected Ionic CLI Console Logger\n\
+      (function() {\n\
+        var methods = "assert clear count debug dir dirxml error exception group groupCollapsed groupEnd info log markTimeline profile profileEnd table time timeEnd timeStamp trace warn".split(" ");\n\
+        var console = (window.console=window.console || {});\n\
+        var logCount = 0;\n\
+        function sendConsoleLog(method, args) {\n\
+          try {\n\
+            var xhr = new XMLHttpRequest();\n\
+            xhr.open("POST", "/__ionic-cli/console", true);\n\
+            xhr.send(JSON.stringify({ index: logCount, method: method, args: args }));\n\
+            logCount++;\n\
+          } catch(e){}\n\
+        }\n\
+        window.onerror = function(msg, url, line) {\n\
+          if(msg && url) console.error(msg, url, (line ? "Line: " + line : ""));\n\
+        };\n\
+        for(var x=0; x<methods.length; x++) {\n\
+          (function(m){\n\
+            var orgConsole = console[m];\n\
+            console[m] = function() {\n\
+              try {\n\
+                sendConsoleLog(m, Array.prototype.slice.call(arguments));\n\
+                if(orgConsole) orgConsole.apply(console, arguments);\n\
+              } catch(e){}\n\
+            };\n\
+          })(methods[x]);\n\
+        }\n\
+      }());\n\
+    </script>');
+  }catch(e){}
+
+  return html;
+}
+
 IonicServeTask.prototype._changed = function(filePath) {
   // Cleanup the path a bit
   var pwd = process.cwd();
   filePath = filePath.replace(pwd + '/', '');
 
-  console.log( ('  changed: ' + filePath).green );
+  if( filePath.indexOf('.css') > 0 ) {
+    console.log( (' CSS changed: ' + filePath).green );
+  } else if( filePath.indexOf('.js') > 0 ) {
+    console.log( ('  JS changed: ' + filePath).green );
+  } else if( filePath.indexOf('.html') > 0 ) {
+    console.log( ('HTML changed: ' + filePath).green );
+  } else {
+    console.log( ('File changed: ' + filePath).green );
+  }
 
   var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
     path: '/changed',
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index b933496bfe..33d5dfc7f5 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -35,7 +35,7 @@ IonicStartTask.prototype.run = function(ionic) {
   this.appDirectory = argv._[1];
 
   // Grab the name of the app from -a or  --app. Defaults to appDirectory if none provided
-  this.appName = argv['app-name'] || argv.a;
+  this.appName = argv.appname || argv['app-name'] || argv.a;
   if(!this.appName) {
     var appNameSplit = this.appDirectory.split('/');
     appNameSplit = appNameSplit[ appNameSplit.length -1 ].split('\\');
@@ -267,7 +267,7 @@ IonicStartTask.prototype.convertTemplates = function(html) {
 
       var tmpPath = path.join(self.targetPath, 'www', path.dirname(tmpl.path));
       if(!fs.existsSync(tmpPath)) {
-        fs.mkdirSync(tmpPath)
+        fs.mkdirSync(tmpPath);
       }
 
       tmpPath = path.join(self.targetPath, 'www', tmpl.path);
@@ -404,11 +404,46 @@ IonicStartTask.prototype.setupSass = function() {
 IonicStartTask.prototype.updateLibFiles = function() {
   var libPath = argv.lib || argv.l || 'lib/ionic';
 
-  if(libPath == 'lib' && this.seedType == 'ionic-starter') {
-    // don't bother if it still will be the default
+  // create a symlink if the path exists locally
+  var libSymlinkPath = path.resolve(libPath);
+  if( fs.existsSync(libSymlinkPath) ) {
+    // rename the existing lib/ionic directory before creating symlink
+    var wwwIonicCssPath = path.resolve('www/lib/ionic/css');
+    if( fs.existsSync(wwwIonicCssPath) ) {
+      mv( wwwIonicCssPath, path.resolve('www/lib/ionic/css_local') );
+    }
+
+    var wwwIonicJsPath = path.resolve('www/lib/ionic/js');
+    if( fs.existsSync(wwwIonicJsPath) ) {
+      mv( wwwIonicJsPath, path.resolve('www/lib/ionic/js_local') );
+    }
+
+    var wwwIonicFontsPath = path.resolve('www/lib/ionic/fonts');
+    if( fs.existsSync(wwwIonicFontsPath) ) {
+      mv( wwwIonicFontsPath, path.resolve('www/lib/ionic/fonts_local') );
+    }
+
+    var libCssSymlinkPath = path.join(libSymlinkPath, 'css');
+    console.log('Create www/lib/ionic/css symlink to ' + libCssSymlinkPath);
+    fs.symlinkSync(libCssSymlinkPath, wwwIonicCssPath);
+
+    var libJsSymlinkPath = path.join(libSymlinkPath, 'js');
+    console.log('Create www/lib/ionic/js symlink to ' + libJsSymlinkPath);
+    fs.symlinkSync(libJsSymlinkPath, wwwIonicJsPath);
+
+    var libFontsSymlinkPath = path.join(libSymlinkPath, 'fonts');
+    console.log('Create www/lib/ionic/fonts symlink to ' + libFontsSymlinkPath);
+    fs.symlinkSync(libFontsSymlinkPath, wwwIonicFontsPath);
+
+    libPath = 'lib/ionic';
+  }
+
+  if(libPath == 'lib/ionic' && this.seedType == 'ionic-starter') {
+    // don't bother if its still is the default which comes with the starters
     return;
   }
 
+  // path did not exist locally, so manually switch out the path in the html
   var libFiles = 'ionic.css ionic.min.css ionic.js ionic.min.js ionic.bundle.js ionic.bundle.min.js ionic-angular.js ionic-angular.min.js'.split(' ');
 
   function isLibFile(tag) {
@@ -478,6 +513,7 @@ IonicStartTask.prototype.updateLibFiles = function() {
   }
 
   try {
+    console.log('Replacing Ionic lib references with ' + libPath);
     var indexPath = path.join(this.targetPath, 'www', 'index.html');
     var html = fs.readFileSync(indexPath, 'utf8');
 
diff --git a/package.json b/package.json
index 8ca102be71..dcb87ef311 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -42,6 +42,8 @@
     "archiver": "0.5.1",
     "colors": "^0.6.2",
     "connect": "^2.14.5",
+    "serve-static": "^1.5.3",
+    "finalhandler": "^0.1.0",
     "connect-livereload": "^0.4.0",
     "event-stream": "3.0.x",
     "form-data": "~0.1.0",

From bbfb344b305dc336595eea70e809685e2b7ee99d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 2 Sep 2014 15:27:06 -0500
Subject: [PATCH 0206/1100] update

---
 README.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2f2157598d..4b74fba3fe 100644
--- a/README.md
+++ b/README.md
@@ -72,15 +72,13 @@ $ ionic platform ios android
 $ ionic build ios
 ```
 
-## Running your app
+## Live Reload App During Development (beta)
 
-Deploys the Ionic app on specified platform devices.
+The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network, and the device must support [web sockets](http://caniuse.com/websockets).
 
-```bash
-$ ionic run ios [options]
-```
+With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
 
-Command-line flags/options:
+Command-line flags/options for `run` and `emulate`:
 
     [--livereload|-l] .......  Live Reload app dev files from the device (beta)
     [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)
@@ -89,19 +87,22 @@ Command-line flags/options:
     [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
     [--debug|--release]
 
-### Live Reload App During Development (beta)
 
-The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network.
+## Emulating your app
 
-With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
+Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`.
 
+```bash
+$ ionic emulate ios [options]
+```
 
-## Emulating your app
 
-Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`. Live reload options are the same as the `run` options listed above.
+## Running your app
+
+Deploys the Ionic app on specified platform devices. If a device is not found it'll then deploy to an emulator/simulator.
 
 ```bash
-$ ionic emulate ios [options]
+$ ionic run ios [options]
 ```
 
 

From 5d023f21884e27312b30ce6778d63192d80166b8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 02:35:31 -0500
Subject: [PATCH 0207/1100] auto remove read me from root

---
 lib/ionic/start.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 33d5dfc7f5..a433d3dbbd 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -559,6 +559,13 @@ IonicStartTask.prototype.finalize = function() {
     ionicBower.setAppName(this.appName);
   } catch(e) {}
 
+  try {
+    // remove the README file in the root because it
+    // doesn't make sense because its the README for the repo
+    // and not helper text while developing an app
+    fs.unlinkSync(this.targetPath + '/README.md');
+  } catch(e) {}
+
   try {
     // remove the README file in the www root because it
     // doesn't make sense because its the README for the repo

From 9f77b5ead5836c1d92af33fb1f34280c3e320cd4 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 3 Sep 2014 02:38:30 -0500
Subject: [PATCH 0208/1100] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4b74fba3fe..44065c5549 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Use the `ionic --help` command for more detailed task information.
 $ npm install -g ionic
 ```
 
-Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo`.
+*Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo`.*
 
 
 ## Starting an Ionic App
@@ -133,7 +133,7 @@ The third argument can be either `debug` or `release`, and the last argument can
 
 Ionic uses Cordova underneath, so you can also substitute Cordova commands to prepare/build/emulate/run, or to add additional plugins.
 
-Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.
+*Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.*
 
 
 ## Using Sass

From 3b713d3caa5a284abc3fc5059cf4c4c49566a51d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 02:52:56 -0500
Subject: [PATCH 0209/1100] add platform class hook

---
 lib/hooks/after_prepare/010_add_platform_class.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index edd86c9065..ed0135f834 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -3,8 +3,9 @@
 // Add Platform Class
 // v1.0
 // Automatically adds the platform class to the body tag
-// after the `prepare` command. This speeds up device rendering
-// the correct layout/style for the specific platform.
+// after the `prepare` command. By placing the platform CSS classes
+// directly in the HTML built for the platform, it speeds up
+// rendering the correct layout/style for the specific platform.
 
 var fs = require('fs');
 var path = require('path');

From 6b75159a851ad0da58237cbafaed4a51e855a38a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 03:06:15 -0500
Subject: [PATCH 0210/1100] update

---
 lib/hooks/after_prepare/010_add_platform_class.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index ed0135f834..bda3e41585 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -5,7 +5,8 @@
 // Automatically adds the platform class to the body tag
 // after the `prepare` command. By placing the platform CSS classes
 // directly in the HTML built for the platform, it speeds up
-// rendering the correct layout/style for the specific platform.
+// rendering the correct layout/style for the specific platform
+// instead of waiting for the JS to figure out the correct classes.
 
 var fs = require('fs');
 var path = require('path');
@@ -37,7 +38,7 @@ function addPlatformBodyTag(indexPath, platform) {
 
     } else {
       // add class attribute to the body tag
-      newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">')
+      newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">');
     }
 
     html = html.replace(bodyTag, newBodyTag);

From 9d01ff2b3d5e8047f98cc4a464a9f9c7da166651 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 03:21:53 -0500
Subject: [PATCH 0211/1100] both app-name and appname work

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d38f10792c..2d892f38b2 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -65,7 +65,7 @@ var TASKS = [
                     'Defaults to Ionic "tabs" starter template'
     },
     options: {
-      '--app-name|-a': 'Human readable name for the app (Use quotes around the name)',
+      '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
       '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
       '--sass|-s': 'Setup the project to use Sass CSS precompiling'

From 76915ae1037535d02c9583faa3db5ae5b63891e2 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 03:47:07 -0500
Subject: [PATCH 0212/1100] add platforms from start cmd

---
 lib/ionic/start.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a433d3dbbd..09900ad962 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -326,10 +326,24 @@ IonicStartTask.prototype.initCordova = function() {
 
     if(this.ionic.hasFailed) return;
 
+    var cmds = [
+      'cordova plugin add org.apache.cordova.device',
+      'cordova plugin add org.apache.cordova.console',
+      'cordova plugin add com.ionic.keyboard'
+    ];
+
+    // platform add android with --android flag
+    if(argv.android) {
+      cmds.push('cordova platform add android');
+    }
+
+    // platform add ios with --android flag
+    if(argv.ios) {
+      cmds.push('cordova platform add ios');
+    }
+
     console.log('Initializing cordova project.'.info.bold);
-    exec('cordova plugin add org.apache.cordova.device && ' +
-         'cordova plugin add org.apache.cordova.console && ' +
-         'cordova plugin add com.ionic.keyboard',
+    exec(cmds.join(' && '),
          function(err, stdout, stderr) {
             if(err) {
               self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. ' +

From eecf1ce49bea2e29f951e97937fed32b76a2b1e9 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 21:31:02 -0500
Subject: [PATCH 0213/1100] do not require all task modules on each run

---
 lib/ionic.js         | 97 ++++++++++++++------------------------------
 lib/ionic/cordova.js | 16 ++++----
 lib/ionic/lib.js     | 26 ++++++------
 lib/ionic/login.js   | 14 +++----
 lib/ionic/package.js | 30 +++++++-------
 lib/ionic/project.js |  3 +-
 lib/ionic/serve.js   | 33 +++++++++------
 lib/ionic/setup.js   | 16 ++++----
 lib/ionic/start.js   | 40 +++++++++---------
 lib/ionic/task.js    |  6 +--
 lib/ionic/upload.js  | 10 ++---
 11 files changed, 131 insertions(+), 160 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2d892f38b2..2dbf7e5530 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -14,25 +14,11 @@ Licensed under the MIT license. See LICENSE For more.
 Copyright 2014 Drifty (http://drifty.com/)
 */
 
-var IonicStartTask = require('./ionic/start').IonicStartTask,
-    IonicCordovaTask = require('./ionic/cordova').IonicCordovaTask,
-    IonicLoginTask = require('./ionic/login').IonicLoginTask,
-    IonicUploadTask = require('./ionic/upload').IonicUploadTask,
-    IonicPackageTask = require('./ionic/package').IonicPackageTask,
-    IonicLibTask = require('./ionic/lib').IonicLibTask,
-    IonicSetupTask = require('./ionic/setup').IonicSetupTask,
-    IonicServeTask = require('./ionic/serve').IonicServeTask,
-    IonicProject = require('./ionic/project'),
-    IonicStore = require('./ionic/store').IonicStore,
-    path = require('path'),
-    request = require('request'),
-    os = require('os'),
-    unzip = require('unzip'),
+var argv = require('optimist').argv,
     colors = require('colors'),
-    spawn = require('child_process').spawn,
     Q = require('q'),
-    settings = require('../package.json');
-
+    settings = require('../package.json'),
+    shelljs = require('shelljs/global'),;
 
 colors.setTheme({
   silly: 'rainbow',
@@ -49,9 +35,6 @@ colors.setTheme({
 });
 
 
-var fs = require('fs'),
-    argv = require('optimist').argv;
-
 var TASKS = [
   {
     title: 'start',
@@ -70,7 +53,7 @@ var TASKS = [
       '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
       '--sass|-s': 'Setup the project to use Sass CSS precompiling'
     },
-    task: IonicStartTask
+    module: './ionic/start'
   },
   {
     title: 'serve',
@@ -87,7 +70,7 @@ var TASKS = [
       '--nobrowser|-b': 'Disable launching a browser',
       '--nolivereload': 'Do not start live reload'
     },
-    task: IonicServeTask
+    module: './ionic/serve'
   },
   {
     title: 'platform',
@@ -97,7 +80,7 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'run',
@@ -116,7 +99,7 @@ var TASKS = [
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'emulate',
@@ -135,7 +118,7 @@ var TASKS = [
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'build',
@@ -145,7 +128,7 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'plugin add',
@@ -159,17 +142,17 @@ var TASKS = [
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n' +
                                   'subdirectories for the plugin before using the registry.'
     },
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'prepare',
     name: 'prepare',
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'compile',
     name: 'compile',
-    task: IonicCordovaTask
+    module: './ionic/cordova'
   },
   {
     title: 'package',
@@ -195,7 +178,7 @@ var TASKS = [
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password'
     },
-    task: IonicPackageTask
+    module: './ionic/package'
   },
   {
     title: 'upload',
@@ -206,7 +189,7 @@ var TASKS = [
       '--password|-p': 'Ionic account password'
     },
     alt: ['up'],
-    task: IonicUploadTask
+    module: './ionic/upload'
   },
   {
     title: 'lib',
@@ -219,7 +202,7 @@ var TASKS = [
     options: {
       '--version|-v': 'Spcific Ionic version, otherwise it defaults to the latest'
     },
-    task: IonicLibTask
+    module: './ionic/lib'
   },
   {
     title: 'setup',
@@ -228,12 +211,12 @@ var TASKS = [
     args: {
       '[sass]': 'Setup the project to use Sass CSS precompiling'
     },
-    task: IonicSetupTask
+    module: './ionic/setup'
   },
   {
     title: 'login',
     name: 'login',
-    task: IonicLoginTask
+    module: './ionic/login'
   }
 ];
 
@@ -436,6 +419,7 @@ Ionic = {
     }
 
     if(argv['stats-opt-out']) {
+      var IonicStore = require('./ionic/store').IonicStore;
       var ionicConfig = new IonicStore('ionic.config');
       ionicConfig.set('statsOptOut', true);
       ionicConfig.save();
@@ -443,13 +427,14 @@ Ionic = {
       return;
     }
 
-    var task = this._tryBuildingTask();
-    if(!task) {
+    var taskSetting = this._tryBuildingTask();
+    if(!taskSetting) {
       return this._printAvailableTasks();
     }
+    var taskModule = require(taskSetting.module).IonicTask;
 
-    var taskObj = new task.task();
-    taskObj.run(this);
+    var taskInstance = new taskModule();
+    taskInstance.run(this);
   },
 
   fail: function(msg, taskHelp) {
@@ -488,6 +473,7 @@ Ionic = {
       }
 
       // stay silent if it errors
+      var IonicStore = require('./ionic/store').IonicStore;
       var ionicConfig = new IonicStore('ionic.config');
       var versionCheck = ionicConfig.get('versionCheck');
       if(versionCheck && ((versionCheck + 86400000) > Date.now() )) {
@@ -497,6 +483,7 @@ Ionic = {
       }
 
       var proxy = process.env.PROXY || null;
+      var request = require('request');
       request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
         try {
           self.npmVersion = JSON.parse(body).version;
@@ -529,39 +516,14 @@ Ionic = {
     });
   },
 
-  spawnPromise: function(cmd, args, onStdOut, onStdErr) {
-    var q = Q.defer();
-    var child;
-    console.log('\nRUNNING:'.info.bold, cmd, args.join(' '));
-    try {
-      child = spawn(cmd, args);
-    } catch(e) {
-    }
-    child.stdout.setEncoding('utf8');
-    child.stdout.on('data', function(data) {
-      process.stdout.write(data);
-      onStdOut && onStdOut(data);
-    });
-    child.stderr.on('data', function(data) {
-      process.stderr.write(data);
-      onStdErr && onStdErr(data);
-    });
-    child.on('error', function(err) {
-      q.reject(err);
-    });
-    child.on('exit', function(code) {
-      if(code === 0) {
-        q.resolve();
-      } else {
-        q.reject(code);
-      }
-    });
-    return q.promise;
-  },
   /**
    * Download a zip file, unzip it to a specific folder.
    */
   fetchArchive: function(targetPath, archiveUrl) {
+    var os = require('os');
+    var fs = require('fs');
+    var path = require('path');
+    var unzip = require('unzip');
     var q = Q.defer();
 
     // The folder name the project will be downloaded and extracted to
@@ -585,6 +547,7 @@ Ionic = {
     };
 
     var proxy = process.env.PROXY || null;
+    var request = require('request');
     request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
       if(!res || res.statusCode !== 200) {
         q.reject(res);
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5db1181e6f..40f898c118 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,4 +1,4 @@
-var IonicTask = require('./task').IonicTask,
+var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     argv = require('optimist').argv,
@@ -7,11 +7,11 @@ var IonicTask = require('./task').IonicTask,
     exec = require('child_process').exec,
     colors = require('colors');
 
-var IonicCordovaTask = function() {};
+var IonicTask = function() {};
 
-IonicCordovaTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicCordovaTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
   var cmdName = process.argv[2].toLowerCase();
@@ -82,7 +82,7 @@ IonicCordovaTask.prototype.run = function(ionic) {
 };
 
 
-IonicCordovaTask.prototype.setupLiveReload = function() {
+IonicTask.prototype.setupLiveReload = function() {
   console.log('Setup Live Reload'.green.bold);
 
   var serve = new require('./serve');
@@ -99,7 +99,7 @@ IonicCordovaTask.prototype.setupLiveReload = function() {
 };
 
 
-IonicCordovaTask.prototype.setConfigXml = function(options) {
+IonicTask.prototype.setConfigXml = function(options) {
   var self = this;
   var madeChange = false;
 
@@ -146,7 +146,7 @@ IonicCordovaTask.prototype.setConfigXml = function(options) {
 };
 
 
-IonicCordovaTask.prototype.addHooks = function() {
+IonicTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
 
@@ -212,4 +212,4 @@ IonicCordovaTask.prototype.addHooks = function() {
 
 };
 
-exports.IonicCordovaTask = IonicCordovaTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 57372c0212..eefc6e6872 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -8,14 +8,14 @@ var fs = require('fs'),
     colors = require('colors'),
     exec = require('child_process').exec,
     Q = require('q'),
-    IonicTask = require('./task').IonicTask,
+    Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats;
 
-var IonicLibTask = function() {};
+var IonicTask = function() {};
 
-IonicLibTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicLibTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.local = {};
   self.versionData = {};
@@ -37,7 +37,7 @@ IonicLibTask.prototype.run = function(ionic) {
 };
 
 
-IonicLibTask.prototype.loadVersionData = function() {
+IonicTask.prototype.loadVersionData = function() {
   this.versionFilePath = path.resolve('www/lib/ionic/version.json');
   if( !fs.existsSync(this.versionFilePath) ) {
     this.versionFilePath = path.resolve('www/lib/ionic/bower.json');
@@ -52,7 +52,7 @@ IonicLibTask.prototype.loadVersionData = function() {
 };
 
 
-IonicLibTask.prototype.printLibVersions = function() {
+IonicTask.prototype.printLibVersions = function() {
   var self = this;
 
   console.log('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
@@ -69,7 +69,7 @@ IonicLibTask.prototype.printLibVersions = function() {
 };
 
 
-IonicLibTask.prototype.getVersionData = function(version) {
+IonicTask.prototype.getVersionData = function(version) {
   var q = Q.defer();
   var self = this;
 
@@ -110,7 +110,7 @@ IonicLibTask.prototype.getVersionData = function(version) {
 };
 
 
-IonicLibTask.prototype.updateLibVersion = function() {
+IonicTask.prototype.updateLibVersion = function() {
   var self = this;
 
   if(self.usesBower) {
@@ -158,7 +158,7 @@ IonicLibTask.prototype.updateLibVersion = function() {
 };
 
 
-IonicLibTask.prototype.getLatest = function() {
+IonicTask.prototype.getLatest = function() {
   var self = this;
 
   var dirPath = path.resolve('www/lib/');
@@ -188,7 +188,7 @@ IonicLibTask.prototype.getLatest = function() {
 };
 
 
-IonicLibTask.prototype.downloadZip = function(version) {
+IonicTask.prototype.downloadZip = function(version) {
   var self = this;
 
   var archivePath = 'https://github.com/driftyco/ionic-bower/archive/v' + version + '.zip';
@@ -253,7 +253,7 @@ IonicLibTask.prototype.downloadZip = function(version) {
 };
 
 
-IonicLibTask.prototype.updateFiles = function(version) {
+IonicTask.prototype.updateFiles = function(version) {
   var self = this;
   var ionicLibDir = path.resolve('www/lib/ionic');
   var readStream = fs.createReadStream(self.tmpZipPath);
@@ -315,7 +315,7 @@ IonicLibTask.prototype.updateFiles = function(version) {
   }
 };
 
-IonicLibTask.prototype.writeVersionData = function() {
+IonicTask.prototype.writeVersionData = function() {
   try {
     var versionData = {
       "version": this.versionData.version_number || this.versionData.version,
@@ -331,4 +331,4 @@ IonicLibTask.prototype.writeVersionData = function() {
   }
 };
 
-exports.IonicLibTask = IonicLibTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index ce1109faae..e94a7edff8 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -4,13 +4,13 @@ var fs = require('fs'),
     prompt = require('prompt'),
     IonicProject = require('./project'),
     IonicStore = require('./store').IonicStore,
-    IonicTask = require('./task').IonicTask;
+    Task = require('./task').Task;
 
-var IonicLoginTask = function() {};
+var IonicTask = function() {};
 
-IonicLoginTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicLoginTask.prototype.get = function(ionic, callback) {
+IonicTask.prototype.get = function(ionic, callback) {
   this.cookieData = new IonicStore('cookies');
 
   if(ionic.jar) {
@@ -48,7 +48,7 @@ IonicLoginTask.prototype.get = function(ionic, callback) {
   this.run(ionic, callback);
 };
 
-IonicLoginTask.prototype.run = function(ionic, callback) {
+IonicTask.prototype.run = function(ionic, callback) {
   var self = this;
 
   if(!this.email && !this.password) {
@@ -92,7 +92,7 @@ IonicLoginTask.prototype.run = function(ionic, callback) {
 
 };
 
-IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
+IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
   var self = this;
 
   var jar = request.jar();
@@ -136,4 +136,4 @@ IonicLoginTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
   });
 };
 
-exports.IonicLoginTask = IonicLoginTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 32a3171f2d..e296b0d1dc 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -8,16 +8,16 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicStore = require('./store').IonicStore,
-    IonicTask = require('./task').IonicTask,
+    Task = require('./task').Task,
     IonicUploadTask = require('./upload').IonicUploadTask,
     IonicStats = require('./stats').IonicStats,
     IonicLoginTask = require('./login').IonicLoginTask;
 
-var IonicPackageTask = function() {};
+var IonicTask = function() {};
 
-IonicPackageTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicPackageTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
 
@@ -51,7 +51,7 @@ IonicPackageTask.prototype.run = function(ionic) {
 };
 
 
-IonicPackageTask.prototype.loadProject = function() {
+IonicTask.prototype.loadProject = function() {
   var appName = this.project.get('name') || "app";
   console.log( ('Loading ' + appName + '...').bold.green );
 
@@ -83,7 +83,7 @@ IonicPackageTask.prototype.loadProject = function() {
 };
 
 
-IonicPackageTask.prototype.loadPlugins = function() {
+IonicTask.prototype.loadPlugins = function() {
   this.plugins = [];
 
   try {
@@ -105,7 +105,7 @@ IonicPackageTask.prototype.loadPlugins = function() {
 };
 
 
-IonicPackageTask.prototype.getCmdLineOptions = function() {
+IonicTask.prototype.getCmdLineOptions = function() {
   var self = this;
 
   function getCmdArgValue(propertyName, shortName) {
@@ -138,7 +138,7 @@ IonicPackageTask.prototype.getCmdLineOptions = function() {
 };
 
 
-IonicPackageTask.prototype.loadAppSigning = function(callback) {
+IonicTask.prototype.loadAppSigning = function(callback) {
   var self = this;
 
   if(self.useCmdArgs) {
@@ -195,7 +195,7 @@ IonicPackageTask.prototype.loadAppSigning = function(callback) {
 };
 
 
-IonicPackageTask.prototype.initPlatforms = function() {
+IonicTask.prototype.initPlatforms = function() {
   var self = this;
 
   if(self.useCmdArgs) {
@@ -231,7 +231,7 @@ IonicPackageTask.prototype.initPlatforms = function() {
 
 };
 
-IonicPackageTask.prototype.packagePlatforms = function() {
+IonicTask.prototype.packagePlatforms = function() {
   var self = this;
   var upload = new IonicUploadTask();
 
@@ -244,7 +244,7 @@ IonicPackageTask.prototype.packagePlatforms = function() {
 };
 
 
-IonicPackageTask.prototype.buildPromptProperties = function() {
+IonicTask.prototype.buildPromptProperties = function() {
   // Just prompt for some build properties
   var promptProperties = {};
 
@@ -325,7 +325,7 @@ IonicPackageTask.prototype.buildPromptProperties = function() {
 };
 
 
-IonicPackageTask.prototype.buildPostRequest = function(platform) {
+IonicTask.prototype.buildPostRequest = function(platform) {
   var form = new FormData();
 
   form.append('build_status_email', this.buildStatusEmail.toString());
@@ -370,7 +370,7 @@ IonicPackageTask.prototype.buildPostRequest = function(platform) {
 };
 
 
-IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
+IonicTask.prototype.submitPostRequest = function(form, platform) {
   var self = this;
   var params = parseUrl(self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/package');
 
@@ -444,7 +444,7 @@ IonicPackageTask.prototype.submitPostRequest = function(form, platform) {
 };
 
 
-IonicPackageTask.prototype.clearSigning = function() {
+IonicTask.prototype.clearSigning = function() {
   var self = this;
   console.log('Clearing app signing and credential information...'.yellow.bold);
 
@@ -612,4 +612,4 @@ function resolvePath (p) {
   return path.resolve(p);
 }
 
-exports.IonicPackageTask = IonicPackageTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index 366a2c4e89..d5c294fa01 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -1,6 +1,5 @@
 var fs = require('fs'),
-    path = require('path'),
-    ionic = require('../ionic');
+    path = require('path');
 
 module.exports = {
   PROJECT_FILE: 'ionic.project',
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 1194024d23..bd5bdee492 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -13,17 +13,17 @@ var fs = require('fs'),
     Q = require('q'),
     spawn = require('child_process').spawn,
     IonicProject = require('./project'),
-    IonicTask = require('./task').IonicTask;
+    Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
 
-var IonicServeTask = function() {};
+var IonicTask = function() {};
 
-IonicServeTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicServeTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
@@ -38,7 +38,7 @@ IonicServeTask.prototype.run = function(ionic) {
 };
 
 
-IonicServeTask.prototype.loadSettings = function() {
+IonicTask.prototype.loadSettings = function() {
   var project = IonicProject.load();
 
   this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
@@ -51,7 +51,7 @@ IonicServeTask.prototype.loadSettings = function() {
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
 };
 
-IonicServeTask.prototype.start = function(ionic) {
+IonicTask.prototype.start = function(ionic) {
   var self = this;
   var app = connect();
 
@@ -180,14 +180,14 @@ IonicServeTask.prototype.start = function(ionic) {
 };
 
 
-IonicServeTask.prototype.serverLog = function(msg) {
+IonicTask.prototype.serverLog = function(msg) {
   if(this.printServerLogs) {
     console.log( ('serve: ' + msg).yellow );
   }
 };
 
 
-IonicServeTask.prototype.consoleLog = function(req) {
+IonicTask.prototype.consoleLog = function(req) {
   var body = '';
 
   req.on('data', function (data) {
@@ -209,7 +209,16 @@ IonicServeTask.prototype.consoleLog = function(req) {
       while(msg.length < 14) {
         msg += ' ';
       }
-      msg += log.args.join(', ');
+
+      if(log.method == 'dir') {
+        var dirObjs = [];
+        log.args.forEach(function(objStr){
+          dirObjs.push( JSON.stringify( JSON.parse(objStr) ) );
+        });
+        msg += dirObjs.join('\n');
+      } else {
+        msg += log.args.join(', ');
+      }
 
       if(log.method == 'error' || log.method == 'exception') msg = msg.red;
       else if(log.method == 'warn') msg = msg.yellow;
@@ -286,7 +295,7 @@ function insertConsoleLogScript(html) {
   return html;
 }
 
-IonicServeTask.prototype._changed = function(filePath) {
+IonicTask.prototype._changed = function(filePath) {
   // Cleanup the path a bit
   var pwd = process.cwd();
   filePath = filePath.replace(pwd + '/', '');
@@ -315,7 +324,7 @@ IonicServeTask.prototype._changed = function(filePath) {
 };
 
 
-IonicServeTask.prototype.host = function(port) {
+IonicTask.prototype.host = function(port) {
   var addresses = [];
 
   try {
@@ -335,4 +344,4 @@ IonicServeTask.prototype.host = function(port) {
   return 'http://' + (addresses.length === 1 ? addresses[0] : 'localhost') + ':' + port;
 };
 
-exports.IonicServeTask = IonicServeTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 68263d22ec..60f6345b82 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,4 +1,4 @@
-var IonicTask = require('./task').IonicTask,
+var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     path = require('path'),
@@ -8,11 +8,11 @@ var IonicTask = require('./task').IonicTask,
     IonicProject = require('./project'),
     colors = require('colors');
 
-var IonicSetupTask = function() {};
+var IonicTask = function() {};
 
-IonicSetupTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicSetupTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   if( argv._.length < 2 ) {
     return ionic.fail('Missing setup task command.', 'setup');
   }
@@ -31,7 +31,7 @@ IonicSetupTask.prototype.run = function(ionic) {
 };
 
 
-IonicSetupTask.prototype.sassSetup = function(ionic) {
+IonicTask.prototype.sassSetup = function(ionic) {
   var q = Q.defer();
   var self = this;
 
@@ -100,7 +100,7 @@ IonicSetupTask.prototype.sassSetup = function(ionic) {
 };
 
 
-IonicSetupTask.prototype.buildSass = function() {
+IonicTask.prototype.buildSass = function() {
   var q = Q.defer();
 
   var childProcess = exec('gulp sass');
@@ -130,7 +130,7 @@ IonicSetupTask.prototype.buildSass = function() {
 };
 
 
-IonicSetupTask.prototype.npmInstall = function() {
+IonicTask.prototype.npmInstall = function() {
   var q = Q.defer();
 
   var childProcess = exec('npm install');
@@ -163,4 +163,4 @@ IonicSetupTask.prototype.npmInstall = function() {
 };
 
 
-exports.IonicSetupTask = IonicSetupTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 09900ad962..4bfffa9e87 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -12,18 +12,18 @@ var fs = require('fs'),
     xml2js = require('xml2js'),
     setup = require('./setup'),
     IonicProject = require('./project'),
-    IonicTask = require('./task').IonicTask;
+    Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
 
 
-var IonicStartTask = function() {};
+var IonicTask = function() {};
 
 // The URL for the cordova wrapper project
-IonicStartTask.WRAPPER_REPO_NAME = 'ionic-app-base';
+IonicTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
-IonicStartTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicStartTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic) {
   this.ionic = ionic;
   var self = this;
 
@@ -94,7 +94,7 @@ IonicStartTask.prototype.run = function(ionic) {
 };
 
 
-IonicStartTask.prototype.startApp = function() {
+IonicTask.prototype.startApp = function() {
   var self = this;
 
   self.fetchWrapper()
@@ -117,14 +117,14 @@ IonicStartTask.prototype.startApp = function() {
 };
 
 
-IonicStartTask.prototype.fetchWrapper = function() {
+IonicTask.prototype.fetchWrapper = function() {
   var q = Q.defer();
   var self = this;
 
-  var repoUrl = 'https://github.com/driftyco/' + IonicStartTask.WRAPPER_REPO_NAME + '/archive/master.zip';
+  var repoUrl = 'https://github.com/driftyco/' + IonicTask.WRAPPER_REPO_NAME + '/archive/master.zip';
 
   Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
-    var repoFolderName = IonicStartTask.WRAPPER_REPO_NAME + '-master';
+    var repoFolderName = IonicTask.WRAPPER_REPO_NAME + '-master';
     cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
     rm('-rf', self.targetPath + '/' + repoFolderName + '/');
     cd(self.targetPath);
@@ -148,7 +148,7 @@ IonicStartTask.prototype.fetchWrapper = function() {
 };
 
 
-IonicStartTask.prototype.fetchSeed = function() {
+IonicTask.prototype.fetchSeed = function() {
 
   if(this.template.toLowerCase().indexOf('codepen') > -1) {
     this.seedType = 'codepen';
@@ -160,7 +160,7 @@ IonicStartTask.prototype.fetchSeed = function() {
 };
 
 
-IonicStartTask.prototype.fetchCodepen = function() {
+IonicTask.prototype.fetchCodepen = function() {
   var self = this;
   var codepenUrl = this.template.split('?')[0].split('#')[0];
   var wwwPath = path.join(this.targetPath, 'www');
@@ -225,7 +225,7 @@ IonicStartTask.prototype.fetchCodepen = function() {
 };
 
 
-IonicStartTask.prototype.convertTemplates = function(html) {
+IonicTask.prototype.convertTemplates = function(html) {
   var templates = [];
   var self = this;
 
@@ -283,7 +283,7 @@ IonicStartTask.prototype.convertTemplates = function(html) {
 };
 
 
-IonicStartTask.prototype.fetchIonicStarter = function() {
+IonicTask.prototype.fetchIonicStarter = function() {
   var self = this;
   var q = Q.defer();
 
@@ -316,7 +316,7 @@ IonicStartTask.prototype.fetchIonicStarter = function() {
 };
 
 
-IonicStartTask.prototype.initCordova = function() {
+IonicTask.prototype.initCordova = function() {
   var self = this;
   var q = Q.defer();
 
@@ -362,7 +362,7 @@ IonicStartTask.prototype.initCordova = function() {
 };
 
 
-IonicStartTask.prototype.updateConfigXml = function() {
+IonicTask.prototype.updateConfigXml = function() {
   var self = this;
   console.log('\nUpdate config.xml'.info.bold);
 
@@ -400,7 +400,7 @@ IonicStartTask.prototype.updateConfigXml = function() {
 };
 
 
-IonicStartTask.prototype.setupSass = function() {
+IonicTask.prototype.setupSass = function() {
   if(argv.sass) {
     // auto setup sass if they set the option
     console.log('setup sass'.green.bold);
@@ -415,7 +415,7 @@ IonicStartTask.prototype.setupSass = function() {
 };
 
 
-IonicStartTask.prototype.updateLibFiles = function() {
+IonicTask.prototype.updateLibFiles = function() {
   var libPath = argv.lib || argv.l || 'lib/ionic';
 
   // create a symlink if the path exists locally
@@ -547,7 +547,7 @@ IonicStartTask.prototype.updateLibFiles = function() {
 };
 
 
-IonicStartTask.prototype.finalize = function() {
+IonicTask.prototype.finalize = function() {
 
   this.updateLibFiles();
 
@@ -593,7 +593,7 @@ IonicStartTask.prototype.finalize = function() {
 };
 
 
-IonicStartTask.prototype.printQuickHelp = function() {
+IonicTask.prototype.printQuickHelp = function() {
   console.log('\nYour Ionic project is ready to go!'.green.bold, 'Some quick tips:');
 
   console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).info.bold);
@@ -618,4 +618,4 @@ IonicStartTask.prototype.printQuickHelp = function() {
 };
 
 
-exports.IonicStartTask = IonicStartTask;
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 20ffec018f..3385c4af82 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,8 +1,8 @@
-var IonicTask = function() { };
+var Task = function() { };
 
-IonicTask.prototype = {
+Task.prototype = {
   run: function(ionic) {
   }
 };
 
-exports.IonicTask = IonicTask;
+exports.Task = Task;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index e0400a4f6a..5ba96d3cbd 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -5,16 +5,16 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     FormData = require('form-data'),
     IonicProject = require('./project'),
-    IonicTask = require('./task').IonicTask,
+    Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     IonicLoginTask = require('./login').IonicLoginTask,
     Q = require('q');
 
-var IonicUploadTask = function() {};
+var IonicTask = function() {};
 
-IonicUploadTask.prototype = new IonicTask();
+IonicTask.prototype = new Task();
 
-IonicUploadTask.prototype.run = function(ionic, callback) {
+IonicTask.prototype.run = function(ionic, callback) {
   var project = IonicProject.load();
   var q = Q.defer();
 
@@ -129,4 +129,4 @@ IonicUploadTask.prototype.run = function(ionic, callback) {
   });
 };
 
-exports.IonicUploadTask = IonicUploadTask;
+exports.IonicTask = IonicTask;

From c732e44e2da3ca3d7fd91e4cf01484356dc7a4f5 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 21:52:12 -0500
Subject: [PATCH 0214/1100] remove white text, closes #70

---
 lib/ionic.js       | 19 ++++++++++---------
 lib/ionic/lib.js   |  2 +-
 lib/ionic/login.js |  2 +-
 lib/ionic/setup.js |  6 +++---
 lib/ionic/start.js | 32 ++++++++++++++++----------------
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2dbf7e5530..4c41e65b0a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -18,7 +18,7 @@ var argv = require('optimist').argv,
     colors = require('colors'),
     Q = require('q'),
     settings = require('../package.json'),
-    shelljs = require('shelljs/global'),;
+    shelljs = require('shelljs/global');
 
 colors.setTheme({
   silly: 'rainbow',
@@ -58,7 +58,7 @@ var TASKS = [
   {
     title: 'serve',
     name: 'serve',
-    summary: 'Start a local development server for app dev and testing',
+    summary: 'Start a local development server for app dev/testing',
     args: {
       '[options]': ''
     },
@@ -92,7 +92,7 @@ var TASKS = [
     },
     options: {
       '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload required)',
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
@@ -111,7 +111,7 @@ var TASKS = [
     },
     options: {
       '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload required)',
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
@@ -139,8 +139,9 @@ var TASKS = [
       '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
     },
     options: {
-      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory and\n' +
-                                  'subdirectories for the plugin before using the registry.'
+      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
+                                  'and subdirectories first for the plugin before\n' +
+                                  'looking it up in the registry.'
     },
     module: './ionic/cordova'
   },
@@ -200,7 +201,7 @@ var TASKS = [
       '[update]': 'Updates the Ionic Framework in www/lib/ionic'
     },
     options: {
-      '--version|-v': 'Spcific Ionic version, otherwise it defaults to the latest'
+      '--version|-v': 'Spcific Ionic version\nOtherwise it defaults to the latest version'
     },
     module: './ionic/lib'
   },
@@ -504,7 +505,7 @@ Ionic = {
       process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
       process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
       process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
-      process.stdout.write( ' * Run '.yellow + 'npm update -g ionic'.info.bold + ' to update\n'.yellow );
+      process.stdout.write( ' * Run '.yellow + 'npm update -g ionic'.bold + ' to update\n'.yellow );
       process.stdout.write('-------------------------\n\n'.red);
       this.npmVersion = null;
     }
@@ -527,7 +528,7 @@ Ionic = {
     var q = Q.defer();
 
     // The folder name the project will be downloaded and extracted to
-    console.log('\nDownloading:'.info.bold, archiveUrl);
+    console.log('\nDownloading:'.bold, archiveUrl);
 
     var tmpFolder = os.tmpdir();
     var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index eefc6e6872..bb5bbbf282 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -135,7 +135,7 @@ IonicTask.prototype.updateLibVersion = function() {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  console.log('Are you sure you want to replace '.green.bold + libPath.info.bold + ' with an updated version of Ionic?'.green.bold);
+  console.log('Are you sure you want to replace '.green.bold + libPath.bold + ' with an updated version of Ionic?'.green.bold);
 
   var promptProperties = {
     areYouSure: {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index e94a7edff8..9b29a04371 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -67,7 +67,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
     // prompt for log
     console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-    console.log('Don\'t have one? Create a one at: '.bold + (ionic.IONIC_DASH + '/signup').info.bold + '\n');
+    console.log('Don\'t have one? Create a one at: '.bold + (ionic.IONIC_DASH + '/signup').bold + '\n');
 
     prompt.override = argv;
     prompt.message = '';
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 60f6345b82..0528d4990b 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -49,7 +49,7 @@ IonicTask.prototype.sassSetup = function(ionic) {
     }
 
     try {
-      var activeRemoving = false;
+      activeRemoving = false;
 
       for(x=0; x<lines.length; x++) {
         line = lines[x];
@@ -122,7 +122,7 @@ IonicTask.prototype.buildSass = function() {
       q.resolve();
     } else {
       console.log( 'Error running '.error.bold + 'gulp sass'.bold );
-      q.reject()
+      q.reject();
     }
   });
 
@@ -155,7 +155,7 @@ IonicTask.prototype.npmInstall = function() {
       q.resolve();
     } else {
       console.log( 'Error running '.error.bold + 'npm install'.bold );
-      q.reject()
+      q.reject();
     }
   });
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 4bfffa9e87..01858e3a14 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -52,7 +52,7 @@ IonicTask.prototype.run = function(ionic) {
   // figure out the full path
   this.targetPath = path.resolve(this.appDirectory);
 
-  console.log('Creating Ionic app in folder', this.targetPath, 'based on', this.template.info.bold, 'project');
+  console.log('Creating Ionic app in folder', this.targetPath, 'based on', this.template.bold, 'project');
 
   // Make sure to create this
   if( fs.existsSync(this.targetPath) ) {
@@ -165,7 +165,7 @@ IonicTask.prototype.fetchCodepen = function() {
   var codepenUrl = this.template.split('?')[0].split('#')[0];
   var wwwPath = path.join(this.targetPath, 'www');
 
-  console.log('\nDownloading Codepen:'.info.bold, codepenUrl);
+  console.log('\nDownloading Codepen:'.bold, codepenUrl);
 
   var qHTML = Q.defer();
   var qCSS = Q.defer();
@@ -342,7 +342,7 @@ IonicTask.prototype.initCordova = function() {
       cmds.push('cordova platform add ios');
     }
 
-    console.log('Initializing cordova project.'.info.bold);
+    console.log('Initializing cordova project'.bold);
     exec(cmds.join(' && '),
          function(err, stdout, stderr) {
             if(err) {
@@ -364,7 +364,7 @@ IonicTask.prototype.initCordova = function() {
 
 IonicTask.prototype.updateConfigXml = function() {
   var self = this;
-  console.log('\nUpdate config.xml'.info.bold);
+  console.log('\nUpdate config.xml'.bold);
 
   try {
     var configXmlPath = self.targetPath + '/config.xml';
@@ -596,25 +596,25 @@ IonicTask.prototype.finalize = function() {
 IonicTask.prototype.printQuickHelp = function() {
   console.log('\nYour Ionic project is ready to go!'.green.bold, 'Some quick tips:');
 
-  console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).info.bold);
+  console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).bold);
 
   if(!argv.sass) {
-    console.log('\n * Setup this project to use Sass:', 'ionic setup sass'.info.bold);
+    console.log('\n * Setup this project to use Sass:', 'ionic setup sass'.bold);
   }
 
-  console.log('\n * Develop in the browser with live reload:', 'ionic serve'.info.bold);
+  console.log('\n * Develop in the browser with live reload:', 'ionic serve'.bold);
 
   if(this.isCordovaProject) {
-    console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.info.bold);
-    console.log('    Note: iOS development requires OS X currently'.small);
-    console.log('    See the Android Platform Guide for full Android installation instructions:'.small);
-    console.log('    https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html'.small);
-    console.log('\n * Build your app:', 'ionic build <PLATFORM>'.info.bold);
-    console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.info.bold);
-    console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.info.bold);
-    console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.info.bold);
+    console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.bold);
+    console.log('   Note: iOS development requires OS X currently'.small);
+    console.log('   See the Android Platform Guide for full Android installation instructions:'.small);
+    console.log('   https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html'.small);
+    console.log('\n * Build your app:', 'ionic build <PLATFORM>'.bold);
+    console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.bold);
+    console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.bold);
+    console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.bold);
   }
-  console.log('\nFor more help use', 'ionic --help'.info.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs\n'.info.bold);
+  console.log('\nFor more help use', 'ionic --help'.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs\n'.bold);
 };
 
 

From ee226be9326c444415bb816623efa5aee8a920c0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 22:13:34 -0500
Subject: [PATCH 0215/1100] console.dir

---
 lib/ionic/serve.js | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index bd5bdee492..54a5a63690 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -210,12 +210,32 @@ IonicTask.prototype.consoleLog = function(req) {
         msg += ' ';
       }
 
+      var msgIndent = '';
+      while(msgIndent.length < msg.length) {
+        msgIndent += ' ';
+      }
+
       if(log.method == 'dir') {
-        var dirObjs = [];
-        log.args.forEach(function(objStr){
-          dirObjs.push( JSON.stringify( JSON.parse(objStr) ) );
+        var isFirstLine = true;
+
+        log.args.forEach(function(argObj){
+
+          for(objKey in argObj) {
+            if(isFirstLine) {
+              isFirstLine = false;
+            } else {
+              msg += '\n' + msgIndent;
+            }
+            msg += objKey + ': ';
+            try {
+              msg += ( JSON.stringify(argObj[objKey], null, 1) ).replace(/\n/g, '');
+            } catch(e) {
+              msg += argObj[objKey];
+            }
+          }
+
         });
-        msg += dirObjs.join('\n');
+
       } else {
         msg += log.args.join(', ');
       }

From 11d17a29f4f9b5a79a5b5a520f0984055d06062a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 3 Sep 2014 22:14:07 -0500
Subject: [PATCH 0216/1100] v update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dcb87ef311..153ac78d0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.0",
+  "version": "1.2.1-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 090fb4cf321c980c2981fedf3c7a3e7d269cec8a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 4 Sep 2014 11:19:36 -0500
Subject: [PATCH 0217/1100] fix module references

---
 lib/ionic/package.js | 4 ++--
 lib/ionic/upload.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index e296b0d1dc..55ae310364 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -9,9 +9,9 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
-    IonicUploadTask = require('./upload').IonicUploadTask,
+    IonicUploadTask = require('./upload').IonicTask,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicLoginTask;
+    IonicLoginTask = require('./login').IonicTask;
 
 var IonicTask = function() {};
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5ba96d3cbd..53bd0973f9 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -7,7 +7,7 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicLoginTask,
+    IonicLoginTask = require('./login').IonicTask,
     Q = require('q');
 
 var IonicTask = function() {};

From c2048197ba8558af9c230537b1fd1c2d42d0e520 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 4 Sep 2014 11:20:23 -0500
Subject: [PATCH 0218/1100] clean cordova cmds / ensure config reset

---
 lib/ionic/cordova.js | 54 ++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 40f898c118..cd54d55766 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -16,22 +16,17 @@ IonicTask.prototype.run = function(ionic) {
   self.ionic = ionic;
   var cmdName = process.argv[2].toLowerCase();
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
-
-  // clean out any cmds that may confuse cordova
-  var port = argv.port || argv.p || '';
-  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.i || '';
-  if(port || liveReloadPort) {
-    for(var x=0; x<cmdArgs.length; x++) {
-      if(cmdArgs[x] == port || cmdArgs[x] == liveReloadPort) {
-        cmdArgs[x] = '';
-      }
-    }
-  }
+  var cmdArg, x, y;
 
   self.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
   if(self.isLiveReload) {
     self.setupLiveReload();
+  } else {
+    // ensure the content node was set back to its original
+    self.setConfigXml({
+      resetContent: true
+    });
   }
 
   // backwards compatibility prior to fully wrapping cordova cmds
@@ -40,7 +35,6 @@ IonicTask.prototype.run = function(ionic) {
     // if a cordova platform cmd isn't the cmd then automatically insert `add`
     var hasCordovaCmd = false;
     var validCommands = 'add remove rm list ls update up check'.split(' ');
-    var cmdArg, x, y;
     for(x=0; x<cmdArgs.length; x++) {
       cmdArg = cmdArgs[x].toLowerCase();
       for(y=0; y<validCommands.length; y++) {
@@ -58,7 +52,29 @@ IonicTask.prototype.run = function(ionic) {
 
   cmdArgs.unshift(cmdName);
 
-  var cordovaProcess = exec('cordova ' + cmdArgs.join(' '));
+  // clean out any cmds that may confuse cordova
+  var cleanArgs = [];
+  var port = argv.port || argv.p || '';
+  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.i || '';
+  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i'.split(' ');
+  var isValdCmd;
+  for(x=0; x<cmdArgs.length; x++) {
+    cmdArg = cmdArgs[x];
+    if(port && cmdArg == port) continue;
+    if(liveReloadPort && cmdArg == liveReloadPort) continue;
+    isValdCmd = true;
+    for(y=0; y<ignoreCmds.length; y++) {
+      if(cmdArg == ignoreCmds[y]) {
+        isValdCmd = false;
+        break;
+      }
+    }
+    if(isValdCmd) {
+      cleanArgs.push(cmdArg);
+    }
+  }
+
+  var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
 
   cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);
@@ -86,7 +102,7 @@ IonicTask.prototype.setupLiveReload = function() {
   console.log('Setup Live Reload'.green.bold);
 
   var serve = new require('./serve');
-  var serveTask = new serve.IonicServeTask();
+  var serveTask = new serve.IonicTask();
   serveTask.loadSettings();
   serveTask.runLivereload = true;
   serveTask.launchBrowser = false;
@@ -179,6 +195,13 @@ IonicTask.prototype.addHooks = function() {
         if( !fs.existsSync(projectHookPath) ) {
           addHookScript(cliHookPath, hookDirectoryName, hookFilename);
         }
+
+        // make the script file executable
+        try {
+          fs.chmodSync(projectScript, '755');
+        } catch(e) {
+          console.log( ('addcliHookDirectory fs.chmodSync: ' + e).error );
+        }
       }
     });
   }
@@ -202,9 +225,6 @@ IonicTask.prototype.addHooks = function() {
       var projectScript = path.join(projectHookPath, hookFilename);
       fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
 
-      // make the script file executable
-      fs.chmodSync(projectScript, '755');
-
     } catch(e) {
       console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);
     }

From 9e4ef6f61f61e72a07e1bcb0ec360f915f4a9e81 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 4 Sep 2014 21:40:52 -0500
Subject: [PATCH 0219/1100] always fs.chmodSync(projectScript, '755');

---
 lib/ionic/cordova.js | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index cd54d55766..bb31d764fe 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -192,16 +192,7 @@ IonicTask.prototype.addHooks = function() {
 
         // check if this hook script has already been added to this ionic project
         var projectHookPath = path.join('hooks', hookDirectoryName, hookFilename);
-        if( !fs.existsSync(projectHookPath) ) {
-          addHookScript(cliHookPath, hookDirectoryName, hookFilename);
-        }
-
-        // make the script file executable
-        try {
-          fs.chmodSync(projectScript, '755');
-        } catch(e) {
-          console.log( ('addcliHookDirectory fs.chmodSync: ' + e).error );
-        }
+        addHookScript(cliHookPath, hookDirectoryName, hookFilename);
       }
     });
   }
@@ -220,10 +211,24 @@ IonicTask.prototype.addHooks = function() {
         fs.mkdirSync(projectHookPath);
       }
 
-      // copy the hook script to the project
-      var cliScript = path.join(cliHookPath, hookFilename);
       var projectScript = path.join(projectHookPath, hookFilename);
-      fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
+      if( !fs.existsSync(projectHookPath) ) {
+        // copy the hook script to the project
+        try {
+          var cliScript = path.join(cliHookPath, hookFilename);
+          fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
+        } catch(e) {
+          console.log( ('addcliHookDirectory fs.createReadStream: ' + e).error );
+          return;
+        }
+      }
+
+      // make the script file executable
+      try {
+        fs.chmodSync(projectScript, '755');
+      } catch(e) {
+        console.log( ('addcliHookDirectory fs.chmodSync: ' + e).error );
+      }
 
     } catch(e) {
       console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);

From f5342357c97093ec34ee9b94d4fe500a3a6e5027 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 4 Sep 2014 22:31:13 -0500
Subject: [PATCH 0220/1100] always 200 response

---
 lib/ionic/serve.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 54a5a63690..a33458cf21 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -120,9 +120,8 @@ IonicTask.prototype.start = function(ionic) {
         fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
           res.setHeader('Content-Type', 'application/javascript');
           if (err) {
-            self.serverLog(req.url + '  (Error ' + platformWWW + ')');
-            res.statusCode = 404;
-            res.end('// 404');
+            self.serverLog(req.url + '  (' + platformWWW + ')');
+            res.end('// mocked cordova.js response to prevent 404 errors during development');
           } else {
             self.serverLog(req.url + '  (' + platformWWW + ')');
             res.end(buf);

From 151816b8ad947ef6f24ca8f4c0c168ffc7ac62aa Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 10:12:24 -0500
Subject: [PATCH 0221/1100] log read/write errors

---
 lib/ionic.js     | 10 ++++++++++
 lib/ionic/lib.js | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 4c41e65b0a..2880ce0034 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -534,14 +534,24 @@ Ionic = {
     var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
     var tempZipFileStream = fs.createWriteStream(tempZipFilePath);
 
+    tempZipFileStream.on('error', function(err) {
+      console.log( ('fetchArchive tempZipFileStream: ' + err).error );
+      q.reject(err);
+    });
+
     var unzipRepo = function(fileName) {
       var readStream = fs.createReadStream(fileName);
+      readStream.on('error', function(err) {
+        console.log( ('unzipRepo readStream: ' + err).error );
+        q.reject(err);
+      });
 
       var writeStream = unzip.Extract({ path: targetPath });
       writeStream.on('close', function() {
         q.resolve();
       });
       writeStream.on('error', function(err) {
+        console.log( ('unzipRepo writeStream: ' + err).error );
         q.reject(err);
       });
       readStream.pipe(writeStream);
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index bb5bbbf282..6df94a0e00 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -197,6 +197,10 @@ IonicTask.prototype.downloadZip = function(version) {
   console.log('Downloading: '.green.bold + archivePath);
 
   var file = fs.createWriteStream(self.tmpZipPath);
+  file.on('error', function(err) {
+    console.log( ('downloadZip createWriteStream: ' + err).error );
+  });
+
   var proxy = process.env.PROXY || null;
   request({ url: archivePath, encoding: null, proxy: proxy }, function(err, res, body) {
     if(err) {
@@ -275,7 +279,7 @@ IonicTask.prototype.updateFiles = function(version) {
       } else {
         var writeStream = fs.createWriteStream(libEntryPath);
         writeStream.on('error', function(err) {
-          console.log( ('Error writing, ' + libEntryPath + ': ' + err).bold.red );
+          console.log( ('updateFiles error writing, ' + libEntryPath + ': ' + err).error );
         });
         entry.pipe(writeStream);
       }
@@ -301,7 +305,7 @@ IonicTask.prototype.updateFiles = function(version) {
       });
 
     readStream.on('error', function(err){
-      console.log('Error: ' + err);
+      console.log( ('updateFiles readStream: ' + err).error );
     });
 
     readStream.on('close', function(err){
@@ -323,9 +327,12 @@ IonicTask.prototype.writeVersionData = function() {
       "date": this.versionData.release_date || this.versionData.date
     };
 
-    var file = fs.createWriteStream( path.resolve('www/lib/ionic/version.json') );
-    file.write( JSON.stringify(versionData, null, 2) );
-    file.close();
+    var fstream = fs.createWriteStream( path.resolve('www/lib/ionic/version.json') );
+    fstream.on('error', function(err) {
+      console.log( ('writeVersionData err: ' + err).error );
+    });
+    fstream.write( JSON.stringify(versionData, null, 2) );
+    fstream.close();
   } catch(e) {
     console.log( ('Error writing version data: ' + e).error.bold );
   }

From db8eb6625e3fdfa6dee2ddf9d9a3c7f426f606fe Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 10:12:55 -0500
Subject: [PATCH 0222/1100] reset config.xml after cordova exit

---
 lib/ionic/cordova.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index bb31d764fe..61adda5350 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -88,9 +88,11 @@ IonicTask.prototype.run = function(ionic) {
 
   cordovaProcess.on('exit', function(){
     if(self.isLiveReload) {
-      self.setConfigXml({
-        resetContent: true
-      });
+      setTimeout(function(){
+        self.setConfigXml({
+          resetContent: true
+        });
+      }, 5000);
     }
   });
 
@@ -136,12 +138,15 @@ IonicTask.prototype.setConfigXml = function(options) {
         }
         if(jsonConfig.widget.content[0].$.src !== options.devServer) {
           jsonConfig.widget.content[0].$.src = options.devServer;
+          console.log( ('Update config.xml for live reload: content[src="' + options.devServer + '"]').yellow );
           madeChange = true;
         }
 
       } else if(options.resetContent) {
+
         if( jsonConfig.widget.content[0].$['original-src'] ) {
           jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
+          console.log( ('Reset config.xml after live reload build, return to content[src="' + jsonConfig.widget.content[0].$.src + '"]').yellow );
           delete jsonConfig.widget.content[0].$['original-src'];
           madeChange = true;
         }
@@ -150,7 +155,6 @@ IonicTask.prototype.setConfigXml = function(options) {
       if(madeChange) {
         var xmlBuilder = new xml2js.Builder();
         configString = xmlBuilder.buildObject(jsonConfig);
-
         fs.writeFileSync(configXmlPath, configString);
       }
 
@@ -178,11 +182,11 @@ IonicTask.prototype.addHooks = function() {
     if(err) return;
     for(var x=0; x<files.length; x++) {
       if(files[x].indexOf('.') > -1) continue;
-      addcliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
+      addCliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
     }
   });
 
-  function addcliHookDirectory(cliHookPath, hookDirectoryName) {
+  function addCliHookDirectory(cliHookPath, hookDirectoryName) {
     fs.readdir(cliHookPath, function(err, files){
       // loop through each of the scripts in the ionic-cli hook directory
       if(err) return;
@@ -218,7 +222,7 @@ IonicTask.prototype.addHooks = function() {
           var cliScript = path.join(cliHookPath, hookFilename);
           fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
         } catch(e) {
-          console.log( ('addcliHookDirectory fs.createReadStream: ' + e).error );
+          console.log( ('addCliHookDirectory fs.createReadStream: ' + e).error );
           return;
         }
       }
@@ -227,7 +231,7 @@ IonicTask.prototype.addHooks = function() {
       try {
         fs.chmodSync(projectScript, '755');
       } catch(e) {
-        console.log( ('addcliHookDirectory fs.chmodSync: ' + e).error );
+        console.log( ('addCliHookDirectory fs.chmodSync: ' + e).error );
       }
 
     } catch(e) {

From 55dbf15b96f44c2925715fe7c4671453e6bb30ec Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 10:13:23 -0500
Subject: [PATCH 0223/1100] update logging

---
 lib/ionic/serve.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index a33458cf21..3d1b059081 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -120,8 +120,12 @@ IonicTask.prototype.start = function(ionic) {
         fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
           res.setHeader('Content-Type', 'application/javascript');
           if (err) {
-            self.serverLog(req.url + '  (' + platformWWW + ')');
             res.end('// mocked cordova.js response to prevent 404 errors during development');
+            if(req.url == '/cordova.js') {
+              self.serverLog(req.url + '  (mocked)');
+            } else {
+              self.serverLog(req.url + '  (Error ' + platformWWW + ')');
+            }
           } else {
             self.serverLog(req.url + '  (' + platformWWW + ')');
             res.end(buf);
@@ -181,7 +185,7 @@ IonicTask.prototype.start = function(ionic) {
 
 IonicTask.prototype.serverLog = function(msg) {
   if(this.printServerLogs) {
-    console.log( ('serve: ' + msg).yellow );
+    console.log( ('serve ' + msg).yellow );
   }
 };
 
@@ -200,12 +204,14 @@ IonicTask.prototype.consoleLog = function(req) {
       var log = JSON.parse(body);
 
       var msg = log.index + '  ';
-      while(msg.length < 4) {
+      while(msg.length < 5) {
         msg += ' ';
       }
 
+      msg += ' ' + (log.ts + '').substr(7) + '   ';
+
       msg += log.method;
-      while(msg.length < 14) {
+      while(msg.length < 24) {
         msg += ' ';
       }
 
@@ -285,17 +291,17 @@ function insertConsoleLogScript(html) {
         var methods = "assert clear count debug dir dirxml error exception group groupCollapsed groupEnd info log markTimeline profile profileEnd table time timeEnd timeStamp trace warn".split(" ");\n\
         var console = (window.console=window.console || {});\n\
         var logCount = 0;\n\
+        window.onerror = function(msg, url, line) {\n\
+          if(msg && url) console.error(msg, url, (line ? "Line: " + line : ""));\n\
+        };\n\
         function sendConsoleLog(method, args) {\n\
           try {\n\
             var xhr = new XMLHttpRequest();\n\
             xhr.open("POST", "/__ionic-cli/console", true);\n\
-            xhr.send(JSON.stringify({ index: logCount, method: method, args: args }));\n\
+            xhr.send(JSON.stringify({ index: logCount, method: method, ts: Date.now(), args: args }));\n\
             logCount++;\n\
           } catch(e){}\n\
         }\n\
-        window.onerror = function(msg, url, line) {\n\
-          if(msg && url) console.error(msg, url, (line ? "Line: " + line : ""));\n\
-        };\n\
         for(var x=0; x<methods.length; x++) {\n\
           (function(m){\n\
             var orgConsole = console[m];\n\

From 1832451ff535147cf295f8e89c54bb3d44e27421 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 12:10:44 -0500
Subject: [PATCH 0224/1100] ask for which ip

---
 lib/ionic.js         |   5 +++
 lib/ionic/cordova.js |  69 +++++++++++++++++++++--------
 lib/ionic/serve.js   | 100 +++++++++++++++++++++++++++++++++++--------
 3 files changed, 139 insertions(+), 35 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2880ce0034..d5ef6b44c4 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -218,6 +218,11 @@ var TASKS = [
     title: 'login',
     name: 'login',
     module: './ionic/login'
+  },
+  {
+    title: 'ip',
+    name: 'ip',
+    module: './ionic/serve'
   }
 ];
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 61adda5350..77f15b973a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,6 +1,7 @@
 var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
+    Q = require('q'),
     argv = require('optimist').argv,
     xml2js = require('xml2js'),
     path = require('path'),
@@ -12,23 +13,34 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
+  this.ionic = ionic;
   var self = this;
-  self.ionic = ionic;
   var cmdName = process.argv[2].toLowerCase();
-  var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
-  var cmdArg, x, y;
+  var q;
 
-  self.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
+  this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
+
+  if(this.isLiveReload) {
+    q = self.setupLiveReload();
 
-  if(self.isLiveReload) {
-    self.setupLiveReload();
   } else {
     // ensure the content node was set back to its original
-    self.setConfigXml({
+    q = this.setConfigXml({
       resetContent: true
     });
   }
 
+  q.then(function(){
+    self.runCordova(cmdName);
+  })
+};
+
+
+IonicTask.prototype.runCordova = function(cmdName) {
+  var self = this;
+  var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
+  var cmdArg, x, y;
+
   // backwards compatibility prior to fully wrapping cordova cmds
   if(cmdName == 'platform') {
     // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
@@ -86,38 +98,58 @@ IonicTask.prototype.run = function(ionic) {
     }
   });
 
-  cordovaProcess.on('exit', function(){
-    if(self.isLiveReload) {
+  if(self.isLiveReload) {
+    cordovaProcess.on('exit', function(){
       setTimeout(function(){
+        // set it back to the original src after a few seconds
         self.setConfigXml({
           resetContent: true
         });
       }, 5000);
-    }
-  });
+    });
+
+    process.on('exit', function(){
+      // verify it was set back
+      self.setConfigXml({
+        resetContent: true
+      });
+    });
+  }
 
   IonicStats.t();
 };
 
 
 IonicTask.prototype.setupLiveReload = function() {
+  var d = Q.defer();
+
   console.log('Setup Live Reload'.green.bold);
 
+  var self = this;
   var serve = new require('./serve');
   var serveTask = new serve.IonicTask();
-  serveTask.loadSettings();
-  serveTask.runLivereload = true;
-  serveTask.launchBrowser = false;
   serveTask.isPlatformServe = true;
-  serveTask.start(this.ionic);
 
-  this.setConfigXml({
-    devServer: serveTask.devServer
+  serveTask.loadSettings(function(){
+    serveTask.runLivereload = true;
+    serveTask.launchBrowser = false;
+    serveTask.start(self.ionic);
+
+    self.setConfigXml({
+      devServer: serveTask.devServer
+    }).then(function(){
+      d.resolve();
+    });
+
   });
+
+  return d.promise;
 };
 
 
 IonicTask.prototype.setConfigXml = function(options) {
+  var d = Q.defer();
+
   var self = this;
   var madeChange = false;
 
@@ -158,11 +190,14 @@ IonicTask.prototype.setConfigXml = function(options) {
         fs.writeFileSync(configXmlPath, configString);
       }
 
+      d.resolve();
     });
 
   } catch(e) {
     return self.ionic.fail('Error updating config.xml file: ' + e);
   }
+
+  return d.promise;
 };
 
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 3d1b059081..de91740a5f 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -5,13 +5,10 @@ var fs = require('fs'),
     finalhandler = require('finalhandler'),
     http = require('http'),
     serveStatic = require('serve-static'),
-    open = require('open'),
     tinylr = require('tiny-lr-fork'),
     lr = require('connect-livereload'),
     vfs = require('vinyl-fs'),
     request = require('request'),
-    Q = require('q'),
-    spawn = require('child_process').spawn,
     IonicProject = require('./project'),
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
@@ -24,21 +21,30 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
+  var self = this;
+
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
-  this.loadSettings();
-  this.start(ionic);
+  this.loadSettings(function(){
+
+    if(argv._[0] == 'ip') {
+      console.log( this.ip );
+      return;
+    }
+
+    self.start(ionic);
 
-  if(ionic.hasFailed) return;
+    if(ionic.hasFailed) return;
 
-  ionic.latestVersion.promise.then(function(){
-    ionic.printVersionWarning();
+    ionic.latestVersion.promise.then(function(){
+      ionic.printVersionWarning();
+    });
   });
 };
 
 
-IonicTask.prototype.loadSettings = function() {
+IonicTask.prototype.loadSettings = function(cb) {
   var project = IonicProject.load();
 
   this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
@@ -49,6 +55,8 @@ IonicTask.prototype.loadSettings = function() {
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
+
+  this.getIp(cb);
 };
 
 IonicTask.prototype.start = function(ionic) {
@@ -60,6 +68,7 @@ IonicTask.prototype.start = function(ionic) {
   }
 
   if(this.watchSass) {
+    var spawn = require('child_process').spawn;
     var childProcess = spawn('gulp', ['sass','watch']);
 
     childProcess.stdout.on('data', function (data) {
@@ -88,6 +97,7 @@ IonicTask.prototype.start = function(ionic) {
       } else {
         console.log('Running live reload server:'.green.bold, self.liveReloadServer.bold );
         if(self.launchBrowser) {
+          var open = require('open');
           open( self.host(self.port) );
         }
       }
@@ -348,25 +358,79 @@ IonicTask.prototype._changed = function(filePath) {
   });
 };
 
-
-IonicTask.prototype.host = function(port) {
-  var addresses = [];
-
+IonicTask.prototype.getIp = function(cb) {
   try {
+    var self = this;
+    var addresses = [];
     var os = require('os');
     var ifaces = os.networkInterfaces();
 
     for (var dev in ifaces) {
-      if(!dev || dev.indexOf('box') > -1) continue;
       ifaces[dev].forEach(function(details){
-        if (details.family == 'IPv4' && !details.internal) {
-          addresses.push(details.address);
+        if (details.family == 'IPv4' && !details.internal && details.address) {
+          addresses.push({
+            ip: details.address,
+            dev: dev
+          });
+        }
+      });
+    }
+
+    if(addresses.length === 1) {
+      this._ip = addresses[0].ip;
+      cb();
+
+    } else if(addresses.length > 1 && this.isPlatformServe) {
+      console.log('\nMultiple IPv4 addresses available.'.error.bold);
+      console.log('Please select which address to use by entering its number from the list below:'.error.bold);
+
+      for(var x=0; x<addresses.length; x++) {
+        console.log( (' ' + (x+1) + ') ' + addresses[x].ip +' (' + addresses[x].dev + ')').yellow );
+      }
+
+      var prompt = require('prompt');
+      var promptProperties = {
+        selection: {
+          name: 'selection',
+          description: 'IP Selection: '.yellow.bold,
+          required: true
         }
+      };
+
+      prompt.override = argv;
+      prompt.message = '';
+      prompt.delimiter = '';
+      prompt.start();
+
+      prompt.get({properties: promptProperties}, function (err, promptResult) {
+        if(err) {
+          return console.log(err);
+        }
+
+        var selection = promptResult.selection;
+        for(var x=0; x<addresses.length; x++) {
+          if(selection == (x + 1) || selection == addresses[x].ip || selection == addresses[x].dev) {
+            self.ip = addresses[x].ip;
+            console.log('Selected IP: '.green.bold + self.ip);
+            cb();
+            return;
+          }
+        }
+
+        console.log('Invalid IP address selection'.error);
       });
+
+    } else {
+      this.ip = 'localhost';
+      cb();
     }
-  } catch(e) {}
+  } catch(e) {
+    console.log('Error getting IPv4 address'.error);
+  }
+};
 
-  return 'http://' + (addresses.length === 1 ? addresses[0] : 'localhost') + ':' + port;
+IonicTask.prototype.host = function(port) {
+  return 'http://' + this.ip + ':' + port;
 };
 
 exports.IonicTask = IonicTask;

From 0aeac50d1149b7b97db76c91c9c1876d511ee592 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:10:30 -0500
Subject: [PATCH 0225/1100] no random package name for tmp

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 01858e3a14..ae4a41b5ec 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -377,7 +377,7 @@ IonicTask.prototype.updateConfigXml = function() {
       }
 
       if(!self.packageName) {
-        var packageName = self.appDirectory + Math.round((Math.random() * 899999) + 100000);
+        var packageName = self.appDirectory + (self.appDirectory !== 'tmp' ? Math.round((Math.random() * 899999) + 100000) : '');
         self.packageName = 'com.ionicframework.' + packageName.replace(/\./g, '');
       }
 

From c4053583c508fd72ade002d063762e7b93f70744 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:11:10 -0500
Subject: [PATCH 0226/1100] prevent bad console logs

---
 lib/ionic/serve.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index de91740a5f..00957213fa 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -230,7 +230,7 @@ IonicTask.prototype.consoleLog = function(req) {
         msgIndent += ' ';
       }
 
-      if(log.method == 'dir') {
+      if(log.method == 'dir' || log.method == 'table') {
         var isFirstLine = true;
 
         log.args.forEach(function(argObj){
@@ -251,7 +251,8 @@ IonicTask.prototype.consoleLog = function(req) {
 
         });
 
-      } else {
+      } else if(log.args.length) {
+        if(log.args.length === 2 && log.args[0] === '%o' && log.args[1] == '[object Object]') return;
         msg += log.args.join(', ');
       }
 

From 963d293984267fe4d2156c5399d08e8e5cb08232 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:11:30 -0500
Subject: [PATCH 0227/1100] 1.2.1-beta2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 153ac78d0f..b2b9a6fe3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.1-beta1",
+  "version": "1.2.1-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From da30b43d7a638fb91159d5cfdfa632c67dec14df Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:38:05 -0500
Subject: [PATCH 0228/1100] fix ip

---
 lib/ionic/serve.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 00957213fa..860080d787 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -28,8 +28,8 @@ IonicTask.prototype.run = function(ionic) {
 
   this.loadSettings(function(){
 
-    if(argv._[0] == 'ip') {
-      console.log( this.ip );
+    if(self.isIpCmd) {
+      console.log( self.ip );
       return;
     }
 
@@ -55,8 +55,16 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
+  this.isIpCmd = argv._[0].toLowerCase() == 'ip';
 
   this.getIp(cb);
+
+  process.stdin.on('readable', function() {
+    var chunk = process.stdin.read();
+    if (chunk !== null && /exit|quit|close|stop/gi.test(chunk)) {
+      process.exit();
+    }
+  });
 };
 
 IonicTask.prototype.start = function(ionic) {
@@ -95,7 +103,7 @@ IonicTask.prototype.start = function(ionic) {
       if(err) {
         return ionic.fail('Unable to start live reload server:', err);
       } else {
-        console.log('Running live reload server:'.green.bold, self.liveReloadServer.bold );
+        console.log('Running live reload server:'.green.bold, self.liveReloadServer );
         if(self.launchBrowser) {
           var open = require('open');
           open( self.host(self.port) );
@@ -182,14 +190,7 @@ IonicTask.prototype.start = function(ionic) {
   app.use(server);
   app.listen(this.port);
 
-  console.log('Running dev server:'.green.bold, this.devServer.bold);
-
-  process.stdin.on('readable', function() {
-    var chunk = process.stdin.read();
-    if (chunk !== null && /exit|quit|close|stop/gi.test(chunk)) {
-      process.exit();
-    }
-  });
+  console.log('Running dev server:'.green.bold, this.devServer);
 };
 
 
@@ -378,10 +379,10 @@ IonicTask.prototype.getIp = function(cb) {
     }
 
     if(addresses.length === 1) {
-      this._ip = addresses[0].ip;
+      this.ip = addresses[0].ip;
       cb();
 
-    } else if(addresses.length > 1 && this.isPlatformServe) {
+    } else if(addresses.length > 1) {
       console.log('\nMultiple IPv4 addresses available.'.error.bold);
       console.log('Please select which address to use by entering its number from the list below:'.error.bold);
 
@@ -412,13 +413,16 @@ IonicTask.prototype.getIp = function(cb) {
         for(var x=0; x<addresses.length; x++) {
           if(selection == (x + 1) || selection == addresses[x].ip || selection == addresses[x].dev) {
             self.ip = addresses[x].ip;
-            console.log('Selected IP: '.green.bold + self.ip);
+            if(!self.isIpCmd) {
+              console.log('Selected IP: '.green.bold + self.ip);
+            }
             cb();
             return;
           }
         }
 
         console.log('Invalid IP address selection'.error);
+        process.exit();
       });
 
     } else {

From 62d80da74ad1b86c4a7067bde83ee893a88acc8d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:38:18 -0500
Subject: [PATCH 0229/1100] add livereload

---
 lib/ionic/stats.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 7c47ecd853..5d05ffb4b5 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -542,7 +542,9 @@ exports.IonicStats = {
         '-w': '--no-cordova',
         '-b': '--nobrowser',
         '-r': '--nolivereload',
-        '-l': '--clear-signing',
+        '-l': '--livereload',
+        '-c': '--consolelogs',
+        '-s': '--serverlogs',
         '-n': '--no-email',
         '-s': '--sass'
       };
@@ -555,7 +557,7 @@ exports.IonicStats = {
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator --sass'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator --sass'.split(' ');
 
       // collect only certain args, skip over everything else
       for(x=0; x<cmdArgs.length; x++) {

From 07548f812bfb3cb4e63ef1aab3797face6dec400 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 14:38:37 -0500
Subject: [PATCH 0230/1100] 1.2.1-beta3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2b9a6fe3f..1932a0eace 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.1-beta2",
+  "version": "1.2.1-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a4bf801fe88f90d1ecd943ffc74076fee136e68d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 15:34:37 -0500
Subject: [PATCH 0231/1100] allow content src other than index.html

---
 lib/ionic.js         | 33 +++++++++++++++++++++++++++++++++
 lib/ionic/cordova.js |  1 +
 lib/ionic/serve.js   | 32 +++++++++++++++++++-------------
 lib/ionic/setup.js   |  2 +-
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d5ef6b44c4..abde36a490 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -522,6 +522,39 @@ Ionic = {
     });
   },
 
+  getContentSrc: function() {
+    var self = this;
+    var contentSrc;
+
+    try {
+      var fs = require('fs');
+      var path = require('path');
+      var configXmlPath = path.resolve('config.xml');
+      if( !fs.existsSync(configXmlPath) ) {
+        return 'index.html';
+      }
+      var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
+
+      var xml2js = require('xml2js');
+      var parseString = xml2js.parseString;
+      parseString(configString, function (err, jsonConfig) {
+        if(err) {
+          return self.fail('Error parsing config.xml: ' + err);
+        }
+        try {
+          contentSrc = jsonConfig.widget.content[0].$.src;
+        } catch(e) {
+          return self.fail('Error parsing ' + configXmlPath + ': ' + e);
+        }
+      });
+
+    } catch(e) {
+      return self.fail('Error loading ' + configXmlPath + ': ' + e);
+    }
+
+    return contentSrc;
+  },
+
   /**
    * Download a zip file, unzip it to a specific folder.
    */
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 77f15b973a..f302559baf 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -128,6 +128,7 @@ IonicTask.prototype.setupLiveReload = function() {
   var self = this;
   var serve = new require('./serve');
   var serveTask = new serve.IonicTask();
+  serveTask.ionic = this.ionic;
   serveTask.isPlatformServe = true;
 
   serveTask.loadSettings(function(){
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 860080d787..080d76fcd5 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -22,7 +22,7 @@ IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
   var self = this;
-
+  this.ionic = ionic;
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
@@ -56,6 +56,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.isIpCmd = argv._[0].toLowerCase() == 'ip';
+  this.contentSrc = path.join('www', this.ionic.getContentSrc());
 
   this.getIp(cb);
 
@@ -165,20 +166,25 @@ IonicTask.prototype.start = function(ionic) {
         return;
       }
 
-      if(req.url === '/') {
-        fs.readFile( path.resolve('www/index.html'), 'utf8', function (err, buf) {
-          res.setHeader('Content-Type', 'text/html');
-          if (err) {
-            self.serverLog(req.url + ' : ERROR!');
-            res.end(err.toString());
-          } else {
-            self.serverLog(req.url);
+    }
+
+    if(req.url === '/') {
+
+      fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
+        res.setHeader('Content-Type', 'text/html');
+        if (err) {
+          self.serverLog(req.url + ' : ERROR!');
+          res.end(err.toString());
+        } else {
+          self.serverLog(req.url + '  (' + self.contentSrc + ')');
+          if(self.printConsoleLogs) {
             res.end( insertConsoleLogScript(buf.toString('utf8')) );
+          } else {
+            res.end(buf);
           }
-        });
-        return;
-      }
-
+        }
+      });
+      return;
     }
 
     // root www directory file
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 0528d4990b..940fdcf079 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -37,7 +37,7 @@ IonicTask.prototype.sassSetup = function(ionic) {
 
   this.npmInstall().then(function(){
 
-    var indexPath = path.resolve('www/index.html');
+    var indexPath = path.resolve( path.join('www', ionic.getContentSrc()) );
     var lines, line, keepLine, activeRemoving;
     var cleanedLines = [];
 

From c197d08cd7568b918bfd84276a960672c2ff1d52 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 15:35:08 -0500
Subject: [PATCH 0232/1100] 1.2.1-beta4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1932a0eace..37c0ede6a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.1-beta3",
+  "version": "1.2.1-beta4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From dd3681b70e4e532d602189046741e45f3b105582 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 5 Sep 2014 15:45:58 -0500
Subject: [PATCH 0233/1100] v1.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 37c0ede6a6..e758fb08cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.1-beta4",
+  "version": "1.2.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 91aee1d7b61d2a59008e410198101bda3a305078 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 6 Sep 2014 16:48:06 -0500
Subject: [PATCH 0234/1100] S fix

---
 lib/ionic/stats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 5d05ffb4b5..230753c00f 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -596,7 +596,7 @@ exports.IonicStats = {
         if(statsData.cli_version.indexOf('beta') > -1) return;
       } catch(e2) {}
 
-      IonicStats.mp(cmdName, statsData);
+      this.mp(cmdName, statsData);
       //console.log(cmdName, statsData);
 
     } catch(e) {

From 0718ed2015ec5ba6fbc3e3b21abf391d421d9b65 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 6 Sep 2014 16:48:22 -0500
Subject: [PATCH 0235/1100] Sfix

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e758fb08cc..660e31570c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From f98ea25ab01ddc4d756798276533914e9fe64277 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 6 Sep 2014 20:50:50 -0500
Subject: [PATCH 0236/1100] remove reset config log

---
 lib/ionic/cordova.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index f302559baf..49d4c2ef3b 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -179,7 +179,6 @@ IonicTask.prototype.setConfigXml = function(options) {
 
         if( jsonConfig.widget.content[0].$['original-src'] ) {
           jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
-          console.log( ('Reset config.xml after live reload build, return to content[src="' + jsonConfig.widget.content[0].$.src + '"]').yellow );
           delete jsonConfig.widget.content[0].$['original-src'];
           madeChange = true;
         }

From 5afe67dafd23f726557a353c6c25484c0dea8522 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 6 Sep 2014 21:26:06 -0500
Subject: [PATCH 0237/1100] remove config update log

---
 lib/ionic/cordova.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 49d4c2ef3b..a024c7f88d 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -171,7 +171,6 @@ IonicTask.prototype.setConfigXml = function(options) {
         }
         if(jsonConfig.widget.content[0].$.src !== options.devServer) {
           jsonConfig.widget.content[0].$.src = options.devServer;
-          console.log( ('Update config.xml for live reload: content[src="' + options.devServer + '"]').yellow );
           madeChange = true;
         }
 

From 13228bdc02dc85d81e120f9cd606ef649f5d89fe Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 6 Sep 2014 22:17:32 -0500
Subject: [PATCH 0238/1100] correct errors when in wrong working directory

---
 lib/ionic/cordova.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index a024c7f88d..87098d5443 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -26,7 +26,8 @@ IonicTask.prototype.run = function(ionic) {
   } else {
     // ensure the content node was set back to its original
     q = this.setConfigXml({
-      resetContent: true
+      resetContent: true,
+      errorWhenNotFound: false
     });
   }
 
@@ -103,7 +104,8 @@ IonicTask.prototype.runCordova = function(cmdName) {
       setTimeout(function(){
         // set it back to the original src after a few seconds
         self.setConfigXml({
-          resetContent: true
+          resetContent: true,
+          errorWhenNotFound: true
         });
       }, 5000);
     });
@@ -111,7 +113,8 @@ IonicTask.prototype.runCordova = function(cmdName) {
     process.on('exit', function(){
       // verify it was set back
       self.setConfigXml({
-        resetContent: true
+        resetContent: true,
+        errorWhenNotFound: false
       });
     });
   }
@@ -156,12 +159,24 @@ IonicTask.prototype.setConfigXml = function(options) {
 
   try {
     var configXmlPath = path.resolve('config.xml');
+
+    if(!fs.existsSync(configXmlPath)) {
+      // working directory does not have the config.xml file
+      if(options.errorWhenNotFound) {
+        d.reject('Unable to locate config.xml file. Please ensure the working directory is at the root of the app where the config.xml should be located.');
+      } else {
+        d.resolve();
+      }
+      return d.promise;
+    }
+
     var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
 
     var parseString = xml2js.parseString;
     parseString(configString, function (err, jsonConfig) {
       if(err) {
-        return self.ionic.fail('Error parsing config.xml: ' + err);
+        d.reject(err);
+        return self.ionic.fail('Error parsing ' + configXmlPath + ': ' + err);
       }
 
       if(options.devServer) {
@@ -193,7 +208,8 @@ IonicTask.prototype.setConfigXml = function(options) {
     });
 
   } catch(e) {
-    return self.ionic.fail('Error updating config.xml file: ' + e);
+    d.reject(e);
+    self.ionic.fail('Error updating ' + configXmlPath + ': ' + e);
   }
 
   return d.promise;

From ff1ee3f7af9aab9ce974a37893d30ec47e1464ec Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 6 Sep 2014 22:34:42 -0500
Subject: [PATCH 0239/1100] improve IPv4 error handling

---
 lib/ionic/serve.js | 38 +++++++++++++++++++++++---------------
 package.json       |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 080d76fcd5..12cbd532e6 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -30,7 +30,7 @@ IonicTask.prototype.run = function(ionic) {
 
     if(self.isIpCmd) {
       console.log( self.ip );
-      return;
+      process.exit();
     }
 
     self.start(ionic);
@@ -373,15 +373,18 @@ IonicTask.prototype.getIp = function(cb) {
     var os = require('os');
     var ifaces = os.networkInterfaces();
 
-    for (var dev in ifaces) {
-      ifaces[dev].forEach(function(details){
-        if (details.family == 'IPv4' && !details.internal && details.address) {
-          addresses.push({
-            ip: details.address,
-            dev: dev
-          });
-        }
-      });
+    if(ifaces){
+      for (var dev in ifaces) {
+        if(!dev) continue;
+        ifaces[dev].forEach(function(details){
+          if (details && details.family == 'IPv4' && !details.internal && details.address) {
+            addresses.push({
+              ip: details.address,
+              dev: dev
+            });
+          }
+        });
+      }
     }
 
     if(addresses.length === 1) {
@@ -393,7 +396,7 @@ IonicTask.prototype.getIp = function(cb) {
       console.log('Please select which address to use by entering its number from the list below:'.error.bold);
 
       for(var x=0; x<addresses.length; x++) {
-        console.log( (' ' + (x+1) + ') ' + addresses[x].ip +' (' + addresses[x].dev + ')').yellow );
+        console.log( (' ' + (x+1) + ') ' + addresses[x].ip + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
       }
 
       var prompt = require('prompt');
@@ -427,16 +430,21 @@ IonicTask.prototype.getIp = function(cb) {
           }
         }
 
-        console.log('Invalid IP address selection'.error);
-        process.exit();
+        self.ionic.fail('Invalid IP address selection');
       });
 
+    } else if(self.isPlatformServe) {
+      // no addresses found
+      self.ionic.fail('Unable to find an IPv4 address for run/emulate live reload.\nIs WiFi disabled or LAN disconnected?');
+
     } else {
-      this.ip = 'localhost';
+      // no address found, but doesn't matter if it doesn't need an ip address and localhost will do
+      self.ip = 'localhost';
       cb();
     }
+
   } catch(e) {
-    console.log('Error getting IPv4 address'.error);
+    self.ionic.fail('Error getting IPv4 address: ' + e);
   }
 };
 
diff --git a/package.json b/package.json
index 660e31570c..32fc3377d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.2",
+  "version": "1.2.3-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e191328989a81f57018234ef680d3765acf24f4f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 01:46:00 -0500
Subject: [PATCH 0240/1100] go to url live reload plugin

---
 lib/ionic/serve.js | 100 ++++++++++++++++++++++++++++++++++++++++-----
 package.json       |   2 +-
 2 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 12cbd532e6..fd0e33f2d7 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -46,6 +46,7 @@ IonicTask.prototype.run = function(ionic) {
 
 IonicTask.prototype.loadSettings = function(cb) {
   var project = IonicProject.load();
+  var self = this;
 
   this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
   this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
@@ -61,8 +62,21 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.getIp(cb);
 
   process.stdin.on('readable', function() {
-    var chunk = process.stdin.read();
-    if (chunk !== null && /exit|quit|close|stop/gi.test(chunk)) {
+    var input = process.stdin.read();
+    if (input === null) return;
+    input = (input + '').trim();;
+
+    if(input.toLowerCase() == 'restart') {
+      self._goToUrl('/');
+
+    } else if(input.toLowerCase().indexOf('goto ') === 0) {
+      var url = input.replace(/goto /i, '');
+      self._goToUrl(url);
+
+    } else if(input.match(/^go\([+-]?[0-9]{1,9}\)$/)) {
+      self._goToHistory(input);
+
+    } else if(/exit|quit|close|stop/i.test(input)) {
       process.exit();
     }
   });
@@ -177,11 +191,14 @@ IonicTask.prototype.start = function(ionic) {
           res.end(err.toString());
         } else {
           self.serverLog(req.url + '  (' + self.contentSrc + ')');
+
+          var html = injectGoToScript( buf.toString('utf8') );
+
           if(self.printConsoleLogs) {
-            res.end( insertConsoleLogScript(buf.toString('utf8')) );
-          } else {
-            res.end(buf);
+            html = injectConsoleLogScript(html);
           }
+
+          res.end(html);
         }
       });
       return;
@@ -298,7 +315,7 @@ function getPlatformWWW(req) {
 }
 
 
-function insertConsoleLogScript(html) {
+function injectConsoleLogScript(html) {
   try{
     var headTag = html.match(/<head>/gi)[0];
 
@@ -338,34 +355,97 @@ function insertConsoleLogScript(html) {
   return html;
 }
 
+
+function injectGoToScript(html) {
+  try{
+    var headTag = html.match(/<head>/gi)[0];
+
+    return html.replace(headTag, headTag + '\n\
+    <script>\n\
+      // Injected Ionic Go To URL Live Reload Plugin\n\
+      window.LiveReloadPlugin_IonicGoToUrl = (function() {\n\
+        var GOTO_KEY = "__ionic_goto_url__";\n\
+        var HISTORY_GO_KEY = "__ionic_history_go__";\n\
+        var GoToUrlPlugin = function(window, host) {\n\
+          this.window = window;\n\
+          this.host = host;\n\
+        }\n\
+        GoToUrlPlugin.identifier = "__ionic_goto_url__";\n\
+        GoToUrlPlugin.version = "1.0";\n\
+        GoToUrlPlugin.prototype.reload = function(path) {\n\
+          try {\n\
+            if(path) {\n\
+              if(path.indexOf(GOTO_KEY) === 0) {\n\
+                this.window.document.location = path.replace(GOTO_KEY, "");\n\
+                return true;\n\
+              }\n\
+              if(path.indexOf(HISTORY_GO_KEY) === 0) {\n\
+                this.window.document.history.go( parseInt(path.replace(HISTORY_GO_KEY, ""), 10));\n\
+                return true;\n\
+              }\n\
+            }\n\
+          } catch(e) {\n\
+            console.log(e);\n\
+          }\n\
+          return false;\n\
+        };\n\
+        return GoToUrlPlugin;\n\
+      })();\n\
+    </script>');
+  }catch(e){}
+
+  return html;
+}
+
+
 IonicTask.prototype._changed = function(filePath) {
   // Cleanup the path a bit
   var pwd = process.cwd();
   filePath = filePath.replace(pwd + '/', '');
 
   if( filePath.indexOf('.css') > 0 ) {
-    console.log( (' CSS changed: ' + filePath).green );
+    console.log( ('CSS changed:  ' + filePath).green );
   } else if( filePath.indexOf('.js') > 0 ) {
-    console.log( ('  JS changed: ' + filePath).green );
+    console.log( ('JS changed:   ' + filePath).green );
   } else if( filePath.indexOf('.html') > 0 ) {
     console.log( ('HTML changed: ' + filePath).green );
   } else {
     console.log( ('File changed: ' + filePath).green );
   }
 
-  var req = request.post('http://localhost:' + this.liveReloadPort + '/changed', {
+  this._postToLiveReload( [filePath] );
+};
+
+
+IonicTask.prototype._goToUrl = function(url) {
+  console.log( ('Loading: ' + url).green );
+  this._postToLiveReload( ['__ionic_goto_url__' + url] );
+};
+
+IonicTask.prototype._goToHistory = function(goHistory) {
+  goHistory = goHistory.replace('go(', '').replace(')', '');
+  console.log( ('History Go: ' + goHistory).green );
+  this._postToLiveReload( ['__ionic_history_go__' + goHistory] );
+};
+
+
+IonicTask.prototype._postToLiveReload = function(files) {
+
+  request.post('http://localhost:' + this.liveReloadPort + '/changed', {
     path: '/changed',
     method: 'POST',
     body: JSON.stringify({
-      files: [filePath]
+      files: files
     })
   }, function(err, res, body) {
     if(err) {
       console.error('Unable to update live reload:', err);
     }
   });
+
 };
 
+
 IonicTask.prototype.getIp = function(cb) {
   try {
     var self = this;
diff --git a/package.json b/package.json
index 32fc3377d1..43aa2f33b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.3-beta1",
+  "version": "1.2.3-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e53dcab453c1cf56d8099993f6d9cc84ee9c54d6 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 20:34:51 -0500
Subject: [PATCH 0241/1100] index.html cache busting and `r` alias for
 `restart`

---
 lib/ionic/serve.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index fd0e33f2d7..b8889acc93 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -66,8 +66,8 @@ IonicTask.prototype.loadSettings = function(cb) {
     if (input === null) return;
     input = (input + '').trim();;
 
-    if(input.toLowerCase() == 'restart') {
-      self._goToUrl('/');
+    if(input.toLowerCase() == 'restart' || input.toLowerCase() == 'r') {
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
 
     } else if(input.toLowerCase().indexOf('goto ') === 0) {
       var url = input.replace(/goto /i, '');
@@ -172,18 +172,13 @@ IonicTask.prototype.start = function(ionic) {
       return;
     }
 
-    if(self.printConsoleLogs) {
-
-      if(req.url === '/__ionic-cli/console') {
-        self.consoleLog(req);
-        res.end('');
-        return;
-      }
-
+    if(self.printConsoleLogs && req.url === '/__ionic-cli/console') {
+      self.consoleLog(req);
+      res.end('');
+      return;
     }
 
-    if(req.url === '/') {
-
+    if(req.url.split('?')[0] === '/') {
       fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
         res.setHeader('Content-Type', 'text/html');
         if (err) {

From 4476985af206fd3a6902ab55c38735e757908609 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 22:08:41 -0500
Subject: [PATCH 0242/1100] improve server cmds, script placement, logs

---
 lib/ionic/serve.js | 89 ++++++++++++++++++++++++++++++++++------------
 package.json       |  2 +-
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b8889acc93..da02c70bff 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -54,8 +54,8 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.launchBrowser = !argv.nobrowser && !argv.b;
   this.runLivereload = !argv.nolivereload && !argv.r;
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
-  this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
+  this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.isIpCmd = argv._[0].toLowerCase() == 'ip';
   this.contentSrc = path.join('www', this.ionic.getContentSrc());
 
@@ -64,24 +64,48 @@ IonicTask.prototype.loadSettings = function(cb) {
   process.stdin.on('readable', function() {
     var input = process.stdin.read();
     if (input === null) return;
-    input = (input + '').trim();;
+    input = (input + '').trim();
 
     if(input.toLowerCase() == 'restart' || input.toLowerCase() == 'r') {
       self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
 
-    } else if(input.toLowerCase().indexOf('goto ') === 0) {
-      var url = input.replace(/goto /i, '');
+    } else if(input.toLowerCase().indexOf('goto ') === 0 || input.toLowerCase().indexOf('g ') === 0) {
+      var url = input.replace('goto ', '').replace('g ', '');
       self._goToUrl(url);
 
-    } else if(input.match(/^go\([+-]?[0-9]{1,9}\)$/)) {
+    } else if(input.toLowerCase() == 'consolelogs' || input.toLowerCase() == 'c') {
+      self.printConsoleLogs = !self.printConsoleLogs;
+      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
+
+    } else if(input.toLowerCase() == 'serverlogs' || input.toLowerCase() == 's') {
+      self.printServerLogs = !self.printServerLogs;
+      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
+
+    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
       self._goToHistory(input);
 
     } else if(/exit|quit|close|stop/i.test(input)) {
       process.exit();
+    } else {
+      console.log('Invalid server command'.error.bold);
+      self.printCommandTips();
     }
+
   });
 };
 
+
+IonicTask.prototype.printCommandTips = function(ionic) {
+  console.log('Server commands, enter:'.green.bold);
+  console.log(' restart' + ' or '.green + 'r' + ' to restart the app from the root'.green);
+  console.log(' goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
+  console.log(' consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
+  console.log(' serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);
+  console.log(' exit' + ' to shutdown the server and exit'.green);
+  console.log('');
+};
+
+
 IonicTask.prototype.start = function(ionic) {
   var self = this;
   var app = connect();
@@ -123,6 +147,7 @@ IonicTask.prototype.start = function(ionic) {
           var open = require('open');
           open( self.host(self.port) );
         }
+        self.printCommandTips();
       }
     });
 
@@ -131,11 +156,6 @@ IonicTask.prototype.start = function(ionic) {
     }));
   }
 
-  if(this.printConsoleLogs) {
-    self.consoleServer = self.host(self.consoleLogPort);
-
-  }
-
   this.devServer = this.host(this.port);
 
   // Serve up the www folder by default
@@ -155,17 +175,17 @@ IonicTask.prototype.start = function(ionic) {
           if (err) {
             res.end('// mocked cordova.js response to prevent 404 errors during development');
             if(req.url == '/cordova.js') {
-              self.serverLog(req.url + '  (mocked)');
+              self.serverLog(req, '(mocked)');
             } else {
-              self.serverLog(req.url + '  (Error ' + platformWWW + ')');
+              self.serverLog(req, '(Error ' + platformWWW + ')');
             }
           } else {
-            self.serverLog(req.url + '  (' + platformWWW + ')');
+            self.serverLog(req, '(' + platformWWW + ')');
             res.end(buf);
           }
         });
       } else {
-        self.serverLog(req.url + '  (mocked)');
+        self.serverLog(req, '(mocked)');
         res.setHeader('Content-Type', 'application/javascript');
         res.end('// mocked cordova.js response to prevent 404 errors during development');
       }
@@ -182,10 +202,10 @@ IonicTask.prototype.start = function(ionic) {
       fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
         res.setHeader('Content-Type', 'text/html');
         if (err) {
-          self.serverLog(req.url + ' : ERROR!');
+          self.serverLog(req, 'ERROR!');
           res.end(err.toString());
         } else {
-          self.serverLog(req.url + '  (' + self.contentSrc + ')');
+          self.serverLog(req, '(' + self.contentSrc + ')');
 
           var html = injectGoToScript( buf.toString('utf8') );
 
@@ -200,7 +220,7 @@ IonicTask.prototype.start = function(ionic) {
     }
 
     // root www directory file
-    self.serverLog(req.url);
+    self.serverLog(req);
     serve(req, res, done);
   });
 
@@ -212,9 +232,26 @@ IonicTask.prototype.start = function(ionic) {
 };
 
 
-IonicTask.prototype.serverLog = function(msg) {
+IonicTask.prototype.serverLog = function(req, msg) {
   if(this.printServerLogs) {
-    console.log( ('serve ' + msg).yellow );
+    var log = 'serve  '.yellow;
+
+    log += (req.url.length > 60 ? req.url.substr(0, 57) + '...' : req.url).yellow;
+
+    if(msg) {
+      log += '  ' + msg.yellow;
+    }
+
+    var ua = (req.headers && req.headers['user-agent'] || '');
+    if(ua.indexOf('Android') > 0) {
+      log += '  Android'.small;
+    } else if(ua.indexOf('iPhone') > -1 || ua.indexOf('iPad') > -1 || ua.indexOf('iPod') > -1) {
+      log += '  iOS'.small;
+    } else if(ua.indexOf('Windows Phone') > -1) {
+      log += '  Windows Phone'.small;
+    }
+
+    console.log(log);
   }
 };
 
@@ -312,9 +349,10 @@ function getPlatformWWW(req) {
 
 function injectConsoleLogScript(html) {
   try{
-    var headTag = html.match(/<head>/gi)[0];
+    var findTags = html.match(/<html(?=[\s>])(.*?)>|<head>|<meta charset(.*?)>/gi);
+    var insertAfter = findTags[ findTags.length - 1 ];
 
-    return html.replace(headTag, headTag + '\n\
+    return html.replace(insertAfter, insertAfter + '\n\
     <script>\n\
       // Injected Ionic CLI Console Logger\n\
       (function() {\n\
@@ -353,9 +391,10 @@ function injectConsoleLogScript(html) {
 
 function injectGoToScript(html) {
   try{
-    var headTag = html.match(/<head>/gi)[0];
+    var findTags = html.match(/<html(?=[\s>])(.*?)>|<head>|<meta charset(.*?)>/gi);
+    var insertAfter = findTags[ findTags.length - 1 ];
 
-    return html.replace(headTag, headTag + '\n\
+    return html.replace(insertAfter, insertAfter + '\n\
     <script>\n\
       // Injected Ionic Go To URL Live Reload Plugin\n\
       window.LiveReloadPlugin_IonicGoToUrl = (function() {\n\
@@ -417,6 +456,7 @@ IonicTask.prototype._goToUrl = function(url) {
   this._postToLiveReload( ['__ionic_goto_url__' + url] );
 };
 
+
 IonicTask.prototype._goToHistory = function(goHistory) {
   goHistory = goHistory.replace('go(', '').replace(')', '');
   console.log( ('History Go: ' + goHistory).green );
@@ -469,6 +509,9 @@ IonicTask.prototype.getIp = function(cb) {
     } else if(addresses.length > 1) {
       console.log('\nMultiple IPv4 addresses available.'.error.bold);
       console.log('Please select which address to use by entering its number from the list below:'.error.bold);
+      if(self.isPlatformServe) {
+        console.log('Note that the emulator/device must be able to access the given IP address'.small);
+      }
 
       for(var x=0; x<addresses.length; x++) {
         console.log( (' ' + (x+1) + ') ' + addresses[x].ip + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
diff --git a/package.json b/package.json
index 43aa2f33b5..def9a8f9ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.3-beta2",
+  "version": "1.2.3-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e4fe72c3ceed0892bd987542db43d36ad0c63c7b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 22:12:33 -0500
Subject: [PATCH 0243/1100] use quit instead of exit

---
 lib/ionic/serve.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index da02c70bff..d868968856 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -66,26 +66,27 @@ IonicTask.prototype.loadSettings = function(cb) {
     if (input === null) return;
     input = (input + '').trim();
 
-    if(input.toLowerCase() == 'restart' || input.toLowerCase() == 'r') {
+    if(input == 'restart' || input == 'r') {
       self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
 
-    } else if(input.toLowerCase().indexOf('goto ') === 0 || input.toLowerCase().indexOf('g ') === 0) {
+    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
       var url = input.replace('goto ', '').replace('g ', '');
       self._goToUrl(url);
 
-    } else if(input.toLowerCase() == 'consolelogs' || input.toLowerCase() == 'c') {
+    } else if(input == 'consolelogs' || input == 'c') {
       self.printConsoleLogs = !self.printConsoleLogs;
       console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
 
-    } else if(input.toLowerCase() == 'serverlogs' || input.toLowerCase() == 's') {
+    } else if(input == 'serverlogs' || input == 's') {
       self.printServerLogs = !self.printServerLogs;
       console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
 
     } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
       self._goToHistory(input);
 
-    } else if(/exit|quit|close|stop/i.test(input)) {
+    } else if(input == 'quit' || input == 'q') {
       process.exit();
+
     } else {
       console.log('Invalid server command'.error.bold);
       self.printCommandTips();
@@ -101,7 +102,7 @@ IonicTask.prototype.printCommandTips = function(ionic) {
   console.log(' goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
   console.log(' consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
   console.log(' serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);
-  console.log(' exit' + ' to shutdown the server and exit'.green);
+  console.log(' quit' + ' or '.green + 'q' + ' to shutdown the server and exit'.green);
   console.log('');
 };
 

From 729beb8292d4d1631fb802ffbae6c3c485618417 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 22:13:20 -0500
Subject: [PATCH 0244/1100] updated restart desc

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index d868968856..982d029d54 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -98,7 +98,7 @@ IonicTask.prototype.loadSettings = function(cb) {
 
 IonicTask.prototype.printCommandTips = function(ionic) {
   console.log('Server commands, enter:'.green.bold);
-  console.log(' restart' + ' or '.green + 'r' + ' to restart the app from the root'.green);
+  console.log(' restart' + ' or '.green + 'r' + ' to restart the client app from the root'.green);
   console.log(' goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
   console.log(' consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
   console.log(' serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);

From ec285f099ed60e4e020ee73ce4460ef4fc80ebfc Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 7 Sep 2014 22:35:32 -0500
Subject: [PATCH 0245/1100] help cmd for ionic server cmds

---
 lib/ionic/serve.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 982d029d54..243fe5a623 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -84,11 +84,14 @@ IonicTask.prototype.loadSettings = function(cb) {
     } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
       self._goToHistory(input);
 
+    } else if(input == 'help' || input == 'h') {
+      self.printCommandTips();
+
     } else if(input == 'quit' || input == 'q') {
       process.exit();
 
     } else {
-      console.log('Invalid server command'.error.bold);
+      console.log('\nInvalid ionic server command'.error.bold);
       self.printCommandTips();
     }
 
@@ -97,7 +100,7 @@ IonicTask.prototype.loadSettings = function(cb) {
 
 
 IonicTask.prototype.printCommandTips = function(ionic) {
-  console.log('Server commands, enter:'.green.bold);
+  console.log('Ionic server commands, enter:'.green.bold);
   console.log(' restart' + ' or '.green + 'r' + ' to restart the client app from the root'.green);
   console.log(' goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
   console.log(' consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);

From bfe36d0b024c59fca1841b684f752f2b2bf8f13e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 08:44:52 -0500
Subject: [PATCH 0246/1100] add localhost to available addresses selection

---
 lib/ionic.js       |  4 ++--
 lib/ionic/serve.js | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index abde36a490..62e1fc75ee 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -220,8 +220,8 @@ var TASKS = [
     module: './ionic/login'
   },
   {
-    title: 'ip',
-    name: 'ip',
+    title: 'address',
+    name: 'address',
     module: './ionic/serve'
   }
 ];
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 243fe5a623..b90ca057e0 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -28,8 +28,8 @@ IonicTask.prototype.run = function(ionic) {
 
   this.loadSettings(function(){
 
-    if(self.isIpCmd) {
-      console.log( self.ip );
+    if(self.isAddressCmd) {
+      console.log( self.address );
       process.exit();
     }
 
@@ -56,10 +56,10 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
-  this.isIpCmd = argv._[0].toLowerCase() == 'ip';
+  this.isAddressCmd = argv._[0].toLowerCase() == 'address';
   this.contentSrc = path.join('www', this.ionic.getContentSrc());
 
-  this.getIp(cb);
+  this.getAddress(cb);
 
   process.stdin.on('readable', function() {
     var input = process.stdin.read();
@@ -76,6 +76,7 @@ IonicTask.prototype.loadSettings = function(cb) {
     } else if(input == 'consolelogs' || input == 'c') {
       self.printConsoleLogs = !self.printConsoleLogs;
       console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
 
     } else if(input == 'serverlogs' || input == 's') {
       self.printServerLogs = !self.printServerLogs;
@@ -485,7 +486,7 @@ IonicTask.prototype._postToLiveReload = function(files) {
 };
 
 
-IonicTask.prototype.getIp = function(cb) {
+IonicTask.prototype.getAddress = function(cb) {
   try {
     var self = this;
     var addresses = [];
@@ -498,7 +499,7 @@ IonicTask.prototype.getIp = function(cb) {
         ifaces[dev].forEach(function(details){
           if (details && details.family == 'IPv4' && !details.internal && details.address) {
             addresses.push({
-              ip: details.address,
+              address: details.address,
               dev: dev
             });
           }
@@ -507,25 +508,31 @@ IonicTask.prototype.getIp = function(cb) {
     }
 
     if(addresses.length === 1) {
-      this.ip = addresses[0].ip;
+      this.address = addresses[0].address;
       cb();
 
     } else if(addresses.length > 1) {
-      console.log('\nMultiple IPv4 addresses available.'.error.bold);
+      console.log('\nMultiple addresses available.'.error.bold);
       console.log('Please select which address to use by entering its number from the list below:'.error.bold);
       if(self.isPlatformServe) {
         console.log('Note that the emulator/device must be able to access the given IP address'.small);
       }
 
+      if(!self.isPlatformServe) {
+        addresses.push({
+          address: 'localhost'
+        });
+      }
+
       for(var x=0; x<addresses.length; x++) {
-        console.log( (' ' + (x+1) + ') ' + addresses[x].ip + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
+        console.log( (' ' + (x+1) + ') ' + addresses[x].address + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
       }
 
       var prompt = require('prompt');
       var promptProperties = {
         selection: {
           name: 'selection',
-          description: 'IP Selection: '.yellow.bold,
+          description: 'Address Selection: '.yellow.bold,
           required: true
         }
       };
@@ -542,17 +549,17 @@ IonicTask.prototype.getIp = function(cb) {
 
         var selection = promptResult.selection;
         for(var x=0; x<addresses.length; x++) {
-          if(selection == (x + 1) || selection == addresses[x].ip || selection == addresses[x].dev) {
-            self.ip = addresses[x].ip;
-            if(!self.isIpCmd) {
-              console.log('Selected IP: '.green.bold + self.ip);
+          if(selection == (x + 1) || selection == addresses[x].address || selection == addresses[x].dev) {
+            self.address = addresses[x].address;
+            if(!self.isAddressCmd) {
+              console.log('Selected address: '.green.bold + self.address);
             }
             cb();
             return;
           }
         }
 
-        self.ionic.fail('Invalid IP address selection');
+        self.ionic.fail('Invalid address selection');
       });
 
     } else if(self.isPlatformServe) {
@@ -561,7 +568,7 @@ IonicTask.prototype.getIp = function(cb) {
 
     } else {
       // no address found, but doesn't matter if it doesn't need an ip address and localhost will do
-      self.ip = 'localhost';
+      self.address = 'localhost';
       cb();
     }
 
@@ -571,7 +578,7 @@ IonicTask.prototype.getIp = function(cb) {
 };
 
 IonicTask.prototype.host = function(port) {
-  return 'http://' + this.ip + ':' + port;
+  return 'http://' + this.address + ':' + port;
 };
 
 exports.IonicTask = IonicTask;

From 4a49552fab8e5793591846744e74939e8b12cd79 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 11:29:28 -0500
Subject: [PATCH 0247/1100] v1.2.3

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 README.md    |  8 ++++++++
 package.json |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..cde6f8e278
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,36 @@
+### 1.2.3
+
+* From the server, use `restart` or `r` to restart the client app from the root
+* From the server, use `goto` or `g` a url to have the client app navigate to the given url
+* From the server, use `consolelogs` or `c` enable/disable console log output
+* From the server, use `serverlogs` or `s` to enable/disable server log output
+* From the server, use `quit` or `q` to shutdown the server and exit
+* Print out Ionic server command tips
+* LiveReload server logs specify which device made the request (iOS, Android, etc.)
+* Remember address selection [#91](https://github.com/driftyco/ionic-cli/issues/91)
+* Reset address selection with `ionic address`
+* Add localhost as an option of possible addresses to use [#88](https://github.com/driftyco/ionic-cli/issues/88)
+* Inject scripts after charset [#87](https://github.com/driftyco/ionic-cli/issues/87)
+* Improved error message when unable to find an IP address [#85](https://github.com/driftyco/ionic-cli/issues/85)
+* Fix config.xml errors when in the wrong working directory [#84](https://github.com/driftyco/ionic-cli/issues/84)
+
+
+### 1.2.2
+
+* ReferenceError hot fix
+
+
+### 1.2.1
+
+* Clean up any cmd flags which may confuse Cordova [#83](https://github.com/driftyco/ionic-cli/issues/83)
+* Select available IP address prompt [#82](https://github.com/driftyco/ionic-cli/issues/82)
+* Fix black screen on load [#81](https://github.com/driftyco/ionic-cli/issues/81)
+
+
+### 1.2.0
+
+* LiveReload from a native app during development
+* Option to print out console logs to the terminal
+* Option to print out server logs to the terminal
+* Start Ionic projects from Codepen urls
+* [Live Reload All the Things: Ionic CLI's Latest Features](http://ionicframework.com/blog/live-reload-all-things-ionic-cli/)
diff --git a/README.md b/README.md
index 44065c5549..976ffc7d18 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,14 @@ Command-line flags/options for `run` and `emulate`:
     [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
     [--debug|--release]
 
+While the server is running for live reload, you can use the following commands within the CLI:
+
+    restart or r to restart the client app from the root
+    goto or g and a url to have the app navigate to the given url
+    consolelogs or c to enable/disable console log output
+    serverlogs or s to enable/disable server log output
+    quit or q to shutdown the server and exit
+
 
 ## Emulating your app
 
diff --git a/package.json b/package.json
index def9a8f9ad..ce16d748c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.3-beta3",
+  "version": "1.2.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 8fceccc8b1127ce8fdf8bca2aa3883a6f8688cdf Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 11:32:20 -0500
Subject: [PATCH 0248/1100] remember address selection

---
 lib/ionic/serve.js | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b90ca057e0..9578c0bcb1 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -492,6 +492,18 @@ IonicTask.prototype.getAddress = function(cb) {
     var addresses = [];
     var os = require('os');
     var ifaces = os.networkInterfaces();
+    var ionicConfig = require('./config').load();
+
+    var addressConfigKey = (self.isPlatformServe ? 'platformServeAddress' : 'ionicServeAddress');
+    var savedAddress;
+
+    if(self.isAddressCmd) {
+      // reset any address configs
+      ionicConfig.set('ionicServeAddress', null);
+      ionicConfig.set('platformServeAddress', null);
+    } else {
+      savedAddress = ionicConfig.get(addressConfigKey);
+    }
 
     if(ifaces){
       for (var dev in ifaces) {
@@ -507,11 +519,23 @@ IonicTask.prototype.getAddress = function(cb) {
       }
     }
 
-    if(addresses.length === 1) {
-      this.address = addresses[0].address;
-      cb();
+    if(savedAddress) {
+      if(savedAddress == 'localhost') {
+        self.address = savedAddress;
+        cb();
+        return;
+      }
+      for(var x=0; x<addresses.length; x++) {
+        // double check if this address is still available
+        if(addresses[x].address == savedAddress) {
+          self.address = addresses[x].address;
+          cb();
+          return;
+        }
+      }
+    }
 
-    } else if(addresses.length > 1) {
+    if(addresses.length > 0) {
       console.log('\nMultiple addresses available.'.error.bold);
       console.log('Please select which address to use by entering its number from the list below:'.error.bold);
       if(self.isPlatformServe) {
@@ -554,6 +578,7 @@ IonicTask.prototype.getAddress = function(cb) {
             if(!self.isAddressCmd) {
               console.log('Selected address: '.green.bold + self.address);
             }
+            ionicConfig.set(addressConfigKey, self.address);
             cb();
             return;
           }

From 0bdfd4466778666d613d8308dbee99dec308b6aa Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 16:12:23 -0500
Subject: [PATCH 0249/1100] remove unneeded module

---
 lib/ionic/start.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ae4a41b5ec..10d01b5a4b 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -7,7 +7,6 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     colors = require('colors'),
-    spawn = require('child_process').spawn,
     Q = require('q'),
     xml2js = require('xml2js'),
     setup = require('./setup'),

From d578486414218eb3c4408f74be4545b42b2455b3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 16:12:57 -0500
Subject: [PATCH 0250/1100] use cross-spawn module for win32 spawn

---
 lib/ionic/serve.js |  2 +-
 package.json       | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 9578c0bcb1..72cb856cbc 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -120,7 +120,7 @@ IonicTask.prototype.start = function(ionic) {
   }
 
   if(this.watchSass) {
-    var spawn = require('child_process').spawn;
+    var spawn = require('cross-spawn').spawn;
     var childProcess = spawn('gulp', ['sass','watch']);
 
     childProcess.stdout.on('data', function (data) {
diff --git a/package.json b/package.json
index ce16d748c4..7e3e87f668 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.3",
+  "version": "1.2.4-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -40,25 +40,26 @@
   "license": "MIT",
   "dependencies": {
     "archiver": "0.5.1",
-    "colors": "^0.6.2",
-    "connect": "^2.14.5",
-    "serve-static": "^1.5.3",
-    "finalhandler": "^0.1.0",
-    "connect-livereload": "^0.4.0",
+    "colors": "0.6.2",
+    "connect": "3.1.1",
+    "cross-spawn": "0.2.3",
+    "connect-livereload": "0.4.0",
     "event-stream": "3.0.x",
-    "form-data": "~0.1.0",
+    "finalhandler": "0.2.0",
+    "form-data": "0.1.4",
     "ncp": "0.4.2",
     "npm": "^1.4.6",
     "open": "0.0.5",
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "progress": "1.1.7",
-    "q": "^1.0.1",
+    "q": "1.0.1",
     "request": "2.27.0",
+    "serve-static": "1.6.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
     "unzip": "0.1.9",
-    "vinyl-fs": "^0.1.4",
-    "xml2js": "^0.4.4"
+    "vinyl-fs": "0.3.7",
+    "xml2js": "0.4.4"
   }
 }

From 0d36d48f1ac663a298db2270a0576a90e22ce7ee Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 16:15:23 -0500
Subject: [PATCH 0251/1100] v1.2.4-beta1

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cde6f8e278..eeb1ef4b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.2.4
+
+* Use `cross-spawn` module to fix errors with using spawn on Windows
+* Use specific npm versions in package.json to avoid any future errors from breaking changes
+
+
 ### 1.2.3
 
 * From the server, use `restart` or `r` to restart the client app from the root

From 33d70386b595270d66be9d412dabcf2715f2b97d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 20:54:22 -0500
Subject: [PATCH 0252/1100] start project from local directory

---
 CHANGELOG.md       |  1 +
 lib/ionic/start.js | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeb1ef4b98..605a09ce7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.2.4
 
 * Use `cross-spawn` module to fix errors with using spawn on Windows
+* Start ionic projects using a local directory
 * Use specific npm versions in package.json to avoid any future errors from breaking changes
 
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 10d01b5a4b..955f1eb5a1 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -149,11 +149,19 @@ IonicTask.prototype.fetchWrapper = function() {
 
 IonicTask.prototype.fetchSeed = function() {
 
+  // Codepen: http://codepen.io/ionic/pen/GpCst
   if(this.template.toLowerCase().indexOf('codepen') > -1) {
     this.seedType = 'codepen';
     return this.fetchCodepen();
   }
 
+  // Local Directory: /User/starterapp
+  if( this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1 ) {
+    this.seedType = 'local';
+    return this.fetchLocalStarter();
+  }
+
+  // Ionic Github Repo
   this.seedType = 'ionic-starter';
   return this.fetchIonicStarter();
 };
@@ -282,6 +290,37 @@ IonicTask.prototype.convertTemplates = function(html) {
 };
 
 
+IonicTask.prototype.fetchLocalStarter = function() {
+  var self = this;
+  var q = Q.defer();
+
+  try {
+    cd('..');
+
+    var localStarterPath = path.resolve(this.template);
+
+    if( !fs.existsSync(localStarterPath) ) {
+      self.ionic.fail('Unable to find local starter template: ' + localStarterPath);
+      q.reject();
+      return q.promise;
+    }
+
+    console.log('\nCopying files to www from:'.bold, localStarterPath);
+
+    // Move the content of this repo into the www folder
+    cp('-Rf', path.join(localStarterPath, '*'), path.join(self.targetPath, 'www'));
+
+    q.resolve();
+  } catch(e) {
+    q.reject(e);
+  }
+
+  cd(self.targetPath);
+
+  return q.promise;
+};
+
+
 IonicTask.prototype.fetchIonicStarter = function() {
   var self = this;
   var q = Q.defer();

From eb05eb4ec7cdedb6eed4b1c10bac54bf3c5f24c3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 21:10:08 -0500
Subject: [PATCH 0253/1100] use fs.writeFileSync on version.json update

---
 lib/ionic/lib.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 6df94a0e00..b93b006fc5 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -327,12 +327,9 @@ IonicTask.prototype.writeVersionData = function() {
       "date": this.versionData.release_date || this.versionData.date
     };
 
-    var fstream = fs.createWriteStream( path.resolve('www/lib/ionic/version.json') );
-    fstream.on('error', function(err) {
-      console.log( ('writeVersionData err: ' + err).error );
-    });
-    fstream.write( JSON.stringify(versionData, null, 2) );
-    fstream.close();
+    fs.writeFileSync( path.resolve('www/lib/ionic/version.json'),
+                      JSON.stringify(versionData, null, 2) );
+
   } catch(e) {
     console.log( ('Error writing version data: ' + e).error.bold );
   }

From 92337310e9e739ff6180504125414d65bf30465d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 21:14:23 -0500
Subject: [PATCH 0254/1100] use fs.writeFileSync

---
 lib/ionic/bower.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index 9ceab6e83f..daf765bc6b 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -35,10 +35,7 @@ exports.IonicBower = {
   saveData: function(bowerData) {
     try {
       var bowerFilePath = path.resolve('bower.json');
-
-      var file = fs.createWriteStream(bowerFilePath);
-      file.write( JSON.stringify(bowerData, null, 2) );
-      file.close();
+      fs.writeFileSync( bowerFilePath, JSON.stringify(bowerData, null, 2) );
     } catch(e) {
       console.log( ('Error saving ' + bowerFilePath + ': ' + e).error.bold );
     }

From b0a8687fa0ffe7c301f7ac121d2ef022ce907370 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 21:14:34 -0500
Subject: [PATCH 0255/1100] v1.2.4-beta2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e3e87f668..eac23196f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.4-beta1",
+  "version": "1.2.4-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 09cbcd424a3b9b852f7019cb56cf3cc8b7dc5075 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 22:28:08 -0500
Subject: [PATCH 0256/1100] start ionic project from any Github repo

---
 CHANGELOG.md       |  1 +
 lib/ionic.js       |  2 ++
 lib/ionic/start.js | 63 +++++++++++++++++++++++++++++++++++-----------
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 605a09ce7b..727834e0a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.2.4
 
 * Use `cross-spawn` module to fix errors with using spawn on Windows
+* Start ionic project from any Github repo
 * Start ionic projects using a local directory
 * Use specific npm versions in package.json to avoid any future errors from breaking changes
 
diff --git a/lib/ionic.js b/lib/ionic.js
index 62e1fc75ee..ed96a832e6 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -599,6 +599,7 @@ Ionic = {
     var request = require('request');
     request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
       if(!res || res.statusCode !== 200) {
+        console.error('Unable to fetch:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
         q.reject(res);
         return;
       }
@@ -607,6 +608,7 @@ Ionic = {
         tempZipFileStream.close();
         unzipRepo(tempZipFilePath);
       } catch(e) {
+        console.log(e.error);
         q.reject(e);
       }
     }).on('response', function(res){
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 955f1eb5a1..9e07911be2 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -3,6 +3,7 @@ var fs = require('fs'),
     request = require('request'),
     ncp = require('ncp').ncp,
     path = require('path'),
+    parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
@@ -150,13 +151,19 @@ IonicTask.prototype.fetchWrapper = function() {
 IonicTask.prototype.fetchSeed = function() {
 
   // Codepen: http://codepen.io/ionic/pen/GpCst
-  if(this.template.toLowerCase().indexOf('codepen') > -1) {
+  if( /\/\/codepen.io\//i.test(this.template) ) {
     this.seedType = 'codepen';
     return this.fetchCodepen();
   }
 
+  // Github URL: http://github.com/myrepo/
+  if( /\/\/github.com\//i.test(this.template) ) {
+    this.seedType = 'github';
+    return this.fetchGithubStarter(this.template);
+  }
+
   // Local Directory: /User/starterapp
-  if( this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1 ) {
+  if( (this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1) && (this.indexOf('http://') === -1 && this.indexOf('https://') === -1)) {
     this.seedType = 'local';
     return this.fetchLocalStarter();
   }
@@ -322,31 +329,57 @@ IonicTask.prototype.fetchLocalStarter = function() {
 
 
 IonicTask.prototype.fetchIonicStarter = function() {
-  var self = this;
-  var q = Q.defer();
 
   // Get the starter project repo name:
-  var repoName = 'ionic-starter-' + self.template;
+  var repoName = 'ionic-starter-' + this.template;
 
   // Get the URL for the starter project repo:
-  var repoUrl = 'https://github.com/driftyco/' + repoName + '/archive/master.zip';
+  var repoUrl = 'https://github.com/driftyco/' + repoName;
+
+  return this.fetchGithubStarter(repoUrl);
+};
+
+
+IonicTask.prototype.fetchGithubStarter = function(repoUrl) {
+  var self = this;
+  var q = Q.defer();
+
+  // https://github.com/driftyco/ionic-starter-tabs/
+  var urlParse = parseUrl(repoUrl);
+  var pathSplit = urlParse.pathname.replace(/\//g, ' ').trim().split(' ');
+  if(!urlParse.hostname || urlParse.hostname.toLowerCase() !== 'github.com' || pathSplit.length !== 2) {
+    console.log( ('Invalid Github URL: ' + repoUrl).error );
+    console.log( ('Example of a valid URL: https://github.com/driftyco/ionic-starter-tabs/').error );
+    self.ionic.fail('');
+    q.reject();
+    return q.promise;
+  }
+  var repoName = pathSplit[1];
+  var repoFolderName = repoName + '-master';
+
+  // ensure there's an ending /
+  if(repoUrl.substr(repoUrl.length -1) !== '/') {
+    repoUrl += '/';
+  }
+  repoUrl += 'archive/master.zip';
 
   Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
 
-    var repoFolderName = repoName + '-master';
+    try {
+      // Move the content of this repo into the www folder
+      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
 
-    // Move the content of this repo into the www folder
-    cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
+      // Clean up start template folder
+      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
 
-    // Clean up start template folder
-    rm('-rf', self.targetPath + '/' + repoFolderName + '/');
+      q.resolve();
 
-    q.resolve();
+    } catch(e) {
+      q.reject(e);
+    }
 
   }).catch(function(err) {
-    console.error('Error: Unable to fetch project: HTTP:'.error.bold,  err.statusCode);
-    console.error('Valid project types are "blank", "tabs", or "sidemenu"'.error.bold);
-    console.error('More info available at: http://ionicframework.com/getting-started/'.error.bold);
+    console.error('More info available at: \nhttp://ionicframework.com/getting-started/\nhttps://github.com/driftyco/ionic-cli'.error.bold);
     return self.ionic.fail('');
   });
 

From ab13dbf0aeac5311963ed7bb7285e7f3667619fe Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 22:36:23 -0500
Subject: [PATCH 0257/1100] fix write errors after downloading archive files

---
 CHANGELOG.md |  1 +
 lib/ionic.js | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 727834e0a1..ad7a00c101 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Start ionic project from any Github repo
 * Start ionic projects using a local directory
 * Use specific npm versions in package.json to avoid any future errors from breaking changes
+* Fix write errors after downloading github archive files
 
 
 ### 1.2.3
diff --git a/lib/ionic.js b/lib/ionic.js
index ed96a832e6..87f7a71b58 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -570,12 +570,7 @@ Ionic = {
 
     var tmpFolder = os.tmpdir();
     var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
-    var tempZipFileStream = fs.createWriteStream(tempZipFilePath);
 
-    tempZipFileStream.on('error', function(err) {
-      console.log( ('fetchArchive tempZipFileStream: ' + err).error );
-      q.reject(err);
-    });
 
     var unzipRepo = function(fileName) {
       var readStream = fs.createReadStream(fileName);
@@ -604,11 +599,10 @@ Ionic = {
         return;
       }
       try {
-        tempZipFileStream.write(body);
-        tempZipFileStream.close();
+        fs.writeFileSync(tempZipFilePath, body);
         unzipRepo(tempZipFilePath);
       } catch(e) {
-        console.log(e.error);
+        console.log('fetchArchive request write: ' + e);
         q.reject(e);
       }
     }).on('response', function(res){

From 0bed06cbfc964cd1d56c7f3e43bca1e91b77eb72 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 8 Sep 2014 23:47:45 -0500
Subject: [PATCH 0258/1100] bug in local template check

---
 lib/ionic/start.js | 3 ++-
 package.json       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9e07911be2..be6047037b 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -163,7 +163,8 @@ IonicTask.prototype.fetchSeed = function() {
   }
 
   // Local Directory: /User/starterapp
-  if( (this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1) && (this.indexOf('http://') === -1 && this.indexOf('https://') === -1)) {
+  if( (this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1) && (this.template.indexOf('http://') === -1 && this.template.indexOf('https://') === -1)) {
+    console.log('local', this.template)
     this.seedType = 'local';
     return this.fetchLocalStarter();
   }
diff --git a/package.json b/package.json
index eac23196f6..27fefdbf56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.4-beta2",
+  "version": "1.2.4-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 5cc52cec9aaf18689461072ca957454a381d4946 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 9 Sep 2014 14:52:39 -0500
Subject: [PATCH 0259/1100] sync writing hook

---
 lib/ionic/cordova.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 87098d5443..ba6b32293b 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -270,7 +270,7 @@ IonicTask.prototype.addHooks = function() {
         // copy the hook script to the project
         try {
           var cliScript = path.join(cliHookPath, hookFilename);
-          fs.createReadStream( cliScript ).pipe(fs.createWriteStream( projectScript ));
+          fs.writeFileSync(projectScript, fs.readFileSync(cliScript));
         } catch(e) {
           console.log( ('addCliHookDirectory fs.createReadStream: ' + e).error );
           return;

From 125ec69dc21da7cf9409fbafdfe4240a41242abd Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 09:26:27 -0500
Subject: [PATCH 0260/1100] place double quotes around --target, closes #94

---
 lib/ionic/cordova.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index ba6b32293b..59a28935e0 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -83,6 +83,11 @@ IonicTask.prototype.runCordova = function(cmdName) {
       }
     }
     if(isValdCmd) {
+      // make sure --target= has double quotes around it (process.argv removes them)
+      if(cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
+        cmdArg = cmdArg.replace('--target=', '--target="') + '"';
+      }
+
       cleanArgs.push(cmdArg);
     }
   }

From 2c339267c31b1c58a9c975f0f6f4e49004931fac Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 09:26:50 -0500
Subject: [PATCH 0261/1100] gulpStartTasks ionic.project setting

---
 lib/ionic/serve.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 72cb856cbc..70f7d2ef62 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -54,6 +54,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.launchBrowser = !argv.nobrowser && !argv.b;
   this.runLivereload = !argv.nolivereload && !argv.r;
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
+  this.gulpStartupTasks = project.get('gulpStartupTasks');
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.isAddressCmd = argv._[0].toLowerCase() == 'address';
@@ -116,12 +117,17 @@ IonicTask.prototype.start = function(ionic) {
   var app = connect();
 
   if (!fs.existsSync( path.resolve('www') )) {
-    return ionic.fail('"www" directory cannot be found. Make sure the working directory is an Ionic project.');
+    return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
   }
 
-  if(this.watchSass) {
+  // gulpStartupTasks should be an array of tasks set in the project config
+  // watchSass is for backwards compatible sass: true project config
+  if(this.gulpStartupTasks || this.watchSass) {
     var spawn = require('cross-spawn').spawn;
-    var childProcess = spawn('gulp', ['sass','watch']);
+    var tasks = this.gulpStartupTasks || ['sass','watch'];
+
+    console.log('Gulp startup tasks:'.green.bold, tasks);
+    var childProcess = spawn('gulp', tasks);
 
     childProcess.stdout.on('data', function (data) {
       process.stdout.write(data);

From 3386840519b7028298bbd184da1c4519f107d23f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 09:35:49 -0500
Subject: [PATCH 0262/1100] v1.2.4

---
 README.md    | 11 ++++++++++-
 package.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 976ffc7d18..d1dcdf3fb4 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ $ npm install -g ionic
 $ ionic start myapp [template]
 ```
 
-Starter templates can either come from a named template, or from any Codepen URL.
+Starter templates can either come from a named template, a Github repo, a Codepen, or a local directory. A starter template is what becomes the `www` directory within the Cordova project.
 
 Named template starters:
 
@@ -28,11 +28,20 @@ Named template starters:
 * [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
 * [blank](https://github.com/driftyco/ionic-starter-blank)
 
+Github Repo starters:
+
+* Any Github repo url, ex: [https://github.com/driftyco/ionic-starter-tabs](https://github.com/driftyco/ionic-starter-tabs)
+* Named templates are simply aliases to Ionic starter repos
+
 Codepen URL starters:
 
 * Any Codepen url, ex: [http://codepen.io/ionic/pen/odqCz](http://codepen.io/ionic/pen/odqCz)
 * [Ionic Codepen Demos](http://codepen.io/ionic/public-list/)
 
+Local directory starters:
+
+* Relative or absolute path to a local directory
+
 Command-line flags/options:
 
     --appname, -a  .......  Human readable name for the app
diff --git a/package.json b/package.json
index 27fefdbf56..33eb86dc1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.4-beta3",
+  "version": "1.2.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ada3ed2514561c0757fe3d8ca14d6d42bede4954 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 10 Sep 2014 09:40:37 -0500
Subject: [PATCH 0263/1100] Update README.md

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d1dcdf3fb4..1f53c8d60a 100644
--- a/README.md
+++ b/README.md
@@ -22,27 +22,27 @@ $ ionic start myapp [template]
 
 Starter templates can either come from a named template, a Github repo, a Codepen, or a local directory. A starter template is what becomes the `www` directory within the Cordova project.
 
-Named template starters:
+__Named template starters:__
 
 * [tabs](https://github.com/driftyco/ionic-starter-tabs) (Default)
 * [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
 * [blank](https://github.com/driftyco/ionic-starter-blank)
 
-Github Repo starters:
+__Github Repo starters:__
 
 * Any Github repo url, ex: [https://github.com/driftyco/ionic-starter-tabs](https://github.com/driftyco/ionic-starter-tabs)
 * Named templates are simply aliases to Ionic starter repos
 
-Codepen URL starters:
+__Codepen URL starters:__
 
 * Any Codepen url, ex: [http://codepen.io/ionic/pen/odqCz](http://codepen.io/ionic/pen/odqCz)
 * [Ionic Codepen Demos](http://codepen.io/ionic/public-list/)
 
-Local directory starters:
+__Local directory starters:__
 
 * Relative or absolute path to a local directory
 
-Command-line flags/options:
+__Command-line flags/options:__
 
     --appname, -a  .......  Human readable name for the app
                             (Use quotes around the name)
@@ -59,7 +59,7 @@ Use `ionic serve` to start a local development server for app dev and testing. T
 $ ionic serve [options]
 ```
 
-Command-line flags/options:
+__Command-line flags/options:__
 
     [--consolelogs|-c] ......  Print app console logs to Ionic CLI
     [--serverlogs|-s] .......  Print dev server logs to Ionic CLI
@@ -87,7 +87,7 @@ The `run` or `emulate` command will deploy the app to the specified platform dev
 
 With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
 
-Command-line flags/options for `run` and `emulate`:
+__Command-line flags/options for `run` and `emulate`:__
 
     [--livereload|-l] .......  Live Reload app dev files from the device (beta)
     [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)

From e898b363dadf08a1c08e59768d2c523ae30244ae Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 09:57:54 -0500
Subject: [PATCH 0264/1100] gulpStartupTasks property

---
 README.md          |  2 +-
 lib/ionic/setup.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1f53c8d60a..0dacf83630 100644
--- a/README.md
+++ b/README.md
@@ -168,4 +168,4 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 2. Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 3. Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 4. Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
-5. In the `ionic.project` file, add the JavaScript property `sass: true` to the object.
+5. In the `ionic.project` file, add the JavaScript property `"gulpStartupTasks": ["sass", "watch"]` (this can also be customized to whatever gulp tasks you'd like).
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 940fdcf079..0366be21ac 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -71,7 +71,15 @@ IonicTask.prototype.sassSetup = function(ionic) {
       }
 
       var project = IonicProject.load();
-      project.set('sass', true);
+      var gulpStartupTasks = project.get('gulpStartupTasks') || [];
+      var hasSass, hasWatch;
+      gulpStartupTasks.forEach(function(taskName){
+        if(taskName == 'sass') hasSass = true;
+        if(taskName == 'watch') hasWatch = true;
+      });
+      if(!hasSass) gulpStartupTasks.push('sass');
+      if(!hasWatch) gulpStartupTasks.push('watch');
+      project.set('gulpStartupTasks', gulpStartupTasks);
       project.save();
 
       fs.writeFileSync(indexPath, cleanedLines.join('\n'), 'utf8');

From 87f62d47b8f64f3880d98d148c5654a5319be498 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 10:00:16 -0500
Subject: [PATCH 0265/1100] v1.2.4

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad7a00c101..89ec05ca04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Start ionic projects using a local directory
 * Use specific npm versions in package.json to avoid any future errors from breaking changes
 * Fix write errors after downloading github archive files
+* Refactor sass setup to use gulpStartupTasks ionic.project property instead
 
 
 ### 1.2.3

From c087f7032c07025badc4b0e708c13cf3ef9b3f37 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 11:31:36 -0500
Subject: [PATCH 0266/1100] clear the terminal

---
 lib/ionic/serve.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 70f7d2ef62..7802afeaff 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -92,6 +92,9 @@ IonicTask.prototype.loadSettings = function(cb) {
     } else if(input == 'quit' || input == 'q') {
       process.exit();
 
+    } else if(input == 'clear' || input == 'clr') {
+      process.stdout.write("\u001b[2J\u001b[0;0H");
+
     } else {
       console.log('\nInvalid ionic server command'.error.bold);
       self.printCommandTips();

From f89b05205ae73e73f542f9a76d21cc418a561cad Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Sep 2014 11:37:45 -0500
Subject: [PATCH 0267/1100] always write a file even if its empty

---
 lib/ionic/start.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index be6047037b..5f103d723f 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -189,7 +189,8 @@ IonicTask.prototype.fetchCodepen = function() {
   var proxy = process.env.PROXY || null;
 
   request({ url: codepenUrl + '.html', proxy: proxy }, function(err, res, html) {
-    if(!err && res && res.statusCode === 200 && html) {
+    if(!err && res && res.statusCode === 200) {
+      html = html || '';
 
       if(html.indexOf('<!DOCTYPE html>') < 0) {
         html = '<!DOCTYPE html>\n' + html;
@@ -214,7 +215,9 @@ IonicTask.prototype.fetchCodepen = function() {
   });
 
   request({ url: codepenUrl + '.css', proxy: proxy }, function(err, res, css) {
-    if(!err && res && res.statusCode === 200 && css) {
+    if(!err && res && res.statusCode === 200) {
+      css = css || '';
+
       var cssPath = path.join(wwwPath, 'css');
       if(!fs.existsSync(cssPath)) {
         fs.mkdirSync(cssPath);
@@ -226,7 +229,9 @@ IonicTask.prototype.fetchCodepen = function() {
   });
 
   request({ url: codepenUrl + '.js', proxy: proxy }, function(err, res, js) {
-    if(!err && res && res.statusCode === 200 && js) {
+    if(!err && res && res.statusCode === 200) {
+      js = js || '';
+
       var jsPath = path.join(wwwPath, 'js');
       if(!fs.existsSync(jsPath)) {
         fs.mkdirSync(jsPath);

From 0df36303fd6b4b4b961d1fd1d2c3ce93a257bcc3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 11 Sep 2014 14:51:02 -0500
Subject: [PATCH 0268/1100] watch patterns from ionic.project

---
 CHANGELOG.md         |   8 ++
 lib/ionic.js         |  73 ++++++++++++++
 lib/ionic/cordova.js |  90 ++++-------------
 lib/ionic/serve.js   | 235 +++++++++++++++++++++++--------------------
 lib/ionic/setup.js   |   3 +
 package.json         |   2 +-
 6 files changed, 232 insertions(+), 179 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89ec05ca04..63a2c3a547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 1.2.5
+
+* Do not watch `www/lib/` files by default
+* Set watchPatterns within ionic.project config file
+* Friendly EMFILE error when too many files are watched
+* Ensure config.xml content[src] gets reset after run/emulate
+
+
 ### 1.2.4
 
 * Use `cross-spawn` module to fix errors with using spawn on Windows
diff --git a/lib/ionic.js b/lib/ionic.js
index 87f7a71b58..185f489332 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -533,6 +533,12 @@ Ionic = {
       if( !fs.existsSync(configXmlPath) ) {
         return 'index.html';
       }
+
+      self.setConfigXml({
+        resetContent: true,
+        errorWhenNotFound: false
+      });
+
       var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
 
       var xml2js = require('xml2js');
@@ -622,6 +628,73 @@ Ionic = {
     });
 
     return q.promise;
+  },
+
+  setConfigXml: function(options) {
+    var fs = require('fs');
+    var path = require('path');
+    var xml2js = require('xml2js');
+    var d = Q.defer();
+
+    var self = this;
+    var madeChange = false;
+
+    try {
+      var configXmlPath = path.resolve('config.xml');
+
+      if(!fs.existsSync(configXmlPath)) {
+        // working directory does not have the config.xml file
+        if(options.errorWhenNotFound) {
+          d.reject('Unable to locate config.xml file. Please ensure the working directory is at the root of the app where the config.xml should be located.');
+        } else {
+          d.resolve();
+        }
+        return d.promise;
+      }
+
+      var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
+
+      var parseString = xml2js.parseString;
+      parseString(configString, function (err, jsonConfig) {
+        if(err) {
+          d.reject(err);
+          return self.fail('Error parsing ' + configXmlPath + ': ' + err);
+        }
+
+        if(options.devServer) {
+          if( !jsonConfig.widget.content[0].$['original-src'] ) {
+            jsonConfig.widget.content[0].$['original-src'] = jsonConfig.widget.content[0].$.src;
+            madeChange = true;
+          }
+          if(jsonConfig.widget.content[0].$.src !== options.devServer) {
+            jsonConfig.widget.content[0].$.src = options.devServer;
+            madeChange = true;
+          }
+
+        } else if(options.resetContent) {
+
+          if( jsonConfig.widget.content[0].$['original-src'] ) {
+            jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
+            delete jsonConfig.widget.content[0].$['original-src'];
+            madeChange = true;
+          }
+        }
+
+        if(madeChange) {
+          var xmlBuilder = new xml2js.Builder();
+          configString = xmlBuilder.buildObject(jsonConfig);
+          fs.writeFileSync(configXmlPath, configString);
+        }
+
+        d.resolve();
+      });
+
+    } catch(e) {
+      d.reject(e);
+      self.fail('Error updating ' + configXmlPath + ': ' + e);
+    }
+
+    return d.promise;
   }
 
 };
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 59a28935e0..1e6b7cb112 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -3,7 +3,6 @@ var Task = require('./task').Task,
     fs = require('fs'),
     Q = require('q'),
     argv = require('optimist').argv,
-    xml2js = require('xml2js'),
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors');
@@ -25,7 +24,7 @@ IonicTask.prototype.run = function(ionic) {
 
   } else {
     // ensure the content node was set back to its original
-    q = this.setConfigXml({
+    q = self.ionic.setConfigXml({
       resetContent: true,
       errorWhenNotFound: false
     });
@@ -108,7 +107,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
     cordovaProcess.on('exit', function(){
       setTimeout(function(){
         // set it back to the original src after a few seconds
-        self.setConfigXml({
+        self.ionic.setConfigXml({
           resetContent: true,
           errorWhenNotFound: true
         });
@@ -117,11 +116,27 @@ IonicTask.prototype.runCordova = function(cmdName) {
 
     process.on('exit', function(){
       // verify it was set back
-      self.setConfigXml({
+      self.ionic.setConfigXml({
         resetContent: true,
         errorWhenNotFound: false
       });
     });
+
+    var readLine = require("readline");
+    if(process.platform === "win32") {
+      var rl = readLine.createInterface ({
+          input: process.stdin,
+          output: process.stdout
+      });
+
+      rl.on("SIGINT", function (){
+        process.emit("SIGINT");
+      });
+    }
+
+    process.on("SIGINT", function(){
+      process.exit();
+    });
   }
 
   IonicStats.t();
@@ -144,7 +159,7 @@ IonicTask.prototype.setupLiveReload = function() {
     serveTask.launchBrowser = false;
     serveTask.start(self.ionic);
 
-    self.setConfigXml({
+    self.ionic.setConfigXml({
       devServer: serveTask.devServer
     }).then(function(){
       d.resolve();
@@ -156,71 +171,6 @@ IonicTask.prototype.setupLiveReload = function() {
 };
 
 
-IonicTask.prototype.setConfigXml = function(options) {
-  var d = Q.defer();
-
-  var self = this;
-  var madeChange = false;
-
-  try {
-    var configXmlPath = path.resolve('config.xml');
-
-    if(!fs.existsSync(configXmlPath)) {
-      // working directory does not have the config.xml file
-      if(options.errorWhenNotFound) {
-        d.reject('Unable to locate config.xml file. Please ensure the working directory is at the root of the app where the config.xml should be located.');
-      } else {
-        d.resolve();
-      }
-      return d.promise;
-    }
-
-    var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
-
-    var parseString = xml2js.parseString;
-    parseString(configString, function (err, jsonConfig) {
-      if(err) {
-        d.reject(err);
-        return self.ionic.fail('Error parsing ' + configXmlPath + ': ' + err);
-      }
-
-      if(options.devServer) {
-        if( !jsonConfig.widget.content[0].$['original-src'] ) {
-          jsonConfig.widget.content[0].$['original-src'] = jsonConfig.widget.content[0].$.src;
-          madeChange = true;
-        }
-        if(jsonConfig.widget.content[0].$.src !== options.devServer) {
-          jsonConfig.widget.content[0].$.src = options.devServer;
-          madeChange = true;
-        }
-
-      } else if(options.resetContent) {
-
-        if( jsonConfig.widget.content[0].$['original-src'] ) {
-          jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
-          delete jsonConfig.widget.content[0].$['original-src'];
-          madeChange = true;
-        }
-      }
-
-      if(madeChange) {
-        var xmlBuilder = new xml2js.Builder();
-        configString = xmlBuilder.buildObject(jsonConfig);
-        fs.writeFileSync(configXmlPath, configString);
-      }
-
-      d.resolve();
-    });
-
-  } catch(e) {
-    d.reject(e);
-    self.ionic.fail('Error updating ' + configXmlPath + ': ' + e);
-  }
-
-  return d.promise;
-};
-
-
 IonicTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 7802afeaff..5ab8a5e7bb 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -55,6 +55,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.runLivereload = !argv.nolivereload && !argv.r;
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.gulpStartupTasks = project.get('gulpStartupTasks');
+  this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.isAddressCmd = argv._[0].toLowerCase() == 'address';
@@ -106,143 +107,161 @@ IonicTask.prototype.loadSettings = function(cb) {
 
 IonicTask.prototype.printCommandTips = function(ionic) {
   console.log('Ionic server commands, enter:'.green.bold);
-  console.log(' restart' + ' or '.green + 'r' + ' to restart the client app from the root'.green);
-  console.log(' goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
-  console.log(' consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
-  console.log(' serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);
-  console.log(' quit' + ' or '.green + 'q' + ' to shutdown the server and exit'.green);
+  console.log('  restart' + ' or '.green + 'r' + ' to restart the client app from the root'.green);
+  console.log('  goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
+  console.log('  consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
+  console.log('  serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);
+  console.log('  quit' + ' or '.green + 'q' + ' to shutdown the server and exit'.green);
   console.log('');
 };
 
 
 IonicTask.prototype.start = function(ionic) {
-  var self = this;
-  var app = connect();
-
-  if (!fs.existsSync( path.resolve('www') )) {
-    return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
-  }
+  try {
+    var self = this;
+    var app = connect();
 
-  // gulpStartupTasks should be an array of tasks set in the project config
-  // watchSass is for backwards compatible sass: true project config
-  if(this.gulpStartupTasks || this.watchSass) {
-    var spawn = require('cross-spawn').spawn;
-    var tasks = this.gulpStartupTasks || ['sass','watch'];
+    if (!fs.existsSync( path.resolve('www') )) {
+      return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
+    }
 
-    console.log('Gulp startup tasks:'.green.bold, tasks);
-    var childProcess = spawn('gulp', tasks);
+    // gulpStartupTasks should be an array of tasks set in the project config
+    // watchSass is for backwards compatible sass: true project config
+    if(this.gulpStartupTasks || this.watchSass) {
+      var spawn = require('cross-spawn').spawn;
+      var tasks = this.gulpStartupTasks || ['sass','watch'];
 
-    childProcess.stdout.on('data', function (data) {
-      process.stdout.write(data);
-    });
+      console.log('Gulp startup tasks:'.green.bold, tasks);
+      var childProcess = spawn('gulp', tasks);
 
-    childProcess.stderr.on('data', function (data) {
-      if(data) {
-        process.stderr.write(data.toString().yellow);
-      }
-    });
-  }
-
-  if(this.runLivereload) {
-    vfs.watch('www/**/*', {
-    }, function(f) {
-      self._changed(f.path);
-    });
+      childProcess.stdout.on('data', function (data) {
+        process.stdout.write(data);
+      });
 
-    self.liveReloadServer = self.host(self.liveReloadPort);
-
-    var lrServer = tinylr();
-    lrServer.listen(this.liveReloadPort, function(err) {
-      if(err) {
-        return ionic.fail('Unable to start live reload server:', err);
-      } else {
-        console.log('Running live reload server:'.green.bold, self.liveReloadServer );
-        if(self.launchBrowser) {
-          var open = require('open');
-          open( self.host(self.port) );
+      childProcess.stderr.on('data', function (data) {
+        if(data) {
+          process.stderr.write(data.toString().yellow);
         }
-        self.printCommandTips();
-      }
-    });
+      });
+    }
 
-    app.use(require('connect-livereload')({
-      port: this.liveReloadPort
-    }));
-  }
+    if(this.runLivereload) {
 
-  this.devServer = this.host(this.port);
+      vfs.watch(self.watchPatterns, {},function(f) {
+        self._changed(f.path);
+      });
 
-  // Serve up the www folder by default
-  var serve = serveStatic('www');
+      self.liveReloadServer = self.host(self.liveReloadPort);
 
-  // Create static server
-  var server = http.createServer(function(req, res){
-    var done = finalhandler(req, res);
+      var lrServer = tinylr();
+      lrServer.listen(this.liveReloadPort, function(err) {
+        if(err) {
+          return ionic.fail('Unable to start live reload server:', err);
+        } else {
+          console.log('Running live reload server:'.green.bold, self.liveReloadServer );
+          console.log('Watching :'.green.bold, self.watchPatterns);
+          if(self.launchBrowser) {
+            var open = require('open');
+            open( self.host(self.port) );
+          }
+          self.printCommandTips();
+        }
+      });
 
-    var platformUrl = getPlatformUrl(req);
-    if(platformUrl) {
-      var platformWWW = getPlatformWWW(req);
+      app.use(require('connect-livereload')({
+        port: this.liveReloadPort
+      }));
+    }
 
-      if(self.isPlatformServe) {
-        fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
-          res.setHeader('Content-Type', 'application/javascript');
-          if (err) {
-            res.end('// mocked cordova.js response to prevent 404 errors during development');
-            if(req.url == '/cordova.js') {
-              self.serverLog(req, '(mocked)');
+    this.devServer = this.host(this.port);
+
+    // Serve up the www folder by default
+    var serve = serveStatic('www');
+
+    // Create static server
+    var server = http.createServer(function(req, res){
+      var done = finalhandler(req, res);
+
+      var platformUrl = getPlatformUrl(req);
+      if(platformUrl) {
+        var platformWWW = getPlatformWWW(req);
+
+        if(self.isPlatformServe) {
+          fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
+            res.setHeader('Content-Type', 'application/javascript');
+            if (err) {
+              res.end('// mocked cordova.js response to prevent 404 errors during development');
+              if(req.url == '/cordova.js') {
+                self.serverLog(req, '(mocked)');
+              } else {
+                self.serverLog(req, '(Error ' + platformWWW + ')');
+              }
             } else {
-              self.serverLog(req, '(Error ' + platformWWW + ')');
+              self.serverLog(req, '(' + platformWWW + ')');
+              res.end(buf);
             }
-          } else {
-            self.serverLog(req, '(' + platformWWW + ')');
-            res.end(buf);
-          }
-        });
-      } else {
-        self.serverLog(req, '(mocked)');
-        res.setHeader('Content-Type', 'application/javascript');
-        res.end('// mocked cordova.js response to prevent 404 errors during development');
+          });
+        } else {
+          self.serverLog(req, '(mocked)');
+          res.setHeader('Content-Type', 'application/javascript');
+          res.end('// mocked cordova.js response to prevent 404 errors during development');
+        }
+        return;
       }
-      return;
-    }
 
-    if(self.printConsoleLogs && req.url === '/__ionic-cli/console') {
-      self.consoleLog(req);
-      res.end('');
-      return;
-    }
+      if(self.printConsoleLogs && req.url === '/__ionic-cli/console') {
+        self.consoleLog(req);
+        res.end('');
+        return;
+      }
 
-    if(req.url.split('?')[0] === '/') {
-      fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
-        res.setHeader('Content-Type', 'text/html');
-        if (err) {
-          self.serverLog(req, 'ERROR!');
-          res.end(err.toString());
-        } else {
-          self.serverLog(req, '(' + self.contentSrc + ')');
+      if(req.url.split('?')[0] === '/') {
+        fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
+          res.setHeader('Content-Type', 'text/html');
+          if (err) {
+            self.serverLog(req, 'ERROR!');
+            res.end(err.toString());
+          } else {
+            self.serverLog(req, '(' + self.contentSrc + ')');
+
+            var html = injectGoToScript( buf.toString('utf8') );
 
-          var html = injectGoToScript( buf.toString('utf8') );
+            if(self.printConsoleLogs) {
+              html = injectConsoleLogScript(html);
+            }
 
-          if(self.printConsoleLogs) {
-            html = injectConsoleLogScript(html);
+            res.end(html);
           }
+        });
+        return;
+      }
 
-          res.end(html);
-        }
-      });
-      return;
-    }
+      // root www directory file
+      self.serverLog(req);
+      serve(req, res, done);
+    });
 
-    // root www directory file
-    self.serverLog(req);
-    serve(req, res, done);
-  });
+    // Listen
+    app.use(server);
+    app.listen(this.port);
 
-  // Listen
-  app.use(server);
-  app.listen(this.port);
+    console.log('Running dev server:'.green.bold, this.devServer);
+
+  } catch(e) {
+    var msg;
+    if(e && (e + '').indexOf('EMFILE') > -1) {
+      msg = (e + '\n').error.bold +
+            'The watch process has exceed the default number of files to keep open.\n'.error.bold +
+            'You can change the default with the following command:\n\n'.error.bold +
+            '  ulimit -n 1000\n\n' +
+            'In the command above, it\'s setting the default to watch a max of 1000 files.\n\n'.error.bold;
 
-  console.log('Running dev server:'.green.bold, this.devServer);
+    } else {
+      msg = ('server start error: ' + e).error.bold;
+    }
+    console.log(msg);
+    process.exit(1);
+  }
 };
 
 
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 0366be21ac..8a4adc01e1 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -80,6 +80,9 @@ IonicTask.prototype.sassSetup = function(ionic) {
       if(!hasSass) gulpStartupTasks.push('sass');
       if(!hasWatch) gulpStartupTasks.push('watch');
       project.set('gulpStartupTasks', gulpStartupTasks);
+      if(!project.get('watchPatterns')){
+        project.set('watchPatterns', ['www/**/*', '!www/lib/**/*'])
+      }
       project.save();
 
       fs.writeFileSync(indexPath, cleanedLines.join('\n'), 'utf8');
diff --git a/package.json b/package.json
index 33eb86dc1b..1afc80870c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.4",
+  "version": "1.2.5-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 0b900432ad2feb5a638d1a9e117fe995ad95900f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 12 Sep 2014 11:47:45 -0500
Subject: [PATCH 0269/1100] improve fetchArchive error handling

---
 CHANGELOG.md |  1 +
 lib/ionic.js | 14 ++++++++++++--
 package.json |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a2c3a547..aec9c6b52e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Set watchPatterns within ionic.project config file
 * Friendly EMFILE error when too many files are watched
 * Ensure config.xml content[src] gets reset after run/emulate
+* Improve fetchArchive error handling
 
 
 ### 1.2.4
diff --git a/lib/ionic.js b/lib/ionic.js
index 185f489332..ae2b826b4d 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -599,8 +599,18 @@ Ionic = {
     var proxy = process.env.PROXY || null;
     var request = require('request');
     request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
-      if(!res || res.statusCode !== 200) {
-        console.error('Unable to fetch:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
+      if(err) {
+        console.error('Error fetching:'.error.bold, archiveUrl, err);
+        q.reject(err);
+        return;
+      }
+      if(!res) {
+        console.error('Invalid response:'.error.bold, archiveUrl);
+        q.reject('Unable to fetch response: ' + archiveUrl);
+        return;
+      }
+      if(res.statusCode !== 200) {
+        console.error('Invalid response status:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
         q.reject(res);
         return;
       }
diff --git a/package.json b/package.json
index 1afc80870c..d38cc04bb4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.5-beta1",
+  "version": "1.2.5-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From dcde1b42461f018deb70470216e001aa6402e705 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 12 Sep 2014 11:55:21 -0500
Subject: [PATCH 0270/1100] custom error for 404 and 406 http response

---
 lib/ionic.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ae2b826b4d..f28b4acd78 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -610,7 +610,12 @@ Ionic = {
         return;
       }
       if(res.statusCode !== 200) {
-        console.error('Invalid response status:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
+        if(res.statusCode === 404 || res.statusCode === 406) {
+          console.error('Not found:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
+          console.error('Please verify the url and try again.'.error.bold);
+        } else {
+          console.error('Invalid response status:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
+        }
         q.reject(res);
         return;
       }

From 921673f90f662cd8ab7d05b8836d6955b46ace29 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 15 Sep 2014 10:52:54 -0500
Subject: [PATCH 0271/1100] request rejectUnauthorized

---
 lib/ionic.js | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index f28b4acd78..f00ca3ad31 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -598,7 +598,7 @@ Ionic = {
 
     var proxy = process.env.PROXY || null;
     var request = require('request');
-    request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
+    request({ url: archiveUrl, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
       if(err) {
         console.error('Error fetching:'.error.bold, archiveUrl, err);
         q.reject(err);
diff --git a/package.json b/package.json
index d38cc04bb4..e0a5a9efdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.5-beta2",
+  "version": "1.2.5-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From de90865ccd743260010d49ee6f5a54320e843ae0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 15 Sep 2014 10:57:53 -0500
Subject: [PATCH 0272/1100] do not prompt for address if there's only 1

---
 lib/ionic/serve.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 5ab8a5e7bb..939ce61199 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -576,6 +576,12 @@ IonicTask.prototype.getAddress = function(cb) {
         });
       }
 
+      if(addresses.length === 1) {
+        self.address = addresses[0].address;
+        cb();
+        return;
+      }
+
       for(var x=0; x<addresses.length; x++) {
         console.log( (' ' + (x+1) + ') ' + addresses[x].address + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
       }

From 93eb4b64e0750fb8399fc4b486f0b92cc401ac27 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 15 Sep 2014 19:54:46 -0500
Subject: [PATCH 0273/1100] v1.2.5

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aec9c6b52e..c0a76956f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Friendly EMFILE error when too many files are watched
 * Ensure config.xml content[src] gets reset after run/emulate
 * Improve fetchArchive error handling
+* Fix SSL Cert errors
+* Do not prompt for address selection when there's only one
 
 
 ### 1.2.4
diff --git a/package.json b/package.json
index e0a5a9efdb..b360ef022b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.5-beta3",
+  "version": "1.2.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d4ff8d76c0699463a0d47f9fc9d5361833db9ef6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 30 Sep 2014 14:11:39 -0500
Subject: [PATCH 0274/1100] v1.2.6

---
 CHANGELOG.md         |   8 +++
 lib/ionic.js         |  14 +++-
 lib/ionic/app.js     | 167 +++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/cordova.js |   2 +-
 lib/ionic/lib.js     | 121 +++++++++++++++----------------
 lib/ionic/serve.js   |   2 +-
 lib/ionic/start.js   |  57 ++++++++++++---
 lib/ionic/upload.js  |  11 +++
 package.json         |   2 +-
 9 files changed, 309 insertions(+), 75 deletions(-)
 create mode 100644 lib/ionic/app.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0a76956f0..287db3a11a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 1.2.6
+
+* Fix `fs.chmodSync: Error: ENOENT` for existing projects
+* Fix lib update
+* Add ionic app task
+* Starter projects can provide `app.json` to specify plugins and sass setup
+
+
 ### 1.2.5
 
 * Do not watch `www/lib/` files by default
diff --git a/lib/ionic.js b/lib/ionic.js
index f00ca3ad31..4de97ab794 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -223,7 +223,19 @@ var TASKS = [
     title: 'address',
     name: 'address',
     module: './ionic/serve'
-  }
+  },
+  {
+    title: 'app',
+    name: 'app',
+    // summary: 'Deploy a new Ionic app version or list versions',
+    // options: {
+    //   '--versions|-v': 'List recently uploaded versions of this app',
+    //   '--deploy|-d': 'Upload the current working copy and mark it as deployed',
+    //   '--note|-n': 'Add a note to a deploy',
+    //   '--uuid|-u': 'Mark an already uploaded version as deployed'
+    // },
+    module: './ionic/app'
+   }
 ];
 
 Ionic = {
diff --git a/lib/ionic/app.js b/lib/ionic/app.js
new file mode 100644
index 0000000000..10801f7a3c
--- /dev/null
+++ b/lib/ionic/app.js
@@ -0,0 +1,167 @@
+var fs = require('fs'),
+    path = require('path'),
+    parseUrl = require('url').parse,
+    request = require('request'),
+    argv = require('optimist').argv,
+    FormData = require('form-data'),
+    IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+    Task = require('./task').Task,
+    IonicLoginTask = require('./login').IonicTask,
+    IonicUploadTask = require('./upload').IonicTask;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+
+  self.ionic = ionic;
+  self.inputValues = {};
+  self.useCmdArgs = false;
+
+  this.getCmdLineOptions();
+
+  var login = new IonicLoginTask();
+  login.get(ionic, function(jar) {
+    self.jar = jar;
+
+    if (argv['versions'] || argv.v) {
+      self.versions(self);
+    } else if (argv['deploy'] || argv.d) {
+      if (!self.inputValues['uuid']) {
+        // Deploying a new version
+        var upload = new IonicUploadTask();
+
+        upload.setNote(self.inputValues['note'] || '');
+        upload.run(self.ionic, function() {
+          self.deploy(self);
+        });
+      } else {
+        self.deploy(self);
+      }
+    }
+  });
+};
+
+IonicTask.prototype.versions = function(self) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("No versions uploaded!".bold.red);
+    return false;
+  }
+
+  var form = new FormData();
+  form.append('csrfmiddlewaretoken', self.jar.cookies[0].value);
+
+  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/versions';
+  var params = parseUrl(url);
+
+  form.submit({
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: self.jar.cookies.map(function (c) {
+          return c.name + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      })
+    },
+    function (err, response) {
+      if (err) {
+        return self.ionic.fail('Error logging in: ' + err);
+      }
+
+      response.setEncoding('utf8');
+      response.on("data", function(data) {
+        try {
+          var d = JSON.parse(data);
+          if (d.errors && d.errors.length) {
+            for (var j = 0; j < d.errors.length; j++) {
+              console.log((d.errors[j]).bold.error);
+            }
+            return self.ionic.fail('Unable to fetch versions list');
+          }
+
+          var heading = ['    UUID   ', ' Created ', '            Note '];
+          var heading_underline = ['------------', '----------', '----------------------------']
+
+          console.log(heading.join('\t'));
+          console.log(heading_underline.join('\t'));
+
+          for (var j = 0; j < d.length; j++) {
+            var active = (d[j].active) ? ' *' : '  ';
+            var uuid = (d[j].active) ? d[j].uuid.substring(0,8).green : d[j].uuid.substring(0,8);
+            var note = d[j].note.substring(0,25) || '\t';
+
+            console.log([active + ' ' + uuid, ' ' + d[j].created, ' ' + note].join('\t'));
+          }
+        } catch(parseEx) {
+          return self.ionic.fail('Error response: ' + parseEx);
+        }
+      });
+    });
+}
+
+IonicTask.prototype.deploy = function(self) {
+  var project = IonicProject.load();
+
+  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/deploy';
+
+  request({
+      method: 'POST',
+      url: url,
+      jar: self.jar,
+      form: {
+        uuid: self.inputValues['uuid'],
+        csrfmiddlewaretoken: self.jar.cookies[0].value
+      },
+      headers: {
+        cookie: self.jar.cookies.map(function (c) {
+          return c.name + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      }
+    },
+    function (err, response, body) {
+      if (err) {
+        return self.ionic.fail('Error deploying version: ' + err);
+      }
+
+      try {
+        var d = JSON.parse(body);
+        if (d.errors && d.errors.length) {
+          for (var j = 0; j < d.errors.length; j++) {
+            console.log((d.errors[j]).bold.error);
+          }
+          return self.ionic.fail('Unable to deploy version');
+        }
+
+        console.log("Successfully deployed " + d.uuid);
+
+      } catch (parseEx) {
+        return self.ionic.fail('Error response: ' + parseEx);
+      }
+    }
+  );
+};
+
+IonicTask.prototype.getCmdLineOptions = function() {
+  var self = this;
+
+  function getCmdArgValue(propertyName, shortName) {
+    var value = argv[propertyName] || argv[shortName];
+    if(value) {
+      self.inputValues[propertyName] = value;
+      self.useCmdArgs = true;
+    }
+  }
+
+  getCmdArgValue('note', 'n');
+  getCmdArgValue('uuid', 'u');
+};
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 1e6b7cb112..8ed6ea66fd 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -221,7 +221,7 @@ IonicTask.prototype.addHooks = function() {
       }
 
       var projectScript = path.join(projectHookPath, hookFilename);
-      if( !fs.existsSync(projectHookPath) ) {
+      if( !fs.existsSync(projectScript) ) {
         // copy the hook script to the project
         try {
           var cliScript = path.join(cliHookPath, hookFilename);
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index b93b006fc5..460b657ede 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -99,6 +99,10 @@ IonicTask.prototype.getVersionData = function(version) {
         return;
       }
       self.versionData = JSON.parse(body);
+      self.versionData.version_number = self.versionData.version_number || self.versionData.version;
+      self.versionData.version_codename = self.versionData.version_codename || self.versionData.codename;
+      self.versionData.release_date = self.versionData.release_date || self.versionData.date;
+
       q.resolve();
     } catch(e) {
       console.log('Error loading '.bold.error + version.bold + ' version information'.bold.error );
@@ -192,29 +196,24 @@ IonicTask.prototype.downloadZip = function(version) {
   var self = this;
 
   var archivePath = 'https://github.com/driftyco/ionic-bower/archive/v' + version + '.zip';
-  self.tmpZipPath = path.resolve('www/lib/ionic/ionic.zip');
 
-  console.log('Downloading: '.green.bold + archivePath);
+  self.tmpExtractPath = path.resolve('www/lib/.ionic');
+  self.tmpZipPath = path.join(self.tmpExtractPath, 'ionic.zip');
 
-  var file = fs.createWriteStream(self.tmpZipPath);
-  file.on('error', function(err) {
-    console.log( ('downloadZip createWriteStream: ' + err).error );
-  });
+  if( !fs.existsSync(self.tmpExtractPath) ) {
+    fs.mkdirSync(self.tmpExtractPath);
+  }
+
+  console.log('Downloading: '.green.bold + archivePath);
 
   var proxy = process.env.PROXY || null;
-  request({ url: archivePath, encoding: null, proxy: proxy }, function(err, res, body) {
+  request({ url: archivePath, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
     if(err) {
       console.log(err);
       return;
     }
-    if(res.statusCode == 404) {
+    if(res.statusCode == 404 || res.statusCode == 406) {
       console.log( ('Invalid version: ' + version).bold.red );
-      try {
-        file.close();
-        fs.unlink(self.tmpZipPath);
-      } catch(e) {
-        console.error( (e).red );
-      }
       return;
     }
     if(res.statusCode >= 400) {
@@ -222,10 +221,8 @@ IonicTask.prototype.downloadZip = function(version) {
       return;
     }
     try {
-      file.write(body);
-      file.close(function(){
-        self.updateFiles();
-      });
+      fs.writeFileSync(self.tmpZipPath, body);
+      self.updateFiles();
     } catch(e) {
       console.error( (e).red );
     }
@@ -260,63 +257,67 @@ IonicTask.prototype.downloadZip = function(version) {
 IonicTask.prototype.updateFiles = function(version) {
   var self = this;
   var ionicLibDir = path.resolve('www/lib/ionic');
-  var readStream = fs.createReadStream(self.tmpZipPath);
 
   try {
+    var readStream = fs.createReadStream(self.tmpZipPath);
+    readStream.on('error', function(err) {
+      console.log( ('updateFiles readStream: ' + err).error );
+    });
 
-    function onEntry(entry) {
-      var libEntryPath = entry.path.replace('ionic-bower-' + self.versionData.version_number + '/', ionicLibDir + '/');
-
-      if( /bower.json|readme/gi.test(entry.path) ) {
-        entry.autodrain();
-        return;
-      }
+    var writeStream = unzip.Extract({ path: self.tmpExtractPath });
+    writeStream.on('close', function() {
+      try {
+        rm('-rf', self.tmpZipPath)
+      } catch(e){}
 
-      if(entry.type == 'Directory') {
-        if( !fs.existsSync(libEntryPath) ) {
-          fs.mkdirSync(libEntryPath);
+      try {
+        var dir = fs.readdirSync(self.tmpExtractPath);
+        var copyFrom;
+        for(var x=0; x<dir.length; x++) {
+          if( dir[x].indexOf('ionic') === 0 ) {
+            copyFrom = path.join(self.tmpExtractPath, dir[x], '*');
+          }
+        }
+        if(!copyFrom) {
+          console.log('updateFiles, invalid zip');
+          return;
         }
-      } else {
-        var writeStream = fs.createWriteStream(libEntryPath);
-        writeStream.on('error', function(err) {
-          console.log( ('updateFiles error writing, ' + libEntryPath + ': ' + err).error );
-        });
-        entry.pipe(writeStream);
-      }
 
-      entry.autodrain();
-    }
+        cp('-Rf', copyFrom, ionicLibDir);
 
-    readStream.pipe(unzip.Parse())
-      .on('entry', onEntry)
-      .on('close', function(){
-        try{
-          console.log('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
-          IonicStats.t();
+        try {
+          rm('-rf', self.tmpExtractPath)
+        } catch(e){}
 
-          self.writeVersionData();
+        try {
+          rm('-rf', path.join(ionicLibDir, 'README.md'));
+        } catch(e){}
 
-          var ionicBower = require('./bower').IonicBower;
-          ionicBower.setIonicVersion(self.versionData.version_number);
+        try {
+          rm('-rf', path.join(ionicLibDir, 'bower.json'));
+        } catch(e){}
 
-        } catch(e) {
-          console.log( ('Error loading version info: ' + e).error.bold );
-        }
-      });
+        console.log('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
+        IonicStats.t();
 
-    readStream.on('error', function(err){
-      console.log( ('updateFiles readStream: ' + err).error );
-    });
+        self.writeVersionData();
 
-    readStream.on('close', function(err){
-      try {
-        fs.unlink(self.tmpZipPath);
-      } catch(e){}
+        var ionicBower = require('./bower').IonicBower;
+        ionicBower.setIonicVersion(self.versionData.version_number);
+
+      } catch(e){
+        console.log('updateFiles Error: ' + e);
+      }
     });
+    writeStream.on('error', function(err) {
+      console.log( ('updateFiles writeStream: ' + err).error );
+    });
+    readStream.pipe(writeStream);
 
-  } catch(err) {
-    console.log('Error: ' + err);
+  } catch(e) {
+    console.log('updateFiles Error: ' + e);
   }
+
 };
 
 IonicTask.prototype.writeVersionData = function() {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 939ce61199..b69d64ea2b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -127,7 +127,7 @@ IonicTask.prototype.start = function(ionic) {
 
     // gulpStartupTasks should be an array of tasks set in the project config
     // watchSass is for backwards compatible sass: true project config
-    if(this.gulpStartupTasks || this.watchSass) {
+    if((this.gulpStartupTasks && this.gulpStartupTasks.length) || this.watchSass) {
       var spawn = require('cross-spawn').spawn;
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5f103d723f..f2ed976fa3 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -10,7 +10,6 @@ var fs = require('fs'),
     colors = require('colors'),
     Q = require('q'),
     xml2js = require('xml2js'),
-    setup = require('./setup'),
     IonicProject = require('./project'),
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
@@ -21,6 +20,15 @@ var IonicTask = function() {};
 // The URL for the cordova wrapper project
 IonicTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
+IonicTask.DEFAULT_APP = {
+  "plugins": [
+    "org.apache.cordova.device@0.2.12",
+    "org.apache.cordova.console@0.2.11",
+    "com.ionic.keyboard@1.0.3"
+  ],
+  "sass": false
+};
+
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
@@ -101,6 +109,9 @@ IonicTask.prototype.startApp = function() {
     .then(function(){
       return self.fetchSeed();
     })
+    .then(function(){
+      return self.loadAppSetup();
+    })
     .then(function(){
       return self.initCordova();
     })
@@ -164,7 +175,7 @@ IonicTask.prototype.fetchSeed = function() {
 
   // Local Directory: /User/starterapp
   if( (this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1) && (this.template.indexOf('http://') === -1 && this.template.indexOf('https://') === -1)) {
-    console.log('local', this.template)
+    console.log('local', this.template);
     this.seedType = 'local';
     return this.fetchLocalStarter();
   }
@@ -175,6 +186,25 @@ IonicTask.prototype.fetchSeed = function() {
 };
 
 
+IonicTask.prototype.loadAppSetup = function() {
+  var q = Q.defer();
+  this.appSetup = IonicTask.DEFAULT_APP;
+
+  var appJsonPath = path.join(this.targetPath, 'www', 'app.json');
+
+  if(fs.existsSync(appJsonPath)) {
+    try {
+      this.appSetup = JSON.parse( fs.readFileSync(appJsonPath) );
+      rm('-rf', appJsonPath);
+    } catch(e) {
+      console.log( 'app.json error:', e);
+    }
+  }
+  q.resolve();
+  return q;
+};
+
+
 IonicTask.prototype.fetchCodepen = function() {
   var self = this;
   var codepenUrl = this.template.split('?')[0].split('#')[0];
@@ -403,11 +433,12 @@ IonicTask.prototype.initCordova = function() {
 
     if(this.ionic.hasFailed) return;
 
-    var cmds = [
-      'cordova plugin add org.apache.cordova.device',
-      'cordova plugin add org.apache.cordova.console',
-      'cordova plugin add com.ionic.keyboard'
-    ];
+    var cmds = [];
+
+    // add plugins
+    for(var x=0; x<self.appSetup.plugins.length; x++) {
+      cmds.push('cordova plugin add ' + self.appSetup.plugins[x]);
+    }
 
     // platform add android with --android flag
     if(argv.android) {
@@ -478,10 +509,14 @@ IonicTask.prototype.updateConfigXml = function() {
 
 
 IonicTask.prototype.setupSass = function() {
-  if(argv.sass) {
+  this.hasSass = false;
+
+  if(argv.sass || this.appSetup.sass) {
     // auto setup sass if they set the option
     console.log('setup sass'.green.bold);
-    var setupTask = new setup.IonicSetupTask();
+    var IonicSetupTask = require('./setup').IonicTask
+    var setupTask = new IonicSetupTask();
+    this.hasSass = true;
     return setupTask.sassSetup(this.ionic);
   }
 
@@ -529,7 +564,7 @@ IonicTask.prototype.updateLibFiles = function() {
     libPath = 'lib/ionic';
   }
 
-  if(libPath == 'lib/ionic' && this.seedType == 'ionic-starter') {
+  if(libPath == 'lib/ionic' && (this.seedType == 'ionic-starter' || /ionic-starter/i.test(this.template))) {
     // don't bother if its still is the default which comes with the starters
     return;
   }
@@ -675,7 +710,7 @@ IonicTask.prototype.printQuickHelp = function() {
 
   console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).bold);
 
-  if(!argv.sass) {
+  if(!this.hasSass) {
     console.log('\n * Setup this project to use Sass:', 'ionic setup sass'.bold);
   }
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 53bd0973f9..62a5a5585c 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -17,6 +17,12 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.run = function(ionic, callback) {
   var project = IonicProject.load();
   var q = Q.defer();
+  var self = this;
+
+  // The note is a short, optional description for a version
+  if (!self.note) {
+    self.note = '';
+  }
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
@@ -44,6 +50,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
       var form = new FormData();
       form.append('name', project.get('name'));
+      form.append('note', self.note);
       form.append('csrfmiddlewaretoken', jar.cookies[0].value);
       form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
 
@@ -129,4 +136,8 @@ IonicTask.prototype.run = function(ionic, callback) {
   });
 };
 
+IonicTask.prototype.setNote = function(note) {
+  this.note = note
+};
+
 exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index b360ef022b..703c8f8e5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.5",
+  "version": "1.2.6-beta3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 964857cce9eac226230168be7bd849be5db2736c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 30 Sep 2014 14:18:36 -0500
Subject: [PATCH 0275/1100] Support for starting from creator projects

---
 lib/ionic/start.js | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f2ed976fa3..0b3b787e24 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -22,9 +22,9 @@ IonicTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
 IonicTask.DEFAULT_APP = {
   "plugins": [
-    "org.apache.cordova.device@0.2.12",
-    "org.apache.cordova.console@0.2.11",
-    "com.ionic.keyboard@1.0.3"
+    "org.apache.cordova.device",
+    "org.apache.cordova.console",
+    "com.ionic.keyboard"
   ],
   "sass": false
 };
@@ -167,6 +167,11 @@ IonicTask.prototype.fetchSeed = function() {
     return this.fetchCodepen();
   }
 
+  if( /creator:/i.test(this.template) ) {
+    this.seedType = 'creator';
+    return this.fetchCreatorApp();
+  }
+
   // Github URL: http://github.com/myrepo/
   if( /\/\/github.com\//i.test(this.template) ) {
     this.seedType = 'github';
@@ -205,6 +210,32 @@ IonicTask.prototype.loadAppSetup = function() {
 };
 
 
+IonicTask.prototype.fetchCreatorApp = function() {
+  var self = this;
+  var appId = this.template.split(':')[1];
+  var downloadUrl = Ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
+  var wwwPath = path.join(this.targetPath, 'www');
+
+  console.log('\nDownloading Creator Prototype:'.bold, downloadUrl);
+
+  var q = Q.defer();
+
+  var proxy = process.env.PROXY || null;
+
+  request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
+    if(!err && res && res.statusCode === 200) {
+      //html = self.convertTemplates(html);
+
+      fs.writeFileSync(path.join(wwwPath, 'index.html'), html, 'utf8');
+    } else {
+      console.log('Unable to fetch', err, res.statusCode);
+      q.reject(res);
+    }
+    q.resolve();
+  });
+  return Q.all([q]);
+};
+
 IonicTask.prototype.fetchCodepen = function() {
   var self = this;
   var codepenUrl = this.template.split('?')[0].split('#')[0];

From 075edf8d15773c93603c2d644c80e4679956ac81 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 30 Sep 2014 14:20:01 -0500
Subject: [PATCH 0276/1100] v1.2.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 703c8f8e5a..4e79dc42eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.6-beta3",
+  "version": "1.2.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 3350d8fc3610e308d6b2052304b9027a536b2062 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 30 Sep 2014 14:51:15 -0500
Subject: [PATCH 0277/1100] npm-shrinkwrap.json

---
 npm-shrinkwrap.json | 1508 +++++++++++++++++++++++++++++++++++++++++++
 package.json        |    2 +-
 2 files changed, 1509 insertions(+), 1 deletion(-)
 create mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 0000000000..c0738d1768
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,1508 @@
+{
+  "name": "ionic",
+  "version": "1.2.7-beta1",
+  "dependencies": {
+    "archiver": {
+      "version": "0.5.1",
+      "from": "archiver@0.5.1",
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.1.13",
+          "from": "readable-stream@~1.1.9",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@~1.0.0"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@~0.10.x"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@~2.0.1"
+            }
+          }
+        },
+        "zip-stream": {
+          "version": "0.1.4",
+          "from": "zip-stream@~0.1.0",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.31",
+              "from": "readable-stream@>=1.0.27-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            },
+            "lodash.defaults": {
+              "version": "2.4.1",
+              "from": "lodash.defaults@~2.4.1",
+              "dependencies": {
+                "lodash.keys": {
+                  "version": "2.4.1",
+                  "from": "lodash.keys@~2.4.1",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1",
+                      "from": "lodash._isnative@~2.4.1"
+                    },
+                    "lodash.isobject": {
+                      "version": "2.4.1",
+                      "from": "lodash.isobject@~2.4.1"
+                    },
+                    "lodash._shimkeys": {
+                      "version": "2.4.1",
+                      "from": "lodash._shimkeys@~2.4.1"
+                    }
+                  }
+                },
+                "lodash._objecttypes": {
+                  "version": "2.4.1",
+                  "from": "lodash._objecttypes@~2.4.1"
+                }
+              }
+            }
+          }
+        },
+        "lazystream": {
+          "version": "0.1.0",
+          "from": "lazystream@~0.1.0",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.31",
+              "from": "readable-stream@~1.0.2",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            }
+          }
+        },
+        "file-utils": {
+          "version": "0.1.5",
+          "from": "file-utils@~0.1.5",
+          "dependencies": {
+            "lodash": {
+              "version": "2.1.0",
+              "from": "lodash@~2.1.0"
+            },
+            "iconv-lite": {
+              "version": "0.2.11",
+              "from": "iconv-lite@~0.2.11"
+            },
+            "rimraf": {
+              "version": "2.2.8",
+              "from": "rimraf@~2.2.2"
+            },
+            "glob": {
+              "version": "3.2.11",
+              "from": "glob@~3.2.6",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@2"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "from": "minimatch@0.3",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.5.0",
+                      "from": "lru-cache@2"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0",
+                      "from": "sigmund@~1.0.0"
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "0.2.14",
+              "from": "minimatch@~0.2.12",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "lru-cache@2"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "sigmund@~1.0.0"
+                }
+              }
+            },
+            "findup-sync": {
+              "version": "0.1.3",
+              "from": "findup-sync@~0.1.2",
+              "dependencies": {
+                "lodash": {
+                  "version": "2.4.1",
+                  "from": "lodash@~2.4.1"
+                }
+              }
+            },
+            "isbinaryfile": {
+              "version": "0.1.9",
+              "from": "isbinaryfile@~0.1.9"
+            }
+          }
+        },
+        "lodash": {
+          "version": "2.4.1",
+          "from": "lodash@~2.4.1"
+        }
+      }
+    },
+    "colors": {
+      "version": "0.6.2",
+      "from": "colors@^0.6.2"
+    },
+    "connect": {
+      "version": "3.1.1",
+      "from": "connect@3.1.1",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "1.0.4",
+          "from": "debug@1.0.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2"
+            }
+          }
+        },
+        "finalhandler": {
+          "version": "0.1.0",
+          "from": "finalhandler@0.1.0",
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1"
+            }
+          }
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@~1.3.0"
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0"
+        }
+      }
+    },
+    "connect-livereload": {
+      "version": "0.4.0",
+      "from": "connect-livereload@^0.4.0"
+    },
+    "cross-spawn": {
+      "version": "0.2.3",
+      "from": "cross-spawn@0.2.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.5.0",
+          "from": "lru-cache@^2.5.0"
+        }
+      }
+    },
+    "event-stream": {
+      "version": "3.0.20",
+      "from": "event-stream@3.0.20",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "dependencies": {
+        "through": {
+          "version": "2.3.4",
+          "from": "through@~2.3.1"
+        },
+        "duplexer": {
+          "version": "0.1.1",
+          "from": "duplexer@~0.1.1"
+        },
+        "from": {
+          "version": "0.1.3",
+          "from": "from@~0"
+        },
+        "map-stream": {
+          "version": "0.0.4",
+          "from": "map-stream@~0.0.3"
+        },
+        "pause-stream": {
+          "version": "0.0.11",
+          "from": "pause-stream@0.0.11"
+        },
+        "split": {
+          "version": "0.2.10",
+          "from": "split@0.2"
+        },
+        "stream-combiner": {
+          "version": "0.0.4",
+          "from": "stream-combiner@~0.0.3"
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "0.2.0",
+      "from": "finalhandler@0.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.0.0",
+          "from": "debug@~2.0.0",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2"
+            }
+          }
+        },
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1"
+        }
+      }
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "from": "form-data@0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "dependencies": {
+        "combined-stream": {
+          "version": "0.0.5",
+          "from": "combined-stream@~0.0.4",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5"
+            }
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "from": "mime@~1.2.11"
+        },
+        "async": {
+          "version": "0.9.0",
+          "from": "async@~0.9.0"
+        }
+      }
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "from": "ncp@0.4.2"
+    },
+    "npm": {
+      "version": "1.5.0-alpha-4",
+      "from": "npm@1.5.0-alpha-4",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-1.5.0-alpha-4.tgz",
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.5",
+          "from": "abbrev@latest",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+        },
+        "ansi": {
+          "version": "0.3.0",
+          "from": "ansi@latest",
+          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+        },
+        "ansicolors": {
+          "version": "0.3.2",
+          "from": "ansicolors@latest"
+        },
+        "ansistyles": {
+          "version": "0.1.3",
+          "from": "ansistyles@0.1.3",
+          "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+        },
+        "archy": {
+          "version": "0.0.2",
+          "from": "archy@0.0.2"
+        },
+        "async-some": {
+          "version": "1.0.0",
+          "from": "async-some@*",
+          "dependencies": {
+            "dezalgo": {
+              "version": "1.0.0",
+              "from": "dezalgo@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz",
+              "dependencies": {
+                "asap": {
+                  "version": "1.0.0",
+                  "from": "asap@>=1.0.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "block-stream": {
+          "version": "0.0.7",
+          "from": "block-stream@latest"
+        },
+        "char-spinner": {
+          "version": "1.0.1",
+          "from": "char-spinner@latest",
+          "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+        },
+        "child-process-close": {
+          "version": "0.1.1",
+          "from": "child-process-close@",
+          "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
+        },
+        "chmodr": {
+          "version": "0.1.0",
+          "from": "chmodr@latest"
+        },
+        "chownr": {
+          "version": "0.0.1",
+          "from": "../chownr"
+        },
+        "cmd-shim": {
+          "version": "1.1.1",
+          "from": "cmd-shim@latest",
+          "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz"
+        },
+        "columnify": {
+          "version": "1.1.0",
+          "from": "columnify@latest",
+          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz",
+          "dependencies": {
+            "strip-ansi": {
+              "version": "0.2.2",
+              "from": "strip-ansi@^0.2.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.1.0",
+                  "from": "ansi-regex@^0.1.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz"
+                }
+              }
+            },
+            "wcwidth.js": {
+              "version": "0.0.4",
+              "from": "wcwidth.js@~0.0.4",
+              "resolved": "https://registry.npmjs.org/wcwidth.js/-/wcwidth.js-0.0.4.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.6.0",
+                  "from": "underscore@>= 1.3.0",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "editor": {
+          "version": "0.1.0",
+          "from": "editor@latest",
+          "resolved": "https://registry.npmjs.org/editor/-/editor-0.1.0.tgz"
+        },
+        "fs-vacuum": {
+          "version": "1.2.1",
+          "from": "fs-vacuum@>=1.2.1-0 <1.3.0-0"
+        },
+        "fstream": {
+          "version": "0.1.28",
+          "from": "fstream@~0.1.27"
+        },
+        "fstream-npm": {
+          "version": "0.1.7",
+          "from": "fstream-npm@latest",
+          "dependencies": {
+            "fstream-ignore": {
+              "version": "0.0.8",
+              "from": "fstream-ignore@~0.0",
+              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"
+            }
+          }
+        },
+        "github-url-from-git": {
+          "version": "1.1.1",
+          "from": "github-url-from-git@1.1.1",
+          "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"
+        },
+        "github-url-from-username-repo": {
+          "version": "0.2.0",
+          "from": "github-url-from-username-repo@latest",
+          "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz"
+        },
+        "glob": {
+          "version": "4.0.3",
+          "from": "glob@latest"
+        },
+        "graceful-fs": {
+          "version": "3.0.2",
+          "from": "graceful-fs@~3.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+        },
+        "inflight": {
+          "version": "1.0.1",
+          "from": "inflight@~1.0.1",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz"
+        },
+        "ini": {
+          "version": "1.2.1",
+          "from": "ini@latest",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.2.1.tgz"
+        },
+        "init-package-json": {
+          "version": "0.1.1",
+          "from": "init-package-json@latest",
+          "dependencies": {
+            "promzard": {
+              "version": "0.2.2",
+              "from": "promzard@>=0.2.0-0 <0.3.0-0",
+              "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"
+            }
+          }
+        },
+        "lockfile": {
+          "version": "0.4.2",
+          "from": "lockfile@0.4.2",
+          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"
+        },
+        "lru-cache": {
+          "version": "2.5.0",
+          "from": "lru-cache@latest"
+        },
+        "minimatch": {
+          "version": "0.3.0",
+          "from": "minimatch@latest",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+          "dependencies": {
+            "sigmund": {
+              "version": "1.0.0",
+              "from": "sigmund@~1.0.0",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+            }
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "from": "mkdirp@latest"
+        },
+        "node-gyp": {
+          "version": "0.13.1",
+          "from": "node-gyp@~0.13.0",
+          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz"
+        },
+        "nopt": {
+          "version": "3.0.1",
+          "from": "nopt@latest"
+        },
+        "npm-cache-filename": {
+          "version": "1.0.1",
+          "from": "npm-cache-filename@latest",
+          "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
+        },
+        "npm-install-checks": {
+          "version": "1.0.2",
+          "from": "npm-install-checks@latest"
+        },
+        "npm-package-arg": {
+          "version": "2.0.0",
+          "from": "npm-package-arg@>=2.0.0-0 <2.1.0-0",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.0.tgz"
+        },
+        "npm-registry-client": {
+          "version": "3.0.2",
+          "from": "npm-registry-client@3.0.2",
+          "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.0.2.tgz"
+        },
+        "npm-user-validate": {
+          "version": "0.1.0",
+          "from": "npm-user-validate@latest"
+        },
+        "npmconf": {
+          "version": "2.0.3",
+          "from": "npmconf@2.0.3",
+          "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.0.3.tgz",
+          "dependencies": {
+            "config-chain": {
+              "version": "1.1.8",
+              "from": "config-chain@>=1.1.8-0 <1.2.0-0",
+              "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+              "dependencies": {
+                "proto-list": {
+                  "version": "1.2.3",
+                  "from": "proto-list@>=1.2.1-0 <1.3.0-0",
+                  "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "npmlog": {
+          "version": "0.1.1",
+          "from": "npmlog@latest"
+        },
+        "once": {
+          "version": "1.3.0",
+          "from": "once@latest"
+        },
+        "opener": {
+          "version": "1.3.0",
+          "from": "opener@latest"
+        },
+        "osenv": {
+          "version": "0.1.0",
+          "from": "osenv@~0.1.0"
+        },
+        "path-is-inside": {
+          "version": "1.0.1",
+          "from": "path-is-inside@1.0.1",
+          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+        },
+        "read": {
+          "version": "1.0.5",
+          "from": "read@latest",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.4",
+              "from": "mute-stream@~0.0.4"
+            }
+          }
+        },
+        "read-installed": {
+          "version": "2.0.5",
+          "from": "read-installed@latest",
+          "dependencies": {
+            "util-extend": {
+              "version": "1.0.1",
+              "from": "util-extend@^1.0.1",
+              "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+            }
+          }
+        },
+        "read-package-json": {
+          "version": "1.2.3",
+          "from": "read-package-json@1.2.3",
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.3.tgz"
+        },
+        "request": {
+          "version": "2.30.0",
+          "from": "request@latest",
+          "dependencies": {
+            "qs": {
+              "version": "0.6.6",
+              "from": "qs@~0.6.0"
+            },
+            "json-stringify-safe": {
+              "version": "5.0.0",
+              "from": "json-stringify-safe@~5.0.0"
+            },
+            "forever-agent": {
+              "version": "0.5.0",
+              "from": "forever-agent@~0.5.0"
+            },
+            "node-uuid": {
+              "version": "1.4.1",
+              "from": "node-uuid@~1.4.0"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@~1.2.9"
+            },
+            "tough-cookie": {
+              "version": "0.9.15",
+              "from": "tough-cookie@~0.9.15",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.2.3",
+                  "from": "punycode@>=0.2.0"
+                }
+              }
+            },
+            "form-data": {
+              "version": "0.1.2",
+              "from": "form-data@~0.1.0",
+              "dependencies": {
+                "combined-stream": {
+                  "version": "0.0.4",
+                  "from": "combined-stream@~0.0.4",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5"
+                    }
+                  }
+                },
+                "async": {
+                  "version": "0.2.9",
+                  "from": "async@~0.2.9"
+                }
+              }
+            },
+            "tunnel-agent": {
+              "version": "0.3.0",
+              "from": "tunnel-agent@~0.3.0"
+            },
+            "http-signature": {
+              "version": "0.10.0",
+              "from": "http-signature@~0.10.0",
+              "dependencies": {
+                "assert-plus": {
+                  "version": "0.1.2",
+                  "from": "assert-plus@0.1.2"
+                },
+                "asn1": {
+                  "version": "0.1.11",
+                  "from": "asn1@0.1.11"
+                },
+                "ctype": {
+                  "version": "0.5.2",
+                  "from": "ctype@0.5.2"
+                }
+              }
+            },
+            "oauth-sign": {
+              "version": "0.3.0",
+              "from": "oauth-sign@~0.3.0"
+            },
+            "hawk": {
+              "version": "1.0.0",
+              "from": "hawk@~1.0.0",
+              "dependencies": {
+                "hoek": {
+                  "version": "0.9.1",
+                  "from": "hoek@0.9.x"
+                },
+                "boom": {
+                  "version": "0.4.2",
+                  "from": "boom@0.4.x"
+                },
+                "cryptiles": {
+                  "version": "0.2.2",
+                  "from": "cryptiles@0.2.x"
+                },
+                "sntp": {
+                  "version": "0.2.4",
+                  "from": "sntp@0.2.x"
+                }
+              }
+            },
+            "aws-sign2": {
+              "version": "0.5.0",
+              "from": "aws-sign2@~0.5.0"
+            }
+          }
+        },
+        "retry": {
+          "version": "0.6.0",
+          "from": "retry"
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "from": "rimraf@latest",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+        },
+        "semver": {
+          "version": "2.3.0",
+          "from": "semver@latest"
+        },
+        "sha": {
+          "version": "1.2.4",
+          "from": "sha@latest",
+          "resolved": "https://registry.npmjs.org/sha/-/sha-1.2.4.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.27-1",
+              "from": "readable-stream@1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.25-1",
+                  "from": "string_decoder@~0.10.x",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "slide": {
+          "version": "1.1.5",
+          "from": "slide@latest"
+        },
+        "sorted-object": {
+          "version": "1.0.0",
+          "from": "sorted-object@"
+        },
+        "tar": {
+          "version": "0.1.20",
+          "from": "tar@~0.1.19"
+        },
+        "text-table": {
+          "version": "0.2.0",
+          "from": "text-table@~0.2.0"
+        },
+        "uid-number": {
+          "version": "0.0.5",
+          "from": "uid-number@latest",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+        },
+        "which": {
+          "version": "1.0.5",
+          "from": "which@1"
+        },
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@"
+        },
+        "normalize-package-data": {
+          "version": "0.4.1",
+          "from": "normalize-package-data@0.4.1"
+        }
+      }
+    },
+    "open": {
+      "version": "0.0.5",
+      "from": "open@0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+    },
+    "optimist": {
+      "version": "0.6.0",
+      "from": "optimist@0.6.0",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "from": "wordwrap@~0.0.2"
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "from": "minimist@~0.0.1"
+        }
+      }
+    },
+    "progress": {
+      "version": "1.1.7",
+      "from": "progress@1.1.7"
+    },
+    "prompt": {
+      "version": "0.2.12",
+      "from": "prompt@0.2.12",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "dependencies": {
+        "pkginfo": {
+          "version": "0.3.0",
+          "from": "pkginfo@0.x.x"
+        },
+        "read": {
+          "version": "1.0.5",
+          "from": "read@1.0.x",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.4",
+              "from": "mute-stream@~0.0.4"
+            }
+          }
+        },
+        "revalidator": {
+          "version": "0.1.8",
+          "from": "revalidator@0.1.x"
+        },
+        "utile": {
+          "version": "0.2.1",
+          "from": "utile@0.2.x",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "from": "async@~0.2.9"
+            },
+            "deep-equal": {
+              "version": "0.2.1",
+              "from": "deep-equal@*"
+            },
+            "i": {
+              "version": "0.3.2",
+              "from": "i@0.3.x"
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "from": "mkdirp@0.x.x",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.2.8",
+              "from": "rimraf@2.x.x"
+            }
+          }
+        },
+        "winston": {
+          "version": "0.6.2",
+          "from": "winston@0.6.x",
+          "dependencies": {
+            "async": {
+              "version": "0.1.22",
+              "from": "async@0.1.x"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@1.0.x"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@0.1.x"
+            },
+            "pkginfo": {
+              "version": "0.2.3",
+              "from": "pkginfo@0.2.x"
+            },
+            "request": {
+              "version": "2.9.203",
+              "from": "request@2.9.x"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@0.0.x"
+            }
+          }
+        }
+      }
+    },
+    "q": {
+      "version": "1.0.1",
+      "from": "q@^1.0.1"
+    },
+    "request": {
+      "version": "2.27.0",
+      "from": "request@2.27.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "0.6.6",
+          "from": "qs@~0.6.0"
+        },
+        "json-stringify-safe": {
+          "version": "5.0.0",
+          "from": "json-stringify-safe@~5.0.0"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "from": "forever-agent@~0.5.0"
+        },
+        "tunnel-agent": {
+          "version": "0.3.0",
+          "from": "tunnel-agent@~0.3.0"
+        },
+        "http-signature": {
+          "version": "0.10.0",
+          "from": "http-signature@~0.10.0",
+          "dependencies": {
+            "assert-plus": {
+              "version": "0.1.2",
+              "from": "assert-plus@0.1.2"
+            },
+            "asn1": {
+              "version": "0.1.11",
+              "from": "asn1@0.1.11",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+            },
+            "ctype": {
+              "version": "0.5.2",
+              "from": "ctype@0.5.2"
+            }
+          }
+        },
+        "hawk": {
+          "version": "1.0.0",
+          "from": "hawk@~1.0.0",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "from": "hoek@0.9.x"
+            },
+            "boom": {
+              "version": "0.4.2",
+              "from": "boom@0.4.x"
+            },
+            "cryptiles": {
+              "version": "0.2.2",
+              "from": "cryptiles@0.2.x"
+            },
+            "sntp": {
+              "version": "0.2.4",
+              "from": "sntp@0.2.x"
+            }
+          }
+        },
+        "aws-sign": {
+          "version": "0.3.0",
+          "from": "aws-sign@~0.3.0"
+        },
+        "oauth-sign": {
+          "version": "0.3.0",
+          "from": "oauth-sign@~0.3.0"
+        },
+        "cookie-jar": {
+          "version": "0.3.0",
+          "from": "cookie-jar@~0.3.0"
+        },
+        "node-uuid": {
+          "version": "1.4.1",
+          "from": "node-uuid@~1.4.0"
+        },
+        "mime": {
+          "version": "1.2.11",
+          "from": "mime@~1.2.9"
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.6.1",
+      "from": "serve-static@1.6.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
+      "dependencies": {
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1"
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@~1.3.0"
+        },
+        "send": {
+          "version": "0.9.1",
+          "from": "send@0.9.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "2.0.0",
+              "from": "debug@~2.0.0"
+            },
+            "depd": {
+              "version": "0.4.4",
+              "from": "depd@0.4.4"
+            },
+            "destroy": {
+              "version": "1.0.3",
+              "from": "destroy@1.0.3"
+            },
+            "etag": {
+              "version": "1.3.0",
+              "from": "etag@~1.3.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.0.tgz",
+              "dependencies": {
+                "buffer-crc32": {
+                  "version": "0.2.3",
+                  "from": "buffer-crc32@0.2.3"
+                }
+              }
+            },
+            "fresh": {
+              "version": "0.2.4",
+              "from": "fresh@0.2.4",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@1.2.11"
+            },
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2"
+            },
+            "on-finished": {
+              "version": "2.1.0",
+              "from": "on-finished@2.1.0",
+              "dependencies": {
+                "ee-first": {
+                  "version": "1.0.5",
+                  "from": "ee-first@1.0.5"
+                }
+              }
+            },
+            "range-parser": {
+              "version": "1.0.1",
+              "from": "range-parser@~1.0.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.1.tgz"
+            }
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0"
+        }
+      }
+    },
+    "shelljs": {
+      "version": "0.2.6",
+      "from": "shelljs@0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+    },
+    "tiny-lr-fork": {
+      "version": "0.0.5",
+      "from": "tiny-lr-fork@0.0.5",
+      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "0.5.6",
+          "from": "qs@0.5.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+        },
+        "faye-websocket": {
+          "version": "0.4.4",
+          "from": "faye-websocket@0.4.4",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+        },
+        "noptify": {
+          "version": "0.0.3",
+          "from": "noptify@~0.0.3",
+          "dependencies": {
+            "nopt": {
+              "version": "2.0.0",
+              "from": "nopt@2.0.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.5",
+                  "from": "abbrev@1"
+                }
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@0.7.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+        }
+      }
+    },
+    "unzip": {
+      "version": "0.1.9",
+      "from": "unzip@0.1.9",
+      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "dependencies": {
+        "fstream": {
+          "version": "0.1.31",
+          "from": "fstream@0.1.31",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "3.0.2",
+              "from": "graceful-fs@~3.0.2"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@~2.0.1"
+            },
+            "mkdirp": {
+              "version": "0.5.0",
+              "from": "mkdirp@0.5",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.2.8",
+              "from": "rimraf@2"
+            }
+          }
+        },
+        "pullstream": {
+          "version": "0.4.0",
+          "from": "pullstream@~0.4.0",
+          "dependencies": {
+            "over": {
+              "version": "0.0.5",
+              "from": "over@~0.0.5"
+            },
+            "readable-stream": {
+              "version": "1.0.31",
+              "from": "readable-stream@1.0.31",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            },
+            "slice-stream": {
+              "version": "0.0.0",
+              "from": "slice-stream@0.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.31",
+                  "from": "readable-stream@1.0.31",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@~1.0.0"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@~0.10.x"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@~2.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "binary": {
+          "version": "0.3.0",
+          "from": "binary@~0.3.0",
+          "dependencies": {
+            "chainsaw": {
+              "version": "0.1.0",
+              "from": "chainsaw@~0.1.0",
+              "dependencies": {
+                "traverse": {
+                  "version": "0.3.9",
+                  "from": "traverse@0.3.9",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                }
+              }
+            },
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@~0.1.1"
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "1.0.31",
+          "from": "readable-stream@1.0.31",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@~1.0.0"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@~0.10.x"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@~2.0.1"
+            }
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.2",
+          "from": "setimmediate@~1.0.1"
+        },
+        "match-stream": {
+          "version": "0.0.2",
+          "from": "match-stream@~0.0.2",
+          "dependencies": {
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@~0.1.1"
+            },
+            "readable-stream": {
+              "version": "1.0.31",
+              "from": "readable-stream@1.0.31",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.7",
+      "from": "vinyl-fs@0.3.7",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "dependencies": {
+        "glob-stream": {
+          "version": "3.1.15",
+          "from": "glob-stream@^3.1.5",
+          "dependencies": {
+            "glob": {
+              "version": "4.0.5",
+              "from": "glob@^4.0.0",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@2"
+                },
+                "once": {
+                  "version": "1.3.0",
+                  "from": "once@^1.3.0"
+                }
+              }
+            },
+            "minimatch": {
+              "version": "1.0.0",
+              "from": "minimatch@^1.0.0",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "lru-cache@2"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "sigmund@~1.0.0"
+                }
+              }
+            },
+            "ordered-read-streams": {
+              "version": "0.0.8",
+              "from": "ordered-read-streams@0.0.8"
+            },
+            "glob2base": {
+              "version": "0.0.11",
+              "from": "glob2base@^0.0.11"
+            },
+            "unique-stream": {
+              "version": "1.0.0",
+              "from": "unique-stream@^1.0.0"
+            }
+          }
+        },
+        "glob-watcher": {
+          "version": "0.0.6",
+          "from": "glob-watcher@^0.0.6",
+          "dependencies": {
+            "gaze": {
+              "version": "0.5.1",
+              "from": "gaze@^0.5.1",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@~0.1.0",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.1",
+                      "from": "lodash@~1.0.1"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@~3.1.21",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@~1.2.0"
+                        },
+                        "inherits": {
+                          "version": "1.0.0",
+                          "from": "inherits@1"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@~0.2.11",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0",
+                          "from": "lru-cache@2"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0",
+                          "from": "sigmund@~1.0.0"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.2",
+          "from": "graceful-fs@^3.0.0"
+        },
+        "lodash": {
+          "version": "2.4.1",
+          "from": "lodash@^2.4.1"
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "from": "mkdirp@^0.5.0",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@^1.0.0",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0",
+              "from": "first-chunk-stream@^1.0.0"
+            },
+            "is-utf8": {
+              "version": "0.2.0",
+              "from": "is-utf8@^0.2.0"
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.1",
+          "from": "through2@^0.6.1",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.31",
+              "from": "readable-stream@>=1.0.27-1 <1.1.0-0",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0",
+              "from": "xtend@>=4.0.0 <4.1.0-0"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.3",
+          "from": "vinyl@^0.4.0",
+          "dependencies": {
+            "clone-stats": {
+              "version": "0.0.1",
+              "from": "clone-stats@^0.0.1"
+            }
+          }
+        }
+      }
+    },
+    "xml2js": {
+      "version": "0.4.4",
+      "from": "xml2js@^0.4.4",
+      "dependencies": {
+        "sax": {
+          "version": "0.6.0",
+          "from": "sax@0.6.x"
+        },
+        "xmlbuilder": {
+          "version": "2.4.3",
+          "from": "xmlbuilder@2.4.3",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz",
+          "dependencies": {
+            "lodash-node": {
+              "version": "2.4.1",
+              "from": "lodash-node@~2.4.1"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 4e79dc42eb..b391330777 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.6",
+  "version": "1.2.7-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 7ceedff7b91609c8b90fbbe73276af6df8dec90a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 3 Oct 2014 13:03:13 -0500
Subject: [PATCH 0278/1100] point api to https://apps.ionic.io

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 4de97ab794..b67a79e005 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -239,7 +239,7 @@ var TASKS = [
 ];
 
 Ionic = {
-  IONIC_DASH: 'https://ionic.io',
+  IONIC_DASH: 'https://apps.ionic.io',
   //IONIC_DASH: 'http://localhost:8000',
   IONIC_API: '/api/v1/',
   PRIVATE_PATH: '.ionic',

From 03c21255047760b7d0ae931ac8b0cb796ec52dbc Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 3 Oct 2014 13:11:40 -0500
Subject: [PATCH 0279/1100] v1.2.7

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 287db3a11a..203ce3cab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.2.7
+
+* npm-shrinkwrap
+* Update ionic.io API URL
+
+
 ### 1.2.6
 
 * Fix `fs.chmodSync: Error: ENOENT` for existing projects
diff --git a/package.json b/package.json
index b391330777..472fc30e7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.7-beta1",
+  "version": "1.2.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 35b636698c987864f5e3f3220790101da572ab75 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 6 Oct 2014 14:36:49 -0500
Subject: [PATCH 0280/1100] Merge branch 'fix-csrf-cookie'

---
 CHANGELOG.md        |   5 +
 lib/ionic/app.js    |  13 +-
 lib/ionic/upload.js |  11 +-
 npm-shrinkwrap.json | 593 +++++++++++++++++++++++++-------------------
 package.json        |   2 +-
 5 files changed, 361 insertions(+), 263 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 203ce3cab9..b5732d1da0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.2.8
+
+* CSRF cookie fixes
+
+
 ### 1.2.7
 
 * npm-shrinkwrap
diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 10801f7a3c..a3bae862a4 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -55,7 +55,7 @@ IonicTask.prototype.versions = function(self) {
   }
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', self.jar.cookies[0].value);
+  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
 
   var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/versions';
   var params = parseUrl(url);
@@ -118,7 +118,7 @@ IonicTask.prototype.deploy = function(self) {
       jar: self.jar,
       form: {
         uuid: self.inputValues['uuid'],
-        csrfmiddlewaretoken: self.jar.cookies[0].value
+        csrfmiddlewaretoken: self.getCsrfToken(self.jar)
       },
       headers: {
         cookie: self.jar.cookies.map(function (c) {
@@ -164,4 +164,13 @@ IonicTask.prototype.getCmdLineOptions = function() {
   getCmdArgValue('uuid', 'u');
 };
 
+IonicTask.prototype.getCsrfToken = function(jar) {
+  for (var i=0; i<jar.cookies.length; i++) {
+    if (jar.cookies[i].name == 'csrftoken') {
+      return jar.cookies[i].value;
+    }
+  }
+  return '';
+}
+
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 62a5a5585c..3f0d7bd5a7 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -48,10 +48,18 @@ IonicTask.prototype.run = function(ionic, callback) {
     zip.on('close', function() {
       console.log('\nUploading app...'.bold.green);
 
+      var csrftoken = '';
+
+      for (var i=0; i<jar.cookies.length; i++) {
+        if (jar.cookies[i].name == 'csrftoken') {
+          csrftoken = jar.cookies[i].value;
+        }
+      }
+
       var form = new FormData();
       form.append('name', project.get('name'));
       form.append('note', self.note);
-      form.append('csrfmiddlewaretoken', jar.cookies[0].value);
+      form.append('csrfmiddlewaretoken', csrftoken);
       form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
 
       var url = ionic.IONIC_DASH + ionic.IONIC_API + 'app/upload/' + project.get('app_id');
@@ -83,6 +91,7 @@ IonicTask.prototype.run = function(ionic, callback) {
               return ionic.fail('Session expired (401). Please log in and run this command again.');
 
             } else if(response.statusCode == 403) {
+              console.log(data);
               q.reject('forbidden');
               return ionic.fail('Forbidden upload (403)');
             }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c0738d1768..3b071c2369 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,18 +1,21 @@
 {
   "name": "ionic",
-  "version": "1.2.7-beta1",
+  "version": "1.2.8-beta1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
       "from": "archiver@0.5.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@~1.1.9",
+          "from": "readable-stream@1.1.13",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@1.0.1",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
@@ -20,26 +23,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@0.10.31",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2.0.1"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@~0.1.0",
+          "from": "zip-stream@0.1.4",
+          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.31",
-              "from": "readable-stream@>=1.0.27-1 <1.1.0-0",
+              "from": "readable-stream@1.0.31",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -47,39 +53,46 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@~2.4.1",
+              "from": "lodash.defaults@2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1"
+                      "from": "lodash._isnative@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1"
+                      "from": "lodash.isobject@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1"
+                      "from": "lodash._shimkeys@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1"
+                  "from": "lodash._objecttypes@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
             }
@@ -87,16 +100,18 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@~0.1.0",
+          "from": "lazystream@0.1.0",
+          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.31",
-              "from": "readable-stream@~1.0.2",
+              "from": "readable-stream@1.0.31",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -104,11 +119,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1"
                 }
               }
             }
@@ -116,39 +132,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@~0.1.5",
+          "from": "file-utils@0.1.5",
+          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@~2.1.0"
+              "from": "lodash@2.1.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@~0.2.11"
+              "from": "iconv-lite@0.2.11",
+              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@~2.2.2"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@~3.2.6",
+              "from": "glob@3.2.11",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2"
+                  "from": "inherits@2.0.1"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3",
+                  "from": "minimatch@0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2"
+                      "from": "lru-cache@2.5.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@~1.0.0"
+                      "from": "sigmund@1.0.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
@@ -156,52 +180,60 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@~0.2.12",
+              "from": "minimatch@0.2.14",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2"
+                  "from": "lru-cache@2.5.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0"
+                  "from": "sigmund@1.0.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@0.1.3",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@~2.4.1"
+                  "from": "lodash@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@~0.1.9"
+              "from": "isbinaryfile@0.1.9",
+              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@~2.4.1"
+          "from": "lodash@2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@^0.6.2"
+      "from": "colors@0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
@@ -213,81 +245,95 @@
         "finalhandler": {
           "version": "0.1.0",
           "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1"
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@1.3.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0"
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.4.0",
-      "from": "connect-livereload@^0.4.0"
+      "from": "connect-livereload@0.4.0",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.0.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@^2.5.0"
+          "from": "lru-cache@2.5.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.20",
+      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.4",
-          "from": "through@~2.3.1"
+          "from": "through@2.3.4",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@~0.1.1"
+          "from": "duplexer@0.1.1",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@~0"
+          "from": "from@0.1.3",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.4",
-          "from": "map-stream@~0.0.3"
+          "from": "map-stream@0.0.4",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11"
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2"
+          "from": "split@0.2.10",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@~0.0.3"
+          "from": "stream-combiner@0.0.4",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@~2.0.0",
+          "from": "debug@2.0.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
@@ -297,18 +343,20 @@
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.5",
-          "from": "combined-stream@~0.0.4",
+          "from": "combined-stream@0.0.5",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -318,21 +366,24 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@~1.2.11"
+          "from": "mime@1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@~0.9.0"
+          "from": "async@0.9.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2"
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "1.5.0-alpha-4",
-      "from": "npm@1.5.0-alpha-4",
+      "from": "https://registry.npmjs.org/npm/-/npm-1.5.0-alpha-4.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-1.5.0-alpha-4.tgz",
       "dependencies": {
         "abbrev": {
@@ -808,109 +859,129 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
       "from": "optimist@0.6.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@~0.0.2"
+          "from": "wordwrap@0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@~0.0.1"
+          "from": "minimist@0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7"
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.x.x"
+          "from": "pkginfo@0.3.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.x",
+          "from": "read@1.0.5",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@~0.0.4"
+              "from": "mute-stream@0.0.4"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.x"
+          "from": "revalidator@0.1.8",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.x",
+          "from": "utile@0.2.1",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@~0.2.9"
+              "from": "async@0.2.10",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@*"
+              "from": "deep-equal@0.2.1",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.x"
+              "from": "i@0.3.2",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.x.x",
+              "from": "mkdirp@0.5.0",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8"
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.x.x"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.x",
+          "from": "winston@0.6.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.x"
+              "from": "async@0.1.22",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.x"
+              "from": "cycle@1.0.3",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.x"
+              "from": "eyes@0.1.8",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.x"
+              "from": "pkginfo@0.2.3",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.x"
+              "from": "request@2.9.203",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.x"
+              "from": "stack-trace@0.0.9",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
         }
@@ -918,32 +989,38 @@
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@^1.0.1"
+      "from": "q@1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.27.0",
-      "from": "request@2.27.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@~0.6.0"
+          "from": "qs@0.6.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@~5.0.0"
+          "from": "json-stringify-safe@5.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@~0.5.0"
+          "from": "forever-agent@0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@~0.3.0"
+          "from": "tunnel-agent@0.3.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@~0.10.0",
+          "from": "http-signature@0.10.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
@@ -951,7 +1028,7 @@
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
@@ -962,97 +1039,114 @@
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@~1.0.0",
+          "from": "hawk@1.0.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.x"
+              "from": "hoek@0.9.1",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.x"
+              "from": "boom@0.4.2",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.x"
+              "from": "cryptiles@0.2.2",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.x"
+              "from": "sntp@0.2.4",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@~0.3.0"
+          "from": "aws-sign@0.3.0",
+          "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@~0.3.0"
+          "from": "oauth-sign@0.3.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@~0.3.0"
+          "from": "cookie-jar@0.3.0",
+          "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
         },
         "node-uuid": {
           "version": "1.4.1",
-          "from": "node-uuid@~1.4.0"
+          "from": "node-uuid@1.4.1",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@~1.2.9"
+          "from": "mime@1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "serve-static": {
       "version": "1.6.1",
-      "from": "serve-static@1.6.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@1.3.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.9.1",
-          "from": "send@0.9.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.0.0",
-              "from": "debug@~2.0.0"
+              "from": "debug@2.0.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz"
             },
             "depd": {
               "version": "0.4.4",
-              "from": "depd@0.4.4"
+              "from": "depd@0.4.4",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3"
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.3.0",
-              "from": "etag@~1.3.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.0.tgz",
               "dependencies": {
                 "buffer-crc32": {
                   "version": "0.2.3",
-                  "from": "buffer-crc32@0.2.3"
+                  "from": "buffer-crc32@0.2.3",
+                  "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11"
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
@@ -1061,58 +1155,63 @@
             "on-finished": {
               "version": "2.1.0",
               "from": "on-finished@2.1.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.0.5",
-                  "from": "ee-first@1.0.5"
+                  "from": "ee-first@1.0.5",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.1",
-              "from": "range-parser@~1.0.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.1.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0"
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@0.5.6",
+          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@0.4.4",
+          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@~0.0.3",
+          "from": "noptify@0.0.3",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@2.0.0",
+              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1"
+                  "from": "abbrev@1.0.5",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
             }
@@ -1120,137 +1219,98 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@0.7.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@0.1.31",
+          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.2",
-              "from": "graceful-fs@~3.0.2"
+              "from": "graceful-fs@3.0.2",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2.0.1"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5",
+              "from": "mkdirp@0.5.0",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8"
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.0",
-          "from": "pullstream@~0.4.0",
+          "from": "pullstream@0.4.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@~0.0.5"
-            },
-            "readable-stream": {
-              "version": "1.0.31",
-              "from": "readable-stream@1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
-                }
-              }
+              "from": "over@0.0.5",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "0.0.0",
-              "from": "slice-stream@0.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.31",
-                  "from": "readable-stream@1.0.31",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@~1.0.0"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@~0.10.x"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@~2.0.1"
-                    }
-                  }
-                }
-              }
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@~0.3.0",
+          "from": "binary@0.3.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@~0.1.0",
+              "from": "chainsaw@0.1.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@0.3.9",
+                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
+              "from": "buffers@0.1.1",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.31",
-          "from": "readable-stream@1.0.31",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@1.0.1",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
@@ -1258,48 +1318,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@0.10.31",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2.0.1"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@~1.0.1"
+          "from": "setimmediate@1.0.2",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@~0.0.2",
+          "from": "match-stream@0.0.2",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
-            },
-            "readable-stream": {
-              "version": "1.0.31",
-              "from": "readable-stream@1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
-                }
-              }
+              "from": "buffers@0.1.1",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         }
@@ -1307,96 +1348,115 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.15",
-          "from": "glob-stream@^3.1.5",
+          "from": "glob-stream@3.1.15",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
           "dependencies": {
             "glob": {
               "version": "4.0.5",
-              "from": "glob@^4.0.0",
+              "from": "glob@4.0.5",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2"
+                  "from": "inherits@2.0.1"
                 },
                 "once": {
                   "version": "1.3.0",
-                  "from": "once@^1.3.0"
+                  "from": "once@1.3.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz"
                 }
               }
             },
             "minimatch": {
               "version": "1.0.0",
-              "from": "minimatch@^1.0.0",
+              "from": "minimatch@1.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2"
+                  "from": "lru-cache@2.5.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0"
+                  "from": "sigmund@1.0.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "ordered-read-streams": {
               "version": "0.0.8",
-              "from": "ordered-read-streams@0.0.8"
+              "from": "ordered-read-streams@0.0.8",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
             },
             "glob2base": {
               "version": "0.0.11",
-              "from": "glob2base@^0.0.11"
+              "from": "glob2base@0.0.11",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@^1.0.0"
+              "from": "unique-stream@1.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@^0.0.6",
+          "from": "glob-watcher@0.0.6",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@^0.5.1",
+              "from": "gaze@0.5.1",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@~0.1.0",
+                  "from": "globule@0.1.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@~1.0.1"
+                      "from": "lodash@1.0.1",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@~3.1.21",
+                      "from": "glob@3.1.21",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@~1.2.0"
+                          "from": "graceful-fs@1.2.3",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1"
+                          "from": "inherits@1.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@~0.2.11",
+                      "from": "minimatch@0.2.14",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2"
+                          "from": "lru-cache@2.5.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0"
+                          "from": "sigmund@1.0.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
@@ -1408,48 +1468,56 @@
         },
         "graceful-fs": {
           "version": "3.0.2",
-          "from": "graceful-fs@^3.0.0"
+          "from": "graceful-fs@3.0.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@^2.4.1"
+          "from": "lodash@2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@^0.5.0",
+          "from": "mkdirp@0.5.0",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@^1.0.0",
+          "from": "strip-bom@1.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@^1.0.0"
+              "from": "first-chunk-stream@1.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@^0.2.0"
+              "from": "is-utf8@0.2.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.1",
-          "from": "through2@^0.6.1",
+          "from": "through2@0.6.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.1.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.31",
-              "from": "readable-stream@>=1.0.27-1 <1.1.0-0",
+              "from": "readable-stream@1.0.31",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -1457,27 +1525,31 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0"
+              "from": "xtend@4.0.0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.3",
-          "from": "vinyl@^0.4.0",
+          "from": "vinyl@0.4.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
           "dependencies": {
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@^0.0.1"
+              "from": "clone-stats@0.0.1",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
         }
@@ -1485,20 +1557,23 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@^0.4.4",
+      "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.0",
-          "from": "sax@0.6.x"
+          "from": "sax@0.6.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.0.tgz"
         },
         "xmlbuilder": {
           "version": "2.4.3",
-          "from": "xmlbuilder@2.4.3",
+          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@~2.4.1"
+              "from": "lodash-node@2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index 472fc30e7e..6933d3cb92 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.7",
+  "version": "1.2.8-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 458574517512ca9ad02d09685846c5e40e75b0c7 Mon Sep 17 00:00:00 2001
From: Serge van den Oever <serge@macaw.nl>
Date: Mon, 6 Oct 2014 22:21:10 +0200
Subject: [PATCH 0281/1100] Update ionic.js

Type for --version: Spcific instead of Specific
---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index b67a79e005..1bcc1e474a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -201,7 +201,7 @@ var TASKS = [
       '[update]': 'Updates the Ionic Framework in www/lib/ionic'
     },
     options: {
-      '--version|-v': 'Spcific Ionic version\nOtherwise it defaults to the latest version'
+      '--version|-v': 'Specific Ionic version\nOtherwise it defaults to the latest version'
     },
     module: './ionic/lib'
   },

From eb63f196d0578b2cea4f352fc89a5d9165409737 Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Mon, 13 Oct 2014 17:12:14 -0500
Subject: [PATCH 0282/1100] add note about bower

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0dacf83630..fc53562cdd 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ the local static files from Ionic's CDN.
 ```bash
 $ ionic lib update
 ```
-
+*Note: Using bower? This command does not update Ionic's dependencies. Run `bower update` to update Ionic and all of it's dependencies defined in `bower.json`.*
 
 ## Packaging an app (beta)
 

From 3d716a99c5f17d6943ddbbe62960ee5f1dafa5aa Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Wed, 15 Oct 2014 14:28:40 -0500
Subject: [PATCH 0283/1100] Overriding the ionic.IONIC_DASH variable for
 staging when using the app task.

---
 lib/ionic/app.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index a3bae862a4..9bcc432209 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -24,6 +24,8 @@ IonicTask.prototype.run = function(ionic) {
 
   this.getCmdLineOptions();
 
+  ionic.IONIC_DASH = 'http://stage.apps.ionic.io';
+  
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
     self.jar = jar;

From e52b1cdf671b5afcfe97d98515ad56e885dd2711 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 15 Oct 2014 14:34:26 -0500
Subject: [PATCH 0284/1100] v1.2.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6933d3cb92..06fd6769b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8-beta1",
+  "version": "1.2.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 2c503d42d124609253cfe8f2dbf8ae17d04056af Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 15 Oct 2014 14:35:34 -0500
Subject: [PATCH 0285/1100] shrinkwrap

---
 npm-shrinkwrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3b071c2369..f482b189d0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8-beta1",
+  "version": "1.2.8",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",

From 1f0efe57a25f2f8330399e7b45dcdff40c057aa1 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 15 Oct 2014 14:53:02 -0500
Subject: [PATCH 0286/1100] v1.2.8-beta2

---
 npm-shrinkwrap.json | 998 +++++++++++++++++++++-----------------------
 package.json        |   4 +-
 2 files changed, 480 insertions(+), 522 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f482b189d0..30dc222158 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,21 +1,18 @@
 {
   "name": "ionic",
-  "version": "1.2.8",
+  "version": "1.2.8-beta2",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
       "from": "archiver@0.5.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@1.1.13",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "from": "readable-stream@~1.1.9",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "from": "core-util-is@~1.0.0"
             },
             "isarray": {
               "version": "0.0.1",
@@ -23,29 +20,26 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "from": "string_decoder@~0.10.x"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1"
+              "from": "inherits@~2.0.1"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@0.1.4",
-          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+          "from": "zip-stream@~0.1.0",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.31",
-              "from": "readable-stream@1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "version": "1.0.33-1",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -53,46 +47,39 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1"
+                  "from": "inherits@~2.0.1"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+              "from": "lodash.defaults@~2.4.1",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@~2.4.1",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                      "from": "lodash._isnative@~2.4.1"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                      "from": "lodash.isobject@~2.4.1"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                      "from": "lodash._shimkeys@~2.4.1"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                  "from": "lodash._objecttypes@~2.4.1"
                 }
               }
             }
@@ -100,18 +87,16 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@0.1.0",
-          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+          "from": "lazystream@~0.1.0",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.31",
-              "from": "readable-stream@1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "version": "1.0.33-1",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -119,12 +104,11 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1"
+                  "from": "inherits@~2.0.1"
                 }
               }
             }
@@ -132,47 +116,39 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@0.1.5",
-          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+          "from": "file-utils@~0.1.5",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@2.1.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+              "from": "lodash@~2.1.0"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@0.2.11",
-              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+              "from": "iconv-lite@~0.2.11"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "from": "rimraf@~2.2.2"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@3.2.11",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "from": "glob@~3.2.6",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1"
+                  "from": "inherits@2"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "from": "minimatch@0.3",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2.5.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                      "from": "lru-cache@2"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@1.0.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "from": "sigmund@~1.0.0"
                     }
                   }
                 }
@@ -180,44 +156,37 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@0.2.14",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "from": "minimatch@~0.2.12",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                  "from": "lru-cache@2"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                  "from": "sigmund@~1.0.0"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@0.1.3",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@~0.1.2",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "from": "lodash@~2.4.1"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@0.1.9",
-              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
+              "from": "isbinaryfile@~0.1.9"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "from": "lodash@~2.4.1"
         }
       }
     },
@@ -228,36 +197,34 @@
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
           "from": "finalhandler@0.1.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+              "from": "escape-html@1.0.1"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@1.3.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+          "from": "parseurl@~1.3.0"
         },
         "utils-merge": {
           "version": "1.0.0",
@@ -268,95 +235,83 @@
     },
     "connect-livereload": {
       "version": "0.4.0",
-      "from": "connect-livereload@0.4.0",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.0.tgz"
+      "from": "connect-livereload@0.4.0"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@2.5.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+          "from": "lru-cache@^2.5.0"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@3.0.x",
       "dependencies": {
         "through": {
-          "version": "2.3.4",
-          "from": "through@2.3.4",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+          "version": "2.3.6",
+          "from": "through@~2.3.1"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@0.1.1",
-          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+          "from": "duplexer@~0.1.1"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@0.1.3",
-          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+          "from": "from@~0"
         },
         "map-stream": {
           "version": "0.0.4",
-          "from": "map-stream@0.0.4",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
+          "from": "map-stream@~0.0.3"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
-          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+          "from": "pause-stream@0.0.11"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2.10",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+          "from": "split@0.2"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@0.0.4",
-          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+          "from": "stream-combiner@~0.0.3"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@2.0.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@~2.0.0",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+          "from": "escape-html@1.0.1"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.5",
-          "from": "combined-stream@0.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+          "from": "combined-stream@~0.0.4",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -366,25 +321,22 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+          "from": "mime@~1.2.9"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@0.9.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+          "from": "async@~0.9.0"
         }
       }
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+      "from": "ncp@0.4.2"
     },
     "npm": {
-      "version": "1.5.0-alpha-4",
-      "from": "https://registry.npmjs.org/npm/-/npm-1.5.0-alpha-4.tgz",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-1.5.0-alpha-4.tgz",
+      "version": "2.1.3",
+      "from": "npm@2.1.3",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
           "version": "1.0.5",
@@ -410,22 +362,9 @@
           "from": "archy@0.0.2"
         },
         "async-some": {
-          "version": "1.0.0",
-          "from": "async-some@*",
-          "dependencies": {
-            "dezalgo": {
-              "version": "1.0.0",
-              "from": "dezalgo@>=1.0.0-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz",
-              "dependencies": {
-                "asap": {
-                  "version": "1.0.0",
-                  "from": "asap@>=1.0.0-0 <2.0.0-0",
-                  "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
-                }
-              }
-            }
-          }
+          "version": "1.0.1",
+          "from": "async-some@>=1.0.1-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz"
         },
         "block-stream": {
           "version": "0.0.7",
@@ -450,41 +389,60 @@
           "from": "../chownr"
         },
         "cmd-shim": {
-          "version": "1.1.1",
-          "from": "cmd-shim@latest",
-          "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz"
+          "version": "2.0.1",
+          "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+          "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
         },
         "columnify": {
-          "version": "1.1.0",
-          "from": "columnify@latest",
-          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz",
+          "version": "1.2.1",
+          "from": "columnify@>=1.2.1-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz",
           "dependencies": {
             "strip-ansi": {
-              "version": "0.2.2",
-              "from": "strip-ansi@^0.2.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz",
+              "version": "1.0.0",
+              "from": "strip-ansi@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz",
               "dependencies": {
                 "ansi-regex": {
-                  "version": "0.1.0",
-                  "from": "ansi-regex@^0.1.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz"
+                  "version": "0.2.1",
+                  "from": "ansi-regex@0.2.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
-            "wcwidth.js": {
-              "version": "0.0.4",
-              "from": "wcwidth.js@~0.0.4",
-              "resolved": "https://registry.npmjs.org/wcwidth.js/-/wcwidth.js-0.0.4.tgz",
+            "wcwidth": {
+              "version": "1.0.0",
+              "from": "wcwidth@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
               "dependencies": {
-                "underscore": {
-                  "version": "1.6.0",
-                  "from": "underscore@>= 1.3.0",
-                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
+                "defaults": {
+                  "version": "1.0.0",
+                  "from": "defaults@>=1.0.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz",
+                  "dependencies": {
+                    "clone": {
+                      "version": "0.1.18",
+                      "from": "clone@>=0.1.5-0 <0.2.0-0",
+                      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.18.tgz"
+                    }
+                  }
                 }
               }
             }
           }
         },
+        "dezalgo": {
+          "version": "1.0.1",
+          "from": "dezalgo@latest",
+          "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz",
+          "dependencies": {
+            "asap": {
+              "version": "1.0.0",
+              "from": "asap@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
+            }
+          }
+        },
         "editor": {
           "version": "0.1.0",
           "from": "editor@latest",
@@ -494,34 +452,39 @@
           "version": "1.2.1",
           "from": "fs-vacuum@>=1.2.1-0 <1.3.0-0"
         },
+        "fs-write-stream-atomic": {
+          "version": "1.0.2",
+          "from": "fs-write-stream-atomic@>=1.0.2 <1.1.0",
+          "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz"
+        },
         "fstream": {
-          "version": "0.1.28",
-          "from": "fstream@~0.1.27"
+          "version": "1.0.2",
+          "from": "fstream@1.0.2",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz"
         },
         "fstream-npm": {
-          "version": "0.1.7",
+          "version": "1.0.0",
           "from": "fstream-npm@latest",
           "dependencies": {
             "fstream-ignore": {
-              "version": "0.0.8",
-              "from": "fstream-ignore@~0.0",
-              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"
+              "version": "1.0.1",
+              "from": "fstream-ignore@^1.0.0"
             }
           }
         },
         "github-url-from-git": {
-          "version": "1.1.1",
-          "from": "github-url-from-git@1.1.1",
-          "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"
+          "version": "1.4.0",
+          "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
         },
         "github-url-from-username-repo": {
-          "version": "0.2.0",
-          "from": "github-url-from-username-repo@latest",
-          "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz"
+          "version": "1.0.2",
+          "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
         },
         "glob": {
-          "version": "4.0.3",
-          "from": "glob@latest"
+          "version": "4.0.5",
+          "from": "glob@latest",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz"
         },
         "graceful-fs": {
           "version": "3.0.2",
@@ -529,9 +492,13 @@
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
         },
         "inflight": {
-          "version": "1.0.1",
-          "from": "inflight@~1.0.1",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz"
+          "version": "1.0.3",
+          "from": "inflight@>=1.0.3 <1.1.0"
+        },
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@latest",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
         },
         "ini": {
           "version": "1.2.1",
@@ -539,29 +506,29 @@
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.2.1.tgz"
         },
         "init-package-json": {
-          "version": "0.1.1",
-          "from": "init-package-json@latest",
+          "version": "1.1.0",
+          "from": "init-package-json@>=1.1.0 <1.2.0",
           "dependencies": {
             "promzard": {
               "version": "0.2.2",
-              "from": "promzard@>=0.2.0-0 <0.3.0-0",
+              "from": "promzard@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"
             }
           }
         },
         "lockfile": {
-          "version": "0.4.2",
-          "from": "lockfile@0.4.2",
-          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"
+          "version": "1.0.0",
+          "from": "lockfile@1.0.0",
+          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"
         },
         "lru-cache": {
           "version": "2.5.0",
           "from": "lru-cache@latest"
         },
         "minimatch": {
-          "version": "0.3.0",
+          "version": "1.0.0",
           "from": "minimatch@latest",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
           "dependencies": {
             "sigmund": {
               "version": "1.0.0",
@@ -571,54 +538,65 @@
           }
         },
         "mkdirp": {
-          "version": "0.3.5",
-          "from": "mkdirp@latest"
+          "version": "0.5.0",
+          "from": "mkdirp@latest",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
         },
         "node-gyp": {
-          "version": "0.13.1",
-          "from": "node-gyp@~0.13.0",
-          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz"
+          "version": "1.0.2",
+          "from": "node-gyp@>=1.0.1-0 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"
         },
         "nopt": {
           "version": "3.0.1",
           "from": "nopt@latest"
         },
+        "normalize-package-data": {
+          "version": "1.0.3",
+          "from": "normalize-package-data@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
+        },
         "npm-cache-filename": {
           "version": "1.0.1",
           "from": "npm-cache-filename@latest",
           "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
         },
         "npm-install-checks": {
-          "version": "1.0.2",
-          "from": "npm-install-checks@latest"
+          "version": "1.0.4",
+          "from": "npm-install-checks@>=1.0.2-0 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz"
         },
         "npm-package-arg": {
-          "version": "2.0.0",
-          "from": "npm-package-arg@>=2.0.0-0 <2.1.0-0",
-          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.0.tgz"
+          "version": "2.1.3",
+          "from": "npm-package-arg@~2.1.3"
         },
         "npm-registry-client": {
-          "version": "3.0.2",
-          "from": "npm-registry-client@3.0.2",
-          "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.0.2.tgz"
+          "version": "3.2.2",
+          "from": "npm-registry-client@>=3.2.2 <3.3.0"
         },
         "npm-user-validate": {
           "version": "0.1.0",
           "from": "npm-user-validate@latest"
         },
         "npmconf": {
-          "version": "2.0.3",
-          "from": "npmconf@2.0.3",
-          "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.0.3.tgz",
+          "version": "2.1.0",
+          "from": "npmconf@>=2.1.0 <2.2.0",
           "dependencies": {
             "config-chain": {
               "version": "1.1.8",
-              "from": "config-chain@>=1.1.8-0 <1.2.0-0",
+              "from": "config-chain@>=1.1.8 <1.2.0",
               "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
               "dependencies": {
                 "proto-list": {
                   "version": "1.2.3",
-                  "from": "proto-list@>=1.2.1-0 <1.3.0-0",
+                  "from": "proto-list@>=1.2.1 <1.3.0",
                   "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
                 }
               }
@@ -657,126 +635,207 @@
           }
         },
         "read-installed": {
-          "version": "2.0.5",
-          "from": "read-installed@latest",
+          "version": "3.1.3",
+          "from": "read-installed@>=3.1.2-0 <3.2.0-0",
+          "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.3.tgz",
           "dependencies": {
+            "debuglog": {
+              "version": "1.0.1",
+              "from": "debuglog@>=1.0.1-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+            },
+            "readdir-scoped-modules": {
+              "version": "1.0.0",
+              "from": "readdir-scoped-modules@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.0.tgz"
+            },
             "util-extend": {
               "version": "1.0.1",
-              "from": "util-extend@^1.0.1",
+              "from": "util-extend@>=1.0.1-0 <2.0.0-0",
               "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
             }
           }
         },
         "read-package-json": {
-          "version": "1.2.3",
-          "from": "read-package-json@1.2.3",
-          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.3.tgz"
+          "version": "1.2.7",
+          "from": "read-package-json@>=1.2.7-0 <1.3.0-0",
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.32",
+          "from": "readable-stream@*",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            }
+          }
+        },
+        "realize-package-specifier": {
+          "version": "1.1.0",
+          "from": "realize-package-specifier@1.1.0"
         },
         "request": {
-          "version": "2.30.0",
-          "from": "request@latest",
+          "version": "2.44.0",
+          "from": "request@>=2.44.0 <2.45.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.44.0.tgz",
           "dependencies": {
+            "bl": {
+              "version": "0.9.3",
+              "from": "bl@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz"
+            },
+            "caseless": {
+              "version": "0.6.0",
+              "from": "caseless@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+            },
+            "forever-agent": {
+              "version": "0.5.2",
+              "from": "forever-agent@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+            },
             "qs": {
-              "version": "0.6.6",
-              "from": "qs@~0.6.0"
+              "version": "1.2.2",
+              "from": "qs@>=1.2.0 <1.3.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
             },
             "json-stringify-safe": {
               "version": "5.0.0",
-              "from": "json-stringify-safe@~5.0.0"
+              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
             },
-            "forever-agent": {
-              "version": "0.5.0",
-              "from": "forever-agent@~0.5.0"
+            "mime-types": {
+              "version": "1.0.2",
+              "from": "mime-types@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
             },
             "node-uuid": {
               "version": "1.4.1",
-              "from": "node-uuid@~1.4.0"
+              "from": "node-uuid@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
             },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@~1.2.9"
+            "tunnel-agent": {
+              "version": "0.4.0",
+              "from": "tunnel-agent@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
             },
             "tough-cookie": {
-              "version": "0.9.15",
-              "from": "tough-cookie@~0.9.15",
+              "version": "0.12.1",
+              "from": "tough-cookie@>=0.12.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
               "dependencies": {
                 "punycode": {
-                  "version": "1.2.3",
-                  "from": "punycode@>=0.2.0"
+                  "version": "1.3.1",
+                  "from": "punycode@>=0.2.0",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
                 }
               }
             },
             "form-data": {
-              "version": "0.1.2",
-              "from": "form-data@~0.1.0",
+              "version": "0.1.4",
+              "from": "form-data@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
               "dependencies": {
                 "combined-stream": {
-                  "version": "0.0.4",
-                  "from": "combined-stream@~0.0.4",
+                  "version": "0.0.5",
+                  "from": "combined-stream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
                   "dependencies": {
                     "delayed-stream": {
                       "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5"
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                     }
                   }
                 },
+                "mime": {
+                  "version": "1.2.11",
+                  "from": "mime@>=1.2.11 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                },
                 "async": {
-                  "version": "0.2.9",
-                  "from": "async@~0.2.9"
+                  "version": "0.9.0",
+                  "from": "async@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
                 }
               }
             },
-            "tunnel-agent": {
-              "version": "0.3.0",
-              "from": "tunnel-agent@~0.3.0"
-            },
             "http-signature": {
               "version": "0.10.0",
-              "from": "http-signature@~0.10.0",
+              "from": "http-signature@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
               "dependencies": {
                 "assert-plus": {
                   "version": "0.1.2",
-                  "from": "assert-plus@0.1.2"
+                  "from": "assert-plus@0.1.2",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
                 },
                 "asn1": {
                   "version": "0.1.11",
-                  "from": "asn1@0.1.11"
+                  "from": "asn1@0.1.11",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
                 },
                 "ctype": {
                   "version": "0.5.2",
-                  "from": "ctype@0.5.2"
+                  "from": "ctype@0.5.2",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
                 }
               }
             },
             "oauth-sign": {
-              "version": "0.3.0",
-              "from": "oauth-sign@~0.3.0"
+              "version": "0.4.0",
+              "from": "oauth-sign@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
             },
             "hawk": {
-              "version": "1.0.0",
-              "from": "hawk@~1.0.0",
+              "version": "1.1.1",
+              "from": "hawk@1.1.1",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
               "dependencies": {
                 "hoek": {
                   "version": "0.9.1",
-                  "from": "hoek@0.9.x"
+                  "from": "hoek@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                 },
                 "boom": {
                   "version": "0.4.2",
-                  "from": "boom@0.4.x"
+                  "from": "boom@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
                 },
                 "cryptiles": {
                   "version": "0.2.2",
-                  "from": "cryptiles@0.2.x"
+                  "from": "cryptiles@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
                 },
                 "sntp": {
                   "version": "0.2.4",
-                  "from": "sntp@0.2.x"
+                  "from": "sntp@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
                 }
               }
             },
             "aws-sign2": {
               "version": "0.5.0",
-              "from": "aws-sign2@~0.5.0"
+              "from": "aws-sign2@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+            },
+            "stringstream": {
+              "version": "0.0.4",
+              "from": "stringstream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
             }
           }
         },
@@ -790,49 +849,28 @@
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
         },
         "semver": {
-          "version": "2.3.0",
-          "from": "semver@latest"
+          "version": "4.0.0",
+          "from": "semver@>=4.0.0-0 <5.0.0-0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.0.0.tgz"
         },
         "sha": {
           "version": "1.2.4",
-          "from": "sha@latest",
-          "resolved": "https://registry.npmjs.org/sha/-/sha-1.2.4.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.27-1",
-              "from": "readable-stream@1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.25-1",
-                  "from": "string_decoder@~0.10.x",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
-                }
-              }
-            }
-          }
+          "from": "sha@>=1.2.1 <1.3.0",
+          "resolved": "https://registry.npmjs.org/sha/-/sha-1.2.4.tgz"
         },
         "slide": {
-          "version": "1.1.5",
-          "from": "slide@latest"
+          "version": "1.1.6",
+          "from": "slide@>=1.1.6 <1.2.0",
+          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
         },
         "sorted-object": {
           "version": "1.0.0",
           "from": "sorted-object@"
         },
         "tar": {
-          "version": "0.1.20",
-          "from": "tar@~0.1.19"
+          "version": "1.0.1",
+          "from": "tar@1.0.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz"
         },
         "text-table": {
           "version": "0.2.0",
@@ -847,19 +885,21 @@
           "version": "1.0.5",
           "from": "which@1"
         },
-        "inherits": {
-          "version": "2.0.1",
-          "from": "inherits@"
+        "wrappy": {
+          "version": "1.0.1",
+          "from": "wrappy@1.0.1",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
         },
-        "normalize-package-data": {
-          "version": "0.4.1",
-          "from": "normalize-package-data@0.4.1"
+        "write-file-atomic": {
+          "version": "1.1.0",
+          "from": "write-file-atomic@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz"
         }
       }
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -869,70 +909,60 @@
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+          "from": "wordwrap@~0.0.2"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+          "from": "minimist@~0.0.1"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+      "from": "progress@1.1.7"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.3.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+          "from": "pkginfo@0.x.x"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.5",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+          "from": "read@1.0.x",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@0.0.4"
+              "from": "mute-stream@~0.0.4"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.8",
-          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+          "from": "revalidator@0.1.x"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.1",
-          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@0.2.x",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@0.2.10",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+              "from": "async@~0.2.9"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@0.2.1",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
+              "from": "deep-equal@*"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.2",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
+              "from": "i@0.3.x"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@0.x.x",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
@@ -943,45 +973,37 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "from": "rimraf@2.x.x"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@0.6.x",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.22",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+              "from": "async@0.1.x"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.3",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+              "from": "cycle@1.0.x"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.8",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+              "from": "eyes@0.1.x"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.3",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+              "from": "pkginfo@0.2.x"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.203",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+              "from": "request@2.9.x"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.9",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+              "from": "stack-trace@0.0.x"
             }
           }
         }
@@ -994,41 +1016,37 @@
     },
     "request": {
       "version": "2.27.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
+      "from": "request@2.27.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@0.6.6",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+          "from": "qs@~0.6.0"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@5.0.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "from": "json-stringify-safe@~5.0.0"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@0.5.2",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+          "from": "forever-agent@~0.5.0"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@0.3.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
+          "from": "tunnel-agent@~0.3.0"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@0.10.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+          "from": "http-signature@~0.10.0",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "assert-plus@0.1.2"
+              "from": "assert-plus@0.1.2",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
@@ -1039,135 +1057,118 @@
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@1.0.0",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+          "from": "hawk@~1.0.0",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.1",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+              "from": "hoek@0.9.x"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.2",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+              "from": "boom@0.4.x"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.2",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+              "from": "cryptiles@0.2.x"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.4",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+              "from": "sntp@0.2.x"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@0.3.0",
-          "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
+          "from": "aws-sign@~0.3.0"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@0.3.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+          "from": "oauth-sign@~0.3.0"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@0.3.0",
-          "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
+          "from": "cookie-jar@~0.3.0"
         },
         "node-uuid": {
           "version": "1.4.1",
-          "from": "node-uuid@1.4.1",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+          "from": "node-uuid@~1.4.0"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+          "from": "mime@1.2.11"
         }
       }
     },
     "serve-static": {
       "version": "1.6.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
+      "from": "serve-static@1.6.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+          "from": "escape-html@1.0.1"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@1.3.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+          "from": "parseurl@~1.3.0"
         },
         "send": {
           "version": "0.9.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
+          "from": "send@0.9.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.0.0",
-              "from": "debug@2.0.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz"
+              "from": "debug@~2.0.0"
             },
             "depd": {
               "version": "0.4.4",
-              "from": "depd@0.4.4",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"
+              "from": "depd@0.4.4"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
-              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+              "from": "destroy@1.0.3"
             },
             "etag": {
-              "version": "1.3.0",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.3.0.tgz",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.0.tgz",
+              "version": "1.3.1",
+              "from": "etag@~1.3.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.1.tgz",
               "dependencies": {
-                "buffer-crc32": {
-                  "version": "0.2.3",
-                  "from": "buffer-crc32@0.2.3",
-                  "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"
+                "crc": {
+                  "version": "3.0.0",
+                  "from": "crc@3.0.0",
+                  "resolved": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+              "from": "mime@1.2.11"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.0",
               "from": "on-finished@2.1.0",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.0.5",
-                  "from": "ee-first@1.0.5",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
+                  "from": "ee-first@1.0.5"
                 }
               }
             },
             "range-parser": {
-              "version": "1.0.1",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.1.tgz"
+              "version": "1.0.2",
+              "from": "range-parser@~1.0.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
@@ -1180,38 +1181,33 @@
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+          "from": "qs@~0.5.2"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+          "from": "faye-websocket@~0.4.3"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@0.0.3",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@~0.0.3",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@~2.0.0",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1.0.5",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                  "from": "abbrev@1"
                 }
               }
             }
@@ -1219,33 +1215,31 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+          "from": "debug@~0.7.0"
         }
       }
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@~0.1.21",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.2",
-              "from": "graceful-fs@3.0.2",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+              "version": "3.0.4",
+              "from": "graceful-fs@~3.0.2",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1"
+              "from": "inherits@~2.0.0"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@0.5",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
@@ -1256,61 +1250,54 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "from": "rimraf@2"
             }
           }
         },
         "pullstream": {
-          "version": "0.4.0",
-          "from": "pullstream@0.4.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz",
+          "version": "0.4.1",
+          "from": "pullstream@~0.4.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@0.0.5",
-              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+              "from": "over@>= 0.0.5 < 1"
             },
             "slice-stream": {
-              "version": "0.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz"
+              "version": "1.0.0",
+              "from": "slice-stream@>= 1.0.0 < 2",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@0.3.0",
-          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@~0.3.0",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@0.1.0",
-              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@~0.1.0",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                  "from": "traverse@>=0.3.0 <0.4"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+              "from": "buffers@~0.1.1"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.31",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+          "version": "1.0.33-1",
+          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "from": "core-util-is@~1.0.0"
             },
             "isarray": {
               "version": "0.0.1",
@@ -1318,29 +1305,25 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "from": "string_decoder@~0.10.x"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1"
+              "from": "inherits@~2.0.1"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@1.0.2",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
+          "from": "setimmediate@~1.0.1"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@0.0.2",
-          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@~0.0.2",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+              "from": "buffers@~0.1.1"
             }
           }
         }
@@ -1348,115 +1331,102 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.15",
-          "from": "glob-stream@3.1.15",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
+          "from": "glob-stream@^3.1.5",
           "dependencies": {
             "glob": {
-              "version": "4.0.5",
-              "from": "glob@4.0.5",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz",
+              "version": "4.0.6",
+              "from": "glob@^4.0.0",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1"
+                  "from": "inherits@2"
                 },
                 "once": {
-                  "version": "1.3.0",
-                  "from": "once@1.3.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz"
+                  "version": "1.3.1",
+                  "from": "once@^1.3.0",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@1"
+                    }
+                  }
                 }
               }
             },
             "minimatch": {
               "version": "1.0.0",
-              "from": "minimatch@1.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "from": "minimatch@^1.0.0",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                  "from": "lru-cache@2"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                  "from": "sigmund@~1.0.0"
                 }
               }
             },
             "ordered-read-streams": {
               "version": "0.0.8",
-              "from": "ordered-read-streams@0.0.8",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
+              "from": "ordered-read-streams@0.0.8"
             },
             "glob2base": {
               "version": "0.0.11",
-              "from": "glob2base@0.0.11",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
+              "from": "glob2base@^0.0.11"
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@1.0.0",
-              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+              "from": "unique-stream@^1.0.0"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@0.0.6",
-          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@^0.0.6",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@0.5.1",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@^0.5.1",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@0.1.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@~0.1.0",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@1.0.1",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
+                      "from": "lodash@~1.0.1"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@3.1.21",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@~3.1.21",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@1.2.3",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                          "from": "graceful-fs@~1.2.0"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                          "from": "inherits@1"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@0.2.14",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@~0.2.11",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2.5.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "from": "lru-cache@2"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@1.0.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "from": "sigmund@~1.0.0"
                         }
                       }
                     }
@@ -1467,57 +1437,52 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.2",
-          "from": "graceful-fs@3.0.2",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+          "version": "3.0.4",
+          "from": "graceful-fs@^3.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "from": "lodash@~2.4.1"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@0.5.0",
+          "from": "mkdirp@0.x.x",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@1.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@^1.0.0",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@1.0.0",
-              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+              "from": "first-chunk-stream@^1.0.0"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@0.2.0",
-              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+              "from": "is-utf8@^0.2.0"
             }
           }
         },
         "through2": {
-          "version": "0.6.1",
-          "from": "through2@0.6.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.1.tgz",
+          "version": "0.6.3",
+          "from": "through2@^0.6.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.31",
-              "from": "readable-stream@1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
+              "version": "1.0.33-1",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -1525,31 +1490,27 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1"
+                  "from": "inherits@~2.0.1"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@4.0.0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+              "from": "xtend@>=4.0.0 <4.1.0-0"
             }
           }
         },
         "vinyl": {
           "version": "0.4.3",
-          "from": "vinyl@0.4.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
+          "from": "vinyl@^0.4.0",
           "dependencies": {
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@0.0.1",
-              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+              "from": "clone-stats@^0.0.1"
             }
           }
         }
@@ -1558,22 +1519,19 @@
     "xml2js": {
       "version": "0.4.4",
       "from": "xml2js@0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
-          "version": "0.6.0",
-          "from": "sax@0.6.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.0.tgz"
+          "version": "0.6.1",
+          "from": "sax@0.6.x",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.4.3",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.3.tgz",
+          "version": "2.4.4",
+          "from": "xmlbuilder@>=1.0.0",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+              "from": "lodash-node@~2.4.1"
             }
           }
         }
diff --git a/package.json b/package.json
index 06fd6769b7..7b01ab1359 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8",
+  "version": "1.2.8-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -48,7 +48,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "ncp": "0.4.2",
-    "npm": "^1.4.6",
+    "npm": "2.1.3",
     "open": "0.0.5",
     "optimist": "0.6.0",
     "prompt": "0.2.12",

From 82d81152db235ed5727d2d22dee645047ce3d6a4 Mon Sep 17 00:00:00 2001
From: jeveloper <serge.bornow@gmail.com>
Date: Wed, 15 Oct 2014 16:54:07 -0400
Subject: [PATCH 0287/1100] Add gulp as an explicit dependency

Since we are using gulp, it shouldn't be assumed that developer has gulp installed.
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 7b01ab1359..9a5b513fca 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "event-stream": "3.0.x",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
+    "gulp": "~3.8.8",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "open": "0.0.5",

From 752eccdfba9d737d9f5f18b173d9552b8f93357e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 15 Oct 2014 22:44:42 -0500
Subject: [PATCH 0288/1100] v1.2.8

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 30dc222158..242cf60f8e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8-beta2",
+  "version": "1.2.8",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 7b01ab1359..8568052a25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8-beta2",
+  "version": "1.2.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 46440268bb4e872d84ddb58f27aae88ac47abba6 Mon Sep 17 00:00:00 2001
From: Sebastian Mach / phresnel <phresnel@gmail.com>
Date: Mon, 20 Oct 2014 17:49:44 +0200
Subject: [PATCH 0289/1100] add option to serve on specific address

Unlike with the saved address that was already implemented, this
option does not fallback onto another address, and instead exits
with failure, thus making it suitable for setup-scripting
---
 lib/ionic.js       |  3 ++-
 lib/ionic/serve.js | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 1bcc1e474a..cfe3ba4946 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -68,7 +68,8 @@ var TASKS = [
       '--port|-p': 'Dev server HTTP port (8100 default)',
       '--livereload-port|-r': 'Live Reload port (35729 default)',
       '--nobrowser|-b': 'Disable launching a browser',
-      '--nolivereload': 'Do not start live reload'
+      '--nolivereload': 'Do not start live reload',
+      '--address': 'Use specific address or return with failure',
     },
     module: './ionic/serve'
   },
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b69d64ea2b..06fd5946f6 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -523,14 +523,17 @@ IonicTask.prototype.getAddress = function(cb) {
     var ionicConfig = require('./config').load();
 
     var addressConfigKey = (self.isPlatformServe ? 'platformServeAddress' : 'ionicServeAddress');
-    var savedAddress;
+    var tryAddress;
 
     if(self.isAddressCmd) {
       // reset any address configs
       ionicConfig.set('ionicServeAddress', null);
       ionicConfig.set('platformServeAddress', null);
     } else {
-      savedAddress = ionicConfig.get(addressConfigKey);
+      if(!argv.address)
+        tryAddress = ionicConfig.get(addressConfigKey);
+      else
+        tryAddress = argv.address;
     }
 
     if(ifaces){
@@ -547,20 +550,24 @@ IonicTask.prototype.getAddress = function(cb) {
       }
     }
 
-    if(savedAddress) {
-      if(savedAddress == 'localhost') {
-        self.address = savedAddress;
+    if(tryAddress) {
+      if(tryAddress == 'localhost') {
+        self.address = tryAddress;
         cb();
         return;
       }
       for(var x=0; x<addresses.length; x++) {
         // double check if this address is still available
-        if(addresses[x].address == savedAddress) {
+        if(addresses[x].address == tryAddress)
+        {
           self.address = addresses[x].address;
           cb();
           return;
         }
       }
+      //console.log(('\nAddress ' + argv.address + ' not available.').error.bold);
+      self.ionic.fail('Address ' + argv.address + ' not available.');
+      return;
     }
 
     if(addresses.length > 0) {

From c6e91d35fc43ffe63292b2a3982e4d70d87571ea Mon Sep 17 00:00:00 2001
From: Sebastian Mach / phresnel <phresnel@gmail.com>
Date: Mon, 20 Oct 2014 18:07:00 +0200
Subject: [PATCH 0290/1100] fix: only early-exit for --address-option

---
 lib/ionic/serve.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 06fd5946f6..4ca808eacd 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -565,9 +565,10 @@ IonicTask.prototype.getAddress = function(cb) {
           return;
         }
       }
-      //console.log(('\nAddress ' + argv.address + ' not available.').error.bold);
-      self.ionic.fail('Address ' + argv.address + ' not available.');
-      return;
+      if (argv.address) {
+        self.ionic.fail('Address ' + argv.address + ' not available.');
+        return;
+      }
     }
 
     if(addresses.length > 0) {

From ebb64341e059154b61379260eaa5e22c121f4d39 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Donoso <jidonoso@gmail.com>
Date: Thu, 30 Oct 2014 16:55:11 -0300
Subject: [PATCH 0291/1100] adds proxy support to the serve command

---
 README.md          | 25 +++++++++++++++++++++++++
 lib/ionic.js       |  3 ++-
 lib/ionic/serve.js | 17 ++++++++++++++++-
 lib/ionic/stats.js |  3 ++-
 package.json       |  1 +
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fc53562cdd..8dfe8a08a1 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,30 @@ Use `ionic serve` to start a local development server for app dev and testing. T
 $ ionic serve [options]
 ```
 
+__Proxies:__
+
+The `serve` command can add some proxies to the http server. This proxies are useful if your are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
+
+In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with two properties:
+
+* `path`: string that will be matched against the beginning of the incoming request URL.
+* `options`: can be an array or an object. Allows any options that are permitted on the [http](http://nodejs.org/api/http.html#http_http_request_options_callback) request options.
+
+```json
+{
+  "name": "appname",
+  "email": "",
+  "app_id": "",
+  "proxies": [
+    {
+      "path": "/api",
+      "options": "http://my.server.com/api"
+    }
+  ]
+}
+
+```
+
 __Command-line flags/options:__
 
     [--consolelogs|-c] ......  Print app console logs to Ionic CLI
@@ -67,6 +91,7 @@ __Command-line flags/options:__
     [--livereload-port|-i] ..  Live Reload port (35729 default)
     [--nobrowser|-b] ........  Disable launching a browser
     [--nolivereload|-r] .....  Do not start live reload
+    [--noproxy|-x] ..........  Do not add proxies
 
 
 ## Adding a platform target
diff --git a/lib/ionic.js b/lib/ionic.js
index 1bcc1e474a..f0d8c21d70 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -68,7 +68,8 @@ var TASKS = [
       '--port|-p': 'Dev server HTTP port (8100 default)',
       '--livereload-port|-r': 'Live Reload port (35729 default)',
       '--nobrowser|-b': 'Disable launching a browser',
-      '--nolivereload': 'Do not start live reload'
+      '--nolivereload': 'Do not start live reload',
+      '--noproxy|-x': 'Do not add proxies'
     },
     module: './ionic/serve'
   },
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b69d64ea2b..6beb5b9e7b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -10,7 +10,9 @@ var fs = require('fs'),
     vfs = require('vinyl-fs'),
     request = require('request'),
     IonicProject = require('./project'),
-    Task = require('./task').Task;
+    Task = require('./task').Task,
+    proxyMiddleware = require('proxy-middleware'),
+    url = require('url');
     IonicStats = require('./stats').IonicStats;
 
 var DEFAULT_HTTP_PORT = 8100;
@@ -53,6 +55,8 @@ IonicTask.prototype.loadSettings = function(cb) {
 
   this.launchBrowser = !argv.nobrowser && !argv.b;
   this.runLivereload = !argv.nolivereload && !argv.r;
+  this.useProxy = !argv.noproxy && !argv.x;
+  this.proxies = project.get('proxies') || [];
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.gulpStartupTasks = project.get('gulpStartupTasks');
   this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
@@ -173,6 +177,17 @@ IonicTask.prototype.start = function(ionic) {
       }));
     }
 
+    if(this.useProxy) {
+
+      for(var x=0; x<this.proxies.length; x++) {
+        var proxy = this.proxies[x];
+
+        app.use(proxy.path, proxyMiddleware(url.parse(proxy.options)));
+        console.log('Proxy added:'.green.bold, proxy.path + " => " + url.format(proxy.options));
+      }
+    }
+
+
     this.devServer = this.host(this.port);
 
     // Serve up the www folder by default
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 230753c00f..4ea184cd2b 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -542,6 +542,7 @@ exports.IonicStats = {
         '-w': '--no-cordova',
         '-b': '--nobrowser',
         '-r': '--nolivereload',
+        '-x': '--noproxy',
         '-l': '--livereload',
         '-c': '--consolelogs',
         '-s': '--serverlogs',
@@ -557,7 +558,7 @@ exports.IonicStats = {
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --no-email --debug --release --device --emulator --sass'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass'.split(' ');
 
       // collect only certain args, skip over everything else
       for(x=0; x<cmdArgs.length; x++) {
diff --git a/package.json b/package.json
index c3ad358a6c..13ebc22bc0 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "optimist": "0.6.0",
     "prompt": "0.2.12",
     "progress": "1.1.7",
+    "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
     "request": "2.27.0",
     "serve-static": "1.6.1",

From 65045ec1d4ccb74f6af0bee8e1fc50b4fac94a58 Mon Sep 17 00:00:00 2001
From: Chakib Benziane <spykspygel@gmail.com>
Date: Sun, 2 Nov 2014 18:40:57 +0100
Subject: [PATCH 0292/1100] Use serve-static@1.7.1

serve-static 1.6.1 creates the following error when launching a dev server:

/home/spike/.nvm/v0.11.14/lib/node_modules/ionic/node_modules/serve-static/node_modules/send/node_modules/etag/index.js:55
    throw new TypeError('argument entity must be string, Buffer, or fs.Stats')
          ^
TypeError: argument entity must be string, Buffer, or fs.Stats
    at etag (/home/spike/.nvm/v0.11.14/lib/node_modules/ionic/node_modules/serve-static/node_modules/send/node_modules/etag/index.js:
55:11)
    at SendStream.setHeader (/home/spike/.nvm/v0.11.14/lib/node_modules/ionic/node_modules/serve-static/node_modules/send/index.js:72
4:15)
    at SendStream.send (/home/spike/.nvm/v0.11.14/lib/node_modules/ionic/node_modules/serve-static/node_modules/send/index.js:500:8)
    at onstat (/home/spike/.nvm/v0.11.14/lib/node_modules/ionic/node_modules/serve-static/node_modules/send/index.js:585:10)
    at Object.oncomplete (fs.js:93:15)
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c3ad358a6c..4bf76277e1 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "progress": "1.1.7",
     "q": "1.0.1",
     "request": "2.27.0",
-    "serve-static": "1.6.1",
+    "serve-static": "1.7.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
     "unzip": "0.1.9",

From 69a59aff84eee3ec660a15a40475e90d685956a3 Mon Sep 17 00:00:00 2001
From: Guillermo Ferrer <guilleferrer@gmail.com>
Date: Thu, 6 Nov 2014 11:31:54 +0100
Subject: [PATCH 0293/1100] feat(serve): Project Level configurable
 DocumentRoot

---
 lib/ionic/serve.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b69d64ea2b..bd61a9c484 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -59,7 +59,8 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.isAddressCmd = argv._[0].toLowerCase() == 'address';
-  this.contentSrc = path.join('www', this.ionic.getContentSrc());
+  this.documentRoot = project.get('documentRoot') || 'www';
+  this.contentSrc = path.join(this.documentRoot, this.ionic.getContentSrc());
 
   this.getAddress(cb);
 
@@ -121,7 +122,7 @@ IonicTask.prototype.start = function(ionic) {
     var self = this;
     var app = connect();
 
-    if (!fs.existsSync( path.resolve('www') )) {
+    if (!fs.existsSync( path.resolve(this.documentRoot) )) {
       return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
     }
 
@@ -176,7 +177,7 @@ IonicTask.prototype.start = function(ionic) {
     this.devServer = this.host(this.port);
 
     // Serve up the www folder by default
-    var serve = serveStatic('www');
+    var serve = serveStatic(this.documentRoot);
 
     // Create static server
     var server = http.createServer(function(req, res){

From 6b9a86b63a5e716412d80220daad605e7cbdd251 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Dec 2014 16:03:44 -0700
Subject: [PATCH 0294/1100] Including notes on the top, as well as the
 beginning of the crosswalk command

---
 lib/ionic/CrosswalkNotes.md | 18 +++++++++++++
 lib/ionic/crosswalk.js      | 51 +++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 lib/ionic/CrosswalkNotes.md
 create mode 100644 lib/ionic/crosswalk.js

diff --git a/lib/ionic/CrosswalkNotes.md b/lib/ionic/CrosswalkNotes.md
new file mode 100644
index 0000000000..089b730a1a
--- /dev/null
+++ b/lib/ionic/CrosswalkNotes.md
@@ -0,0 +1,18 @@
+Crosswalk Notes
+
+Cloned down Cordova android 4.0.x
+Ran download shell
+Copied files into plugin libs
+Plugin add that downloaded plugin
+
+
+When running `cordova run android` -
+-----------------------
+* Where:
+Script '/Users/JoshBavari/Development/testing/crosswalk-engine/platforms/android/cordova.gradle' line: 59
+
+* What went wrong:
+A problem occurred evaluating script.
+> No installed build tools found. Please install the Android build tools version 19.1.0 or higher.
+
+Had to bump the minversionnumber in platform/android/AndroidManifest.xml to 14 from 10.
diff --git a/lib/ionic/crosswalk.js b/lib/ionic/crosswalk.js
new file mode 100644
index 0000000000..dcd0f9afb0
--- /dev/null
+++ b/lib/ionic/crosswalk.js
@@ -0,0 +1,51 @@
+//Cross walk process
+//the bin/create method fires off the android update project
+
+// A few notes
+// Stuck currently to cordova android 3.5 - that means restricting cordova plugins to whatever was working with 3.5
+
+
+
+//Install the crosswalk latest files
+// cordova platform remove android
+// cordova platform add android@3.5
+var path = require('path');
+
+var XWALK_LIBRARY_PATH = path.join(process.cwd(), 'tmp', 'xwalk');
+var ARM_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/arm/crosswalk-webview-8.37.189.0-arm.zip";
+var X86_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/x86/crosswalk-webview-8.37.189.0-x86.zip";
+
+function downloadFiles() {
+	var tempDir = '../../tmp/crosswalk-engine';
+	//Download ARM
+	//unzip ARM
+	//rm zip
+	var libCrossWalk = path.join(process.cwd(), 'libs', 'xwalk_core_library');
+
+}
+
+function updateCrosswalkProject() {
+	// prepare xwalk_core_library
+	if(fs.existsSync(XWALK_LIBRARY_PATH)) {
+	    exec('android update lib-project --path "' + XWALK_LIBRARY_PATH + '" --target "' + target_api + '"' )
+	} else {
+	    // TODO(wang16): download xwalk core library here
+	    return Q.reject('No XWalk Library Project found. Please download it and extract it to $XWALK_LIBRARY_PATH')
+	}
+}
+// download() {
+//     TMPDIR=cordova-crosswalk-engine-$$
+//     pushd $TMPDIR > /dev/null
+//     echo "Fetching $1..."
+//     curl -# $1 -o library.zip
+//     unzip -q library.zip
+//     rm library.zip
+//     PACKAGENAME=$(ls|head -n 1)
+//     echo "Installing $PACKAGENAME into xwalk_core_library..."
+//     cp -a $PACKAGENAME/* ../libs/xwalk_core_library
+//     popd > /dev/null
+//     rm -r $TMPDIR
+// }
+
+// download $ARM_DOWNLOAD
+// download $X86_DOWNLOAD

From 2a64ec980a5b19d9e4d66928277391aa595e1b3f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Dec 2014 17:54:47 -0700
Subject: [PATCH 0295/1100] Fix for documentation about proxy settings

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8dfe8a08a1..7108381aff 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,7 @@ The `serve` command can add some proxies to the http server. This proxies are us
 
 In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with two properties:
 
-* `path`: string that will be matched against the beginning of the incoming request URL.
-* `options`: can be an array or an object. Allows any options that are permitted on the [http](http://nodejs.org/api/http.html#http_http_request_options_callback) request options.
+Say you want to intercept all calls to your server `http://localhost:8100/api` to go instead to `http://my.server.com/api` - use the following configuration:
 
 ```json
 {
@@ -83,6 +82,10 @@ In the `ionic.project` file you can add a property with an array of proxies you
 
 ```
 
+* `path`: string that will be matched against after the host in the request URL (for example, the `/api` in `http://localhost:8100/api`)
+* `options`: a string of the address to proxy to. Allows any options that are permitted on the [http](http://nodejs.org/api/http.html#http_http_request_options_callback) request options.
+
+
 __Command-line flags/options:__
 
     [--consolelogs|-c] ......  Print app console logs to Ionic CLI

From 3afbf206e1fe1c9449307ff59ce6213c2bb2d6f3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Dec 2014 23:56:13 -0700
Subject: [PATCH 0296/1100] Renaming to browser

---
 lib/ionic/browser.js   | 126 +++++++++++++++++++++++++++++++++++++++++
 lib/ionic/crosswalk.js |  51 -----------------
 2 files changed, 126 insertions(+), 51 deletions(-)
 create mode 100644 lib/ionic/browser.js
 delete mode 100644 lib/ionic/crosswalk.js

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
new file mode 100644
index 0000000000..2c8aa36f44
--- /dev/null
+++ b/lib/ionic/browser.js
@@ -0,0 +1,126 @@
+//Cross walk process
+
+//See the cordova-engine-crosswalk plugin for how to install the browser as a plugin
+//https://github.com/MobileChromeApps/cordova-crosswalk-engine
+
+//Find CrossWalk webviews here:
+//https://download.01.org/crosswalk/releases/crosswalk/android/stable/
+
+//Clone the git repo for cordova-crosswalk-engine
+//Clone the git repo for cordova-android 4.0.x
+//Ensure Android API 19 is installed
+//Run cordova platform rm android
+//Run cordova platform add ./engine/cordova-android@4.0.x
+//Run cordova plugin add ./engine/cordova-crosswalk-engine
+//Run android update project on android file
+//Run project
+
+//Install the crosswalk latest files
+// cordova platform remove android
+// cordova platform add android@3.5
+var path = require('path'),
+    shelljs = require('shelljs');
+
+var XWALK_LIBRARY_PATH = path.join(process.cwd(), 'tmp', 'xwalk');
+var ARM_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/arm/crosswalk-webview-8.37.189.0-arm.zip";
+var X86_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/x86/crosswalk-webview-8.37.189.0-x86.zip";
+
+function downloadFiles() {
+	var tempDir = '../../tmp/crosswalk-engine';
+	//Download ARM
+	//unzip ARM
+	//rm zip
+	var libCrossWalk = path.join(process.cwd(), 'libs', 'xwalk_core_library');
+
+}
+
+function updateCrosswalkProject() {
+	// prepare xwalk_core_library
+	if(fs.existsSync(XWALK_LIBRARY_PATH)) {
+	    exec('android update lib-project --path "' + XWALK_LIBRARY_PATH + '" --target "' + target_api + '"' )
+	} else {
+	    // TODO(wang16): download xwalk core library here
+	    return Q.reject('No XWalk Library Project found. Please download it and extract it to $XWALK_LIBRARY_PATH')
+	}
+}
+
+function ensureAndroidLibs() {
+  var command = 'echo "y" | android update sdk --no-ui --filter 19 --force';
+  var result = shelljs.exec(command);
+
+  if(result.code != 0) {
+    console.log('error!');
+  }
+
+}
+// download() {
+//     TMPDIR=cordova-crosswalk-engine-$$
+//     pushd $TMPDIR > /dev/null
+//     echo "Fetching $1..."
+//     curl -# $1 -o library.zip
+//     unzip -q library.zip
+//     rm library.zip
+//     PACKAGENAME=$(ls|head -n 1)
+//     echo "Installing $PACKAGENAME into xwalk_core_library..."
+//     cp -a $PACKAGENAME/* ../libs/xwalk_core_library
+//     popd > /dev/null
+//     rm -r $TMPDIR
+// }
+
+// download $ARM_DOWNLOAD
+// download $X86_DOWNLOAD
+
+
+
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    proxyMiddleware = require('proxy-middleware'),
+    IonicStats = require('./stats').IonicStats;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.getCrosswalkEngine = function getCrosswalkEngine() {
+  if(!fs.existsSync(path.join(process.cwd(), 'engine'))) {
+    shelljs.mkdir(path.join(process.cwd(), 'engine'));
+  }
+
+  var downloadResult = shelljs.exec('git clone git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
+
+  if(downloadResult.code == 1) {
+    //LOG ERROR
+  }
+}
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+  this.ionic = ionic;
+
+
+  this.getCrosswalkEngine();
+
+  this.getAndroidRuntimes();
+
+  this.getCrosswalkWebviews();
+
+  this.getCordovaAndroid40x();
+
+  this.removeAndroidProject();
+
+  this.addCordova40xProject();
+
+  this.updateAndroidProject();
+  // this.port = argv._[1];
+  // this.liveReloadPort = argv._[2];
+
+  IonicStats.t();
+
+};
+
+
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/crosswalk.js b/lib/ionic/crosswalk.js
deleted file mode 100644
index dcd0f9afb0..0000000000
--- a/lib/ionic/crosswalk.js
+++ /dev/null
@@ -1,51 +0,0 @@
-//Cross walk process
-//the bin/create method fires off the android update project
-
-// A few notes
-// Stuck currently to cordova android 3.5 - that means restricting cordova plugins to whatever was working with 3.5
-
-
-
-//Install the crosswalk latest files
-// cordova platform remove android
-// cordova platform add android@3.5
-var path = require('path');
-
-var XWALK_LIBRARY_PATH = path.join(process.cwd(), 'tmp', 'xwalk');
-var ARM_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/arm/crosswalk-webview-8.37.189.0-arm.zip";
-var X86_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/x86/crosswalk-webview-8.37.189.0-x86.zip";
-
-function downloadFiles() {
-	var tempDir = '../../tmp/crosswalk-engine';
-	//Download ARM
-	//unzip ARM
-	//rm zip
-	var libCrossWalk = path.join(process.cwd(), 'libs', 'xwalk_core_library');
-
-}
-
-function updateCrosswalkProject() {
-	// prepare xwalk_core_library
-	if(fs.existsSync(XWALK_LIBRARY_PATH)) {
-	    exec('android update lib-project --path "' + XWALK_LIBRARY_PATH + '" --target "' + target_api + '"' )
-	} else {
-	    // TODO(wang16): download xwalk core library here
-	    return Q.reject('No XWalk Library Project found. Please download it and extract it to $XWALK_LIBRARY_PATH')
-	}
-}
-// download() {
-//     TMPDIR=cordova-crosswalk-engine-$$
-//     pushd $TMPDIR > /dev/null
-//     echo "Fetching $1..."
-//     curl -# $1 -o library.zip
-//     unzip -q library.zip
-//     rm library.zip
-//     PACKAGENAME=$(ls|head -n 1)
-//     echo "Installing $PACKAGENAME into xwalk_core_library..."
-//     cp -a $PACKAGENAME/* ../libs/xwalk_core_library
-//     popd > /dev/null
-//     rm -r $TMPDIR
-// }
-
-// download $ARM_DOWNLOAD
-// download $X86_DOWNLOAD

From 5e9313a37cf19c19bd336a30786184f82b146c93 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Dec 2014 23:56:37 -0700
Subject: [PATCH 0297/1100] Bumping version to 1.2.9

---
 lib/ionic.js | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index f0d8c21d70..683013df28 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -236,6 +236,15 @@ var TASKS = [
     //   '--uuid|-u': 'Mark an already uploaded version as deployed'
     // },
     module: './ionic/app'
+   },
+   {
+    title: 'browser',
+    name: 'browser',
+    summary: 'Add another broswer for a platform ' + '(beta)'.yellow,
+    args: {
+      '[sass]': 'Setup the project to use Sass CSS precompiling'
+    },
+    module: './ionic/browser'
    }
 ];
 
diff --git a/package.json b/package.json
index 13ebc22bc0..13b3d6cb5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8",
+  "version": "1.2.9-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 0e90497980eac8daa02811ee8b5d9d857f569d1a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Dec 2014 23:57:28 -0700
Subject: [PATCH 0298/1100] Wrong version, meant 1.3.0-beta.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 13b3d6cb5f..864e2d4522 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.9-beta.1",
+  "version": "1.3.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 2a7f6af83f6b417776de7cb6d0f0c9cd54cc150f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 6 Dec 2014 02:33:01 -0700
Subject: [PATCH 0299/1100] Automation of installation for Crosswalk as a
 plugin 'browser'. Only needs to modify the uses-sdk minsdkversion to 10 to
 work with 2.3

---
 lib/ionic/browser.js | 132 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 108 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 2c8aa36f44..510d8b57e8 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -13,7 +13,7 @@
 //Run cordova platform add ./engine/cordova-android@4.0.x
 //Run cordova plugin add ./engine/cordova-crosswalk-engine
 //Run android update project on android file
-//Run project
+//Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
 //Install the crosswalk latest files
 // cordova platform remove android
@@ -44,15 +44,45 @@ function updateCrosswalkProject() {
 	}
 }
 
-function ensureAndroidLibs() {
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    proxyMiddleware = require('proxy-middleware'),
+    IonicStats = require('./stats').IonicStats;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.getCrosswalkEngine = function getCrosswalkEngine() {
+  if(!fs.existsSync(path.join(process.cwd(), 'engine'))) {
+    shelljs.mkdir(path.join(process.cwd(), 'engine'));
+  }
+
+  if(fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine'))) {
+    return; //It exists, nothing to do here.
+  }
+
+  shelljs.cd(path.join(process.cwd(), 'engine'));
+  var downloadResult = shelljs.exec('git clone --depth=1 git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
+  shelljs.cd('..')
+
+  if(downloadResult.code == 1) {
+    //LOG ERROR
+  }
+}
+
+IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   var command = 'echo "y" | android update sdk --no-ui --filter 19 --force';
   var result = shelljs.exec(command);
 
   if(result.code != 0) {
     console.log('error!');
   }
-
 }
+
 // download() {
 //     TMPDIR=cordova-crosswalk-engine-$$
 //     pushd $TMPDIR > /dev/null
@@ -70,30 +100,86 @@ function ensureAndroidLibs() {
 // download $ARM_DOWNLOAD
 // download $X86_DOWNLOAD
 
+function downloadCrosswalkEngine(architecture, version) {
+  var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
+    version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip -o library.zip';
 
+  //Ensure xwalk-webviews folder exists
+  if (!fs.existsSync(path.join(process.cwd(), 'engine', 'xwalk-webviews'))) {
+    shelljs.mkdir(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
+  }
 
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    shelljs = require('shelljs'),
-    Task = require('./task').Task,
-    proxyMiddleware = require('proxy-middleware'),
-    IonicStats = require('./stats').IonicStats;
+  shelljs.cd(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
 
-var IonicTask = function() {};
+  console.log('Downloading the crosswalk webview for ' + architecture + ', version ' + version);
+  var resultCurl = shelljs.exec(command);
 
-IonicTask.prototype = new Task();
+  //TODO: Check for resultCurl
 
-IonicTask.prototype.getCrosswalkEngine = function getCrosswalkEngine() {
-  if(!fs.existsSync(path.join(process.cwd(), 'engine'))) {
-    shelljs.mkdir(path.join(process.cwd(), 'engine'));
-  }
+  console.log('Unzipping webview binaries')
+  var unzipCommand = 'unzip -q library.zip -d unzipped';
+  var resultUnzip =  shelljs.exec(unzipCommand);
+  var fileName = fs.readdirSync('unzipped')[0];
 
-  var downloadResult = shelljs.exec('git clone git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
+  console.log('file name: ', fileName);
 
-  if(downloadResult.code == 1) {
-    //LOG ERROR
+  shelljs.cd('../../'); //Back at process.cwd() in ionic project root
+
+  var copySource = path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped', fileName, '*');
+  console.log('copy source ', copySource)
+  var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library', '/');
+  var cpArmLibsCommand = 'cp -r ' + copySource + ' ' + copyDestination;
+  console.log('command: ', cpArmLibsCommand);
+  shelljs.exec(cpArmLibsCommand);
+
+  shelljs.rm('-rf', path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped'));
+
+}
+
+IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews() {
+  // var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/8.37.189.14/arm/crosswalk-webview-8.37.189.14-arm.zip -o arm.zip';
+  var version = '8.37.189.14';
+
+  downloadCrosswalkEngine('arm', version);
+  downloadCrosswalkEngine('x86', version);
+}
+
+IonicTask.prototype.getCordovaAndroid40x = function getCordovaAndroid40x() {
+  if (fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-android'))) {
+    return;
   }
+  var command = 'git clone --depth=1 -b 4.0.x git@github.com:apache/cordova-android.git';
+
+  shelljs.cd(path.join(process.cwd(), 'engine'));
+
+  var result = shelljs.exec(command);
+
+  shelljs.cd('..');
+}
+
+IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
+  var command = 'cordova platform remove android';
+  var result = shelljs.exec(command);
+}
+
+IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
+  var command =  'cordova platform add ./engine/cordova-android/';
+  var result = shelljs.exec(command);
+}
+
+IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
+  var command = 'cordova plugin add ./engine/cordova-crosswalk-engine';
+  var result = shelljs.exec(command);
+}
+
+IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
+  var xwalkLibraryPath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library');
+
+  shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
+
+  shelljs.exec('android update lib-project --path "' + xwalkLibraryPath + '" --target "4"');
+
+  shelljs.cd('../../');
 }
 
 IonicTask.prototype.run = function(ionic) {
@@ -113,14 +199,12 @@ IonicTask.prototype.run = function(ionic) {
 
   this.addCordova40xProject();
 
+  this.addCrosswalkPlugin();
+
   this.updateAndroidProject();
-  // this.port = argv._[1];
-  // this.liveReloadPort = argv._[2];
 
-  IonicStats.t();
+  // IonicStats.t();
 
 };
 
-
-
 exports.IonicTask = IonicTask;

From 67fd21f02034cb844bcd231b85cee8ae80cfee70 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 8 Dec 2014 14:51:12 -0600
Subject: [PATCH 0300/1100] feat(lab): first version of Ionic Lab

---
 lib/ionic/assets/preview.html |  144 +++++
 lib/ionic/serve.js            |   17 +-
 npm-shrinkwrap.json           | 1040 ++++++++++++++++++++++++++-------
 3 files changed, 1002 insertions(+), 199 deletions(-)
 create mode 100644 lib/ionic/assets/preview.html

diff --git a/lib/ionic/assets/preview.html b/lib/ionic/assets/preview.html
new file mode 100644
index 0000000000..25e11303b9
--- /dev/null
+++ b/lib/ionic/assets/preview.html
@@ -0,0 +1,144 @@
+<!doctype html>
+<html>
+  <head>
+    <style>
+      body {
+        background-color: #31363f;
+        font-family: 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+        padding: 0;
+        margin: 0;
+      }
+      preview {
+        display: block;
+        max-width: 840px;
+        margin: 30px auto 0 auto;
+        overflow: auto;
+      }
+      h2 {
+        color: #fff;
+        font-weight: 200;
+        letter-spacing: 1px;
+      }
+      #header {
+      }
+      #header #left {
+        position: absolute; 
+        left: 20px;
+        top: 20px;
+      }
+      #header {
+        position: fixed;
+        top: 30px;
+        right: 20px;
+      }
+      #header a {
+        color: #fff;
+        display: inline-block;
+        margin: 0px 9px;
+        opacity: 0.4;
+        font-size: 90%;
+        letter-spacing: 1px;
+        text-decoration: none;
+      }
+      #header a:hover {
+        opacity: 1;
+      }
+      .phone {
+        float: left;
+        margin: 20px;
+      }
+      .frame {
+        border: 6px solid #121316;
+        border-radius: 3px;
+      }
+      #iphone-frame {
+        top: 109px;
+        left: 25px;
+        width: 375px;
+        height: 667px;
+      }
+      #android-frame {
+        top: 88px;
+        left: 24px;
+        width: 360px;
+        height: 640px;
+      }
+      #iphone {
+      }
+      #android {
+      }
+      #logo {
+        display: block;
+        width: 48px;
+        height: 48px;
+        position: fixed;
+        top: 20px;
+        left: 20px;
+        opacity: 0.3;
+      }
+      #logo:hover {
+        opacity: 1;
+      }
+      #logo img {
+        max-width: 100%;
+      }
+      @media screen and (max-height:860px) {
+        #logo {
+          display: none;
+        }
+      }
+    </style>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.min.js"></script>
+    <script>
+      angular.module('app', [])
+      .directive('preview', function() {
+        return {
+          restrict: 'E',
+          scope: true,
+          link: function($scope, $element, $attr) {
+            $scope.screenSizes = [
+              { label: 'iPhone 5 (320x568)', size: '320x568' }
+            ];
+            $scope.screenSize = $scope.screenSizes[0];
+          }
+        }
+      });
+    </script>
+  </head>
+  <body ng-app="app">
+    <a target="_blank" href="http://ionicframework.com/" id="logo">
+      <img src="http://docs.ionic.io/img/ionic-logo.png">
+    </a>
+    <header id="header">
+      <a target="_blank" href="http://ionicframework.com/docs/components/">CSS</a>
+      <a target="_blank" href="http://ionicframework.com/docs/api/">API</a>
+      <a target="_blank" href="http://forum.ionicframework.com/">Forum</a>
+      <a target="_blank" href="http://ngcordova.com/">ngCordova</a>
+      <a target="_blank" href="https://github.com/driftyco/ionic">GitHub</a>
+    </header>
+    <preview>
+      <!--
+      <div id="choice">
+        <select ng-model="screenSize" ng-options="s.label for s in screenSizes"></select>
+      </div>
+      -->
+      <div class="phone">
+        <div id="iphone">
+          <h2>iPhone 6</h2>
+          <iframe id="iphone-frame" src="/?ionicplatform=ios" class="frame"></iframe>
+        </div>
+      </div>
+      <div class="phone">
+        <div id="android">
+          <h2>Android</h2>
+          <iframe id="android-frame" src="/?ionicplatform=android" class="frame"></iframe>
+        </div>
+      </div>
+    </preview>
+    <!--
+    <a href="http://ionicframework.com/" id="logo">
+      <img src="http://docs.ionic.io/img/ionic-logo.png">
+    </a>
+    -->
+  </body>
+</html>
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 6beb5b9e7b..0d0095c5a9 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -54,6 +54,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
 
   this.launchBrowser = !argv.nobrowser && !argv.b;
+  this.launchLab = this.launchBrowser && argv.lab;
   this.runLivereload = !argv.nolivereload && !argv.r;
   this.useProxy = !argv.noproxy && !argv.x;
   this.proxies = project.get('proxies') || [];
@@ -164,7 +165,10 @@ IonicTask.prototype.start = function(ionic) {
         } else {
           console.log('Running live reload server:'.green.bold, self.liveReloadServer );
           console.log('Watching :'.green.bold, self.watchPatterns);
-          if(self.launchBrowser) {
+          if(self.launchLab) {
+            var open = require('open');
+            open( self.host(self.port) + '/lab' );
+          } else if(self.launchBrowser) {
             var open = require('open');
             open( self.host(self.port) );
           }
@@ -230,6 +234,17 @@ IonicTask.prototype.start = function(ionic) {
         return;
       }
 
+      if(req.url === '/lab') {
+        fs.readFile(path.resolve(path.join(__dirname, 'assets/preview.html')), function(err, buf) {
+          if(err) {
+            res.end('404');
+          }
+          res.setHeader('Content-Type', 'text/html');
+          res.end(buf);
+        });
+        return;
+      }
+
       if(req.url.split('?')[0] === '/') {
         fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
           res.setHeader('Content-Type', 'text/html');
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 242cf60f8e..ceae9c9547 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -5,81 +5,98 @@
     "archiver": {
       "version": "0.5.1",
       "from": "archiver@0.5.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@~1.1.9",
+          "from": "readable-stream@1.1.13",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@1.0.1",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1"
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@0.10.31",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2.0.1",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@~0.1.0",
+          "from": "zip-stream@0.1.4",
+          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33-1",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@~2.4.1",
+              "from": "lodash.defaults@2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1"
+                      "from": "lodash._isnative@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1"
+                      "from": "lodash.isobject@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1"
+                      "from": "lodash._shimkeys@2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1"
+                  "from": "lodash._objecttypes@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
             }
@@ -87,28 +104,33 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@~0.1.0",
+          "from": "lazystream@0.1.0",
+          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33-1",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             }
@@ -116,39 +138,48 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@~0.1.5",
+          "from": "file-utils@0.1.5",
+          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@~2.1.0"
+              "from": "lodash@2.1.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@~0.2.11"
+              "from": "iconv-lite@0.2.11",
+              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@~2.2.2"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@~3.2.6",
+              "from": "glob@3.2.11",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3",
+                  "from": "minimatch@0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2"
+                      "from": "lru-cache@2.5.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@~1.0.0"
+                      "from": "sigmund@1.0.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
@@ -156,58 +187,65 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@~0.2.12",
+              "from": "minimatch@0.2.14",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2"
+                  "from": "lru-cache@2.5.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0"
+                  "from": "sigmund@1.0.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@0.1.3",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@~2.4.1"
+                  "from": "lodash@2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@~0.1.9"
+              "from": "isbinaryfile@0.1.9",
+              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@~2.4.1"
+          "from": "lodash@2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -215,127 +253,626 @@
         "finalhandler": {
           "version": "0.1.0",
           "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1"
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@1.3.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.4.0",
-      "from": "connect-livereload@0.4.0"
+      "from": "connect-livereload@0.4.0",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.0.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@^2.5.0"
+          "from": "lru-cache@2.5.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.x",
+      "from": "event-stream@3.0.20",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@~2.3.1"
+          "from": "through@2.3.6",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@~0.1.1"
+          "from": "duplexer@0.1.1",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@~0"
+          "from": "from@0.1.3",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.4",
-          "from": "map-stream@~0.0.3"
+          "from": "map-stream@0.0.4",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11"
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2"
+          "from": "split@0.2.10",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@~0.0.3"
+          "from": "stream-combiner@0.0.4",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@~2.0.0",
+          "from": "debug@2.0.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.5",
-          "from": "combined-stream@~0.0.4",
+          "from": "combined-stream@0.0.5",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5"
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@~1.2.9"
+          "from": "mime@1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@~0.9.0"
+          "from": "async@0.9.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+        }
+      }
+    },
+    "gulp": {
+      "version": "3.8.10",
+      "from": "gulp@",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz",
+      "dependencies": {
+        "archy": {
+          "version": "1.0.0",
+          "from": "archy@^1.0.0",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "from": "chalk@^0.5.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0",
+              "from": "ansi-styles@^1.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.2",
+              "from": "escape-string-regexp@^1.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "from": "has-ansi@^0.1.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@^0.2.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "from": "strip-ansi@^0.3.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@^0.2.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "from": "supports-color@^0.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+            }
+          }
+        },
+        "deprecated": {
+          "version": "0.0.1",
+          "from": "deprecated@^0.0.1",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+        },
+        "gulp-util": {
+          "version": "3.0.1",
+          "from": "gulp-util@^3.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
+          "dependencies": {
+            "dateformat": {
+              "version": "1.0.11",
+              "from": "dateformat@^1.0.7-1.2.3",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "3.0.2",
+                  "from": "get-stdin@*",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
+                },
+                "meow": {
+                  "version": "2.0.0",
+                  "from": "meow@*",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "from": "camelcase-keys@^1.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2",
+                          "from": "camelcase@^1.0.1",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.0",
+                          "from": "map-obj@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "indent-string": {
+                      "version": "1.2.0",
+                      "from": "indent-string@^1.1.0",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "1.1.0",
+                          "from": "repeating@^1.1.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.0",
+                              "from": "is-finite@^1.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                            },
+                            "meow": {
+                              "version": "1.0.0",
+                              "from": "meow@^1.0.0",
+                              "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "object-assign": {
+                      "version": "1.0.0",
+                      "from": "object-assign@^1.0.0",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash": {
+              "version": "2.4.1",
+              "from": "lodash@^2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+            },
+            "lodash._reinterpolate": {
+              "version": "2.4.1",
+              "from": "lodash._reinterpolate@^2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
+            },
+            "lodash.template": {
+              "version": "2.4.1",
+              "from": "lodash.template@^2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "from": "lodash.defaults@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                    }
+                  }
+                },
+                "lodash.escape": {
+                  "version": "2.4.1",
+                  "from": "lodash.escape@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._escapehtmlchar": {
+                      "version": "2.4.1",
+                      "from": "lodash._escapehtmlchar@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1",
+                          "from": "lodash._htmlescapes@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._reunescapedhtml": {
+                      "version": "2.4.1",
+                      "from": "lodash._reunescapedhtml@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._htmlescapes": {
+                          "version": "2.4.1",
+                          "from": "lodash._htmlescapes@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash._escapestringchar": {
+                  "version": "2.4.1",
+                  "from": "lodash._escapestringchar@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
+                },
+                "lodash.keys": {
+                  "version": "2.4.1",
+                  "from": "lodash.keys@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1",
+                      "from": "lodash._isnative@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                    },
+                    "lodash.isobject": {
+                      "version": "2.4.1",
+                      "from": "lodash.isobject@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1",
+                          "from": "lodash._objecttypes@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._shimkeys": {
+                      "version": "2.4.1",
+                      "from": "lodash._shimkeys@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._objecttypes": {
+                          "version": "2.4.1",
+                          "from": "lodash._objecttypes@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash.templatesettings": {
+                  "version": "2.4.1",
+                  "from": "lodash.templatesettings@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
+                },
+                "lodash.values": {
+                  "version": "2.4.1",
+                  "from": "lodash.values@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
+                }
+              }
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "from": "multipipe@^0.1.0",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "from": "duplexer2@0.0.2",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@~1.1.9",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@~0.10.x",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@~2.0.1",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "from": "through2@^0.6.1",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@~1.0.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@~0.10.x",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@~2.0.1",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "from": "vinyl@^0.4.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "clone@^0.2.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@^0.0.1",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "interpret": {
+          "version": "0.3.8",
+          "from": "interpret@^0.3.2",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"
+        },
+        "liftoff": {
+          "version": "0.13.6",
+          "from": "liftoff@^0.13.2",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz",
+          "dependencies": {
+            "findup-sync": {
+              "version": "0.1.3",
+              "from": "findup-sync@~0.1.2",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@~3.2.9",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@2",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@0.3",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.5.0",
+                          "from": "lru-cache@2",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.0",
+                          "from": "sigmund@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash": {
+                  "version": "2.4.1",
+                  "from": "lodash@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                }
+              }
+            },
+            "resolve": {
+              "version": "1.0.0",
+              "from": "resolve@~1.0.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"
+            },
+            "extend": {
+              "version": "1.3.0",
+              "from": "extend@~1.3.0",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
+            },
+            "flagged-respawn": {
+              "version": "0.3.1",
+              "from": "flagged-respawn@~0.3.0",
+              "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.1.0",
+          "from": "minimist@^1.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
+        },
+        "orchestrator": {
+          "version": "0.3.7",
+          "from": "orchestrator@^0.3.0",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "dependencies": {
+            "end-of-stream": {
+              "version": "0.1.5",
+              "from": "end-of-stream@~0.1.5",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.1",
+                  "from": "once@~1.3.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "sequencify": {
+              "version": "0.0.7",
+              "from": "sequencify@~0.0.7",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+            },
+            "stream-consume": {
+              "version": "0.1.0",
+              "from": "stream-consume@~0.1.0",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+            }
+          }
+        },
+        "pretty-hrtime": {
+          "version": "0.2.2",
+          "from": "pretty-hrtime@^0.2.0",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
+        },
+        "semver": {
+          "version": "4.1.0",
+          "from": "semver@^4.1.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
+        },
+        "tildify": {
+          "version": "1.0.0",
+          "from": "tildify@^1.0.0",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "dependencies": {
+            "user-home": {
+              "version": "1.1.0",
+              "from": "user-home@^1.0.0",
+              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
+            }
+          }
+        },
+        "v8flags": {
+          "version": "1.0.5",
+          "from": "v8flags@^1.0.1",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"
         }
       }
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2"
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -899,315 +1436,369 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "optimist@0.6.0",
+      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@~0.0.2"
+          "from": "wordwrap@0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@~0.0.1"
+          "from": "minimist@0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7"
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.x.x"
+          "from": "pkginfo@0.3.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.x",
+          "from": "read@1.0.5",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@~0.0.4"
+              "from": "mute-stream@0.0.4",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.x"
+          "from": "revalidator@0.1.8",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.x",
+          "from": "utile@0.2.1",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@~0.2.9"
+              "from": "async@0.2.10",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@*"
+              "from": "deep-equal@0.2.1",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.x"
+              "from": "i@0.3.2",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.x.x",
+              "from": "mkdirp@0.5.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.x.x"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.x",
+          "from": "winston@0.6.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.x"
+              "from": "async@0.1.22",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.x"
+              "from": "cycle@1.0.3",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.x"
+              "from": "eyes@0.1.8",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.x"
+              "from": "pkginfo@0.2.3",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.x"
+              "from": "request@2.9.203",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.x"
+              "from": "stack-trace@0.0.9",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
         }
       }
     },
+    "proxy-middleware": {
+      "version": "0.7.0",
+      "from": "proxy-middleware@0.7.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+    },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.27.0",
-      "from": "request@2.27.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@~0.6.0"
+          "from": "qs@0.6.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@~5.0.0"
+          "from": "json-stringify-safe@5.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@~0.5.0"
+          "from": "forever-agent@0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@~0.3.0"
+          "from": "tunnel-agent@0.3.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@~0.10.0",
+          "from": "http-signature@0.10.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "assert-plus@0.1.2",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.2",
-              "from": "ctype@0.5.2"
+              "from": "ctype@0.5.2",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
             }
           }
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@~1.0.0",
+          "from": "hawk@1.0.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.x"
+              "from": "hoek@0.9.1",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.x"
+              "from": "boom@0.4.2",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.x"
+              "from": "cryptiles@0.2.2",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.x"
+              "from": "sntp@0.2.4",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@~0.3.0"
+          "from": "aws-sign@0.3.0",
+          "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@~0.3.0"
+          "from": "oauth-sign@0.3.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@~0.3.0"
+          "from": "cookie-jar@0.3.0",
+          "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
         },
         "node-uuid": {
           "version": "1.4.1",
-          "from": "node-uuid@~1.4.0"
+          "from": "node-uuid@1.4.1",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11"
+          "from": "mime@1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "serve-static": {
       "version": "1.6.1",
-      "from": "serve-static@1.6.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@1.3.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.9.1",
-          "from": "send@0.9.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.0.0",
-              "from": "debug@~2.0.0"
+              "from": "debug@2.0.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz"
             },
             "depd": {
               "version": "0.4.4",
-              "from": "depd@0.4.4"
+              "from": "depd@0.4.4",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3"
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.3.1",
-              "from": "etag@~1.3.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.3.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.1.tgz",
               "dependencies": {
                 "crc": {
                   "version": "3.0.0",
-                  "from": "crc@3.0.0",
+                  "from": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11"
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.0",
               "from": "on-finished@2.1.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.0.5",
-                  "from": "ee-first@1.0.5"
+                  "from": "ee-first@1.0.5",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@~1.0.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@~0.5.2"
+          "from": "qs@0.5.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@~0.4.3"
+          "from": "faye-websocket@0.4.4",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@~0.0.3",
+          "from": "noptify@0.0.3",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@~2.0.0",
+              "from": "nopt@2.0.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1"
+                  "from": "abbrev@1.0.5",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
             }
@@ -1215,115 +1806,132 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@~0.7.0"
+          "from": "debug@0.7.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@~0.1.21",
+          "from": "fstream@0.1.31",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.4",
-              "from": "graceful-fs@~3.0.2",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.0"
+              "from": "inherits@2.0.1",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5",
+              "from": "mkdirp@0.5.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2"
+              "from": "rimraf@2.2.8",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@~0.4.0",
+          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>= 0.0.5 < 1"
+              "from": "over@0.0.5",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>= 1.0.0 < 2",
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@~0.3.0",
+          "from": "binary@0.3.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@~0.1.0",
+              "from": "chainsaw@0.1.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4"
+                  "from": "traverse@0.3.9",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
+              "from": "buffers@0.1.1",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33-1",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@1.0.1",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1"
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@0.10.31",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2.0.1",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@~1.0.1"
+          "from": "setimmediate@1.0.2",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@~0.0.2",
+          "from": "match-stream@0.0.2",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
+              "from": "buffers@0.1.1",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         }
@@ -1331,28 +1939,33 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.15",
-          "from": "glob-stream@^3.1.5",
+          "from": "glob-stream@3.1.15",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
           "dependencies": {
             "glob": {
               "version": "4.0.6",
-              "from": "glob@^4.0.0",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@^1.3.0",
+                  "from": "once@1.3.1",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1"
+                      "from": "wrappy@1.0.1",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 }
@@ -1360,73 +1973,89 @@
             },
             "minimatch": {
               "version": "1.0.0",
-              "from": "minimatch@^1.0.0",
+              "from": "minimatch@1.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2"
+                  "from": "lru-cache@2.5.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0"
+                  "from": "sigmund@1.0.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "ordered-read-streams": {
               "version": "0.0.8",
-              "from": "ordered-read-streams@0.0.8"
+              "from": "ordered-read-streams@0.0.8",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
             },
             "glob2base": {
               "version": "0.0.11",
-              "from": "glob2base@^0.0.11"
+              "from": "glob2base@0.0.11",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@^1.0.0"
+              "from": "unique-stream@1.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@^0.0.6",
+          "from": "glob-watcher@0.0.6",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@^0.5.1",
+              "from": "gaze@0.5.1",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@~0.1.0",
+                  "from": "globule@0.1.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@~1.0.1"
+                      "from": "lodash@1.0.1",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@~3.1.21",
+                      "from": "glob@3.1.21",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@~1.2.0"
+                          "from": "graceful-fs@1.2.3",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1"
+                          "from": "inherits@1.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@~0.2.11",
+                      "from": "minimatch@0.2.14",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2"
+                          "from": "lru-cache@2.5.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0"
+                          "from": "sigmund@1.0.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
@@ -1438,79 +2067,91 @@
         },
         "graceful-fs": {
           "version": "3.0.4",
-          "from": "graceful-fs@^3.0.0",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@~2.4.1"
+          "from": "lodash@2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@0.x.x",
+          "from": "mkdirp@0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@^1.0.0",
+          "from": "strip-bom@1.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@^1.0.0"
+              "from": "first-chunk-stream@1.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@^0.2.0"
+              "from": "is-utf8@0.2.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@^0.6.1",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33-1",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0"
+              "from": "xtend@4.0.0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.3",
-          "from": "vinyl@^0.4.0",
+          "from": "vinyl@0.4.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
           "dependencies": {
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@^0.0.1"
+              "from": "clone-stats@0.0.1",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
         }
@@ -1519,19 +2160,22 @@
     "xml2js": {
       "version": "0.4.4",
       "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@0.6.x",
+          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.4.4",
-          "from": "xmlbuilder@>=1.0.0",
+          "from": "xmlbuilder@2.4.4",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.4.tgz",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@~2.4.1"
+              "from": "lodash-node@2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }
         }

From 3d077f76860f009eb467df0c34c47b5b0b52bad4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 8 Dec 2014 16:53:49 -0700
Subject: [PATCH 0301/1100] Making the document easier to understand for
 proxying. Updated the options to be proxyUrl, as well as updating that value
 in serve.js

---
 README.md          | 33 +++++++++++++++++++++++++++------
 lib/ionic/serve.js |  4 ++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7108381aff..403ed5a361 100644
--- a/README.md
+++ b/README.md
@@ -61,11 +61,12 @@ $ ionic serve [options]
 
 __Proxies:__
 
-The `serve` command can add some proxies to the http server. This proxies are useful if your are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
+The `serve` command can add some proxies to the http server. These proxies are useful if you are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
 
 In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with two properties:
 
-Say you want to intercept all calls to your server `http://localhost:8100/api` to go instead to `http://my.server.com/api` - use the following configuration:
+* `path`: string that will be matched against the beginning of the incoming request URL.
+* `proxyUrl`: a string with the url of where the proxied request should go.
 
 ```json
 {
@@ -74,17 +75,37 @@ Say you want to intercept all calls to your server `http://localhost:8100/api` t
   "app_id": "",
   "proxies": [
     {
-      "path": "/api",
-      "options": "http://my.server.com/api"
+      "path": "/v1",
+      "proxyUrl": "https://api.instagram.com/v1"
     }
   ]
 }
 
 ```
 
-* `path`: string that will be matched against after the host in the request URL (for example, the `/api` in `http://localhost:8100/api`)
-* `options`: a string of the address to proxy to. Allows any options that are permitted on the [http](http://nodejs.org/api/http.html#http_http_request_options_callback) request options.
+Using the above configuration, you can now make requests to your local server at `http://localhost:8100/v1` to have it proxy out requests to `https://api.instagram.com/v1`
 
+For example:
+
+```js
+angular.module('starter.controllers', [])
+.constant('InstagramApiUrl', '')
+// .contant('InstagramApiUrl','https://api.instagram.com')
+//In production, make this the real URL
+
+.controller('FeedCtrl', function($scope, $http, InstagramApiUrl) {
+
+  $scope.feed = null;
+
+  $http.get(InstagramApiUrl + '/v1/media/search?client_id=1&lat=48&lng=2.294351').then(function(data) {
+    console.log('data ' , data)
+    $scope.feed = data;
+  })
+
+})
+```
+
+See also [this gist](https://gist.github.com/jbavari/d9c1c94058c4fdd4e935) for more help.
 
 __Command-line flags/options:__
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 0d0095c5a9..73edccef4a 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -186,8 +186,8 @@ IonicTask.prototype.start = function(ionic) {
       for(var x=0; x<this.proxies.length; x++) {
         var proxy = this.proxies[x];
 
-        app.use(proxy.path, proxyMiddleware(url.parse(proxy.options)));
-        console.log('Proxy added:'.green.bold, proxy.path + " => " + url.format(proxy.options));
+        app.use(proxy.path, proxyMiddleware(url.parse(proxy.proxyUrl)));
+        console.log('Proxy added:'.green.bold, proxy.path + " => " + url.format(proxy.proxyUrl));
       }
     }
 

From 03855c011a8a57d1caa4685cdc30a280a0a5742c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 8 Dec 2014 18:09:40 -0600
Subject: [PATCH 0302/1100] Fallback platform override

---
 lib/ionic/serve.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 0d0095c5a9..d64824bf6b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -12,7 +12,7 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
     proxyMiddleware = require('proxy-middleware'),
-    url = require('url');
+    url = require('url'),
     IonicStats = require('./stats').IonicStats;
 
 var DEFAULT_HTTP_PORT = 8100;
@@ -201,6 +201,9 @@ IonicTask.prototype.start = function(ionic) {
     var server = http.createServer(function(req, res){
       var done = finalhandler(req, res);
 
+      var urlParsed = url.parse(req.url, true);
+      var platformOverride = urlParsed.query.ionicplatform;
+
       var platformUrl = getPlatformUrl(req);
       if(platformUrl) {
         var platformWWW = getPlatformWWW(req);
@@ -260,6 +263,10 @@ IonicTask.prototype.start = function(ionic) {
               html = injectConsoleLogScript(html);
             }
 
+            if(platformOverride) {
+              html = injectPlatformScript( html, platformOverride );
+            }
+
             res.end(html);
           }
         });
@@ -494,6 +501,24 @@ function injectGoToScript(html) {
   return html;
 }
 
+/**
+ * Inject the platform override for choosing Android or iOS during
+ * development.
+ */
+function injectPlatformScript(html, platformOverride) {
+  try {
+    var findTags = html.toLowerCase().indexOf('</body>');
+    if(findTags < 0) { return html; }
+
+    return html.slice(0, findTags) + '\n' +
+    '<script>\n' +
+      'ionic && ionic.Platform && ionic.Platform.setPlatform("' + platformOverride + '");\n' +
+    '</script>\n' +
+    html.slice(findTags);
+  } catch(e) {}
+
+  return html;
+}
 
 IonicTask.prototype._changed = function(filePath) {
   // Cleanup the path a bit

From ce1565d216950cb28bcff780a063934c6edcc126 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 8 Dec 2014 18:15:36 -0600
Subject: [PATCH 0303/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 403ed5a361..f8d807c0ca 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Use `ionic serve` to start a local development server for app dev and testing. T
 $ ionic serve [options]
 ```
 
-__Proxies:__
+__Service Proxies:__
 
 The `serve` command can add some proxies to the http server. These proxies are useful if you are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
 

From 4c94afcc4aa3f49bf69591ac0d43704bf66b0399 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 8 Dec 2014 17:37:24 -0700
Subject: [PATCH 0304/1100] Bumping version to 1.2.9, adding myself as
 maintainer

---
 package.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 36033a77cf..5dfa933b4c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -35,6 +35,11 @@
     {
       "name": "Adam Bradley",
       "web": "https://twitter.com/adamdbradley"
+    },
+    {
+      "name": "Josh Bavari",
+      "web": "https://twitter.com/jbavari",
+      "email": "josh@drifty.com"
     }
   ],
   "license": "MIT",

From 674df4906a091305edcfcdc545e37030ebcd43fa Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 8 Dec 2014 17:39:45 -0700
Subject: [PATCH 0305/1100] Shrinkwrapped

---
 npm-shrinkwrap.json | 663 +++++++++++++++++++++++---------------------
 1 file changed, 347 insertions(+), 316 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ceae9c9547..f36e3667be 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -9,12 +9,12 @@
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@1.1.13",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -24,29 +24,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@0.1.4",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -56,46 +56,46 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@2.4.1",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@2.4.1",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@2.4.1",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@2.4.1",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@2.4.1",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@0.1.0",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -124,12 +124,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@0.1.5",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@2.1.0",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@0.2.11",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@3.2.11",
+              "from": "glob@>=3.2.6 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3.0",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2.5.0",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@1.0.0",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,65 +187,65 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@0.2.14",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@0.1.3",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@0.1.9",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -264,12 +264,12 @@
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -281,40 +281,40 @@
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@2.5.0",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.20",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@2.3.6",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@0.1.3",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.4",
-          "from": "map-stream@0.0.4",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
+          "version": "0.0.5",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -323,29 +323,29 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2.10",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@0.0.4",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -359,13 +359,13 @@
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
-          "version": "0.0.5",
-          "from": "combined-stream@0.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -376,85 +376,85 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@0.9.0",
+          "from": "async@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.10",
-      "from": "gulp@",
+      "from": "gulp@>=3.8.8 <3.9.0",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz",
       "dependencies": {
         "archy": {
           "version": "1.0.0",
-          "from": "archy@^1.0.0",
+          "from": "archy@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@^0.5.0",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@^1.1.0",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "escape-string-regexp@^1.0.0",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@^0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@^0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@^0.2.0",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@^0.0.1",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.1",
-          "from": "gulp-util@^3.0.0",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
           "dependencies": {
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@^1.0.7-1.2.3",
+              "from": "dateformat@>=1.0.7-1.2.3 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
@@ -469,39 +469,39 @@
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@^1.0.0",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@^1.0.1",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@^1.0.0",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "indent-string@^1.1.0",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.0",
-                          "from": "repeating@^1.1.0",
+                          "from": "repeating@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@^1.0.0",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "1.0.0",
-                              "from": "meow@^1.0.0",
+                              "from": "meow@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
                             }
                           }
@@ -510,7 +510,7 @@
                     },
                     "object-assign": {
                       "version": "1.0.0",
-                      "from": "object-assign@^1.0.0",
+                      "from": "object-assign@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
                     }
                   }
@@ -519,56 +519,56 @@
             },
             "lodash": {
               "version": "2.4.1",
-              "from": "lodash@^2.4.1",
+              "from": "lodash@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
             },
             "lodash._reinterpolate": {
               "version": "2.4.1",
-              "from": "lodash._reinterpolate@^2.4.1",
+              "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
-              "from": "lodash.template@^2.4.1",
+              "from": "lodash.template@>=2.4.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
-                  "from": "lodash.defaults@~2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
                       "version": "2.4.1",
-                      "from": "lodash._objecttypes@~2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
-                  "from": "lodash.escape@~2.4.1",
+                  "from": "lodash.escape@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
-                      "from": "lodash._escapehtmlchar@~2.4.1",
+                      "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@~2.4.1",
+                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
-                      "from": "lodash._reunescapedhtml@~2.4.1",
+                      "from": "lodash._reunescapedhtml@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@~2.4.1",
+                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
@@ -577,39 +577,39 @@
                 },
                 "lodash._escapestringchar": {
                   "version": "2.4.1",
-                  "from": "lodash._escapestringchar@~2.4.1",
+                  "from": "lodash._escapestringchar@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@~2.4.1",
+                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@~2.4.1",
+                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
@@ -618,19 +618,19 @@
                 },
                 "lodash.templatesettings": {
                   "version": "2.4.1",
-                  "from": "lodash.templatesettings@~2.4.1",
+                  "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
                   "version": "2.4.1",
-                  "from": "lodash.values@~2.4.1",
+                  "from": "lodash.values@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@^0.1.0",
+              "from": "multipipe@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
@@ -640,12 +640,12 @@
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@~1.1.9",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@~1.0.0",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
@@ -655,12 +655,12 @@
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@~0.10.x",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@~2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -671,7 +671,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@^0.6.1",
+              "from": "through2@>=0.6.1 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -681,7 +681,7 @@
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@~1.0.0",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
@@ -691,12 +691,12 @@
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@~0.10.x",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -710,17 +710,17 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@^0.4.0",
+              "from": "vinyl@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@^0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@^0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -729,42 +729,42 @@
         },
         "interpret": {
           "version": "0.3.8",
-          "from": "interpret@^0.3.2",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"
         },
         "liftoff": {
           "version": "0.13.6",
-          "from": "liftoff@^0.13.2",
+          "from": "liftoff@>=0.13.2 <0.14.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@~3.2.9",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@2",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@0.3",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -773,51 +773,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@~2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "1.0.0",
-              "from": "resolve@~1.0.0",
+              "from": "resolve@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@~1.3.0",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             },
             "flagged-respawn": {
               "version": "0.3.1",
-              "from": "flagged-respawn@~0.3.0",
+              "from": "flagged-respawn@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "minimist@^1.1.0",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@^0.3.0",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@~0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@~1.3.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -826,41 +826,41 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@~0.0.7",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@~0.1.0",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@^0.2.0",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "4.1.0",
-          "from": "semver@^4.1.0",
+          "from": "semver@>=4.1.0 <5.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@^1.0.0",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.0",
-              "from": "user-home@^1.0.0",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
             }
           }
         },
         "v8flags": {
           "version": "1.0.5",
-          "from": "v8flags@^1.0.1",
+          "from": "v8flags@>=1.0.1 <2.0.0",
           "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"
         }
       }
@@ -872,7 +872,7 @@
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1436,22 +1436,22 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@0.0.2",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@0.0.10",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1463,103 +1463,103 @@
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.3.0",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.5",
+          "from": "read@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@0.0.4",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.8",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.1",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@0.2.10",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@0.2.1",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.2",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.2",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.22",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.3",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.203",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1568,52 +1568,52 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@0.7.0",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.27.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
+      "from": "request@2.27.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@0.6.6",
+          "from": "qs@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@5.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@0.5.2",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@0.3.0",
+          "from": "tunnel-agent@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@0.10.0",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz",
+              "from": "assert-plus@0.1.2",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
@@ -1625,62 +1625,62 @@
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@1.0.0",
+          "from": "hawk@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.1",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.2",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.2",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.4",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@0.3.0",
+          "from": "aws-sign@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@0.3.0",
+          "from": "oauth-sign@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@0.3.0",
+          "from": "cookie-jar@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
         },
         "node-uuid": {
-          "version": "1.4.1",
-          "from": "node-uuid@1.4.1",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+          "version": "1.4.2",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
+          "from": "mime@>=1.2.9 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "serve-static": {
-      "version": "1.6.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz",
+      "version": "1.7.1",
+      "from": "serve-static@1.7.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
@@ -1689,23 +1689,23 @@
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
-          "version": "0.9.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.9.1.tgz",
+          "version": "0.10.1",
+          "from": "send@0.10.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
-              "version": "2.0.0",
-              "from": "debug@2.0.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz"
+              "version": "2.1.0",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz"
             },
             "depd": {
-              "version": "0.4.4",
-              "from": "depd@0.4.4",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"
+              "version": "1.0.0",
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
@@ -1713,20 +1713,20 @@
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
-              "version": "1.3.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.3.1.tgz",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.3.1.tgz",
+              "version": "1.5.1",
+              "from": "etag@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "dependencies": {
                 "crc": {
-                  "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz"
+                  "version": "3.2.1",
+                  "from": "crc@3.2.1",
+                  "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
@@ -1736,68 +1736,68 @@
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
-              "version": "2.1.0",
-              "from": "on-finished@2.1.0",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz",
+              "version": "2.1.1",
+              "from": "on-finished@>=2.1.1 <2.2.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
-                  "version": "1.0.5",
-                  "from": "ee-first@1.0.5",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
+                  "version": "1.1.0",
+                  "from": "ee-first@1.1.0",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@0.5.6",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@0.4.4",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1.0.5",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1806,99 +1806,99 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@0.7.4",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.4",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+              "version": "3.0.5",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@0.3.9",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.33-1",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -1908,29 +1908,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@1.0.2",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -1939,32 +1939,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
-          "version": "3.1.15",
-          "from": "glob-stream@3.1.15",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.0.6",
-              "from": "glob@4.0.6",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "version": "4.3.1",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
               "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@1.3.1",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1972,89 +1984,103 @@
               }
             },
             "minimatch": {
-              "version": "1.0.0",
-              "from": "minimatch@1.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "version": "2.0.1",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
               "dependencies": {
-                "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                },
-                "sigmund": {
-                  "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                "brace-expansion": {
+                  "version": "1.0.1",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.0.1.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.0",
+                      "from": "concat-map@0.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.0.tgz"
+                    }
+                  }
                 }
               }
             },
             "ordered-read-streams": {
-              "version": "0.0.8",
-              "from": "ordered-read-streams@0.0.8",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
-              "version": "0.0.11",
-              "from": "glob2base@0.0.11",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@1.0.0",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@0.5.1",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@1.0.1",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1.0.0",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2.5.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@1.0.0",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2066,57 +2092,57 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.4",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+          "version": "3.0.5",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@0.5.0",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@1.0.0",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@0.2.0",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -2126,31 +2152,36 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@4.0.0",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.3",
-          "from": "vinyl@0.4.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@0.0.1",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2164,17 +2195,17 @@
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.4.4",
-          "from": "xmlbuilder@2.4.4",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.4.tgz",
+          "version": "2.4.5",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@2.4.1",
+              "from": "lodash-node@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }

From c805f00c32117fb4c1541a060e7d1d5ba6a85c77 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 8 Dec 2014 19:21:42 -0700
Subject: [PATCH 0306/1100] Adding in the service/remove/add commands to assist
 in maintaining bower components

---
 lib/ionic.js         |  39 ++++++++
 lib/ionic/add.js     |  91 +++++++++++++++++++
 lib/ionic/bower.js   |  29 ++++--
 lib/ionic/service.js | 207 +++++++++++++++++++++++++++++++++++++++++++
 package.json         |   3 +-
 5 files changed, 361 insertions(+), 8 deletions(-)
 create mode 100644 lib/ionic/add.js
 create mode 100644 lib/ionic/service.js

diff --git a/lib/ionic.js b/lib/ionic.js
index f0d8c21d70..d34d78d506 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -236,6 +236,45 @@ var TASKS = [
     //   '--uuid|-u': 'Mark an already uploaded version as deployed'
     // },
     module: './ionic/app'
+   },
+   {
+    title: 'service add',
+    name: 'service',
+    summary: 'Add an Ionic service package and install any required plugins',
+    args: {
+      '[options]': '',
+      '<SPEC>': 'Can be a service name or a git url'
+    },
+    module: './ionic/service'
+   },
+   {
+    title: 'add',
+    name: 'add',
+    summary: 'Add a bower component to the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add'
+   },
+   {
+    title: 'remove',
+    name: 'remove',
+    summary: 'Remove a bower component from the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add',
+    alt: ['rm']
+   },
+   {
+    title: 'list',
+    name: 'list',
+    summary: 'List bower components from the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add',
+    alt: ['ls']
    }
 ];
 
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
new file mode 100644
index 0000000000..c18a919c74
--- /dev/null
+++ b/lib/ionic/add.js
@@ -0,0 +1,91 @@
+require('shelljs/global')
+
+var Task = require('./task').Task,
+    IonicCordova = require('./cordova').IonicTask,
+    IonicStats = require('./stats').IonicStats,
+    argv = require('optimist').argv,
+    fs = require('fs'),
+    path = require('path'),
+    bower = require('./bower');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.installBowerComponent = function installBowerComponent(componentName) {
+  var bowerInstallCommand = 'bower install --save-dev ' + componentName;
+
+  var result = exec(bowerInstallCommand);
+
+  if (result.code != 0) {
+    //Error happened, report it.
+    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'add');
+  } else {
+    var message = 'Bower component installed - ' + componentName;
+    console.log(message.green)
+  }
+}
+
+IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(componentName) {
+  var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
+
+  var result = exec(bowerUninstallCommand);
+
+  if (result.code != 0) {
+    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'add')
+  } else {
+    var message = 'Bower component removed - ' + componentName;
+    console.log(message.red);
+  }
+}
+
+IonicTask.prototype.listComponents = function listComponents() {
+  var bowerJson = require(path.join(process.cwd(), 'bower.json'));
+  console.log('Components installed: '.info)
+  for (var bowerCompIndex in bowerJson.devDependencies) {
+    console.log(bowerCompIndex.green);
+  }
+}
+
+// Need to look at bower.json of package just installed and look for any cordova plugins required
+// Check the directory in the projects `.bowerrc` file
+// Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
+// For each plugins - call 'ionic add plugin <current-required-plugin>'
+IonicTask.prototype.run = function(ionic, callback) {
+  // console.log('running ', argv._)
+  this.ionic = ionic;
+
+  IonicStats.t();
+
+  if (!bower.IonicBower.checkForBower()) {
+    this.ionic.fail(bower.IonicBower.installMessage, 'add');
+    return;
+  }
+
+  var action = argv._[0]
+  var componentName = argv._[1];
+
+  try {
+    switch (action) {
+      case 'add':
+        this.installBowerComponent(componentName);
+        break;
+      case 'remove':
+      case 'rm':
+        this.uninstallBowerComponent(componentName);
+        break;
+      case 'list':
+      case 'ls':
+      case '':
+        this.listComponents();
+        break;
+    }
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    this.ionic.fail(errorMessage, 'service')
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index daf765bc6b..3c6657c23d 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -1,3 +1,5 @@
+require('shelljs/global')
+
 var fs = require('fs'),
     path = require('path'),
     colors = require('colors');
@@ -6,7 +8,7 @@ exports.IonicBower = {
 
   setIonicVersion: function(newVersion) {
     var bowerData = this.getData();
-    if(!bowerData.devDependencies) bowerData.devDependencies = {};
+    if (!bowerData.devDependencies) bowerData.devDependencies = {};
     bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
     this.saveData(bowerData);
   },
@@ -21,10 +23,10 @@ exports.IonicBower = {
     var bowerFilePath = path.resolve('bower.json');
 
     try {
-      if( fs.existsSync(bowerFilePath) ) {
+      if (fs.existsSync(bowerFilePath)) {
         return require(bowerFilePath);
       }
-    } catch(e){}
+    } catch (e) {}
 
     return {
       "name": "HelloIonic",
@@ -35,10 +37,23 @@ exports.IonicBower = {
   saveData: function(bowerData) {
     try {
       var bowerFilePath = path.resolve('bower.json');
-      fs.writeFileSync( bowerFilePath, JSON.stringify(bowerData, null, 2) );
-    } catch(e) {
-      console.log( ('Error saving ' + bowerFilePath + ': ' + e).error.bold );
+      fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
+    } catch (e) {
+      console.log(('Error saving ' + bowerFilePath + ': ' + e).error.bold);
     }
-  }
+  },
+
+  checkForBower: function checkForBower() {
+    var installed = false;
+    try {
+      var result = exec('bower -v', {silent: true});
+      if (result.output.indexOf('command not found') == -1 && result.output.indexOf('not recognized') == -1) {
+        installed = true;
+      }
+    } catch (ex) { }
+    return installed;
+  },
+
+  installMessage: 'You must have bower installed to continue. \nType `npm install -g bower`'
 
 };
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
new file mode 100644
index 0000000000..47e95d82f1
--- /dev/null
+++ b/lib/ionic/service.js
@@ -0,0 +1,207 @@
+require('shelljs/global')
+
+var Task = require('./task').Task,
+    IonicCordova = require('./cordova').IonicTask,
+    IonicStats = require('./stats').IonicStats,
+    argv = require('optimist').argv,
+    fs = require('fs'),
+    path = require('path')
+    _ = require('underscore'),
+    bower = require('./bower');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.readIonicProjectJson = function readIonicProjectJson() {
+  var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
+  var ionicProjectJson = null;
+  try {
+    var content = fs.readFileSync(ionicProjectFile, 'utf8');
+    ionicProjectJson = JSON.parse(content);
+  } catch (ex) { }
+
+  return ionicProjectJson;
+}
+
+IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(serviceName) {
+  var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
+
+  try {
+    var ionicProjectJson = this.readIonicProjectJson() || {};
+
+    if (!ionicProjectJson.services) {
+      ionicProjectJson.services = [];
+    }
+
+    var existingProject = _.findWhere(ionicProjectJson.services, {name: serviceName});
+    if (typeof existingProject != 'undefined') {
+      return;
+    }
+
+    ionicProjectJson.services.push({name: serviceName});
+    fs.writeFileSync(ionicProjectFile, JSON.stringify(ionicProjectJson, null, 2), 'utf8');
+
+  } catch (ex) {
+    this.ionic.fail('Failed to update the ionic.project settings for the service', 'service');
+  }
+}
+
+IonicTask.prototype.installBowerComponent = function installBowerComponent(serviceName) {
+  // console.log('We are here now.');
+  var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
+  // var bowerInstallCommand = 'bower install ionic-service-' + serviceName;
+
+  var result = exec(bowerInstallCommand);
+
+  if (result.code != 0) {
+    //Error happened, report it.
+    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'service');
+  } else {
+    this.addServiceToIonicJson(serviceName);
+  }
+}
+
+IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(serviceName) {
+  var bowerUninstallCommand = 'bower unlink ionic-service-' + serviceName;
+
+  var result = exec(bowerUninstallCommand);
+
+  if (result.code != 0) {
+    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'service')
+  } else {
+    // console.log('Uninstalled Ionic service', serviceName);
+  }
+}
+
+IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLocation() {
+  var bowerRcFileLocation = path.join(process.cwd(), '.bowerrc');
+  // console.log('location bowerrc: ' , bowerRcFileLocation)
+  var bowerRc = null;
+
+  try {
+    var content = fs.readFileSync(bowerRcFileLocation, 'utf8');
+    bowerRc = JSON.parse(content);
+    // console.log('bowerRc contents: ', bowerRc)
+  } catch (ex) { }
+
+  var directory = 'www/lib'; //Default directory
+
+  if (bowerRc && bowerRc.directory) {
+    directory = bowerRc.directory;
+  }
+
+  return directory;
+}
+
+IonicTask.prototype.getBowerJson = function getBowerJson(directory, serviceName) {
+  var bowerJsonLocation = path.join(process.cwd(), directory, 'ionic-service-' + serviceName, 'ionic-plugins.json');
+  var packageBowerJson = require(bowerJsonLocation);
+  return packageBowerJson;
+}
+
+IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory, serviceName) {
+  // var bowerJsonLocation = process.cwd() + '/' + directory + '/ionic-service-' + serviceName + '/bower.json';
+  // var packageBowerJson = require(bowerJsonLocation);
+  var packageBowerJson = this.getBowerJson(directory, serviceName);
+
+  // console.log('bowerjson = ', packageBowerJson.plugins);
+  // console.log('ionic - ', IonicCordova);
+  _.each(packageBowerJson.plugins, function(plugin) {
+    // var ic = new IonicCordova();
+    // ic.run('ionic plugin add ' + plugin);
+    console.log('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
+    var installPluginCmd = 'ionic plugin add ' + plugin.uri;
+    console.log(installPluginCmd);
+    var pluginInstallResult = exec(installPluginCmd);
+
+    if (pluginInstallResult.code != 0) {
+      var errorMessage = 'Failed to find the plugin "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      this.ionic.fail(errorMessage, 'service');
+    }
+    // console.log(pluginInstallResult);
+  })
+}
+
+IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bowerJson) {
+  _.each(bowerJson.plugins, function(plugin) {
+    console.log('Uninstalling cordova plugin -  ' + plugin.name);
+    var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
+    console.log(uninstallPluginCmd);
+    var pluginRemoveResult = exec(uninstallPluginCmd)
+
+    if (pluginRemoveResult.code != 0) {
+      var errorMessage = 'Failed to find the plugin to remove "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      this.ionic.fail(errorMessage, 'service');
+    }
+  })
+}
+
+IonicTask.prototype.addService = function addService(serviceName) {
+  this.installBowerComponent(serviceName);
+
+  var directory = this.getBowerComponentsLocation();
+  // console.log('Directory we are searching for bower.json - ', directory);
+
+  console.log('Checking for any plugins required by service package');
+
+  this.installBowerPlugins(directory, serviceName);
+  console.log('ionic service add completed');
+}
+
+IonicTask.prototype.removeService = function removeService(serviceName) {
+  var directory = this.getBowerComponentsLocation();
+  var packageBowerJson = this.getBowerJson(directory, serviceName);
+
+  this.uninstallBowerComponent(serviceName);
+
+  this.uninstallBowerPlugins(packageBowerJson);
+
+}
+
+IonicTask.prototype.listServices = function listServices() {
+  // var directory = this.getBowerComponentsLocation();
+  var bowerJson = require(process.cwd() + '/bower.json');
+  // console.log(bowerJson);
+
+}
+
+// Need to look at bower.json of package just installed and look for any cordova plugins required
+// Check the directory in the projects `.bowerrc` file
+// Then go to /path/to/bower/components/<ionic-service-serviceName>/ionic-plugins.json - 'plugins'
+// For each plugins - call 'ionic add plugin <current-required-plugin>'
+IonicTask.prototype.run = function run(ionic, callback) {
+  this.ionic = ionic;
+
+  IonicStats.t();
+
+
+  if (!bower.IonicBower.checkForBower()) {
+    this.ionic.fail(bower.IonicBower.installMessage, 'service');
+    return;
+  }
+
+  var action = argv._[1]
+  var serviceName = argv._[2];
+
+  try {
+    switch (action) {
+      case 'add':
+        this.addService(serviceName);
+        break;
+      case 'remove':
+        this.removeService(serviceName);
+        break;
+      case 'list':
+        this.listServices();
+        break;
+    }
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    this.ionic.fail(errorMessage, 'service')
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index 5dfa933b4c..685ae01890 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "tiny-lr-fork": "0.0.5",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",
-    "xml2js": "0.4.4"
+    "xml2js": "0.4.4",
+    "underscore": "~1.7.0"
   }
 }

From 562f71a080eed2bc1629a40fd14f9c14884d5a4e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 8 Dec 2014 19:21:42 -0700
Subject: [PATCH 0307/1100] Adding in the service/remove/add commands to assist
 in maintaining bower components

---
 lib/ionic.js         |  39 ++++++++
 lib/ionic/add.js     |  91 +++++++++++++++++++
 lib/ionic/bower.js   |  29 ++++--
 lib/ionic/service.js | 207 +++++++++++++++++++++++++++++++++++++++++++
 npm-shrinkwrap.json  |   5 ++
 package.json         |   3 +-
 6 files changed, 366 insertions(+), 8 deletions(-)
 create mode 100644 lib/ionic/add.js
 create mode 100644 lib/ionic/service.js

diff --git a/lib/ionic.js b/lib/ionic.js
index f0d8c21d70..d34d78d506 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -236,6 +236,45 @@ var TASKS = [
     //   '--uuid|-u': 'Mark an already uploaded version as deployed'
     // },
     module: './ionic/app'
+   },
+   {
+    title: 'service add',
+    name: 'service',
+    summary: 'Add an Ionic service package and install any required plugins',
+    args: {
+      '[options]': '',
+      '<SPEC>': 'Can be a service name or a git url'
+    },
+    module: './ionic/service'
+   },
+   {
+    title: 'add',
+    name: 'add',
+    summary: 'Add a bower component to the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add'
+   },
+   {
+    title: 'remove',
+    name: 'remove',
+    summary: 'Remove a bower component from the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add',
+    alt: ['rm']
+   },
+   {
+    title: 'list',
+    name: 'list',
+    summary: 'List bower components from the project',
+    args: {
+      'component name': ''
+    },
+    module: './ionic/add',
+    alt: ['ls']
    }
 ];
 
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
new file mode 100644
index 0000000000..c18a919c74
--- /dev/null
+++ b/lib/ionic/add.js
@@ -0,0 +1,91 @@
+require('shelljs/global')
+
+var Task = require('./task').Task,
+    IonicCordova = require('./cordova').IonicTask,
+    IonicStats = require('./stats').IonicStats,
+    argv = require('optimist').argv,
+    fs = require('fs'),
+    path = require('path'),
+    bower = require('./bower');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.installBowerComponent = function installBowerComponent(componentName) {
+  var bowerInstallCommand = 'bower install --save-dev ' + componentName;
+
+  var result = exec(bowerInstallCommand);
+
+  if (result.code != 0) {
+    //Error happened, report it.
+    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'add');
+  } else {
+    var message = 'Bower component installed - ' + componentName;
+    console.log(message.green)
+  }
+}
+
+IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(componentName) {
+  var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
+
+  var result = exec(bowerUninstallCommand);
+
+  if (result.code != 0) {
+    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'add')
+  } else {
+    var message = 'Bower component removed - ' + componentName;
+    console.log(message.red);
+  }
+}
+
+IonicTask.prototype.listComponents = function listComponents() {
+  var bowerJson = require(path.join(process.cwd(), 'bower.json'));
+  console.log('Components installed: '.info)
+  for (var bowerCompIndex in bowerJson.devDependencies) {
+    console.log(bowerCompIndex.green);
+  }
+}
+
+// Need to look at bower.json of package just installed and look for any cordova plugins required
+// Check the directory in the projects `.bowerrc` file
+// Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
+// For each plugins - call 'ionic add plugin <current-required-plugin>'
+IonicTask.prototype.run = function(ionic, callback) {
+  // console.log('running ', argv._)
+  this.ionic = ionic;
+
+  IonicStats.t();
+
+  if (!bower.IonicBower.checkForBower()) {
+    this.ionic.fail(bower.IonicBower.installMessage, 'add');
+    return;
+  }
+
+  var action = argv._[0]
+  var componentName = argv._[1];
+
+  try {
+    switch (action) {
+      case 'add':
+        this.installBowerComponent(componentName);
+        break;
+      case 'remove':
+      case 'rm':
+        this.uninstallBowerComponent(componentName);
+        break;
+      case 'list':
+      case 'ls':
+      case '':
+        this.listComponents();
+        break;
+    }
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    this.ionic.fail(errorMessage, 'service')
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index daf765bc6b..3c6657c23d 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -1,3 +1,5 @@
+require('shelljs/global')
+
 var fs = require('fs'),
     path = require('path'),
     colors = require('colors');
@@ -6,7 +8,7 @@ exports.IonicBower = {
 
   setIonicVersion: function(newVersion) {
     var bowerData = this.getData();
-    if(!bowerData.devDependencies) bowerData.devDependencies = {};
+    if (!bowerData.devDependencies) bowerData.devDependencies = {};
     bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
     this.saveData(bowerData);
   },
@@ -21,10 +23,10 @@ exports.IonicBower = {
     var bowerFilePath = path.resolve('bower.json');
 
     try {
-      if( fs.existsSync(bowerFilePath) ) {
+      if (fs.existsSync(bowerFilePath)) {
         return require(bowerFilePath);
       }
-    } catch(e){}
+    } catch (e) {}
 
     return {
       "name": "HelloIonic",
@@ -35,10 +37,23 @@ exports.IonicBower = {
   saveData: function(bowerData) {
     try {
       var bowerFilePath = path.resolve('bower.json');
-      fs.writeFileSync( bowerFilePath, JSON.stringify(bowerData, null, 2) );
-    } catch(e) {
-      console.log( ('Error saving ' + bowerFilePath + ': ' + e).error.bold );
+      fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
+    } catch (e) {
+      console.log(('Error saving ' + bowerFilePath + ': ' + e).error.bold);
     }
-  }
+  },
+
+  checkForBower: function checkForBower() {
+    var installed = false;
+    try {
+      var result = exec('bower -v', {silent: true});
+      if (result.output.indexOf('command not found') == -1 && result.output.indexOf('not recognized') == -1) {
+        installed = true;
+      }
+    } catch (ex) { }
+    return installed;
+  },
+
+  installMessage: 'You must have bower installed to continue. \nType `npm install -g bower`'
 
 };
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
new file mode 100644
index 0000000000..47e95d82f1
--- /dev/null
+++ b/lib/ionic/service.js
@@ -0,0 +1,207 @@
+require('shelljs/global')
+
+var Task = require('./task').Task,
+    IonicCordova = require('./cordova').IonicTask,
+    IonicStats = require('./stats').IonicStats,
+    argv = require('optimist').argv,
+    fs = require('fs'),
+    path = require('path')
+    _ = require('underscore'),
+    bower = require('./bower');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.readIonicProjectJson = function readIonicProjectJson() {
+  var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
+  var ionicProjectJson = null;
+  try {
+    var content = fs.readFileSync(ionicProjectFile, 'utf8');
+    ionicProjectJson = JSON.parse(content);
+  } catch (ex) { }
+
+  return ionicProjectJson;
+}
+
+IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(serviceName) {
+  var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
+
+  try {
+    var ionicProjectJson = this.readIonicProjectJson() || {};
+
+    if (!ionicProjectJson.services) {
+      ionicProjectJson.services = [];
+    }
+
+    var existingProject = _.findWhere(ionicProjectJson.services, {name: serviceName});
+    if (typeof existingProject != 'undefined') {
+      return;
+    }
+
+    ionicProjectJson.services.push({name: serviceName});
+    fs.writeFileSync(ionicProjectFile, JSON.stringify(ionicProjectJson, null, 2), 'utf8');
+
+  } catch (ex) {
+    this.ionic.fail('Failed to update the ionic.project settings for the service', 'service');
+  }
+}
+
+IonicTask.prototype.installBowerComponent = function installBowerComponent(serviceName) {
+  // console.log('We are here now.');
+  var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
+  // var bowerInstallCommand = 'bower install ionic-service-' + serviceName;
+
+  var result = exec(bowerInstallCommand);
+
+  if (result.code != 0) {
+    //Error happened, report it.
+    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'service');
+  } else {
+    this.addServiceToIonicJson(serviceName);
+  }
+}
+
+IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(serviceName) {
+  var bowerUninstallCommand = 'bower unlink ionic-service-' + serviceName;
+
+  var result = exec(bowerUninstallCommand);
+
+  if (result.code != 0) {
+    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    this.ionic.fail(errorMessage, 'service')
+  } else {
+    // console.log('Uninstalled Ionic service', serviceName);
+  }
+}
+
+IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLocation() {
+  var bowerRcFileLocation = path.join(process.cwd(), '.bowerrc');
+  // console.log('location bowerrc: ' , bowerRcFileLocation)
+  var bowerRc = null;
+
+  try {
+    var content = fs.readFileSync(bowerRcFileLocation, 'utf8');
+    bowerRc = JSON.parse(content);
+    // console.log('bowerRc contents: ', bowerRc)
+  } catch (ex) { }
+
+  var directory = 'www/lib'; //Default directory
+
+  if (bowerRc && bowerRc.directory) {
+    directory = bowerRc.directory;
+  }
+
+  return directory;
+}
+
+IonicTask.prototype.getBowerJson = function getBowerJson(directory, serviceName) {
+  var bowerJsonLocation = path.join(process.cwd(), directory, 'ionic-service-' + serviceName, 'ionic-plugins.json');
+  var packageBowerJson = require(bowerJsonLocation);
+  return packageBowerJson;
+}
+
+IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory, serviceName) {
+  // var bowerJsonLocation = process.cwd() + '/' + directory + '/ionic-service-' + serviceName + '/bower.json';
+  // var packageBowerJson = require(bowerJsonLocation);
+  var packageBowerJson = this.getBowerJson(directory, serviceName);
+
+  // console.log('bowerjson = ', packageBowerJson.plugins);
+  // console.log('ionic - ', IonicCordova);
+  _.each(packageBowerJson.plugins, function(plugin) {
+    // var ic = new IonicCordova();
+    // ic.run('ionic plugin add ' + plugin);
+    console.log('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
+    var installPluginCmd = 'ionic plugin add ' + plugin.uri;
+    console.log(installPluginCmd);
+    var pluginInstallResult = exec(installPluginCmd);
+
+    if (pluginInstallResult.code != 0) {
+      var errorMessage = 'Failed to find the plugin "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      this.ionic.fail(errorMessage, 'service');
+    }
+    // console.log(pluginInstallResult);
+  })
+}
+
+IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bowerJson) {
+  _.each(bowerJson.plugins, function(plugin) {
+    console.log('Uninstalling cordova plugin -  ' + plugin.name);
+    var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
+    console.log(uninstallPluginCmd);
+    var pluginRemoveResult = exec(uninstallPluginCmd)
+
+    if (pluginRemoveResult.code != 0) {
+      var errorMessage = 'Failed to find the plugin to remove "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      this.ionic.fail(errorMessage, 'service');
+    }
+  })
+}
+
+IonicTask.prototype.addService = function addService(serviceName) {
+  this.installBowerComponent(serviceName);
+
+  var directory = this.getBowerComponentsLocation();
+  // console.log('Directory we are searching for bower.json - ', directory);
+
+  console.log('Checking for any plugins required by service package');
+
+  this.installBowerPlugins(directory, serviceName);
+  console.log('ionic service add completed');
+}
+
+IonicTask.prototype.removeService = function removeService(serviceName) {
+  var directory = this.getBowerComponentsLocation();
+  var packageBowerJson = this.getBowerJson(directory, serviceName);
+
+  this.uninstallBowerComponent(serviceName);
+
+  this.uninstallBowerPlugins(packageBowerJson);
+
+}
+
+IonicTask.prototype.listServices = function listServices() {
+  // var directory = this.getBowerComponentsLocation();
+  var bowerJson = require(process.cwd() + '/bower.json');
+  // console.log(bowerJson);
+
+}
+
+// Need to look at bower.json of package just installed and look for any cordova plugins required
+// Check the directory in the projects `.bowerrc` file
+// Then go to /path/to/bower/components/<ionic-service-serviceName>/ionic-plugins.json - 'plugins'
+// For each plugins - call 'ionic add plugin <current-required-plugin>'
+IonicTask.prototype.run = function run(ionic, callback) {
+  this.ionic = ionic;
+
+  IonicStats.t();
+
+
+  if (!bower.IonicBower.checkForBower()) {
+    this.ionic.fail(bower.IonicBower.installMessage, 'service');
+    return;
+  }
+
+  var action = argv._[1]
+  var serviceName = argv._[2];
+
+  try {
+    switch (action) {
+      case 'add':
+        this.addService(serviceName);
+        break;
+      case 'remove':
+        this.removeService(serviceName);
+        break;
+      case 'list':
+        this.listServices();
+        break;
+    }
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    this.ionic.fail(errorMessage, 'service')
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f36e3667be..1100c36b64 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1811,6 +1811,11 @@
         }
       }
     },
+    "underscore": {
+      "version": "1.7.0",
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+    },
     "unzip": {
       "version": "0.1.9",
       "from": "unzip@0.1.9",
diff --git a/package.json b/package.json
index 5dfa933b4c..685ae01890 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "tiny-lr-fork": "0.0.5",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",
-    "xml2js": "0.4.4"
+    "xml2js": "0.4.4",
+    "underscore": "~1.7.0"
   }
 }

From bb2f5ba9f076a2e4c6222015d88ee5b522962b89 Mon Sep 17 00:00:00 2001
From: Mehdy Dara <mdara@eleven-labs.com>
Date: Tue, 9 Dec 2014 17:06:47 +0100
Subject: [PATCH 0308/1100] spawn use option "stdio" inheritance

* http://nodejs.org/api/child_process.html#child_process_child_process_spawn_command_args_options
* Less code
* Color enabled
---
 lib/ionic/serve.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 55a74e9687..0c18d946a7 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -133,21 +133,10 @@ IonicTask.prototype.start = function(ionic) {
     // gulpStartupTasks should be an array of tasks set in the project config
     // watchSass is for backwards compatible sass: true project config
     if((this.gulpStartupTasks && this.gulpStartupTasks.length) || this.watchSass) {
-      var spawn = require('cross-spawn').spawn;
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
       console.log('Gulp startup tasks:'.green.bold, tasks);
-      var childProcess = spawn('gulp', tasks);
-
-      childProcess.stdout.on('data', function (data) {
-        process.stdout.write(data);
-      });
-
-      childProcess.stderr.on('data', function (data) {
-        if(data) {
-          process.stderr.write(data.toString().yellow);
-        }
-      });
+      require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
     }
 
     if(this.runLivereload) {

From f9712b3be0abbb02a6585ad1f5b1cf4f201ae814 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 9 Dec 2014 11:12:07 -0700
Subject: [PATCH 0309/1100] Adding in the environment variable http_proxy for
 npm defaults, along with the PROXY env variable we suggested

---
 lib/ionic.js         | 2 +-
 lib/ionic/lib.js     | 2 +-
 lib/ionic/login.js   | 2 +-
 lib/ionic/package.js | 2 +-
 lib/ionic/start.js   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d34d78d506..0bd4be6f11 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -540,7 +540,7 @@ Ionic = {
         return;
       }
 
-      var proxy = process.env.PROXY || null;
+      var proxy = process.env.PROXY || process.env.http_proxy || null;
       var request = require('request');
       request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
         try {
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 460b657ede..e64ff7c9bf 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -80,7 +80,7 @@ IonicTask.prototype.getVersionData = function(version) {
     url += '/' + version + '/version.json';
   }
 
-  var proxy = process.env.PROXY || null;
+  var proxy = process.env.PROXY || process.env.http_proxy || null;
   request({ url: url, proxy: proxy }, function(err, res, body) {
     try {
       if(err || !res || !body) {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 9b29a04371..7710f39fa6 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -104,7 +104,7 @@ IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
       username: self.email.toString().toLowerCase(),
       password: self.password
     },
-    proxy: process.env.PROXY || null
+    proxy: process.env.PROXY || process.env.http_proxy || null
   },
   function (err, response, body) {
     if(err) {
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 55ae310364..1234dc80b7 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -169,7 +169,7 @@ IonicTask.prototype.loadAppSigning = function(callback) {
       }).join("; "),
       cck: cck
     },
-    proxy: process.env.PROXY || null
+    proxy: process.env.PROXY || process.env.http_proxy || null
   };
 
   request(options, function(err, response, body) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0b3b787e24..3e43ea68ac 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -247,7 +247,7 @@ IonicTask.prototype.fetchCodepen = function() {
   var qCSS = Q.defer();
   var qJS = Q.defer();
 
-  var proxy = process.env.PROXY || null;
+  var proxy = process.env.PROXY || process.env.http_proxy || null;
 
   request({ url: codepenUrl + '.html', proxy: proxy }, function(err, res, html) {
     if(!err && res && res.statusCode === 200) {

From 0835f23c99b9ae562d604208a863173bbed18a34 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 9 Dec 2014 12:11:07 -0700
Subject: [PATCH 0310/1100] Adding documenation to README about working around
 proxies, as well as adding in the additional http_proxy in lib/ionic.js

---
 README.md    | 17 +++++++++++++++++
 lib/ionic.js |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8d807c0ca..17bdcb1962 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,23 @@ Ionic uses Cordova underneath, so you can also substitute Cordova commands to pr
 
 *Note: we occasionally send anonymous usage statistics to the Ionic team to make the tool better.*
 
+## Working around proxies
+
+If you have a proxy you need to get around, you can pass that proxy with the default `http_proxy` [node environment variable](https://www.npmjs.org/doc/misc/npm-config.html#proxy) or an environment variable `proxy`.
+
+A few ways to set up and use the environment variable:
+
+```bash
+export http_proxy=internal.proxy.com
+# Or
+export PROXY=internal.proxy.com
+
+ionic start my_app
+
+# Additionally, pass in line
+PROXY=internal.proxy.com ionic start my_app
+```
+
 
 ## Using Sass
 
diff --git a/lib/ionic.js b/lib/ionic.js
index 0bd4be6f11..ccc80aeae2 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -648,7 +648,7 @@ Ionic = {
       readStream.pipe(writeStream);
     };
 
-    var proxy = process.env.PROXY || null;
+    var proxy = process.env.PROXY || process.env.http_proxy || null;
     var request = require('request');
     request({ url: archiveUrl, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
       if(err) {

From 78e4117ae1c145ed3d8aecef56f147417d0926d7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 9 Dec 2014 20:35:20 -0700
Subject: [PATCH 0311/1100] Refactoring changes to use the Ionic.fetchArchive
 instead of using the git clone and curl commands

---
 lib/ionic/CrosswalkNotes.md |  12 ++
 lib/ionic/browser.js        | 218 ++++++++++++++++++++++--------------
 2 files changed, 149 insertions(+), 81 deletions(-)

diff --git a/lib/ionic/CrosswalkNotes.md b/lib/ionic/CrosswalkNotes.md
index 089b730a1a..83af78b830 100644
--- a/lib/ionic/CrosswalkNotes.md
+++ b/lib/ionic/CrosswalkNotes.md
@@ -16,3 +16,15 @@ A problem occurred evaluating script.
 > No installed build tools found. Please install the Android build tools version 19.1.0 or higher.
 
 Had to bump the minversionnumber in platform/android/AndroidManifest.xml to 14 from 10.
+
+
+
+
+## Roadmap for Crosswalk integration
+
+Cordova release in Jan 2015 is pushing for pluggable web views
+
+In the meantime, do we go ahead and release now as a beta?
+
+When they do release, how do we integrate with those changes?
+
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 510d8b57e8..46d65fe2b8 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -18,22 +18,29 @@
 //Install the crosswalk latest files
 // cordova platform remove android
 // cordova platform add android@3.5
-var path = require('path'),
-    shelljs = require('shelljs');
+
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    request = require('request'),
+    Q = require('q'),
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    proxyMiddleware = require('proxy-middleware'),
+    unzip = require('unzip'),
+    Ionic = require('../ionic').Ionic,
+    IonicStats = require('./stats').IonicStats;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+
 
 var XWALK_LIBRARY_PATH = path.join(process.cwd(), 'tmp', 'xwalk');
 var ARM_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/arm/crosswalk-webview-8.37.189.0-arm.zip";
 var X86_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/x86/crosswalk-webview-8.37.189.0-x86.zip";
 
-function downloadFiles() {
-	var tempDir = '../../tmp/crosswalk-engine';
-	//Download ARM
-	//unzip ARM
-	//rm zip
-	var libCrossWalk = path.join(process.cwd(), 'libs', 'xwalk_core_library');
-
-}
-
 function updateCrosswalkProject() {
 	// prepare xwalk_core_library
 	if(fs.existsSync(XWALK_LIBRARY_PATH)) {
@@ -44,34 +51,35 @@ function updateCrosswalkProject() {
 	}
 }
 
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    shelljs = require('shelljs'),
-    Task = require('./task').Task,
-    proxyMiddleware = require('proxy-middleware'),
-    IonicStats = require('./stats').IonicStats;
+IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngine() {
+  var q = Q.defer();
 
-var IonicTask = function() {};
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.getCrosswalkEngine = function getCrosswalkEngine() {
   if(!fs.existsSync(path.join(process.cwd(), 'engine'))) {
     shelljs.mkdir(path.join(process.cwd(), 'engine'));
   }
 
   if(fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine'))) {
-    return; //It exists, nothing to do here.
+    q.resolve();
+    return q.promise;
   }
 
-  shelljs.cd(path.join(process.cwd(), 'engine'));
-  var downloadResult = shelljs.exec('git clone --depth=1 git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
-  shelljs.cd('..')
+  // shelljs.cd(path.join(process.cwd(), 'engine'));
+  // var downloadResult = shelljs.exec('git clone --depth=1 git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
+  var downloadUrl = 'https://github.com/driftyco/cordova-crosswalk-engine/archive/v0.8.zip';
 
-  if(downloadResult.code == 1) {
-    //LOG ERROR
-  }
+  var tempZipFilePath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine.zip');
+  var zipOutPath = path.join(process.cwd(), 'engine');
+
+  Ionic.fetchArchive(zipOutPath, downloadUrl)
+  .then(function(data) {
+    console.log('downloaded')
+    q.resolve();
+  }, function(error) {
+    console.log('failed to download engine - ', error);
+    q.reject();
+  })
+
+  return q.promise;
 }
 
 IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
@@ -83,78 +91,114 @@ IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   }
 }
 
-// download() {
-//     TMPDIR=cordova-crosswalk-engine-$$
-//     pushd $TMPDIR > /dev/null
-//     echo "Fetching $1..."
-//     curl -# $1 -o library.zip
-//     unzip -q library.zip
-//     rm library.zip
-//     PACKAGENAME=$(ls|head -n 1)
-//     echo "Installing $PACKAGENAME into xwalk_core_library..."
-//     cp -a $PACKAGENAME/* ../libs/xwalk_core_library
-//     popd > /dev/null
-//     rm -r $TMPDIR
-// }
-
-// download $ARM_DOWNLOAD
-// download $X86_DOWNLOAD
-
-function downloadCrosswalkEngine(architecture, version) {
-  var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
-    version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip -o library.zip';
+function downloadCrosswalkWebview(architecture, version) {
+  // var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
+    // version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip -o library.zip';
+  var q = Q.defer();
+
+  var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
+    version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip';
+
+  var tempZipFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
 
   //Ensure xwalk-webviews folder exists
   if (!fs.existsSync(path.join(process.cwd(), 'engine', 'xwalk-webviews'))) {
     shelljs.mkdir(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
   }
 
-  shelljs.cd(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
+  Ionic.fetchArchive(tempZipFilePath, downloadUrl)
+  .then(function(data) {
+    console.log('xwalk download good - ', data);
+
+    //Need to go copy to android directory.
+    var fileName = fs.readdirSync(tempZipFilePath);
+    console.log('fileName for dirs ', fileName)
+
+    var copySource = path.join(tempZipFilePath, fileName[0], '*');
+    console.log('copy source - ', copySource)
+
+    var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library', '/')
+    console.log('copyDestination - ', copyDestination);
 
-  console.log('Downloading the crosswalk webview for ' + architecture + ', version ' + version);
-  var resultCurl = shelljs.exec(command);
 
-  //TODO: Check for resultCurl
+    var cpXwalkLibsCmd = 'cp -r ' + copySource + ' ' + copyDestination;
+    var cpResult = shelljs.exec(cpXwalkLibsCmd)
 
-  console.log('Unzipping webview binaries')
-  var unzipCommand = 'unzip -q library.zip -d unzipped';
-  var resultUnzip =  shelljs.exec(unzipCommand);
-  var fileName = fs.readdirSync('unzipped')[0];
+    console.log('Result from cp - ' , cpResult)
+    // var archDirectory = fs.readdirSync(path.join(fileName[0]));
+    // console.log('archDirectory - ', archDirectory);
 
-  console.log('file name: ', fileName);
+    q.resolve(data);
+  }, function(error) {
+    console.log('xwalk download failed - ', error)
+    q.reject(error);
+  })
 
-  shelljs.cd('../../'); //Back at process.cwd() in ionic project root
+  // shelljs.cd(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
 
-  var copySource = path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped', fileName, '*');
-  console.log('copy source ', copySource)
-  var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library', '/');
-  var cpArmLibsCommand = 'cp -r ' + copySource + ' ' + copyDestination;
-  console.log('command: ', cpArmLibsCommand);
-  shelljs.exec(cpArmLibsCommand);
+  // console.log('Downloading the crosswalk webview for ' + architecture + ', version ' + version);
+  // var resultCurl = shelljs.exec(command);
 
-  shelljs.rm('-rf', path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped'));
+  // console.log('Unzipping webview binaries')
+  // var unzipCommand = 'unzip -q library.zip -d unzipped';
+  // var resultUnzip =  shelljs.exec(unzipCommand);
+  // var fileName = fs.readdirSync('unzipped')[0];
 
+  // console.log('file name: ', fileName);
+
+  // shelljs.cd('../../'); //Back at process.cwd() in ionic project root
+
+  // var copySource = path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped', fileName, '*');
+  // console.log('copy source ', copySource)
+  // var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library', '/');
+  // var cpArmLibsCommand = 'cp -r ' + copySource + ' ' + copyDestination;
+  // console.log('command: ', cpArmLibsCommand);
+  // shelljs.exec(cpArmLibsCommand);
+
+  // shelljs.rm('-rf', path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped'));
+  return q.promise;
 }
 
 IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews() {
   // var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/8.37.189.14/arm/crosswalk-webview-8.37.189.14-arm.zip -o arm.zip';
   var version = '8.37.189.14';
 
-  downloadCrosswalkEngine('arm', version);
-  downloadCrosswalkEngine('x86', version);
+  var armPromise = downloadCrosswalkWebview('arm', version);
+  var x86Promise = downloadCrosswalkWebview('x86', version);
+  // downloadCrosswalkWebview('x86', version);
+
+  return Q.all[armPromise, x86Promise];
 }
 
 IonicTask.prototype.getCordovaAndroid40x = function getCordovaAndroid40x() {
+  var q = Q.defer();
+
   if (fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-android'))) {
-    return;
+    q.resolve();
+    return q.promise;
   }
-  var command = 'git clone --depth=1 -b 4.0.x git@github.com:apache/cordova-android.git';
+  // var command = 'git clone --depth=1 -b 4.0.x git@github.com:apache/cordova-android.git';
+  var downloadUrl = 'https://github.com/driftyco/cordova-android/archive/v4.0.x.zip';
 
-  shelljs.cd(path.join(process.cwd(), 'engine'));
+  var tempZipFilePath = path.join(process.cwd(), 'engine');
 
-  var result = shelljs.exec(command);
 
-  shelljs.cd('..');
+  Ionic.fetchArchive(tempZipFilePath, downloadUrl)
+  .then(function(data) {
+    console.log('downloaded - ', data);
+    q.resolve();
+  }, function(error) {
+    console.log('download fail - ', error);
+    q.reject();
+  })
+
+  // shelljs.cd(path.join(process.cwd(), 'engine'));
+
+  // var result = shelljs.exec(command);
+
+  // shelljs.cd('..');
+
+  return q.promise;
 }
 
 IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
@@ -163,17 +207,17 @@ IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  'cordova platform add ./engine/cordova-android/';
+  var command =  'cordova platform add ./engine/cordova-android-4.0.x/';
   var result = shelljs.exec(command);
 }
 
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
-  var command = 'cordova plugin add ./engine/cordova-crosswalk-engine';
+  var command = 'cordova plugin add ./engine/cordova-crosswalk-engine-0.8';
   var result = shelljs.exec(command);
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
-  var xwalkLibraryPath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library');
+  var xwalkLibraryPath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library');
 
   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
 
@@ -187,13 +231,25 @@ IonicTask.prototype.run = function(ionic) {
   this.ionic = ionic;
 
 
-  this.getCrosswalkEngine();
+  // this.getCordovaCrosswalkEngine()
+  // .then(function(data) {
+  //   console.log('we completed the download')
+  //   return self.getCordovaAndroid40x();
+  // }, function(error) {
+  //   console.log('Error - ', error)
+  // })
+  // .then(function(data) {
+  //   console.log('downloaded Android runtimes');
+
+  //   self.getCrosswalkWebviews();
 
-  this.getAndroidRuntimes();
+  // }, function(error) {
+  //   console.log('failed to download android runtime');
+  // })
 
-  this.getCrosswalkWebviews();
+  // this.getAndroidRuntimes();
 
-  this.getCordovaAndroid40x();
+  // this.getCordovaAndroid40x();
 
   this.removeAndroidProject();
 

From b684e4ab301e34f30bdaa110f0427601c4ed3cc4 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 10 Dec 2014 11:37:56 -0600
Subject: [PATCH 0312/1100] New serve

---
 lib/ionic/assets/preview.html |  60 +++-
 lib/ionic/serve.js            |  45 ++-
 npm-shrinkwrap.json           | 631 ++++++++++++++++------------------
 package.json                  |   2 +-
 4 files changed, 379 insertions(+), 359 deletions(-)

diff --git a/lib/ionic/assets/preview.html b/lib/ionic/assets/preview.html
index 25e11303b9..61c4b7e0ed 100644
--- a/lib/ionic/assets/preview.html
+++ b/lib/ionic/assets/preview.html
@@ -1,17 +1,18 @@
 <!doctype html>
-<html>
+<html ng-app="app">
   <head>
+    <title ng-bind="appName"></title>
     <style>
       body {
-        background-color: #31363f;
+        background-color: #EFF1F5;
         font-family: 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
         padding: 0;
         margin: 0;
       }
       preview {
         display: block;
-        max-width: 840px;
-        margin: 30px auto 0 auto;
+        max-width: 855px;
+        margin: 10px auto 0 auto;
         overflow: auto;
       }
       h2 {
@@ -43,6 +44,10 @@
       #header a:hover {
         opacity: 1;
       }
+      h2 a {
+        color: #222;
+        text-decoration: none;
+      }
       .phone {
         float: left;
         margin: 20px;
@@ -60,8 +65,8 @@
       #android-frame {
         top: 88px;
         left: 24px;
-        width: 360px;
-        height: 640px;
+        width: 375px;
+        height: 667px;
       }
       #iphone {
       }
@@ -74,7 +79,11 @@
         position: fixed;
         top: 20px;
         left: 20px;
-        opacity: 0.3;
+        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACQRJREFUeNrsXQmMFEUUrR0OEVAINyoIKIjGa4NBAhhZFA0uQU1cgxwJciyECGgIEQKoxEU0iCIQ5BA0AWQjRhJYUA4BIxIhQQMaWUHCIrccETnWLAi+R7/Gdtid7Znp7mGG/slL7dFT/f/rOn79+tWTNXPWXJMq2b33yO0o2gH3A22AFkBToCFQy3FpGVAKnAD2AyXCD8DW1i2bHEmVDVUDJqwOiqeA7kBX4NaoS44BB3gpcA44A1QDagD8bF3gQeDRqHpJ6tfAcmAdCD2dMQTCON6jBzAAeBKorn8VA/OALcB2YCcMP+uyThJ5J/AQ0B7oCPQXyvD/IpTzgdWo8x8/7cvyqwvLyKHAcOAW4BKwEVgKrIRhv3t8vzv0oJ51tFC25hnALNzvTFoQCENuQjEKeFndjuPTHLYIGLE/oKGCZL4IDAIaa+ycDkx128oDJxBKZ6kLTZbSe4FJwEIoXZaiSepG6TQWaAYcBEYDhdDpkhf3iHikaGsUG4AFGvTZbdtCyfmpIo+Ce5cCH+LHVsArQG3gU2A9dG4R7REAnYC2QCSwFoib5aN4T24HCRwNpU+aa1CgK92jtzWhndaD5sz/DnCv49Ij+tt02HLRFwKhTE0U/HAf4BC7Cm621qSBQPdczdKNK7mUE16vWCRGElSAs+omkfcVHeF0IU9de6VaYWWSB4zwdAwEeXeh+B7IVnfoAYVOmPSTgS6vezXWmFg1TvLu4wAM1AMGg7iPTPpKF5fXNdEyszgpAtXy1su347iw1KS31I3j2vpJdWGNeWvV8vpkAHn2KiXpayMuyONsWyRHdEiGkEdZ4fK6n2HzvmRa4Fx7wkjzMS9aOAH+6WYSSXgWlpNsuyrjM4g8ujIHFHiojMRGCTnSWp79CJySn+erq4L7VUHRE8gxVlC1WpxV0Nn9w1jhsaVuoy+4720oxiiS00yEbpSjzZVVTdlf4ppABQY2KCz0hN9Osh7W58aKTHshXIr1ht4bPFixFInQruUFICpyY/qLvAUBkMf1KaPJjE6/C8wGShIJhKIuttzngQJgFX7vjHq2JbNiQR0LtGrpBSypdAxUPI8hqZMK/fgtE9R1hkFhBiL2JBpFxucOAx8YK/LNIWC6B/qN0TA2BdzUcjOJjNIi+/WAoiq9gV8023s1QWxGUWisUH+ydTFa84Z6yKiYBCoMz0jyXi8NitHl6snL3+xVgNMhmzysa6axdgNHQOfasVrgUC3VJgURCGULB7KAwT5U/7eHel7QsMaHPaxcArV7Nlwz2EITSrR8AhwlR3K5rpqF6QdxzTvR69anG/LhjDTW5nkyws30Aui4LGDHuxR2cCU2TpPUqmgCOVVfkvPoJXm8xzI9oKNyUA/qXvEI62klZ/sL1EsSJwTcCj8WgQP/R6AyBsjqRq/3a7UEJHmfGSvsX5rkA2mqQMB4/My0jhUBtsI9uOc3tIfuHjMg7DGQ6RbMGPAj0sLdsN+AfsmSZ/t6KJ7WJDE2BWPhMnH1uHMS6a5ypQ83vBlY5OW4iro4BKwBOqSAwCKVPZ0EcgFf7EP3tWWfT3VmpSCKswfFLuCxywQqxYwRiW/TzK24mMJ7f8flJ7hrwhbYTn/cErp6rmWryvYRRwhpe8iLa7EjPNkksI1+2Rny4t6bUtkyopXBMa/TvjJZwBWj1gxxtSCBdEwPhLTELSWcSEggI8LHQz7iFrbC+iSQUdZzIR9xC7twDduRPhPyEbdwKXlDJOQhYbngXMrVDvmIW2rZBNJ9qRnyEbeQszMkkLtODUI+4hZydpwEHlYwIZT4hJwdjsghbFjepnEoFazjLK7oP5eQwF36+90hNa7F5moXCdyhXx4IeXEtNlc7SKAdmnk45MW12Fxtiyh9lcGER0JeXAu5OkDubEeaeXQ8I9Y8g4y83acJhBy1FWdXViJfqszNkFmS2459gb98qD7XyZlNIHfZue2YlwHk8Ygrc3t4ov19H26RJ65WXSEQfZmhmdVAl3TtxtB7onJXmJrHLFXu3xb40H27GOtVAqecLZDCnBjusw5I08b3mrFyVpj9wGyIZ5SW5qUMEEdX8oecyUV8Yjy2OhRMv5XKg9KJCPMMAxhXh4ojOzvhvxaop8UXNDC9t1/oqVwl/cTNDGfLjg6oMkOefXucGPdKavhgUGBrd3ExTtzMdv4vEtUNuFEyDWgJ5HuoQyePDWJ3ZQJ5UOeU88XJNHFkKmqBlKnGSoScqCTwZIUZ8y+gro4eG3SPsV4g4XfrIwcTxcnU6P9HyhmM+TIG5t3xg1M80IFH5s9z6ocyI5UgmYghVfg+GIA6zTJW1vybAbS+KeJibHmvlArkqBfqy1FraeKRUYwgPQe9dvvc+roZKw+RWak55R3FCOywoc5X5CmS0cjE/74GtuLDerDL/X4nFvStrwfF9Ofsih5WzNeeoBKe35irVUqu30pfQ6sanipgti7zxvNh97yKro1U4pzyg4tVUYG5fqRANi+KRZ5x2Y3y1ZXH4MkMug5aH20cI5uHVHZ9pQTiCTBvpodmvTm4QV4Gk0fb5sjWHrLdJNsCSSLXf5yReHpzcSaSKJsWy8Zustl4QqBI/NVYr+3krFyYSd1ZthTKtq6y1XhKoEj8CUVnYx3VmocbT3YevEvH2ZY2GOtVpLSps2w0vhDoaIkd7ImF0718pnQjr75cFXvC6BBPy0uYQMeY2Nnh4uyQ154u5HWTk3zZVVHLO5RIXQnnB3KGAvrKzaG3vgaKzfcoAOFbYIA6anlWR05yPzezrecERjnb2VovMuS9G0q+5HE8MVniqlMnYx1PGCBdsytzkgMhUCRSsRwpxzUrI9vFUHpgKokUcdwnKZZO56VjjleBiCBfg7zAx8OM0To0F1Hcw2gs94SB4qlev+U8k17ETdJyFfHpYqzds0NqebOjI8nXPIEOw2K9Cp4nRBN5FTz3Q5hixiwphseYq9JW/y5T9Ihbj0U+bG0GS2CU4c4vI+CYGZ0Za38ZAQ/+2F9GQGEskTnJDfSZhlGf42cYJ2S6xSp70zsICfTbHGTYEiHW12Hw5+hdt7MimK8PWGesxFD6cttivSDRb/lXgAEA54tdUatEpQUAAAAASUVORK5CYII=);
+        background-repeat: no-repeat;
+        width: 40px;
+        height: 40px;
+        background-size: 100%;
       }
       #logo:hover {
         opacity: 1;
@@ -82,12 +91,13 @@
       #logo img {
         max-width: 100%;
       }
-      @media screen and (max-height:860px) {
-        #logo {
-          display: none;
-        }
-      }
     </style>
+
+    <!-- quick and dirty templating, don't touch this -->
+    <script>
+      //INSERT_JSON_HERE;
+    </script>
+
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.min.js"></script>
     <script>
       angular.module('app', [])
@@ -102,13 +112,17 @@
             $scope.screenSize = $scope.screenSizes[0];
           }
         }
-      });
+      })
+      .run(['$rootScope', function($rootScope) {
+        $rootScope.appName = BOOTSTRAP && (BOOTSTRAP.appName + ' - Ionic Lab') || 'Ionic App';
+      }]);
     </script>
+
   </head>
-  <body ng-app="app">
+  <body>
     <a target="_blank" href="http://ionicframework.com/" id="logo">
-      <img src="http://docs.ionic.io/img/ionic-logo.png">
     </a>
+    <!--
     <header id="header">
       <a target="_blank" href="http://ionicframework.com/docs/components/">CSS</a>
       <a target="_blank" href="http://ionicframework.com/docs/api/">API</a>
@@ -116,6 +130,7 @@
       <a target="_blank" href="http://ngcordova.com/">ngCordova</a>
       <a target="_blank" href="https://github.com/driftyco/ionic">GitHub</a>
     </header>
+    -->
     <preview>
       <!--
       <div id="choice">
@@ -124,13 +139,13 @@
       -->
       <div class="phone">
         <div id="iphone">
-          <h2>iPhone 6</h2>
+          <h2><a href="/?ionicplatform=ios" target="_blank">iOS</a></h2>
           <iframe id="iphone-frame" src="/?ionicplatform=ios" class="frame"></iframe>
         </div>
       </div>
       <div class="phone">
         <div id="android">
-          <h2>Android</h2>
+          <h2><a href="/?ionicplatform=android" target="_blank">Android</a></h2>
           <iframe id="android-frame" src="/?ionicplatform=android" class="frame"></iframe>
         </div>
       </div>
@@ -140,5 +155,16 @@ <h2>Android</h2>
       <img src="http://docs.ionic.io/img/ionic-logo.png">
     </a>
     -->
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-44023830-9', {
+        'cookieDomain': 'none'
+      })
+      ga('send', 'pageview');
+    </script>
   </body>
 </html>
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 55a74e9687..a722beab5f 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -13,10 +13,12 @@ var fs = require('fs'),
     Task = require('./task').Task,
     proxyMiddleware = require('proxy-middleware'),
     url = require('url'),
+    xml2js = require('xml2js'),
     IonicStats = require('./stats').IonicStats;
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
+var IONIC_LAB_URL = '/ionic-lab';
 
 var IonicTask = function() {};
 
@@ -167,7 +169,7 @@ IonicTask.prototype.start = function(ionic) {
           console.log('Watching :'.green.bold, self.watchPatterns);
           if(self.launchLab) {
             var open = require('open');
-            open( self.host(self.port) + '/lab' );
+            open( self.host(self.port) + IONIC_LAB_URL );
           } else if(self.launchBrowser) {
             var open = require('open');
             open( self.host(self.port) );
@@ -202,7 +204,7 @@ IonicTask.prototype.start = function(ionic) {
       var done = finalhandler(req, res);
 
       var urlParsed = url.parse(req.url, true);
-      var platformOverride = urlParsed.query.ionicplatform;
+      var platformOverride = urlParsed.query && urlParsed.query.ionicplatform;
 
       var platformUrl = getPlatformUrl(req);
       if(platformUrl) {
@@ -237,14 +239,37 @@ IonicTask.prototype.start = function(ionic) {
         return;
       }
 
-      if(req.url === '/lab') {
-        fs.readFile(path.resolve(path.join(__dirname, 'assets/preview.html')), function(err, buf) {
-          if(err) {
-            res.end('404');
-          }
-          res.setHeader('Content-Type', 'text/html');
-          res.end(buf);
-        });
+      if(req.url === IONIC_LAB_URL) {
+        // Serve the lab page with the given object with template data
+        var labServeFn = function(context) {
+          fs.readFile(path.resolve(path.join(__dirname, 'assets/preview.html')), function(err, buf) {
+            var html;
+            if(err) {
+              res.end('404');
+            } else {
+              html = buf.toString('utf8');
+              html = html.replace('//INSERT_JSON_HERE', 'var BOOTSTRAP = ' + JSON.stringify(context || {}));
+            }
+            res.setHeader('Content-Type', 'text/html');
+            res.end(html);
+          });
+        };
+
+        // If the config.xml file exists, let's parse it for some nice features like
+        // showing the name of the app in the title
+        if(fs.existsSync('config.xml')) {
+          fs.readFile(path.resolve('config.xml'), function(err, buf) {
+            var xml = buf.toString('utf8');
+            xml2js.parseString(xml, function (err, result) {
+              labServeFn({
+                appName: result.widget.name[0]
+              });
+            });
+          });
+        } else {
+          labServeFn();
+        }
+
         return;
       }
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1100c36b64..d623d0718d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -9,12 +9,12 @@
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "from": "readable-stream@1.1.13",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@1.0.1",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -24,29 +24,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "string_decoder@0.10.31",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "from": "zip-stream@0.1.4",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.33-1",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@1.0.1",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -56,46 +56,46 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@0.10.31",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "from": "lodash.defaults@2.4.1",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "lodash.keys@2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "lodash._isnative@2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "lodash.isobject@2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "lodash._shimkeys@2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "from": "lodash._objecttypes@2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
+          "from": "lazystream@0.1.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.33-1",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@1.0.1",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -124,12 +124,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@0.10.31",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
+          "from": "file-utils@0.1.5",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
+              "from": "lodash@2.1.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "from": "iconv-lite@0.2.11",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "rimraf@2.2.8",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
+              "from": "glob@3.2.11",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "minimatch@0.3.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "lru-cache@2.5.0",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "sigmund@1.0.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,65 +187,65 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@0.2.14",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "lru-cache@2.5.0",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "sigmund@1.0.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "findup-sync@0.1.3",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "lodash@2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "from": "isbinaryfile@0.1.9",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "lodash@2.4.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -264,12 +264,12 @@
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "parseurl@1.3.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -281,40 +281,40 @@
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "from": "lru-cache@2.5.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "event-stream@3.0.20",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@>=2.3.1 <2.4.0",
+          "from": "through@2.3.6",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "duplexer@0.1.1",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "from@0.1.3",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.5",
-          "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
+          "version": "0.0.4",
+          "from": "map-stream@0.0.4",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -323,29 +323,29 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "split@0.2.10",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "stream-combiner@0.0.4",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "debug@2.0.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -359,13 +359,13 @@
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "version": "0.0.5",
+          "from": "combined-stream@0.0.5",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -376,85 +376,85 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "mime@1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@>=0.9.0 <0.10.0",
+          "from": "async@0.9.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.10",
-      "from": "gulp@>=3.8.8 <3.9.0",
+      "from": "gulp@",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz",
       "dependencies": {
         "archy": {
           "version": "1.0.0",
-          "from": "archy@>=1.0.0 <2.0.0",
+          "from": "archy@^1.0.0",
           "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "chalk@^0.5.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "ansi-styles@^1.1.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "escape-string-regexp@^1.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "has-ansi@^0.1.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@^0.2.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "strip-ansi@^0.3.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@^0.2.1",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "supports-color@^0.2.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "deprecated@^0.0.1",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.1",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "gulp-util@^3.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
           "dependencies": {
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.7-1.2.3 <2.0.0",
+              "from": "dateformat@^1.0.7-1.2.3",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
@@ -469,39 +469,39 @@
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "camelcase-keys@^1.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "camelcase@^1.0.1",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "map-obj@^1.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "from": "indent-string@^1.1.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.0",
-                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "from": "repeating@^1.1.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "from": "is-finite@^1.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "1.0.0",
-                              "from": "meow@>=1.0.0 <2.0.0",
+                              "from": "meow@^1.0.0",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
                             }
                           }
@@ -510,7 +510,7 @@
                     },
                     "object-assign": {
                       "version": "1.0.0",
-                      "from": "object-assign@>=1.0.0 <2.0.0",
+                      "from": "object-assign@^1.0.0",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
                     }
                   }
@@ -519,56 +519,56 @@
             },
             "lodash": {
               "version": "2.4.1",
-              "from": "lodash@>=2.4.1 <2.5.0",
+              "from": "lodash@^2.4.1",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
             },
             "lodash._reinterpolate": {
               "version": "2.4.1",
-              "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
+              "from": "lodash._reinterpolate@^2.4.1",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
-              "from": "lodash.template@>=2.4.1 <3.0.0",
+              "from": "lodash.template@^2.4.1",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
+                  "from": "lodash.defaults@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
                       "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                      "from": "lodash._objecttypes@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
-                  "from": "lodash.escape@>=2.4.1 <2.5.0",
+                  "from": "lodash.escape@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
-                      "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
+                      "from": "lodash._escapehtmlchar@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
+                          "from": "lodash._htmlescapes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
-                      "from": "lodash._reunescapedhtml@>=2.4.1 <2.5.0",
+                      "from": "lodash._reunescapedhtml@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
+                          "from": "lodash._htmlescapes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
@@ -577,39 +577,39 @@
                 },
                 "lodash._escapestringchar": {
                   "version": "2.4.1",
-                  "from": "lodash._escapestringchar@>=2.4.1 <2.5.0",
+                  "from": "lodash._escapestringchar@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "lodash.keys@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "lodash._isnative@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "lodash.isobject@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                          "from": "lodash._objecttypes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "lodash._shimkeys@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                          "from": "lodash._objecttypes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
@@ -618,19 +618,19 @@
                 },
                 "lodash.templatesettings": {
                   "version": "2.4.1",
-                  "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
+                  "from": "lodash.templatesettings@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
                   "version": "2.4.1",
-                  "from": "lodash.values@>=2.4.1 <2.5.0",
+                  "from": "lodash.values@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.0 <0.2.0",
+              "from": "multipipe@^0.1.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
@@ -640,12 +640,12 @@
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "from": "readable-stream@~1.1.9",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "from": "core-util-is@~1.0.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
@@ -655,12 +655,12 @@
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "from": "string_decoder@~0.10.x",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "inherits@~2.0.1",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -671,7 +671,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.1 <0.7.0",
+              "from": "through2@^0.6.1",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -681,7 +681,7 @@
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "from": "core-util-is@~1.0.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
@@ -691,12 +691,12 @@
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "from": "string_decoder@~0.10.x",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@~2.0.1",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -710,17 +710,17 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
+              "from": "vinyl@^0.4.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
+                  "from": "clone@^0.2.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "from": "clone-stats@^0.0.1",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -729,42 +729,42 @@
         },
         "interpret": {
           "version": "0.3.8",
-          "from": "interpret@>=0.3.2 <0.4.0",
+          "from": "interpret@^0.3.2",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"
         },
         "liftoff": {
           "version": "0.13.6",
-          "from": "liftoff@>=0.13.2 <0.14.0",
+          "from": "liftoff@^0.13.2",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "findup-sync@~0.1.2",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
+                  "from": "glob@~3.2.9",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@2",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "from": "minimatch@0.3",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "lru-cache@2",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "sigmund@~1.0.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -773,51 +773,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "lodash@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "1.0.0",
-              "from": "resolve@>=1.0.0 <1.1.0",
+              "from": "resolve@~1.0.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "extend@~1.3.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             },
             "flagged-respawn": {
               "version": "0.3.1",
-              "from": "flagged-respawn@>=0.3.0 <0.4.0",
+              "from": "flagged-respawn@~0.3.0",
               "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "minimist@^1.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "orchestrator@^0.3.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "end-of-stream@~0.1.5",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@~1.3.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "wrappy@1",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -826,41 +826,41 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "sequencify@~0.0.7",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "stream-consume@~0.1.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "pretty-hrtime@^0.2.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "4.1.0",
-          "from": "semver@>=4.1.0 <5.0.0",
+          "from": "semver@^4.1.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "tildify@^1.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.0",
-              "from": "user-home@>=1.0.0 <2.0.0",
+              "from": "user-home@^1.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
             }
           }
         },
         "v8flags": {
           "version": "1.0.5",
-          "from": "v8flags@>=1.0.1 <2.0.0",
+          "from": "v8flags@^1.0.1",
           "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"
         }
       }
@@ -872,7 +872,7 @@
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1436,22 +1436,22 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "optimist@0.6.0",
+      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "wordwrap@0.0.2",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "minimist@0.0.10",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1463,103 +1463,103 @@
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "pkginfo@0.3.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "read@1.0.5",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "mute-stream@0.0.4",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "revalidator@0.1.8",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "utile@0.2.1",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "async@0.2.10",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@*",
+              "from": "deep-equal@0.2.1",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "i@0.3.2",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@0.5.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2.2.8",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "winston@0.6.2",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "async@0.1.22",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "cycle@1.0.3",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "eyes@0.1.8",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "pkginfo@0.2.3",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "request@2.9.203",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "stack-trace@0.0.9",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1568,52 +1568,52 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "proxy-middleware@0.7.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.27.0",
-      "from": "request@2.27.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@>=0.6.0 <0.7.0",
+          "from": "qs@0.6.6",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@5.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "from": "forever-agent@0.5.2",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@>=0.3.0 <0.4.0",
+          "from": "tunnel-agent@0.3.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@>=0.10.0 <0.11.0",
+          "from": "http-signature@0.10.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "assert-plus@0.1.2",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
@@ -1625,179 +1625,179 @@
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@>=1.0.0 <1.1.0",
+          "from": "hawk@1.0.0",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
+              "from": "hoek@0.9.1",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
+              "from": "boom@0.4.2",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "from": "cryptiles@0.2.2",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
+              "from": "sntp@0.2.4",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@>=0.3.0 <0.4.0",
+          "from": "aws-sign@0.3.0",
           "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@>=0.3.0 <0.4.0",
+          "from": "oauth-sign@0.3.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@>=0.3.0 <0.4.0",
+          "from": "cookie-jar@0.3.0",
           "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
         },
         "node-uuid": {
-          "version": "1.4.2",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
+          "version": "1.4.1",
+          "from": "node-uuid@1.4.1",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.9 <1.3.0",
+          "from": "mime@1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.0",
-              "from": "debug@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz"
             },
             "depd": {
               "version": "1.0.0",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "dependencies": {
                 "crc": {
                   "version": "3.2.1",
-                  "from": "crc@3.2.1",
+                  "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "qs@0.5.6",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "faye-websocket@0.4.4",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
+          "from": "noptify@0.0.3",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "nopt@2.0.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "abbrev@1.0.5",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1806,7 +1806,7 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "debug@0.7.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
@@ -1818,92 +1818,92 @@
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
+          "from": "fstream@0.1.31",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.5",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+              "version": "3.0.4",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@0.5.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2.2.8",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "over@0.0.5",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "binary@0.3.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "chainsaw@0.1.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "traverse@0.3.9",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "version": "1.0.33-1",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@1.0.1",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -1913,29 +1913,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "string_decoder@0.10.31",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "setimmediate@1.0.2",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "match-stream@0.0.2",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -1944,44 +1944,32 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
-          "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "version": "3.1.15",
+          "from": "glob-stream@3.1.15",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.1",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
+              "version": "4.0.6",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@1.3.1",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "wrappy@1.0.1",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1989,103 +1977,89 @@
               }
             },
             "minimatch": {
-              "version": "2.0.1",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+              "version": "1.0.0",
+              "from": "minimatch@1.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
-                "brace-expansion": {
-                  "version": "1.0.1",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.0.1.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-                    },
-                    "concat-map": {
-                      "version": "0.0.0",
-                      "from": "concat-map@0.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.0.tgz"
-                    }
-                  }
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "lru-cache@2.5.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "sigmund@1.0.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "ordered-read-streams": {
-              "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+              "version": "0.0.8",
+              "from": "ordered-read-streams@0.0.8",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
             },
             "glob2base": {
-              "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "dependencies": {
-                "find-index": {
-                  "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                }
-              }
+              "version": "0.0.11",
+              "from": "glob2base@0.0.11",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "unique-stream@1.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "glob-watcher@0.0.6",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "gaze@0.5.1",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "globule@0.1.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "lodash@1.0.1",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "glob@3.1.21",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "graceful-fs@1.2.3",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "inherits@1.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "minimatch@0.2.14",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "lru-cache@2.5.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "sigmund@1.0.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2097,57 +2071,57 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+          "version": "3.0.4",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@2.4.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "mkdirp@0.5.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "strip-bom@1.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "first-chunk-stream@1.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "is-utf8@0.2.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.33-1",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@1.0.1",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -2157,36 +2131,31 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@0.10.31",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "from": "xtend@4.0.0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "version": "0.4.3",
+          "from": "vinyl@0.4.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
           "dependencies": {
-            "clone": {
-              "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-            },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "clone-stats@0.0.1",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2195,12 +2164,12 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@0.4.4",
+      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
+          "from": "sax@0.6.x",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
@@ -2210,7 +2179,7 @@
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@>=2.4.1 <2.5.0",
+              "from": "lodash-node@~2.4.1",
               "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }
diff --git a/package.json b/package.json
index 685ae01890..38968a4557 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 12117df3e0e15a2abef8960a658b5487accb159f Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 10 Dec 2014 11:50:18 -0600
Subject: [PATCH 0313/1100] Nicer lab styles

---
 lib/ionic/assets/preview.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/assets/preview.html b/lib/ionic/assets/preview.html
index 61c4b7e0ed..48ae25928f 100644
--- a/lib/ionic/assets/preview.html
+++ b/lib/ionic/assets/preview.html
@@ -45,7 +45,8 @@
         opacity: 1;
       }
       h2 a {
-        color: #222;
+        font-size: 18px;
+        color: #6F7582;
         text-decoration: none;
       }
       .phone {
@@ -53,8 +54,9 @@
         margin: 20px;
       }
       .frame {
-        border: 6px solid #121316;
+        border: 1px solid transparent;
         border-radius: 3px;
+        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.2);
       }
       #iphone-frame {
         top: 109px;

From 8bab19c2fd5a60d67b0be7a677ca6d0c71cb0180 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 10 Dec 2014 11:50:29 -0600
Subject: [PATCH 0314/1100] vbump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 38968a4557..ef64155837 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 0796c9039d930b41127f4779f9f7c85512e46c96 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 10 Dec 2014 12:19:58 -0600
Subject: [PATCH 0315/1100] Better lab

---
 lib/ionic/assets/preview.html | 42 +++++++++++++++++++++++++----------
 package.json                  |  2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/assets/preview.html b/lib/ionic/assets/preview.html
index 48ae25928f..aad119a41f 100644
--- a/lib/ionic/assets/preview.html
+++ b/lib/ionic/assets/preview.html
@@ -1,18 +1,19 @@
 <!doctype html>
 <html ng-app="app">
   <head>
-    <title ng-bind="appName"></title>
+    <title ng-bind="title"></title>
     <style>
       body {
         background-color: #EFF1F5;
         font-family: 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
         padding: 0;
         margin: 0;
+        -webkit-font-smoothing: antialiased;
       }
       preview {
         display: block;
         max-width: 855px;
-        margin: 10px auto 0 auto;
+        margin: 0 auto 0 auto;
         overflow: auto;
       }
       h2 {
@@ -20,6 +21,21 @@
         font-weight: 200;
         letter-spacing: 1px;
       }
+      #header-left {
+        position: absolute;
+        top: 20px;
+        left: 20px;
+        line-height: 40px;
+      }
+      #header-left span {
+        margin-left: 10px;
+        vertical-align: middle;
+        display: inline-block;
+        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+        font-weight: 300;
+        color: #6F7582;
+        font-size: 16px;
+      }
       #header {
       }
       #header #left {
@@ -51,12 +67,12 @@
       }
       .phone {
         float: left;
-        margin: 20px;
+        margin: 40px 20px 0 20px;
       }
       .frame {
-        border: 1px solid transparent;
+        border: none;
         border-radius: 3px;
-        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.2);
+        box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.3);
       }
       #iphone-frame {
         top: 109px;
@@ -75,12 +91,10 @@
       #android {
       }
       #logo {
-        display: block;
+        display: inline-block;
         width: 48px;
         height: 48px;
-        position: fixed;
-        top: 20px;
-        left: 20px;
+        vertical-align: middle;
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACQRJREFUeNrsXQmMFEUUrR0OEVAINyoIKIjGa4NBAhhZFA0uQU1cgxwJciyECGgIEQKoxEU0iCIQ5BA0AWQjRhJYUA4BIxIhQQMaWUHCIrccETnWLAi+R7/Gdtid7Znp7mGG/slL7dFT/f/rOn79+tWTNXPWXJMq2b33yO0o2gH3A22AFkBToCFQy3FpGVAKnAD2AyXCD8DW1i2bHEmVDVUDJqwOiqeA7kBX4NaoS44BB3gpcA44A1QDagD8bF3gQeDRqHpJ6tfAcmAdCD2dMQTCON6jBzAAeBKorn8VA/OALcB2YCcMP+uyThJ5J/AQ0B7oCPQXyvD/IpTzgdWo8x8/7cvyqwvLyKHAcOAW4BKwEVgKrIRhv3t8vzv0oJ51tFC25hnALNzvTFoQCENuQjEKeFndjuPTHLYIGLE/oKGCZL4IDAIaa+ycDkx128oDJxBKZ6kLTZbSe4FJwEIoXZaiSepG6TQWaAYcBEYDhdDpkhf3iHikaGsUG4AFGvTZbdtCyfmpIo+Ce5cCH+LHVsArQG3gU2A9dG4R7REAnYC2QCSwFoib5aN4T24HCRwNpU+aa1CgK92jtzWhndaD5sz/DnCv49Ij+tt02HLRFwKhTE0U/HAf4BC7Cm621qSBQPdczdKNK7mUE16vWCRGElSAs+omkfcVHeF0IU9de6VaYWWSB4zwdAwEeXeh+B7IVnfoAYVOmPSTgS6vezXWmFg1TvLu4wAM1AMGg7iPTPpKF5fXNdEyszgpAtXy1su347iw1KS31I3j2vpJdWGNeWvV8vpkAHn2KiXpayMuyONsWyRHdEiGkEdZ4fK6n2HzvmRa4Fx7wkjzMS9aOAH+6WYSSXgWlpNsuyrjM4g8ujIHFHiojMRGCTnSWp79CJySn+erq4L7VUHRE8gxVlC1WpxV0Nn9w1jhsaVuoy+4720oxiiS00yEbpSjzZVVTdlf4ppABQY2KCz0hN9Osh7W58aKTHshXIr1ht4bPFixFInQruUFICpyY/qLvAUBkMf1KaPJjE6/C8wGShIJhKIuttzngQJgFX7vjHq2JbNiQR0LtGrpBSypdAxUPI8hqZMK/fgtE9R1hkFhBiL2JBpFxucOAx8YK/LNIWC6B/qN0TA2BdzUcjOJjNIi+/WAoiq9gV8023s1QWxGUWisUH+ydTFa84Z6yKiYBCoMz0jyXi8NitHl6snL3+xVgNMhmzysa6axdgNHQOfasVrgUC3VJgURCGULB7KAwT5U/7eHel7QsMaHPaxcArV7Nlwz2EITSrR8AhwlR3K5rpqF6QdxzTvR69anG/LhjDTW5nkyws30Aui4LGDHuxR2cCU2TpPUqmgCOVVfkvPoJXm8xzI9oKNyUA/qXvEI62klZ/sL1EsSJwTcCj8WgQP/R6AyBsjqRq/3a7UEJHmfGSvsX5rkA2mqQMB4/My0jhUBtsI9uOc3tIfuHjMg7DGQ6RbMGPAj0sLdsN+AfsmSZ/t6KJ7WJDE2BWPhMnH1uHMS6a5ypQ83vBlY5OW4iro4BKwBOqSAwCKVPZ0EcgFf7EP3tWWfT3VmpSCKswfFLuCxywQqxYwRiW/TzK24mMJ7f8flJ7hrwhbYTn/cErp6rmWryvYRRwhpe8iLa7EjPNkksI1+2Rny4t6bUtkyopXBMa/TvjJZwBWj1gxxtSCBdEwPhLTELSWcSEggI8LHQz7iFrbC+iSQUdZzIR9xC7twDduRPhPyEbdwKXlDJOQhYbngXMrVDvmIW2rZBNJ9qRnyEbeQszMkkLtODUI+4hZydpwEHlYwIZT4hJwdjsghbFjepnEoFazjLK7oP5eQwF36+90hNa7F5moXCdyhXx4IeXEtNlc7SKAdmnk45MW12Fxtiyh9lcGER0JeXAu5OkDubEeaeXQ8I9Y8g4y83acJhBy1FWdXViJfqszNkFmS2459gb98qD7XyZlNIHfZue2YlwHk8Ygrc3t4ov19H26RJ65WXSEQfZmhmdVAl3TtxtB7onJXmJrHLFXu3xb40H27GOtVAqecLZDCnBjusw5I08b3mrFyVpj9wGyIZ5SW5qUMEEdX8oecyUV8Yjy2OhRMv5XKg9KJCPMMAxhXh4ojOzvhvxaop8UXNDC9t1/oqVwl/cTNDGfLjg6oMkOefXucGPdKavhgUGBrd3ExTtzMdv4vEtUNuFEyDWgJ5HuoQyePDWJ3ZQJ5UOeU88XJNHFkKmqBlKnGSoScqCTwZIUZ8y+gro4eG3SPsV4g4XfrIwcTxcnU6P9HyhmM+TIG5t3xg1M80IFH5s9z6ocyI5UgmYghVfg+GIA6zTJW1vybAbS+KeJibHmvlArkqBfqy1FraeKRUYwgPQe9dvvc+roZKw+RWak55R3FCOywoc5X5CmS0cjE/74GtuLDerDL/X4nFvStrwfF9Ofsih5WzNeeoBKe35irVUqu30pfQ6sanipgti7zxvNh97yKro1U4pzyg4tVUYG5fqRANi+KRZ5x2Y3y1ZXH4MkMug5aH20cI5uHVHZ9pQTiCTBvpodmvTm4QV4Gk0fb5sjWHrLdJNsCSSLXf5yReHpzcSaSKJsWy8Zustl4QqBI/NVYr+3krFyYSd1ZthTKtq6y1XhKoEj8CUVnYx3VmocbT3YevEvH2ZY2GOtVpLSps2w0vhDoaIkd7ImF0718pnQjr75cFXvC6BBPy0uYQMeY2Nnh4uyQ154u5HWTk3zZVVHLO5RIXQnnB3KGAvrKzaG3vgaKzfcoAOFbYIA6anlWR05yPzezrecERjnb2VovMuS9G0q+5HE8MVniqlMnYx1PGCBdsytzkgMhUCRSsRwpxzUrI9vFUHpgKokUcdwnKZZO56VjjleBiCBfg7zAx8OM0To0F1Hcw2gs94SB4qlev+U8k17ETdJyFfHpYqzds0NqebOjI8nXPIEOw2K9Cp4nRBN5FTz3Q5hixiwphseYq9JW/y5T9Ihbj0U+bG0GS2CU4c4vI+CYGZ0Za38ZAQ/+2F9GQGEskTnJDfSZhlGf42cYJ2S6xSp70zsICfTbHGTYEiHW12Hw5+hdt7MimK8PWGesxFD6cttivSDRb/lXgAEA54tdUatEpQUAAAAASUVORK5CYII=);
         background-repeat: no-repeat;
         width: 40px;
@@ -116,14 +130,18 @@
         }
       })
       .run(['$rootScope', function($rootScope) {
-        $rootScope.appName = BOOTSTRAP && (BOOTSTRAP.appName + ' - Ionic Lab') || 'Ionic App';
+        $rootScope.appName = BOOTSTRAP && BOOTSTRAP.appName || null;
+        $rootScope.title = $rootScope.appName && $rootScope.appName + ' - Ionic App' || 'Ionic App';
       }]);
     </script>
 
   </head>
   <body>
-    <a target="_blank" href="http://ionicframework.com/" id="logo">
-    </a>
+    <div id="header-left">
+      <a target="_blank" href="http://ionicframework.com/" id="logo">
+      </a>
+      <span ng-bind="appName"></span>
+    </div>
     <!--
     <header id="header">
       <a target="_blank" href="http://ionicframework.com/docs/components/">CSS</a>
diff --git a/package.json b/package.json
index ef64155837..c630bb2435 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a7a8552602f40978e2d55db4e8586ffd0287df77 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 11 Dec 2014 12:59:23 -0700
Subject: [PATCH 0316/1100] Cleaned up the code. Removed unused functions and
 variables, comments, and updated process at top

---
 lib/ionic/CrosswalkNotes.md |   7 ++
 lib/ionic/browser.js        | 171 +++++++++++++-----------------------
 2 files changed, 66 insertions(+), 112 deletions(-)

diff --git a/lib/ionic/CrosswalkNotes.md b/lib/ionic/CrosswalkNotes.md
index 83af78b830..7f6d9e473a 100644
--- a/lib/ionic/CrosswalkNotes.md
+++ b/lib/ionic/CrosswalkNotes.md
@@ -28,3 +28,10 @@ In the meantime, do we go ahead and release now as a beta?
 
 When they do release, how do we integrate with those changes?
 
+
+
+`ionic browser add crosswalk` will add that engine file.
+It will also add a platform for android
+How do we handle the case of when they want to re-add stuffs?
+Removing Android - browser remove feature
+
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 46d65fe2b8..b52bbb0818 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -6,19 +6,15 @@
 //Find CrossWalk webviews here:
 //https://download.01.org/crosswalk/releases/crosswalk/android/stable/
 
-//Clone the git repo for cordova-crosswalk-engine
-//Clone the git repo for cordova-android 4.0.x
+//Download the release for cordova-crosswalk-engine
+//Download the release for cordova-android with crosswalk
 //Ensure Android API 19 is installed
 //Run cordova platform rm android
-//Run cordova platform add ./engine/cordova-android@4.0.x
+//Run cordova platform add ./engine/cordova-android-crosswalk
 //Run cordova plugin add ./engine/cordova-crosswalk-engine
 //Run android update project on android file
 //Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
-//Install the crosswalk latest files
-// cordova platform remove android
-// cordova platform add android@3.5
-
 var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
@@ -35,22 +31,6 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-
-
-var XWALK_LIBRARY_PATH = path.join(process.cwd(), 'tmp', 'xwalk');
-var ARM_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/arm/crosswalk-webview-8.37.189.0-arm.zip";
-var X86_DOWNLOAD_URL = "https://download.01.org/crosswalk/releases/crosswalk/android/canary/8.37.189.0/x86/crosswalk-webview-8.37.189.0-x86.zip";
-
-function updateCrosswalkProject() {
-	// prepare xwalk_core_library
-	if(fs.existsSync(XWALK_LIBRARY_PATH)) {
-	    exec('android update lib-project --path "' + XWALK_LIBRARY_PATH + '" --target "' + target_api + '"' )
-	} else {
-	    // TODO(wang16): download xwalk core library here
-	    return Q.reject('No XWalk Library Project found. Please download it and extract it to $XWALK_LIBRARY_PATH')
-	}
-}
-
 IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngine() {
   var q = Q.defer();
 
@@ -63,8 +43,6 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
     return q.promise;
   }
 
-  // shelljs.cd(path.join(process.cwd(), 'engine'));
-  // var downloadResult = shelljs.exec('git clone --depth=1 git@github.com:MobileChromeApps/cordova-crosswalk-engine.git');
   var downloadUrl = 'https://github.com/driftyco/cordova-crosswalk-engine/archive/v0.8.zip';
 
   var tempZipFilePath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine.zip');
@@ -72,10 +50,9 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
 
   Ionic.fetchArchive(zipOutPath, downloadUrl)
   .then(function(data) {
-    console.log('downloaded')
     q.resolve();
   }, function(error) {
-    console.log('failed to download engine - ', error);
+    console.log('Failed to download cordova-crosswalk-engine - ', error);
     q.reject();
   })
 
@@ -84,7 +61,7 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
 
 IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   var command = 'echo "y" | android update sdk --no-ui --filter 19 --force';
-  var result = shelljs.exec(command);
+  var result = shelljs.exec(command, { silent: true } );
 
   if(result.code != 0) {
     console.log('error!');
@@ -92,8 +69,6 @@ IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
 }
 
 function downloadCrosswalkWebview(architecture, version) {
-  // var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
-    // version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip -o library.zip';
   var q = Q.defer();
 
   var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
@@ -101,103 +76,63 @@ function downloadCrosswalkWebview(architecture, version) {
 
   var tempZipFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
 
-  //Ensure xwalk-webviews folder exists
   if (!fs.existsSync(path.join(process.cwd(), 'engine', 'xwalk-webviews'))) {
     shelljs.mkdir(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
   }
 
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
-    console.log('xwalk download good - ', data);
-
     //Need to go copy to android directory.
     var fileName = fs.readdirSync(tempZipFilePath);
-    console.log('fileName for dirs ', fileName)
 
     var copySource = path.join(tempZipFilePath, fileName[0], '*');
-    console.log('copy source - ', copySource)
-
-    var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library', '/')
-    console.log('copyDestination - ', copyDestination);
 
+    var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library', '/');
 
-    var cpXwalkLibsCmd = 'cp -r ' + copySource + ' ' + copyDestination;
-    var cpResult = shelljs.exec(cpXwalkLibsCmd)
+    var cpResult = shelljs.cp('-R', copySource, copyDestination);
 
-    console.log('Result from cp - ' , cpResult)
-    // var archDirectory = fs.readdirSync(path.join(fileName[0]));
-    // console.log('archDirectory - ', archDirectory);
+    console.log('Copy result: ', cpResult);
 
     q.resolve(data);
   }, function(error) {
-    console.log('xwalk download failed - ', error)
+    console.log('Crosswalk webviews failed to download - ', error)
     q.reject(error);
   })
 
-  // shelljs.cd(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
-
-  // console.log('Downloading the crosswalk webview for ' + architecture + ', version ' + version);
-  // var resultCurl = shelljs.exec(command);
-
-  // console.log('Unzipping webview binaries')
-  // var unzipCommand = 'unzip -q library.zip -d unzipped';
-  // var resultUnzip =  shelljs.exec(unzipCommand);
-  // var fileName = fs.readdirSync('unzipped')[0];
-
-  // console.log('file name: ', fileName);
-
-  // shelljs.cd('../../'); //Back at process.cwd() in ionic project root
-
-  // var copySource = path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped', fileName, '*');
-  // console.log('copy source ', copySource)
-  // var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine', 'libs', 'xwalk_core_library', '/');
-  // var cpArmLibsCommand = 'cp -r ' + copySource + ' ' + copyDestination;
-  // console.log('command: ', cpArmLibsCommand);
-  // shelljs.exec(cpArmLibsCommand);
-
-  // shelljs.rm('-rf', path.join(process.cwd(), 'engine', 'xwalk-webviews', 'unzipped'));
   return q.promise;
 }
 
 IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews() {
-  // var command = 'curl -# https://download.01.org/crosswalk/releases/crosswalk/android/stable/8.37.189.14/arm/crosswalk-webview-8.37.189.14-arm.zip -o arm.zip';
   var version = '8.37.189.14';
 
   var armPromise = downloadCrosswalkWebview('arm', version);
   var x86Promise = downloadCrosswalkWebview('x86', version);
-  // downloadCrosswalkWebview('x86', version);
 
-  return Q.all[armPromise, x86Promise];
+  return Q.all([armPromise, x86Promise]);
 }
 
-IonicTask.prototype.getCordovaAndroid40x = function getCordovaAndroid40x() {
+IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   var q = Q.defer();
 
-  if (fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-android'))) {
-    q.resolve();
-    return q.promise;
-  }
-  // var command = 'git clone --depth=1 -b 4.0.x git@github.com:apache/cordova-android.git';
-  var downloadUrl = 'https://github.com/driftyco/cordova-android/archive/v4.0.x.zip';
+  var downloadUrl = 'https://github.com/driftyco/cordova-android/archive/crosswalk.zip';
 
   var tempZipFilePath = path.join(process.cwd(), 'engine');
 
-
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
-    console.log('downloaded - ', data);
+    console.log('Finished downloading cordova-android v4.0.x');
+    //Need to make certain files executable
+    var cordovaAndroid4Path = path.join(tempZipFilePath, 'cordova-android-crosswalk', 'bin');
+    var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
+    shelljs.chmod('+x', path.join(cordovaAndroid4Path, '*'));
+    shelljs.chmod('+x', path.join(android4BinPath, '*'))
+    console.log('Changed permissions')
     q.resolve();
   }, function(error) {
-    console.log('download fail - ', error);
+    console.log('Failed to download cordova-android v4.0.x ', error);
     q.reject();
   })
 
-  // shelljs.cd(path.join(process.cwd(), 'engine'));
-
-  // var result = shelljs.exec(command);
-
-  // shelljs.cd('..');
-
   return q.promise;
 }
 
@@ -207,7 +142,7 @@ IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  'cordova platform add ./engine/cordova-android-4.0.x/';
+  var command =  'cordova platform add ./engine/cordova-android-crosswalk/';
   var result = shelljs.exec(command);
 }
 
@@ -221,43 +156,55 @@ IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
 
   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
 
-  shelljs.exec('android update lib-project --path "' + xwalkLibraryPath + '" --target "4"');
+  shelljs.exec('android update lib-project --path "' + xwalkLibraryPath + '" --target "4"', {silent: true});
 
   shelljs.cd('../../');
 }
 
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-  this.ionic = ionic;
-
-
-  // this.getCordovaCrosswalkEngine()
-  // .then(function(data) {
-  //   console.log('we completed the download')
-  //   return self.getCordovaAndroid40x();
-  // }, function(error) {
-  //   console.log('Error - ', error)
-  // })
-  // .then(function(data) {
-  //   console.log('downloaded Android runtimes');
-
-  //   self.getCrosswalkWebviews();
+IonicTask.prototype.downloadFiles = function downloadFiles() {
+  var q = Q.defer();
 
-  // }, function(error) {
-  //   console.log('failed to download android runtime');
-  // })
+  var self = this;
+  this.getCordovaCrosswalkEngine()
+  .then(function(data) {
+    console.log('Downloaded cordova-crosswalk-engine');
+    return self.downloadCordova40x();
+  })
+  .then(function(data) {
+    console.log('Downloaded Cordova Android for Crosswalk');
+    return self.getCrosswalkWebviews();
+  })
+  .then(function(data) {
+    console.log('Downloaded Crosswalk webviews');
+    return self.getAndroidRuntimes();
+  })
+  .then(function(data) {
+    console.log('Downloaded Android runtime (API 19)');
+    q.resolve();
+  }, function(error) {
+    q.reject();
+  })
+  .catch(function(error){
+    q.reject(error);
+  })
 
-  // this.getAndroidRuntimes();
+  return q.promise;
+}
 
-  // this.getCordovaAndroid40x();
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+  this.ionic = ionic;
 
-  this.removeAndroidProject();
+  this.downloadFiles()
+  .then(function(data) {
+    self.removeAndroidProject();
 
-  this.addCordova40xProject();
+    self.addCordova40xProject();
 
-  this.addCrosswalkPlugin();
+    self.addCrosswalkPlugin();
 
-  this.updateAndroidProject();
+    self.updateAndroidProject();
+  })
 
   // IonicStats.t();
 

From 9f8ba9acb76ad6785a5e000324d2572fe38cdebf Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 11 Dec 2014 15:24:04 -0700
Subject: [PATCH 0317/1100] Locking gulp at 3.8.8 so it doesnt introduce
 v8flags dependency thats causing crash. Bumping to 1.2.13

---
 npm-shrinkwrap.json | 668 +++++++++++++++++++++++---------------------
 package.json        |   4 +-
 2 files changed, 349 insertions(+), 323 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d623d0718d..e83c737c53 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.9",
+  "version": "1.2.12",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -9,12 +9,12 @@
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@1.1.13",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -24,29 +24,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@0.1.4",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -56,46 +56,46 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@2.4.1",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@2.4.1",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@2.4.1",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@2.4.1",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@2.4.1",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@0.1.0",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -124,12 +124,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@0.1.5",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@2.1.0",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@0.2.11",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@3.2.11",
+              "from": "glob@>=3.2.6 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3.0",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2.5.0",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@1.0.0",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,65 +187,65 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@0.2.14",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@0.1.3",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@0.1.9",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -264,12 +264,12 @@
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -281,40 +281,40 @@
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@2.5.0",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.20",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@2.3.6",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@0.1.3",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.4",
-          "from": "map-stream@0.0.4",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
+          "version": "0.0.5",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -323,29 +323,29 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2.10",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@0.0.4",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
@@ -359,13 +359,13 @@
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
-          "version": "0.0.5",
-          "from": "combined-stream@0.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -376,85 +376,85 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@0.9.0",
+          "from": "async@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "gulp": {
-      "version": "3.8.10",
-      "from": "gulp@",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz",
+      "version": "3.8.8",
+      "from": "gulp@3.8.8",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
-          "version": "1.0.0",
-          "from": "archy@^1.0.0",
-          "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+          "version": "0.0.2",
+          "from": "archy@>=0.0.2 <0.0.3",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@^0.5.0",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@^1.1.0",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "escape-string-regexp@^1.0.0",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@^0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@^0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.1",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@^0.2.0",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@^0.0.1",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.1",
-          "from": "gulp-util@^3.0.0",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
           "dependencies": {
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@^1.0.7-1.2.3",
+              "from": "dateformat@>=1.0.7-1.2.3 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
@@ -469,39 +469,39 @@
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@^1.0.0",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@^1.0.1",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@^1.0.0",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "indent-string@^1.1.0",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.0",
-                          "from": "repeating@^1.1.0",
+                          "from": "repeating@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@^1.0.0",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "1.0.0",
-                              "from": "meow@^1.0.0",
+                              "from": "meow@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
                             }
                           }
@@ -510,7 +510,7 @@
                     },
                     "object-assign": {
                       "version": "1.0.0",
-                      "from": "object-assign@^1.0.0",
+                      "from": "object-assign@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
                     }
                   }
@@ -519,56 +519,56 @@
             },
             "lodash": {
               "version": "2.4.1",
-              "from": "lodash@^2.4.1",
+              "from": "lodash@>=2.4.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
             },
             "lodash._reinterpolate": {
               "version": "2.4.1",
-              "from": "lodash._reinterpolate@^2.4.1",
+              "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
-              "from": "lodash.template@^2.4.1",
+              "from": "lodash.template@>=2.4.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
-                  "from": "lodash.defaults@~2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
                     "lodash._objecttypes": {
                       "version": "2.4.1",
-                      "from": "lodash._objecttypes@~2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
-                  "from": "lodash.escape@~2.4.1",
+                  "from": "lodash.escape@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
-                      "from": "lodash._escapehtmlchar@~2.4.1",
+                      "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@~2.4.1",
+                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
-                      "from": "lodash._reunescapedhtml@~2.4.1",
+                      "from": "lodash._reunescapedhtml@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@~2.4.1",
+                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
@@ -577,39 +577,39 @@
                 },
                 "lodash._escapestringchar": {
                   "version": "2.4.1",
-                  "from": "lodash._escapestringchar@~2.4.1",
+                  "from": "lodash._escapestringchar@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@~2.4.1",
+                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@~2.4.1",
+                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                           "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                         }
                       }
@@ -618,19 +618,19 @@
                 },
                 "lodash.templatesettings": {
                   "version": "2.4.1",
-                  "from": "lodash.templatesettings@~2.4.1",
+                  "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
                   "version": "2.4.1",
-                  "from": "lodash.values@~2.4.1",
+                  "from": "lodash.values@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@^0.1.0",
+              "from": "multipipe@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
@@ -640,12 +640,12 @@
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@~1.1.9",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@~1.0.0",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
@@ -655,12 +655,12 @@
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@~0.10.x",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@~2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -671,7 +671,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@^0.6.1",
+              "from": "through2@>=0.6.1 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -681,7 +681,7 @@
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@~1.0.0",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
@@ -691,12 +691,12 @@
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@~0.10.x",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -710,17 +710,17 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@^0.4.0",
+              "from": "vinyl@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@^0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@^0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -728,43 +728,43 @@
           }
         },
         "interpret": {
-          "version": "0.3.8",
-          "from": "interpret@^0.3.2",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"
+          "version": "0.3.9",
+          "from": "interpret@>=0.3.2 <0.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.9.tgz"
         },
         "liftoff": {
-          "version": "0.13.6",
-          "from": "liftoff@^0.13.2",
-          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz",
+          "version": "0.12.1",
+          "from": "liftoff@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@~3.2.9",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@2",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@0.3",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -773,51 +773,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@~2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
-              "version": "1.0.0",
-              "from": "resolve@~1.0.0",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"
+              "version": "0.7.4",
+              "from": "resolve@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+            },
+            "minimist": {
+              "version": "0.2.0",
+              "from": "minimist@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@~1.3.0",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
-            },
-            "flagged-respawn": {
-              "version": "0.3.1",
-              "from": "flagged-respawn@~0.3.0",
-              "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "minimist@^1.1.0",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@^0.3.0",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@~0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@~1.3.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -826,42 +826,37 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@~0.0.7",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@~0.1.0",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@^0.2.0",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
-          "version": "4.1.0",
-          "from": "semver@^4.1.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
+          "version": "3.0.1",
+          "from": "semver@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@^1.0.0",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.0",
-              "from": "user-home@^1.0.0",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
             }
           }
-        },
-        "v8flags": {
-          "version": "1.0.5",
-          "from": "v8flags@^1.0.1",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"
         }
       }
     },
@@ -872,7 +867,7 @@
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1436,22 +1431,22 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@0.0.2",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@0.0.10",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1463,103 +1458,103 @@
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.3.0",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.5",
+          "from": "read@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@0.0.4",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.8",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.1",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@0.2.10",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "0.2.1",
-              "from": "deep-equal@0.2.1",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.2",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.2",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.22",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.3",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.203",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1568,52 +1563,52 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@0.7.0",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.27.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
+      "from": "request@2.27.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
       "dependencies": {
         "qs": {
           "version": "0.6.6",
-          "from": "qs@0.6.6",
+          "from": "qs@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@5.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@0.5.2",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "tunnel-agent": {
           "version": "0.3.0",
-          "from": "tunnel-agent@0.3.0",
+          "from": "tunnel-agent@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@0.10.0",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz",
+              "from": "assert-plus@0.1.2",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
@@ -1625,179 +1620,179 @@
         },
         "hawk": {
           "version": "1.0.0",
-          "from": "hawk@1.0.0",
+          "from": "hawk@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.1",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.2",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.2",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.4",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign": {
           "version": "0.3.0",
-          "from": "aws-sign@0.3.0",
+          "from": "aws-sign@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
         },
         "oauth-sign": {
           "version": "0.3.0",
-          "from": "oauth-sign@0.3.0",
+          "from": "oauth-sign@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
         },
         "cookie-jar": {
           "version": "0.3.0",
-          "from": "cookie-jar@0.3.0",
+          "from": "cookie-jar@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
         },
         "node-uuid": {
-          "version": "1.4.1",
-          "from": "node-uuid@1.4.1",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+          "version": "1.4.2",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
+          "from": "mime@>=1.2.9 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.0",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
+              "from": "debug@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz"
             },
             "depd": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
+              "from": "depd@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "dependencies": {
                 "crc": {
                   "version": "3.2.1",
-                  "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+                  "from": "crc@3.2.1",
                   "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@0.5.6",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@0.4.4",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1.0.5",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1806,7 +1801,7 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@0.7.4",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
@@ -1818,92 +1813,92 @@
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.4",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+              "version": "3.0.5",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.2.8",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@0.3.9",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.33-1",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -1913,29 +1908,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@1.0.2",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -1944,32 +1939,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
-          "version": "3.1.15",
-          "from": "glob-stream@3.1.15",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.0.6",
-              "from": "glob@4.0.6",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "version": "4.3.1",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
               "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@1.3.1",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1977,89 +1984,103 @@
               }
             },
             "minimatch": {
-              "version": "1.0.0",
-              "from": "minimatch@1.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "version": "2.0.1",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
               "dependencies": {
-                "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "lru-cache@2.5.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                },
-                "sigmund": {
-                  "version": "1.0.0",
-                  "from": "sigmund@1.0.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                "brace-expansion": {
+                  "version": "1.0.1",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.0.1.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.0",
+                      "from": "concat-map@0.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.0.tgz"
+                    }
+                  }
                 }
               }
             },
             "ordered-read-streams": {
-              "version": "0.0.8",
-              "from": "ordered-read-streams@0.0.8",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
-              "version": "0.0.11",
-              "from": "glob2base@0.0.11",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@1.0.0",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@0.5.1",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@1.0.1",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1.0.0",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@2.5.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@1.0.0",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2071,57 +2092,57 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.4",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+          "version": "3.0.5",
+          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@2.4.1",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@0.5.0",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@1.0.0",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@0.2.0",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -2131,31 +2152,36 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@4.0.0",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.3",
-          "from": "vinyl@0.4.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@0.0.1",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2164,12 +2190,12 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@0.6.x",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
@@ -2179,7 +2205,7 @@
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@~2.4.1",
+              "from": "lodash-node@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }
diff --git a/package.json b/package.json
index c630bb2435..b5437f3cf9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -52,7 +52,7 @@
     "event-stream": "3.0.x",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
-    "gulp": "~3.8.8",
+    "gulp": "3.8.8",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "open": "0.0.5",

From fd9d5cdcf4ba54b11b77ebff81c4c413bd5c157f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Dec 2014 00:12:22 -0700
Subject: [PATCH 0318/1100] Adding in info/about command to give more
 information about the runtime environment of the CLI users

---
 lib/ionic.js      |   6 ++
 lib/ionic/info.js | 202 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)
 create mode 100644 lib/ionic/info.js

diff --git a/lib/ionic.js b/lib/ionic.js
index ccc80aeae2..40f36612f5 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -36,6 +36,12 @@ colors.setTheme({
 
 
 var TASKS = [
+  {
+    title: 'info',
+    name: 'info',
+    summary: 'List information about the users runtime environment',
+    module: './ionic/info'
+  },
   {
     title: 'start',
     name: 'start',
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
new file mode 100644
index 0000000000..f5680c7067
--- /dev/null
+++ b/lib/ionic/info.js
@@ -0,0 +1,202 @@
+var fs = require('fs'),
+    path = require('path'),
+    shelljs = require('shelljs'),
+    os = require('os'),
+    argv = require('optimist').argv,
+    IonicProject = require('./project'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+// http://en.wikipedia.org/wiki/Darwin_%28operating_system%29#Release_history
+IonicTask.prototype.getMacInfo = function() {
+  //Need to get:
+  //Look up for what version (Yosemite, Mavericks, Mountain Lion)
+  //What version of Xcode
+  var macVersion = 'Yosemite';
+  switch(os.release()) {
+    case '14.0.0':
+      macVersion = 'Yosemite';
+      break;
+    case '13.0.0':
+      macVersion = 'Mavericks';
+      break;
+    case '12.0.0':
+    case '12.5.0':
+      macVersion = 'Mountain Lion';
+      break;
+    case '11.4.2':
+      macVersion = 'Lion';
+      break;
+    case '10.8':
+      macVersion = 'Snow Leopard';
+      break;
+  }
+
+  return 'Mac OS X ' + macVersion;
+  // console.log('Mac OS X', macVersion);
+}
+
+IonicTask.prototype.getCordovaInfo = function(info) {
+  var command = 'cordova -v';
+  var result = shelljs.exec(command, { silent: true });
+  if(result.code != 0) {
+    info.cordova = 'Not installed';
+    return;
+  }
+
+  info.cordova = 'Cordova CLI ' + result.output.replace('\n', '');
+}
+
+IonicTask.prototype.getXcodeInformation = function() {
+  var result = shelljs.exec('/usr/bin/xcodebuild -version', {silent: true});
+  if(result.code != 0) {
+    return 'Not installed';
+  }
+  var version = result.output.replace(/\n/g, ' ')
+  return version;
+}
+
+IonicTask.prototype.getIonicVersions = function(info) {
+  var ionicCliVersion = require('../../package.json').version;
+  var ionicVersion = require( path.resolve('www/lib/ionic/version.json') ).version;
+
+  info.ionic_cli = ionicCliVersion;
+  info.ionic = ionicVersion;
+
+  // console.log('Ionic CLI version', ionicCliVersion)
+  // console.log('Ionic version', ionicVersion)
+}
+
+// Windows XP  5.1.2600
+// Windows Server 2003 5.2.3790
+// Windows Vista
+// Windows Server 2008 6.0.6000
+// Windows Vista, SP2  6.0.6002
+// Windows 7
+// Windows Server 2008 R2  6.1.7600
+// Windows 7 SP1
+// Windows Server 2008 R2 SP1  6.1.7601
+// Windows 8
+// Windows Server 2012 6.2.9200
+// Windows 8.1
+// Windows Server 2012 R2  6.3.9600
+// Windows 10 Technical Preview  6.4.9841
+
+IonicTask.prototype.getWindowsEnvironmentInfo = function() {
+  // Windows version reference
+  // http://en.wikipedia.org/wiki/Ver_%28command%29
+  var version = os.release();
+  var windowsVersion = null;
+  switch(version) {
+    case '5.1.2600':
+      windowsVersion = 'Windows XP';
+      break;
+    case '6.0.6000':
+      windowsVersion = 'Windows Vista';
+      break;
+    case '6.0.6002':
+      windowsVersion = 'Windows Vista SP2';
+      break;
+    case '6.1.7600':
+      windowsVersion = 'Windows 7';
+      break;
+    case '6.1.7601':
+      windowsVersion = 'Windows 7 SP1';
+      break;
+    case '6.2.9200':
+      windowsVersion = 'Windows 8';
+      break;
+    case '6.3.9600':
+      windowsVersion = 'Windows 8.1';
+      break;
+  }
+
+  return windowsVersion;
+}
+
+IonicTask.prototype.getLinuxEnvironmentInfo = function() {
+  //TODO - Implement this.
+}
+
+//http://stackoverflow.com/questions/6551006/get-my-os-from-the-node-js-shell
+IonicTask.prototype.getOsEnvironment = function(info) {
+  var self = this;
+
+  switch(os.type()) {
+    case 'Darwin':
+      info.os = self.getMacInfo();
+      info.xcode = self.getXcodeInformation();
+      break;
+    case 'Windows_NT':
+      info.os = self.getWindowsEnvironmentInfo();
+      break;
+    case '':
+    case 'Linux':
+      info.os = self.getLinuxEnvironmentInfo();
+      break;
+  }
+}
+
+IonicTask.prototype.getNodeVersion = function(info) {
+  var command = 'node -v';
+  var result = shelljs.exec(command, { silent: true } );
+  info.node = result.output.replace('\n','');
+}
+
+IonicTask.prototype.gatherInfo = function() {
+  var self = this;
+  var info = {};
+  //For macs we want:
+  //Mac version, xcode version (if installed)
+
+  //For windows
+  //Windows version
+
+  //For all
+  // Android SDK info
+  // Cordova CLI info
+  // Ionic CLI version
+  // Ionic version
+
+  // var info = {
+  //   cordova: 'CLI v3.5.0',
+  //   os: 'Mac OSX Yosemite',
+  //   xcode: 'Xcode 6.1.1',
+  //   ionic: '1.0.0-beta.13',
+  //   ionic_cli: '1.3.0'
+  // };
+
+  self.getIonicVersions(info);
+
+  self.getNodeVersion(info);
+
+  self.getOsEnvironment(info);
+
+  self.getCordovaInfo(info);
+
+  // self.printJavaInformation();
+  return info;
+}
+
+IonicTask.prototype.printInfo = function(info) {
+  console.log('OS:', info.os);
+  console.log('Node Version:', info.node);
+  console.log('Cordova CLI:', info.cordova);
+  console.log('Ionic Version:', info.ionic);
+  console.log('Ionic CLI Version:', info.ionic_cli);
+  if(info.xcode) {
+    console.log('Xcode version:', info.xcode);
+  }
+}
+
+IonicTask.prototype.run = function(ionic) {
+  var info = this.gatherInfo();
+  this.printInfo(info);
+  IonicStats.t();
+}
+
+exports.IonicTask = IonicTask;

From 99469d076580f1b624aab70746065c552de4317e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Dec 2014 21:55:02 -0700
Subject: [PATCH 0319/1100] Adding new file help.js to give individual help
 information about commands. Updating ionic.js to add help to the tasks

---
 lib/ionic.js      |  9 +++++++++
 lib/ionic/help.js | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 lib/ionic/help.js

diff --git a/lib/ionic.js b/lib/ionic.js
index ccc80aeae2..37b8806cdf 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -36,6 +36,15 @@ colors.setTheme({
 
 
 var TASKS = [
+  {
+    title: 'help',
+    name: 'help',
+    summary: 'Provides help for a certain command',
+    args: {
+      '[command]': 'The command you desire help with'
+    },
+    module: './ionic/help'
+  },
   {
     title: 'start',
     name: 'start',
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
new file mode 100644
index 0000000000..1a16330256
--- /dev/null
+++ b/lib/ionic/help.js
@@ -0,0 +1,36 @@
+var IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+    argv = require('optimist').argv,
+    Task = require('./task').Task;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+
+  self.ionic = ionic;
+
+  var command = argv._[1];
+
+  var task = self.ionic._getTaskWithName(command);
+
+  if(!task) {
+    console.log('Sorry .There is no "'.red.bold, command.cyan, '" command.'.red.bold)
+    return
+  }
+  self.ionic._printIonic();
+  process.stderr.write('\n=======================\n');
+
+
+  self.ionic.printUsage(task);
+
+  process.stderr.write('\n\n');
+
+
+  // IonicStats.t();
+}
+
+exports.IonicTask = IonicTask;

From 1d284c9409bcf42412655fb7edbff25e50a26a44 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Dec 2014 22:19:05 -0700
Subject: [PATCH 0320/1100] Updating console output for newline padding.
 Including ios-sim version (ios-sim Supports xcode 6 since version 3.x)

---
 lib/ionic/info.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index f5680c7067..50f78c7e93 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -51,8 +51,17 @@ IonicTask.prototype.getCordovaInfo = function(info) {
   info.cordova = 'Cordova CLI ' + result.output.replace('\n', '');
 }
 
-IonicTask.prototype.getXcodeInformation = function() {
-  var result = shelljs.exec('/usr/bin/xcodebuild -version', {silent: true});
+IonicTask.prototype.getXcodeInfo = function() {
+  var result = shelljs.exec('/usr/bin/xcodebuild -version', { silent: true });
+  if(result.code != 0) {
+    return 'Not installed';
+  }
+  var version = result.output.replace(/\n/g, ' ')
+  return version;
+}
+
+IonicTask.prototype.getIosSimInfo = function() {
+  var result = shelljs.exec('ios-sim --version', { silent: true });
   if(result.code != 0) {
     return 'Not installed';
   }
@@ -129,7 +138,8 @@ IonicTask.prototype.getOsEnvironment = function(info) {
   switch(os.type()) {
     case 'Darwin':
       info.os = self.getMacInfo();
-      info.xcode = self.getXcodeInformation();
+      info.xcode = self.getXcodeInfo();
+      info.ios_sim = self.getIosSimInfo();
       break;
     case 'Windows_NT':
       info.os = self.getWindowsEnvironmentInfo();
@@ -183,6 +193,7 @@ IonicTask.prototype.gatherInfo = function() {
 }
 
 IonicTask.prototype.printInfo = function(info) {
+  console.log('\nYour system information:\n');
   console.log('OS:', info.os);
   console.log('Node Version:', info.node);
   console.log('Cordova CLI:', info.cordova);
@@ -191,9 +202,15 @@ IonicTask.prototype.printInfo = function(info) {
   if(info.xcode) {
     console.log('Xcode version:', info.xcode);
   }
+
+  if(info.ios_sim) {
+    console.log('ios-sim version:', info.ios_sim);
+  }
+  console.log('\n');
 }
 
 IonicTask.prototype.run = function(ionic) {
+
   var info = this.gatherInfo();
   this.printInfo(info);
   IonicStats.t();

From 6a7434e5b23384bac450c63350afaf6a1f778cc4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Dec 2014 22:31:54 -0700
Subject: [PATCH 0321/1100] Including the lsb_release command to get the linux
 version information

---
 lib/ionic/info.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 50f78c7e93..2fb330352b 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -128,7 +128,8 @@ IonicTask.prototype.getWindowsEnvironmentInfo = function() {
 }
 
 IonicTask.prototype.getLinuxEnvironmentInfo = function() {
-  //TODO - Implement this.
+  var result = shelljs.exec('lsb_release -id', { silent: true });
+  return result.output.replace('\n','');
 }
 
 //http://stackoverflow.com/questions/6551006/get-my-os-from-the-node-js-shell
@@ -144,7 +145,6 @@ IonicTask.prototype.getOsEnvironment = function(info) {
     case 'Windows_NT':
       info.os = self.getWindowsEnvironmentInfo();
       break;
-    case '':
     case 'Linux':
       info.os = self.getLinuxEnvironmentInfo();
       break;

From 9d08fb0b86d4bbe63396ecb2644c98a21a95020b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Dec 2014 22:34:55 -0700
Subject: [PATCH 0322/1100] Removing all the new line characters for linux
 distros

---
 lib/ionic/info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 2fb330352b..7f8b85dfd0 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -129,7 +129,7 @@ IonicTask.prototype.getWindowsEnvironmentInfo = function() {
 
 IonicTask.prototype.getLinuxEnvironmentInfo = function() {
   var result = shelljs.exec('lsb_release -id', { silent: true });
-  return result.output.replace('\n','');
+  return result.output.replace(/\n/g, ' ')
 }
 
 //http://stackoverflow.com/questions/6551006/get-my-os-from-the-node-js-shell

From 43a2415c5a8ce3f8cde56263b5f8038bd55b4335 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 17 Dec 2014 09:26:14 -0700
Subject: [PATCH 0323/1100] Removing unused 'copy result' console.log statement

---
 lib/ionic/browser.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index b52bbb0818..24feb13360 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -91,8 +91,6 @@ function downloadCrosswalkWebview(architecture, version) {
 
     var cpResult = shelljs.cp('-R', copySource, copyDestination);
 
-    console.log('Copy result: ', cpResult);
-
     q.resolve(data);
   }, function(error) {
     console.log('Crosswalk webviews failed to download - ', error)

From ddc1fdef72d2dbfa65697ea87c8592f19bd0f82c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 17 Dec 2014 12:00:14 -0700
Subject: [PATCH 0324/1100] Getting rid of duplicate 'Cordova CLI' from the
 cordova version

---
 lib/ionic/info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 7f8b85dfd0..d80cb55c6f 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -48,7 +48,7 @@ IonicTask.prototype.getCordovaInfo = function(info) {
     return;
   }
 
-  info.cordova = 'Cordova CLI ' + result.output.replace('\n', '');
+  info.cordova = result.output.replace('\n', '');
 }
 
 IonicTask.prototype.getXcodeInfo = function() {

From 463c2987415a1388923b9a7b1783a6333f9f5f64 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 17 Dec 2014 14:37:10 -0700
Subject: [PATCH 0325/1100] Adding opbeat node module to report errors.
 Included require with opbeat keys and such to report errors

---
 lib/ionic.js | 7 ++++++-
 package.json | 9 +++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ccc80aeae2..8470d5137c 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -18,7 +18,12 @@ var argv = require('optimist').argv,
     colors = require('colors'),
     Q = require('q'),
     settings = require('../package.json'),
-    shelljs = require('shelljs/global');
+    shelljs = require('shelljs/global'),
+    opbeat = require('opbeat')({
+      organizationId: '7456d1360946446791cde22d1ff90a56',
+      appId: '1a3f490314',
+      secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b'
+    });
 
 colors.setTheme({
   silly: 'rainbow',
diff --git a/package.json b/package.json
index b5437f3cf9..cbd7b40324 100644
--- a/package.json
+++ b/package.json
@@ -47,27 +47,28 @@
     "archiver": "0.5.1",
     "colors": "0.6.2",
     "connect": "3.1.1",
-    "cross-spawn": "0.2.3",
     "connect-livereload": "0.4.0",
+    "cross-spawn": "0.2.3",
     "event-stream": "3.0.x",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "ncp": "0.4.2",
     "npm": "2.1.3",
+    "opbeat": "^1.0.7",
     "open": "0.0.5",
     "optimist": "0.6.0",
-    "prompt": "0.2.12",
     "progress": "1.1.7",
+    "prompt": "0.2.12",
     "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
     "request": "2.27.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
+    "underscore": "~1.7.0",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",
-    "xml2js": "0.4.4",
-    "underscore": "~1.7.0"
+    "xml2js": "0.4.4"
   }
 }

From c786e5261a4f19ec3e74f3ee746e00d567e3c77f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 17 Dec 2014 17:27:06 -0700
Subject: [PATCH 0326/1100] Updating changelog for changes 1.2.9 to 1.2.13

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5732d1da0..91245cc076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+### 1.2.13
+
+* Locking Gulp at 3.8.8 to avoid adding the v8flags module dependency
+
+### 1.2.12
+
+* Updating the npm-shrinkwrap
+
+### 1.2.11
+
+* Updating the Labs styles
+
+### 1.2.10
+
+* Updated the serve command for the `serve --labs` to use `IONIC_LAB_URL`
+
+### 1.2.9
+
+* Added proxy-middleware to provide proxying to APIs from the `serve` command
+* Updated README doc about how to use the proxy
+* Injects platform specific class to HTML to view it as an iOS or Android device in browser
+* Introduced Ionic Labs - a way to see preview iOS and Android side by side in the browser
+* Bumped `serve-static` to 1.7.1 to avoid some errors with the `serve` for users of Node 0.12
+* Added the `add` command to use ionic to manage bower components
+* Ionic now reads the Node environment variable `http_proxy` along with the passed `PROXY` variable to get around a local proxy
+
 ### 1.2.8
 
 * CSRF cookie fixes

From 565e13c131498fc04b7803f5d3ee979a3decfade Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 30 Dec 2014 21:55:48 -0600
Subject: [PATCH 0327/1100] v1.2.14

---
 .jscs.json                      |  41 ++
 CHANGELOG.md                    |  12 +
 README.md                       |  41 ++
 lib/ionic.js                    |  39 ++
 lib/ionic/config.js             |  12 +-
 lib/ionic/lib.js                |   6 +-
 lib/ionic/package.js            |   6 +-
 lib/ionic/resources/generate.js | 627 ++++++++++++++++++++++++++++
 lib/ionic/resources/settings.js | 112 +++++
 lib/ionic/start.js              |   4 +-
 lib/ionic/upload.js             |  28 +-
 npm-shrinkwrap.json             | 707 +++++++++++++++++---------------
 package.json                    |   7 +-
 13 files changed, 1279 insertions(+), 363 deletions(-)
 create mode 100644 .jscs.json
 create mode 100644 lib/ionic/resources/generate.js
 create mode 100644 lib/ionic/resources/settings.js

diff --git a/.jscs.json b/.jscs.json
new file mode 100644
index 0000000000..4e02926354
--- /dev/null
+++ b/.jscs.json
@@ -0,0 +1,41 @@
+{
+  "excludeFiles": ["src/ngLocale/**"],
+  "disallowKeywords": ["with"],
+  "disallowMixedSpacesAndTabs": true,
+  "disallowMultipleLineStrings": true,
+  "disallowNewlineBeforeBlockStatements": true,
+  "disallowSpaceAfterObjectKeys": true,
+  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceBeforeBinaryOperators": [","],
+  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "disallowSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInFunctionDeclaration": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInNamedFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInsideArrayBrackets": true,
+  "disallowSpacesInsideParentheses": true,
+  "disallowTrailingComma": true,
+  "disallowTrailingWhitespace": true,
+  "requireCommaBeforeLineBreak": true,
+  "requireLineFeedAtFileEnd": true,
+  "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
+  "requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
+  "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
+  "requireSpaceBeforeBlockStatements": true,
+  "requireSpacesInConditionalExpression": {
+    "afterTest": true,
+    "beforeConsequent": true,
+    "afterConsequent": true,
+    "beforeAlternate": true
+  },
+  "requireSpacesInFunction": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "validateLineBreaks": "LF",
+  "validateParameterSeparator": ", "
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91245cc076..15f319662c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,30 @@
+### 1.2.14
+
+* Automatically create icon resources from source file: `ionic resources --icon`
+* Automatically create splash screen resources from source file: `ionic resources --splash`
+* Update config.xml resource platform nodes
+
+
 ### 1.2.13
 
 * Locking Gulp at 3.8.8 to avoid adding the v8flags module dependency
 
+
 ### 1.2.12
 
 * Updating the npm-shrinkwrap
 
+
 ### 1.2.11
 
 * Updating the Labs styles
 
+
 ### 1.2.10
 
 * Updated the serve command for the `serve --labs` to use `IONIC_LAB_URL`
 
+
 ### 1.2.9
 
 * Added proxy-middleware to provide proxying to APIs from the `serve` command
@@ -24,6 +35,7 @@
 * Added the `add` command to use ionic to manage bower components
 * Ionic now reads the Node environment variable `http_proxy` along with the passed `PROXY` variable to get around a local proxy
 
+
 ### 1.2.8
 
 * CSRF cookie fixes
diff --git a/README.md b/README.md
index 17bdcb1962..c15fa2de24 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,47 @@ Deploys the Ionic app on specified platform devices. If a device is not found it
 $ ionic run ios [options]
 ```
 
+## Icon and Splash Screen Image Generation
+
+Automatically generate icons and splash screens from source images to create each size needed for each platform, in addition to copying each resized and cropped image into each platform's resources directory. Source images can either be a `png`, `psd` __Photoshop__ or `ai` __Illustrator__ file. Images are generated using Ionic's image resizing and cropping server, instead of requiring special libraries and plugins to be installed locally.
+
+Since each platform has different image requirements, it's best to make a source image for the largest size needed, and let the CLI do all the resizing, cropping and copying for you. Newly generated images will be placed in the `resources` directory at the root of the Cordova project. Additionally, the CLI will update and add the correct `<platform>` configs to the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file.
+
+During the build process, Cordova will look through the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file and copy the newly created resource images to the platform's specific resource folder. For example, Android's resource folder can be found in `platforms/android/res`, and iOS uses `platforms/ios/APP_NAME/Resources`.
+
+
+### Icon Source Image
+
+Save an `icon.png`, `icon.psd` or `icon.ai` file within the `resources` directory at the root of the Cordova project. The icon image's minimum dimensions should be 192x192 px, and should have __no__ rounded corners. Note that each platform will apply it's own mask and effects to the icons. For example, iOS will automatically apply it's custom rounded corners, so the source file should not already come with rounded corners.
+
+```bash
+$ ionic resources --icon
+```
+
+
+### Splash Screen Source Image
+
+Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone.
+
+```bash
+$ ionic resources --splash
+```
+
+- [Photoshop template](http://code.ionicframework.com/resources/splash.psd)
+
+
+### Generating Icons and Splash Screens
+
+To generate both icons and splash screens, follow the instructions above and run:
+
+```bash
+$ ionic resources
+```
+
+### Platform Specific Resource Images
+
+One source image can be used to generate images for each platform by placing the file within the `resources` directory, such as `resources/icon.png`. To use different source images for individual platforms, place the source image in the respective platform's directory. For example, to use a different icon for Android, it should follow this path: `resources/android/icon.png`, and a different image for iOS would use this path: `resources/ios/icon.png`.
+
 
 ## Update Ionic lib
 
diff --git a/lib/ionic.js b/lib/ionic.js
index ccc80aeae2..6fbff43bb6 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -156,6 +156,16 @@ var TASKS = [
     name: 'compile',
     module: './ionic/cordova'
   },
+  {
+    title: 'resources',
+    name: 'resources',
+    summary: 'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
+    options: {
+      '--icon|-i': 'Generate icon resources',
+      '--splash|-s': 'Generate splash screen resources'
+    },
+    module: './ionic/resources/generate'
+  },
   {
     title: 'package',
     name: 'package',
@@ -766,4 +776,33 @@ Ionic = {
 
 };
 
+var consoleInfo = console.info;
+console.info = function() {
+  if (arguments.length === 1 && !arguments[0]) return;
+  var msg = '';
+  for (var n in arguments) {
+    msg += arguments[n] + ' ';
+  }
+  consoleInfo.call(console, msg.blue.bold);
+};
+
+var consoleError = console.error;
+console.error = function() {
+  if (arguments.length === 1 && !arguments[0]) return;
+  var msg = ' ✗';
+  for (var n in arguments) {
+    msg += ' ' + arguments[n];
+  }
+  consoleError.call(console, msg.red.bold);
+};
+
+console.success = function() {
+  if (arguments.length === 1 && !arguments[0]) return;
+  var msg = ' ✓';
+  for (var n in arguments) {
+    msg += ' ' + arguments[n];
+  }
+  console.log(msg.green.bold);
+};
+
 exports.Ionic = Ionic;
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index f2474fba5f..82c4885f2a 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -8,7 +8,7 @@ module.exports = {
   CONFIG_FILE: '.ionic/ionic.config',
   load: function() {
     this.file = this.CONFIG_FILE;
-    if(fs.existsSync(path.join(home,this.file))) {
+    if (fs.existsSync(path.join(home,this.file))) {
       this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
     } else {
       this.data = {};
@@ -16,26 +16,26 @@ module.exports = {
     return this;
   },
   save: function() {
-    if(!this.data) {
+    if (!this.data) {
       return;
     }
     try {
       var dirPath = path.join(home, path.dirname(this.CONFIG_FILE));
       var p = path.join(home, this.CONFIG_FILE);
 
-      if(!fs.existsSync(dirPath)) {
+      if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath);
       }
       fs.writeFileSync(p, JSON.stringify(this.data, null, 2));
-    } catch(e) {
-      console.error( ('Unable to save settings file: ' + e).red );
+    } catch (e) {
+      console.error('Unable to save settings file: ' + e);
     }
   },
   get: function(k) {
     return this.data[k];
   },
   set: function(k, v) {
-    if(!this.data) {
+    if (!this.data) {
       this.data = {};
     }
     this.data[k] = v;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index e64ff7c9bf..d08b0b8519 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -224,7 +224,7 @@ IonicTask.prototype.downloadZip = function(version) {
       fs.writeFileSync(self.tmpZipPath, body);
       self.updateFiles();
     } catch(e) {
-      console.error( (e).red );
+      console.error(e);
     }
   }).on('response', function(res){
 
@@ -246,9 +246,9 @@ IonicTask.prototype.downloadZip = function(version) {
     try {
       fs.unlink(self.tmpZipPath);
     } catch(e) {
-      console.error( (e).red );
+      console.error(e);
     }
-    console.error( (err).red );
+    console.error(err);
   });
 
 };
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 1234dc80b7..61bbb67d95 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -557,7 +557,7 @@ function downloadBuildPackage(platform, data) {
   var proxy = process.env.PROXY || null;
   request({ url: data.package_url, proxy: proxy }, function(err, res, body) {
     if(res.statusCode !== 200) {
-      console.error( (err).red );
+      console.error(err);
       return;
     }
     try {
@@ -592,9 +592,9 @@ function downloadBuildPackage(platform, data) {
     try {
       fs.unlink(filePath);
     } catch(e) {
-      console.error( (e).red );
+      console.error(e);
     }
-    console.error( (err).red );
+    console.error(err);
   });
 }
 
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
new file mode 100644
index 0000000000..d01e60b6c7
--- /dev/null
+++ b/lib/ionic/resources/generate.js
@@ -0,0 +1,627 @@
+var fs = require('fs'),
+    os = require('os'),
+    path = require('path'),
+    Q = require('q'),
+    argv = require('optimist').argv,
+    request = require('request'),
+    _ = require('underscore'),
+    crc = require('crc'),
+    resSettings = require('./settings.js'),
+    Task = require('../task').Task,
+    moduleSettings = require('../../../package.json'),
+    IonicStats = require('../stats').IonicStats;
+
+
+var IonicResources = function() {};
+IonicResources.prototype = new Task();
+
+var settings = resSettings.ResSettings;
+var platformConfigs = resSettings.ResPlatforms;
+var tmpDir = os.tmpdir();
+var buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
+
+IonicResources.prototype.run = function() {
+  buildPlatforms = [];
+  images = [];
+  generateQueue = [];
+  sourceFiles = {};
+  generatingImages = {};
+
+  if (!fs.existsSync(settings.configFile)) {
+    console.error('Invalid ' + settings.configFile + ' file. Make sure the working directory is a Cordova project.');
+    return;
+  }
+
+  if (!fs.existsSync(settings.resourceDir)) {
+    fs.mkdirSync(settings.resourceDir);
+  }
+
+  var hasPlatforms = true;
+  if (!fs.existsSync('platforms')) {
+    hasPlatforms = false;
+  } else {
+    buildPlatforms = fs.readdirSync('platforms');
+    hasPlatforms = buildPlatforms.length;
+  }
+
+  if (!hasPlatforms) {
+    console.error('No platforms have been added. Please add a platform, for example: ionic platform add ios');
+    return;
+  }
+
+  var promises = [];
+
+  if (argv.icon || argv.i) {
+    console.info('Ionic icon resources generator');
+    promises.push(queueResTypeImages('icon'));
+
+  } else if (argv.splash || argv.s) {
+    console.info('Ionic splash screen resources generator');
+    promises.push(queueResTypeImages('splash'));
+
+  } else {
+    console.info('Ionic icon and splash screen resources generator');
+    promises.push(queueResTypeImages('icon'));
+    promises.push(queueResTypeImages('splash'));
+  }
+
+  Q.all(promises)
+    .then(loadSourceImages)
+    .then(generateResourceImages)
+    .then(loadResourceImages)
+    .then(updateConfigData)
+    .catch(console.error);
+
+  IonicStats.t();
+};
+
+function queueResTypeImages(resType) {
+  var resTypePlatforms = {};
+
+  return buildImagesData()
+    .then(validateSourceImages)
+    .then(queueResourceImages)
+    .catch(console.error);
+
+  function buildImagesData() {
+    var deferred = Q.defer();
+
+    buildPlatforms.forEach(function(platform) {
+      if (!platformConfigs[platform]) return;
+
+      var platformResourceDir = path.join(settings.resourceDir, platform);
+      var resTypeDir = path.join(platformResourceDir, settings[resType + 'Dir']);
+
+      if (!fs.existsSync(platformResourceDir)) {
+        fs.mkdirSync(platformResourceDir);
+      }
+
+      if (!fs.existsSync(resTypeDir)) {
+        fs.mkdirSync(resTypeDir);
+      }
+
+      _.forEach(platformConfigs[platform][resType].images, function(image) {
+        var data = _.clone(image);
+        _.extend(data, {
+          platform: platform,
+          src: path.join(resTypeDir, image.name),
+          nodeName: platformConfigs[platform][resType].nodeName,
+          nodeAttributes: platformConfigs[platform][resType].nodeAttributes,
+          resType: resType
+        });
+        images.push(data);
+      });
+    });
+
+    deferred.resolve();
+    return deferred.promise;
+  }
+
+  function validateSourceImages() {
+    var deferred = Q.defer();
+
+    var validSourceFiles = _.map(settings.sourceExtensions, function(ext) {
+      return settings[resType + 'SourceFile'] + '.' + ext;
+    });
+
+    images.forEach(function(image) {
+      if (resTypePlatforms[image.platform]) return;
+      resTypePlatforms[image.platform] = { platform: image.platform };
+    });
+
+    _.each(resTypePlatforms, function(resTypePlatform) {
+      for (var x = 0; x < validSourceFiles.length; x++) {
+        globalSourceFile = path.join(settings.resourceDir, validSourceFiles[x]);
+        platformSourceFile = path.join(settings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
+
+        if (fs.existsSync(platformSourceFile)) {
+          resTypePlatform.sourceFilePath = platformSourceFile;
+          resTypePlatform.sourceFilename = resTypePlatform.platform + '/' + validSourceFiles[x];
+          break;
+
+        } else if (fs.existsSync(globalSourceFile)) {
+          resTypePlatform.sourceFilePath = globalSourceFile;
+          resTypePlatform.sourceFilename = validSourceFiles[x];
+          break;
+        }
+      }
+
+      if (!resTypePlatform.sourceFilePath || sourceFiles[resTypePlatform.sourceFilePath]) return;
+
+      sourceFiles[resTypePlatform.sourceFilePath] = {
+        filePath: resTypePlatform.sourceFilePath,
+        filename: resTypePlatform.sourceFilename
+      };
+    });
+
+    var missingPlatformSources = _.filter(resTypePlatforms, function(resTypePlatform) {
+      return !resTypePlatform.sourceFilePath;
+    });
+
+    if (missingPlatformSources.length) {
+      var notFoundDirs = ['resources'];
+      missingPlatformSources.forEach(function(missingPlatformSource) {
+        notFoundDirs.push('resources/' + missingPlatformSource.platform);
+      });
+
+      var msg = resType + ' source file not found in ';
+      if (notFoundDirs.length > 1) {
+        msg += 'any of these directories: ' + notFoundDirs.join(', ');
+      } else {
+        msg += 'the resources directory';
+      }
+
+      console.error(msg);
+      console.error('valid ' + resType + ' source files: ' + validSourceFiles.join(', '));
+    }
+
+    deferred.resolve();
+
+    return deferred.promise;
+  }
+
+  function queueResourceImages() {
+    var promises = [];
+
+    _.each(resTypePlatforms, function(resTypePlatform) {
+
+      if (!resTypePlatform.sourceFilePath) return;
+
+      var deferred = Q.defer();
+      promises.push(deferred.promise);
+
+      fs.readFile(resTypePlatform.sourceFilePath, function(err, buf) {
+        if (err) {
+          deferred.reject('Error reading ' + resTypePlatform.sourceFilePath);
+
+        } else {
+          try {
+            sourceFiles[resTypePlatform.sourceFilePath].imageId = crc.crc32(buf).toString(16);
+
+            var resImages = _.filter(images, function(image) {
+              return image.resType == resType;
+            });
+
+            resImages.forEach(function(image) {
+              if (image.platform == resTypePlatform.platform) {
+                image.sourceFilePath = resTypePlatform.sourceFilePath;
+
+                var sourceFile = sourceFiles[image.sourceFilePath];
+                var tmpFilename = sourceFile.imageId + '-' + image.width + 'x' + image.height + '.png';
+
+                image.imageId = sourceFile.imageId;
+                image.tmpPath = path.join(tmpDir, tmpFilename);
+
+                if (settings.cacheImages && fs.existsSync(image.tmpPath)) {
+                  console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
+
+                } else {
+                  loadCachedSourceImageData(sourceFile);
+
+                  if (sourceFile.cachedData && !sourceFile.cachedData.vector && (sourceFile.cachedData.width < image.width || sourceFile.cachedData.height < image.height)) {
+                    image.skip = true;
+                    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.cachedData.width + 'x' + sourceFile.cachedData.height + ') too small');
+
+                  } else {
+                    sourceFile.upload = true;
+                    generateQueue.push(image);
+                  }
+                }
+              }
+            });
+            deferred.resolve();
+
+          } catch (e) {
+            deferred.reject('Error loading ' + resTypePlatform.sourceFilePath + ' md5: ' + e);
+          }
+        }
+      });
+    });
+
+    return Q.all(promises);
+  }
+
+}
+
+function loadSourceImages() {
+  var promises = [];
+
+  _.each(sourceFiles, function(sourceFile) {
+    if (!sourceFile.upload) return;
+
+    var deferred = Q.defer();
+
+    console.log(' uploading ' + sourceFile.filename + '...');
+
+    var postData = {
+      url: settings.apiUrl + settings.apiUploadPath,
+      formData: {
+        image_id: sourceFile.imageId,
+        src: fs.createReadStream(sourceFile.filePath),
+        cli_version: moduleSettings.version
+      },
+      proxy: process.env.PROXY || null
+    };
+
+    request.post(postData, function(err, httpResponse, body) {
+      function reject(msg) {
+        try {
+          msg += JSON.parse(body).Error;
+        } catch (e) {
+          msg += body || '';
+        }
+        deferred.reject(msg);
+      }
+
+      if (err) {
+        var msg = 'Failed to upload source image: ';
+        if (err.code == 'ENOTFOUND') {
+          msg += 'requires network connection';
+        } else {
+          msg += err;
+        }
+        deferred.reject(msg);
+
+      } else if (!httpResponse) {
+        reject('Invalid http response');
+
+      } else if (httpResponse.statusCode >= 500) {
+        reject('Image server temporarily unavailable: ');
+
+      } else if (httpResponse.statusCode == 404) {
+        reject('Image server unavailable: ');
+
+      } else if (httpResponse.statusCode > 200) {
+        reject('Invalid upload: ');
+
+      } else {
+        try {
+          var d = JSON.parse(body);
+          sourceFile.width = d.Width;
+          sourceFile.height = d.Height;
+          sourceFile.vector = d.Vector;
+          if (sourceFile.vector) {
+            console.success(sourceFile.filename + ' (vector image) upload complete');
+          } else {
+            console.success(sourceFile.filename + ' (' + d.Width + 'x' + d.Height + ') upload complete');
+          }
+
+          cacheSourceImageData(sourceFile);
+          deferred.resolve();
+
+        } catch (e) {
+          reject('Error parsing upload response: ');
+        }
+      }
+    });
+    promises.push(deferred.promise);
+  });
+
+  return Q.all(promises);
+}
+
+function cacheSourceImageData(sourceFile) {
+  try {
+    var data = JSON.stringify({
+      width: sourceFile.width,
+      height: sourceFile.height,
+      vector: sourceFile.vector,
+      version: 1
+    });
+    var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
+    fs.writeFile(cachedImagePath, data, function(err) {
+      if (err) console.error('Error writing cacheSourceImageData: ' + err);
+    });
+  } catch (e) {
+    console.error('Error cacheSourceImageData: ' + e);
+  }
+}
+
+function loadCachedSourceImageData(sourceFile) {
+  if (settings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
+    try {
+      var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
+      sourceFile.cachedData = JSON.parse(fs.readFileSync(cachedImagePath));
+    } catch (e) {
+      sourceFile.cachedData = false;
+    }
+  }
+}
+
+
+function generateResourceImages() {
+  var deferred = Q.defer();
+
+  // https://github.com/ferentchak/QThrottle
+  var max = settings.generateThrottle - 1;
+  var outstanding = 0;
+
+  function catchingFunction(value) {
+    deferred.notify(value);
+    outstanding--;
+
+    if (generateQueue.length) {
+      outstanding++;
+      generateResourceImage(generateQueue.pop())
+        .then(catchingFunction)
+        .fail(deferred.reject);
+
+    } else if (outstanding === 0) {
+      deferred.resolve();
+    }
+  }
+
+  if (generateQueue.length) {
+    while (max-- && generateQueue.length) {
+      generateResourceImage(generateQueue.pop())
+        .then(catchingFunction)
+        .fail(deferred.reject);
+      outstanding++;
+    }
+  } else {
+    deferred.resolve();
+  }
+
+  return deferred.promise;
+}
+
+function generateResourceImage(image) {
+  var deferred = Q.defer();
+
+  var sourceFile = sourceFiles[image.sourceFilePath];
+
+  if (!sourceFile.vector && (sourceFile.width < image.width || sourceFile.height < image.height)) {
+    image.skip = true;
+    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.width + 'x' + sourceFile.height + ') too small');
+    deferred.resolve();
+
+  } else if (generatingImages[image.tmpPath]) {
+    console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
+    deferred.resolve();
+
+  } else {
+    console.log(' generating ' + image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ')...');
+    generatingImages[image.tmpPath] = true;
+
+    var postData = {
+      url: settings.apiUrl + settings.apiTransformPath,
+      formData: {
+        image_id: image.imageId,
+        name: image.name,
+        platform: image.platform,
+        width: image.width,
+        height: image.height,
+        res_type: image.resType,
+        crop: 'center',
+        encoding: 'png',
+        cli_version: moduleSettings.version
+      },
+      proxy: process.env.PROXY || null
+    };
+
+    var wr = fs.createWriteStream(image.tmpPath, { flags: 'w' });
+    wr.on("error", function(err) {
+      console.error('Error copying to ' + image.tmpPath + ': ' + err);
+      deferred.resolve();
+    });
+    wr.on("finish", function() {
+      if (!image.skip) {
+        console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
+        deferred.resolve();
+      }
+    });
+
+    request.post(postData, function(err, httpResponse, body) {
+
+      function reject(msg) {
+        image.skip = true;
+        try {
+          delete generatingImages[image.tmpPath];
+          wr.close();
+          fs.unlink(image.tmpPath);
+        } catch (err) {}
+
+        try {
+          msg += JSON.parse(body).Error;
+        } catch (e) {
+          msg += body || '';
+        }
+        deferred.reject(msg);
+      }
+
+      if (err || !httpResponse) {
+        reject('Failed to generate image: ' + err);
+
+      } else if (httpResponse.statusCode >= 500) {
+        reject('Image transformation server temporarily unavailable: ');
+
+      } else if (httpResponse.statusCode > 200) {
+        reject('Invalid transformation: ');
+      }
+    })
+    .pipe(wr);
+  }
+
+  return deferred.promise;
+}
+
+function loadResourceImages() {
+  var promises = [];
+
+  images.forEach(function(image) {
+    if (!image.tmpPath || !fs.existsSync(image.tmpPath)) return;
+
+    var deferred = Q.defer();
+    promises.push(deferred.promise);
+
+    var rd = fs.createReadStream(image.tmpPath);
+    rd.on('error', function(err) {
+      deferred.reject('Unable to read generated image: ' + err);
+    });
+
+    var wr = fs.createWriteStream(image.src, {flags: 'w'});
+    wr.on('error', function(err) {
+      deferred.reject('Unable to copy to ' + image.src + ': ' + err);
+    });
+    wr.on('finish', function() {
+      image.isValid = true;
+      deferred.resolve();
+    });
+    rd.pipe(wr);
+  });
+
+  return Q.all(promises);
+}
+
+
+function updateConfigData() {
+  images = _.filter(images, function(image) {
+    return image.isValid && !image.skip;
+  });
+
+  if (!images.length) return;
+
+  var xml2js = require('xml2js');
+  var settings = resSettings.ResSettings;
+  var configData;
+  var madeChanges = false;
+
+  try {
+    fs.readFile(settings.configFile, onConfigRead);
+  } catch (err) {
+    console.error('Error saveConfigData: ' + err);
+  }
+
+  function onConfigRead(err, data) {
+    if (err) return console.error('Error reading config file: ' + err);
+
+    try {
+      var parser = new xml2js.Parser();
+      parser.parseString(data, onXmlParse);
+    } catch (e) {
+      console.error('Error xml2js parseString: ' + e);
+    }
+  }
+
+  function onXmlParse(err, parsedData) {
+    if (err) return console.error('Error parsing config file: ' + err);
+
+    configData = parsedData;
+    clearResourcesNodes();
+    images.forEach(updateImageNode);
+    buildDefaultIconNode();
+    writeConfigData();
+  }
+
+  function clearResourcesNodes() {
+    images.forEach(function(image) {
+      if (!image) return;
+      var platformConfigData = getPlatformConfigData(image.platform);
+      if (platformConfigData && platformConfigData[image.resType]) {
+        delete platformConfigData[image.resType];
+        madeChanges = true;
+      }
+    });
+  }
+
+  function updateImageNode(image) {
+    if (!image) return;
+
+    if (!configData.widget.platform) {
+      configData.widget.platform = [];
+    }
+
+    var platformConfigData = getPlatformConfigData(image.platform);
+
+    if (!platformConfigData) {
+      configData.widget.platform.push({ '$': { name: image.platform } });
+      platformConfigData = getPlatformConfigData(image.platform);
+    }
+
+    if (!platformConfigData[image.nodeName]) {
+      platformConfigData[image.nodeName] = [];
+    }
+
+    var node = getResourceConfigNode(platformConfigData, image.nodeName, image.src);
+    if (!node) {
+      node = { '$': {} };
+      platformConfigData[image.nodeName].push(node);
+      madeChanges = true;
+    }
+
+    image.nodeAttributes.forEach(function(nodeAttribute) {
+      node.$[nodeAttribute] = image[nodeAttribute];
+    });
+  }
+
+  function buildDefaultIconNode() {
+    var currentSize = 0;
+    var defaultIcon;
+
+    images.forEach(function(image) {
+      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= settings.defaultMaxIconSize) {
+        currentSize = image.width;
+        defaultIcon = image;
+      }
+    });
+
+    if (defaultIcon) {
+      configData.widget.icon = [{ '$': { src: defaultIcon.src } }];
+      madeChanges = true;
+    }
+  }
+
+  function writeConfigData() {
+    if (!madeChanges) return;
+
+    try {
+      var builder = new xml2js.Builder();
+      var xmlString = builder.buildObject(configData);
+
+      fs.writeFile(settings.configFile, xmlString, function(err) {
+        if (err) console.error('Error writing config data: ' + err);
+      });
+    } catch (e) {
+      console.error('Error writeConfigData: ' + e);
+    }
+  }
+
+  function getPlatformConfigData(platform) {
+    if (configData.widget && configData.widget.platform) {
+      return _.find(configData.widget.platform, function(d) {
+        return d && d.$ && d.$.name == platform;
+      });
+    }
+  }
+
+  function getResourceConfigNode(platformData, nodeName, src) {
+    if (platformData[nodeName]) {
+      return _.find(platformData[nodeName], function(d) {
+        return d && d.$ && d.$.src == src;
+      });
+    }
+  }
+
+}
+
+exports.IonicTask = IonicResources;
diff --git a/lib/ionic/resources/settings.js b/lib/ionic/resources/settings.js
new file mode 100644
index 0000000000..39db81b8c8
--- /dev/null
+++ b/lib/ionic/resources/settings.js
@@ -0,0 +1,112 @@
+
+exports.ResSettings = {
+  apiUrl: 'http://res.ionic.io',
+  apiUploadPath: '/api/v1/upload',
+  apiTransformPath: '/api/v1/transform',
+  resourceDir: 'resources',
+  iconDir: 'icon',
+  splashDir: 'splash',
+  iconSourceFile: 'icon',
+  splashSourceFile: 'splash',
+  sourceExtensions: ['psd', 'ai', 'png'],
+  configFile: 'config.xml',
+  generateThrottle: 4,
+  defaultMaxIconSize: 96,
+  cacheImages: true
+};
+
+
+exports.ResPlatforms = {
+
+  android: {
+    icon: {
+      images: [
+        { name: 'drawable-ldpi-icon.png',    width: 36,   height: 36,   density: "ldpi" },
+        { name: 'drawable-mdpi-icon.png',    width: 48,   height: 48,   density: "mdpi" },
+        { name: 'drawable-hdpi-icon.png',    width: 72,   height: 72,   density: "hdpi" },
+        { name: 'drawable-xhdpi-icon.png',   width: 96,   height: 96,   density: "xhdpi" },
+        { name: 'drawable-xxhdpi-icon.png',  width: 144,  height: 144,  density: "xxhdpi" },
+        { name: 'drawable-xxxhdpi-icon.png', width: 192,  height: 192,  density: "xxxhdpi" }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'density']
+    },
+    splash: {
+      images: [
+        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 200,   density: 'land-ldpi' },
+        { name: 'drawable-land-mdpi-screen.png',    width: 480,   height: 320,   density: 'land-mdpi' },
+        { name: 'drawable-land-hdpi-screen.png',    width: 800,   height: 480,   density: 'land-hdpi' },
+        { name: 'drawable-land-xhdpi-screen.png',   width: 1280,  height: 720,   density: 'land-xhdpi' },
+        { name: 'drawable-land-xxhdpi-screen.png',  width: 1600,  height: 960,   density: 'land-xxhdpi' },
+        { name: 'drawable-land-xxxhdpi-screen.png', width: 1920,  height: 1280,  density: 'land-xxxhdpi' },
+        { name: 'drawable-port-ldpi-screen.png',    width: 200,   height: 320,   density: 'port-ldpi' },
+        { name: 'drawable-port-mdpi-screen.png',    width: 320,   height: 480,   density: 'port-mdpi' },
+        { name: 'drawable-port-hdpi-screen.png',    width: 480,   height: 800,   density: 'port-hdpi' },
+        { name: 'drawable-port-xhdpi-screen.png',   width: 720,   height: 1280,  density: 'port-xhdpi' },
+        { name: 'drawable-port-xxhdpi-screen.png',  width: 960,   height: 1600,  density: 'port-xxhdpi' },
+        { name: 'drawable-port-xxxhdpi-screen.png', width: 1280,  height: 1920,  density: 'port-xxxhdpi' }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'density']
+    }
+  },
+
+  ios: {
+    icon: {
+      images: [
+        { name: 'icon.png',             width: 57,    height: 57 },
+        { name: 'icon@2x.png',          width: 114,   height: 114 },
+        { name: 'icon-40.png',          width: 40,    height: 40 },
+        { name: 'icon-40@2x.png',       width: 80,    height: 80 },
+        { name: 'icon-50.png',          width: 50,    height: 50 },
+        { name: 'icon-50@2x.png',       width: 100,   height: 100 },
+        { name: 'icon-60.png',          width: 60,    height: 60 },
+        { name: 'icon-60@2x.png',       width: 120,   height: 120 },
+        { name: 'icon-60@3x.png',       width: 180,   height: 180 },
+        { name: 'icon-72.png',          width: 72,    height: 72 },
+        { name: 'icon-72@2x.png',       width: 144,   height: 144 },
+        { name: 'icon-76.png',          width: 76,    height: 76 },
+        { name: 'icon-76@2x.png',       width: 152,   height: 152 },
+        { name: 'icon-small.png',       width: 29,    height: 29 },
+        { name: 'icon-small@2x.png',    width: 58,    height: 58 }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'width', 'height']
+    },
+    splash: {
+      images: [
+        { name: 'Default-568h@2x~iphone.png',     width: 640,   height: 1136 },
+        { name: 'Default-667h.png',               width: 750,   height: 1334 },
+        { name: 'Default-736h.png',               width: 1242,  height: 2208 },
+        { name: 'Default-Landscape-736h.png',     width: 2208,  height: 1242 },
+        { name: 'Default-Landscape@2x~ipad.png',  width: 2048,  height: 1536 },
+        { name: 'Default-Landscape~ipad.png',     width: 1024,  height: 768 },
+        { name: 'Default-Portrait@2x~ipad.png',   width: 1536,  height: 2048 },
+        { name: 'Default-Portrait~ipad.png',      width: 768,   height: 1024 },
+        { name: 'Default@2x~iphone.png',          width: 640,   height: 960 },
+        { name: 'Default~iphone.png',             width: 320,   height: 480 }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'width', 'height']
+    }
+  },
+
+  wp8: {
+    icon: {
+      images: [
+        { name: 'ApplicationIcon.png',  width: 99,   height: 99 },
+        { name: 'Background.png',       width: 159,  height: 159 }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'width', 'height']
+    },
+    splash: {
+      images: [
+        { name: 'SplashScreenImage.png',  width: 768,   height: 1280 }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'width', 'height']
+    }
+  }
+
+};
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 3e43ea68ac..3f0466c6fa 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -122,7 +122,7 @@ IonicTask.prototype.startApp = function() {
       return self.finalize();
     })
     .catch(function(err) {
-      console.error('Error: Unable to initalize app: '.error.bold, err);
+      console.error('Error: Unable to initalize app:', err);
       return self.ionic.fail('');
     });
 };
@@ -446,7 +446,7 @@ IonicTask.prototype.fetchGithubStarter = function(repoUrl) {
     }
 
   }).catch(function(err) {
-    console.error('More info available at: \nhttp://ionicframework.com/getting-started/\nhttps://github.com/driftyco/ionic-cli'.error.bold);
+    console.error('More info available at: \nhttp://ionicframework.com/getting-started/\nhttps://github.com/driftyco/ionic-cli');
     return self.ionic.fail('');
   });
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 3f0d7bd5a7..a0bb4eb36f 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -40,7 +40,7 @@ IonicTask.prototype.run = function(ionic, callback) {
     ]);
 
     archive.finalize(function(err, bytes) {
-      if(err) {
+      if (err) {
         return ionic.fail("Error uploading: " + err);
       }
     });
@@ -50,7 +50,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
       var csrftoken = '';
 
-      for (var i=0; i<jar.cookies.length; i++) {
+      for (var i = 0; i < jar.cookies.length; i++) {
         if (jar.cookies[i].name == 'csrftoken') {
           csrftoken = jar.cookies[i].value;
         }
@@ -71,14 +71,14 @@ IonicTask.prototype.run = function(ionic, callback) {
         port: params.port,
         path: params.path,
         headers: form.getHeaders({
-          cookie: jar.cookies.map(function (c) {
+          cookie: jar.cookies.map(function(c) {
             return c.name + "=" + encodeURIComponent(c.value);
           }).join("; ")
         })
       }, function(err, response) {
 
         rm('-f', TEMP_FILENAME);
-        if(err) {
+        if (err) {
           return ionic.fail("Error uploading: " + err);
         }
 
@@ -86,35 +86,35 @@ IonicTask.prototype.run = function(ionic, callback) {
         response.on("data", function(data) {
           try {
 
-            if(response.statusCode == 401) {
+            if (response.statusCode == 401) {
               q.reject('not_logged_in');
               return ionic.fail('Session expired (401). Please log in and run this command again.');
 
-            } else if(response.statusCode == 403) {
+            } else if (response.statusCode == 403) {
               console.log(data);
               q.reject('forbidden');
               return ionic.fail('Forbidden upload (403)');
             }
 
             var d = JSON.parse(data);
-            if(d.errors && d.errors.length) {
+            if (d.errors && d.errors.length) {
               for (var j = 0; j < d.errors.length; j++) {
-                console.log( (d.errors[j]).bold.error );
+                console.error(d.errors[j]);
               }
               q.reject('upload_error');
               return ionic.fail('Unable to upload app');
             }
 
-            if(response.statusCode == 200) {
+            if (response.statusCode == 200) {
               // Success
               project.set('app_id', d.app_id);
               project.save();
-              console.log( ('Successfully uploaded (' + project.get('app_id') + ')\n').bold );
+              console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
 
-              if(callback) {
+              if (callback) {
                 try {
                   callback();
-                } catch(callbackEx) {
+                } catch (callbackEx) {
                   q.reject('upload_error');
                   return ionic.fail('Error upload callback: ' + callbackEx);
                 }
@@ -124,7 +124,7 @@ IonicTask.prototype.run = function(ionic, callback) {
               q.reject('upload_error');
             }
 
-          } catch(parseEx) {
+          } catch (parseEx) {
             q.reject('upload_error');
             return ionic.fail('Error upload response: ' + parseEx);
           }
@@ -137,7 +137,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
   q.promise.then(function(callback) {
     // Exit if there was no callback
-    if(!callback) {
+    if (!callback) {
       process.exit(0);
     }
   }, function(err) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e83c737c53..43b542fd5f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -9,12 +9,12 @@
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "from": "readable-stream@~1.1.9",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@~1.0.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -24,29 +24,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "string_decoder@~0.10.x",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@~2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "from": "zip-stream@~0.1.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@~1.0.24",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@~1.0.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -56,46 +56,46 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@~0.10.x",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "from": "lodash.defaults@~2.4.1",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "lodash.keys@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "lodash._isnative@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "lodash.isobject@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "lodash._shimkeys@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "from": "lodash._objecttypes@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
+          "from": "lazystream@~0.1.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "from": "readable-stream@~1.0.2",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@~1.0.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -124,12 +124,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@~0.10.x",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
+          "from": "file-utils@~0.1.5",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
+              "from": "lodash@~2.1.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "from": "iconv-lite@~0.2.11",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@~2.2.2",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
+              "from": "glob@~3.2.6",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@2",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "minimatch@0.3",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "lru-cache@2",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "sigmund@~1.0.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,43 +187,43 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@~0.2.11",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "lru-cache@2",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "sigmund@~1.0.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "findup-sync@~0.1.2",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "lodash@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "from": "isbinaryfile@~0.1.9",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@~2.4.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -264,7 +264,7 @@
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "parseurl@~1.3.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
@@ -279,6 +279,11 @@
       "from": "connect-livereload@0.4.0",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.0.tgz"
     },
+    "crc": {
+      "version": "3.2.1",
+      "from": "crc@3.2.1",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+    },
     "cross-spawn": {
       "version": "0.2.3",
       "from": "cross-spawn@0.2.3",
@@ -286,34 +291,33 @@
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+          "from": "lru-cache@^2.5.0"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "event-stream@3.0.20",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@>=2.3.1 <2.4.0",
+          "from": "through@~2.3.1",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "duplexer@~0.1.1",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "from@~0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "map-stream@>=0.0.3 <0.1.0",
+          "from": "map-stream@~0.0.3",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
@@ -323,12 +327,12 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "split@0.2",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "stream-combiner@~0.0.3",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
@@ -340,7 +344,7 @@
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "debug@~2.0.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
@@ -364,7 +368,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "combined-stream@~0.0.4",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -376,12 +380,12 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "mime@~1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@>=0.9.0 <0.10.0",
+          "from": "async@~0.9.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
@@ -389,72 +393,71 @@
     "gulp": {
       "version": "3.8.8",
       "from": "gulp@3.8.8",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
+          "from": "archy@^0.0.2",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "chalk@^0.5.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "ansi-styles@^1.1.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "escape-string-regexp@^1.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "has-ansi@^0.1.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@^0.2.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "strip-ansi@^0.3.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@^0.2.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "supports-color@^0.2.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "deprecated@^0.0.1",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.1",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "gulp-util@^3.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
           "dependencies": {
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.7-1.2.3 <2.0.0",
+              "from": "dateformat@^1.0.7-1.2.3",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
@@ -469,39 +472,39 @@
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "camelcase-keys@^1.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "camelcase@^1.0.1",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "map-obj@^1.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "from": "indent-string@^1.1.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.0",
-                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "from": "repeating@^1.1.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "from": "is-finite@^1.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "1.0.0",
-                              "from": "meow@>=1.0.0 <2.0.0",
+                              "from": "meow@^1.0.0",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
                             }
                           }
@@ -510,7 +513,7 @@
                     },
                     "object-assign": {
                       "version": "1.0.0",
-                      "from": "object-assign@>=1.0.0 <2.0.0",
+                      "from": "object-assign@^1.0.0",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
                     }
                   }
@@ -519,56 +522,53 @@
             },
             "lodash": {
               "version": "2.4.1",
-              "from": "lodash@>=2.4.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+              "from": "lodash@^2.4.1"
             },
             "lodash._reinterpolate": {
               "version": "2.4.1",
-              "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
+              "from": "lodash._reinterpolate@^2.4.1",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
             },
             "lodash.template": {
               "version": "2.4.1",
-              "from": "lodash.template@>=2.4.1 <3.0.0",
+              "from": "lodash.template@^2.4.1",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
               "dependencies": {
                 "lodash.defaults": {
                   "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "from": "lodash.defaults@~2.4.1",
                   "dependencies": {
                     "lodash._objecttypes": {
                       "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                      "from": "lodash._objecttypes@~2.4.1"
                     }
                   }
                 },
                 "lodash.escape": {
                   "version": "2.4.1",
-                  "from": "lodash.escape@>=2.4.1 <2.5.0",
+                  "from": "lodash.escape@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
                   "dependencies": {
                     "lodash._escapehtmlchar": {
                       "version": "2.4.1",
-                      "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
+                      "from": "lodash._escapehtmlchar@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
+                          "from": "lodash._htmlescapes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
                     },
                     "lodash._reunescapedhtml": {
                       "version": "2.4.1",
-                      "from": "lodash._reunescapedhtml@>=2.4.1 <2.5.0",
+                      "from": "lodash._reunescapedhtml@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
                       "dependencies": {
                         "lodash._htmlescapes": {
                           "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
+                          "from": "lodash._htmlescapes@~2.4.1",
                           "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
                         }
                       }
@@ -577,40 +577,34 @@
                 },
                 "lodash._escapestringchar": {
                   "version": "2.4.1",
-                  "from": "lodash._escapestringchar@>=2.4.1 <2.5.0",
+                  "from": "lodash._escapestringchar@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
                 },
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@~2.4.1",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                      "from": "lodash._isnative@~2.4.1"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "from": "lodash.isobject@~2.4.1",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                          "from": "lodash._objecttypes@~2.4.1"
                         }
                       }
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "from": "lodash._shimkeys@~2.4.1",
                       "dependencies": {
                         "lodash._objecttypes": {
                           "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                          "from": "lodash._objecttypes@~2.4.1"
                         }
                       }
                     }
@@ -618,19 +612,19 @@
                 },
                 "lodash.templatesettings": {
                   "version": "2.4.1",
-                  "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
+                  "from": "lodash.templatesettings@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
                 },
                 "lodash.values": {
                   "version": "2.4.1",
-                  "from": "lodash.values@>=2.4.1 <2.5.0",
+                  "from": "lodash.values@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.0 <0.2.0",
+              "from": "multipipe@^0.1.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
@@ -640,28 +634,23 @@
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@~1.1.9",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "from": "core-util-is@~1.0.0"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                          "from": "isarray@0.0.1"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                          "from": "string_decoder@~0.10.x"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                          "from": "inherits@~2.0.1"
                         }
                       }
                     }
@@ -671,101 +660,85 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.1 <0.7.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "from": "through2@^0.6.1",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
                   "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "from": "core-util-is@~1.0.0"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                      "from": "isarray@0.0.1"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                      "from": "string_decoder@~0.10.x"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@~2.0.1"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                  "from": "xtend@>=4.0.0 <4.1.0-0"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@^0.4.0",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                  "from": "clone@^0.2.0"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                  "from": "clone-stats@^0.0.1"
                 }
               }
             }
           }
         },
         "interpret": {
-          "version": "0.3.9",
-          "from": "interpret@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.9.tgz"
+          "version": "0.3.10",
+          "from": "interpret@^0.3.2",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
+          "from": "liftoff@^0.12.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@~0.1.2",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@~3.2.9",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@~2.0.1"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@0.3",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "from": "lru-cache@2"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "from": "sigmund@~1.0.0"
                         }
                       }
                     }
@@ -773,52 +746,49 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "from": "lodash@~2.4.1"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
+              "from": "resolve@~0.7.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
+              "from": "minimist@~0.2.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "extend@~1.3.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "minimist@^1.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "orchestrator@^0.3.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "end-of-stream@~0.1.5",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@~1.3.0",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                      "from": "wrappy@1"
                     }
                   }
                 }
@@ -826,34 +796,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "sequencify@~0.0.7",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "stream-consume@~0.1.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "pretty-hrtime@^0.2.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
+          "from": "semver@^3.0.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "tildify@^1.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.0",
-              "from": "user-home@>=1.0.0 <2.0.0",
+              "from": "user-home@^1.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
             }
           }
@@ -1441,12 +1411,12 @@
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "wordwrap@~0.0.2",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "minimist@~0.0.1",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1463,34 +1433,34 @@
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "pkginfo@0.x.x",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "read@1.0.x",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "mute-stream@~0.0.4",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "revalidator@0.1.x",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "utile@0.2.x",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "async@~0.2.9",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
@@ -1500,12 +1470,12 @@
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "i@0.3.x",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@0.x.x",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1517,44 +1487,44 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2.x.x",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "winston@0.6.x",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "async@0.1.x",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "cycle@1.0.x",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "eyes@0.1.x",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "pkginfo@0.2.x",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "request@2.9.x",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "stack-trace@0.0.x",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1563,7 +1533,7 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "proxy-middleware@0.7.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
@@ -1572,161 +1542,236 @@
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
-      "version": "2.27.0",
-      "from": "request@2.27.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
+      "version": "2.51.0",
+      "from": "request@2.51.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
-        "qs": {
-          "version": "0.6.6",
-          "from": "qs@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+        "bl": {
+          "version": "0.9.3",
+          "from": "bl@~0.9.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@~1.0.26",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            }
+          }
         },
-        "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+        "caseless": {
+          "version": "0.8.0",
+          "from": "caseless@~0.8.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+          "from": "forever-agent@~0.5.0"
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "from": "form-data@~0.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.9.0",
+              "from": "async@~0.9.0"
+            },
+            "mime-types": {
+              "version": "2.0.4",
+              "from": "mime-types@~2.0.3",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.3.1",
+                  "from": "mime-db@~1.3.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.0",
+          "from": "json-stringify-safe@~5.0.0"
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "from": "mime-types@~1.0.1",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+        },
+        "node-uuid": {
+          "version": "1.4.2",
+          "from": "node-uuid@~1.4.0"
+        },
+        "qs": {
+          "version": "2.3.3",
+          "from": "qs@~2.3.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
-          "version": "0.3.0",
-          "from": "tunnel-agent@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
+          "version": "0.4.0",
+          "from": "tunnel-agent@~0.4.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+        },
+        "tough-cookie": {
+          "version": "0.12.1",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "from": "punycode@>=0.2.0",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+            }
+          }
         },
         "http-signature": {
           "version": "0.10.0",
-          "from": "http-signature@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+          "from": "http-signature@~0.10.0",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.2",
-              "from": "assert-plus@0.1.2",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+              "from": "assert-plus@0.1.2"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+              "from": "asn1@0.1.11"
             },
             "ctype": {
               "version": "0.5.2",
-              "from": "ctype@0.5.2",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+              "from": "ctype@0.5.2"
             }
           }
         },
+        "oauth-sign": {
+          "version": "0.5.0",
+          "from": "oauth-sign@~0.5.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+        },
         "hawk": {
-          "version": "1.0.0",
-          "from": "hawk@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+          "version": "1.1.1",
+          "from": "hawk@1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+              "from": "hoek@0.9.x"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+              "from": "boom@0.4.x"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+              "from": "cryptiles@0.2.x"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+              "from": "sntp@0.2.x"
             }
           }
         },
-        "aws-sign": {
-          "version": "0.3.0",
-          "from": "aws-sign@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
-        },
-        "oauth-sign": {
-          "version": "0.3.0",
-          "from": "oauth-sign@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
-        },
-        "cookie-jar": {
-          "version": "0.3.0",
-          "from": "cookie-jar@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"
+        "aws-sign2": {
+          "version": "0.5.0",
+          "from": "aws-sign2@~0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
-        "node-uuid": {
-          "version": "1.4.2",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
+        "stringstream": {
+          "version": "0.0.4",
+          "from": "stringstream@~0.0.4",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.9 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@~0.0.5",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5"
+            }
+          }
         }
       }
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.0",
-              "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz"
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "ms@0.6.2",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
             },
             "depd": {
               "version": "1.0.0",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "dependencies": {
                 "crc": {
                   "version": "3.2.1",
-                  "from": "crc@3.2.1",
+                  "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
                 }
               }
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
@@ -1736,26 +1781,26 @@
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -1772,27 +1817,26 @@
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "qs@0.5.6",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "faye-websocket@0.4.4",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@~0.0.3",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "nopt@2.0.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "abbrev@1",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1801,14 +1845,14 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "debug@0.7.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
+      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
@@ -1818,22 +1862,22 @@
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
+          "from": "fstream@~0.1.21",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.5",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "from": "graceful-fs@~3.0.2",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@~2.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@0.5",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1845,60 +1889,60 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
+          "from": "pullstream@~0.4.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "over@>= 0.0.5 < 1",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "from": "slice-stream@>= 1.0.0 < 2",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "binary@~0.3.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "chainsaw@~0.1.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "traverse@>=0.3.0 <0.4",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@~0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "from": "readable-stream@~1.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@~1.0.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -1908,29 +1952,29 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "string_decoder@~0.10.x",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@~2.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "setimmediate@~1.0.1",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "match-stream@~0.0.2",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@~0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -1944,39 +1988,39 @@
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "from": "glob-stream@^3.1.5",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.1",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
+              "version": "4.3.2",
+              "from": "glob@^4.3.1",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "from": "inflight@^1.0.4",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "wrappy@1",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@2",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@^1.3.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "wrappy@1",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1985,23 +2029,23 @@
             },
             "minimatch": {
               "version": "2.0.1",
-              "from": "minimatch@>=2.0.1 <3.0.0",
+              "from": "minimatch@^2.0.1",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
               "dependencies": {
                 "brace-expansion": {
-                  "version": "1.0.1",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.0.1.tgz",
+                  "version": "1.1.0",
+                  "from": "brace-expansion@^1.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "from": "balanced-match@^0.2.0",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
-                      "version": "0.0.0",
-                      "from": "concat-map@0.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.0.tgz"
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
                 }
@@ -2009,78 +2053,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "from": "ordered-read-streams@^0.1.0",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
+              "from": "glob2base@^0.0.12",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "from": "find-index@^0.1.1",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "unique-stream@^1.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "glob-watcher@^0.0.6",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "gaze@^0.5.1",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "globule@~0.1.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "lodash@~1.0.1",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "glob@~3.1.21",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "graceful-fs@~1.2.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "inherits@1",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "minimatch@~0.2.11",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "lru-cache@2",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "sigmund@~1.0.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2093,17 +2137,17 @@
         },
         "graceful-fs": {
           "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "from": "graceful-fs@~3.0.2",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@~2.4.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "mkdirp@0.x.x",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
@@ -2115,34 +2159,34 @@
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "strip-bom@^1.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "first-chunk-stream@^1.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "is-utf8@^0.2.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "through2@^0.6.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@~1.0.24",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@~1.0.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -2152,12 +2196,12 @@
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "string_decoder@~0.10.x",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -2171,17 +2215,17 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "vinyl@^0.4.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
+              "from": "clone@^0.2.0",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "clone-stats@^0.0.1",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2191,21 +2235,20 @@
     "xml2js": {
       "version": "0.4.4",
       "from": "xml2js@0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
+          "from": "sax@0.6.x",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.4.5",
-          "from": "xmlbuilder@>=1.0.0",
+          "from": "xmlbuilder@2.4.5",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",
-              "from": "lodash-node@>=2.4.1 <2.5.0",
+              "from": "lodash-node@~2.4.1",
               "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
             }
           }
diff --git a/package.json b/package.json
index b5437f3cf9..f5d6796da2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -47,8 +47,9 @@
     "archiver": "0.5.1",
     "colors": "0.6.2",
     "connect": "3.1.1",
-    "cross-spawn": "0.2.3",
     "connect-livereload": "0.4.0",
+    "crc": "3.2.1",
+    "cross-spawn": "0.2.3",
     "event-stream": "3.0.x",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
@@ -61,7 +62,7 @@
     "progress": "1.1.7",
     "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
-    "request": "2.27.0",
+    "request": "2.51.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",

From c13111879bbb42596d75a848645b1d7b68ca8bee Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 31 Dec 2014 10:12:04 -0600
Subject: [PATCH 0328/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c15fa2de24..287addd4c3 100644
--- a/README.md
+++ b/README.md
@@ -177,7 +177,7 @@ Automatically generate icons and splash screens from source images to create eac
 
 Since each platform has different image requirements, it's best to make a source image for the largest size needed, and let the CLI do all the resizing, cropping and copying for you. Newly generated images will be placed in the `resources` directory at the root of the Cordova project. Additionally, the CLI will update and add the correct `<platform>` configs to the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file.
 
-During the build process, Cordova will look through the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file and copy the newly created resource images to the platform's specific resource folder. For example, Android's resource folder can be found in `platforms/android/res`, and iOS uses `platforms/ios/APP_NAME/Resources`.
+During the build process, Cordova (v3.6 or later) will look through the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file and copy the newly created resource images to the platform's specific resource folder. For example, Android's resource folder can be found in `platforms/android/res`, and iOS uses `platforms/ios/APP_NAME/Resources`.
 
 
 ### Icon Source Image

From a107716a597760e0f41fca5140de4601bbb90b23 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 31 Dec 2014 11:29:48 -0600
Subject: [PATCH 0329/1100] photoshop icon template

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 287addd4c3..4ebafb006b 100644
--- a/README.md
+++ b/README.md
@@ -182,22 +182,24 @@ During the build process, Cordova (v3.6 or later) will look through the project'
 
 ### Icon Source Image
 
-Save an `icon.png`, `icon.psd` or `icon.ai` file within the `resources` directory at the root of the Cordova project. The icon image's minimum dimensions should be 192x192 px, and should have __no__ rounded corners. Note that each platform will apply it's own mask and effects to the icons. For example, iOS will automatically apply it's custom rounded corners, so the source file should not already come with rounded corners.
+Save an `icon.png`, `icon.psd` or `icon.ai` file within the `resources` directory at the root of the Cordova project. The icon image's minimum dimensions should be 192x192 px, and should have __no__ rounded corners. Note that each platform will apply it's own mask and effects to the icons. For example, iOS will automatically apply it's custom rounded corners, so the source file should not already come with rounded corners. This [Photoshop icon template](http://code.ionicframework.com/resources/icon.psd) provides the recommended size and guidelines of the artwork's safe zone.
 
 ```bash
 $ ionic resources --icon
 ```
 
+- [Photoshop Icon Template](http://code.ionicframework.com/resources/icon.psd)
+
 
 ### Splash Screen Source Image
 
-Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone.
+Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop splash screen template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone.
 
 ```bash
 $ ionic resources --splash
 ```
 
-- [Photoshop template](http://code.ionicframework.com/resources/splash.psd)
+- [Photoshop Splash Screen Template](http://code.ionicframework.com/resources/splash.psd)
 
 
 ### Generating Icons and Splash Screens

From fc6c826d9d5b36d0d7cf49b2f68e5e564846d368 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 5 Jan 2015 18:39:13 -0700
Subject: [PATCH 0330/1100] Including listing of browser types for ios (for
 preview) and android. Updating logging messages to be more precise. Added
 multiple-progress bars for the parallel downloading of Crosswalk web views.

---
 lib/ionic.js          |  10 +--
 lib/ionic/browser.js  | 141 ++++++++++++++++++++++++++++++++++++++----
 lib/ionic/multibar.js | 103 ++++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 16 deletions(-)
 create mode 100644 lib/ionic/multibar.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 7c1e09605b..2542f84da5 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -18,7 +18,8 @@ var argv = require('optimist').argv,
     colors = require('colors'),
     Q = require('q'),
     settings = require('../package.json'),
-    shelljs = require('shelljs/global');
+    shelljs = require('shelljs/global'),
+    Multibar = require('./ionic/multibar');
 
 colors.setTheme({
   silly: 'rainbow',
@@ -242,7 +243,8 @@ var TASKS = [
     name: 'browser',
     summary: 'Add another broswer for a platform ' + '(beta)'.yellow,
     args: {
-      '[sass]': 'Setup the project to use Sass CSS precompiling'
+      '<command>': '"add remove rm list ls update up check"',
+      '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
     module: './ionic/browser'
   },
@@ -688,8 +690,8 @@ Ionic = {
         q.reject(e);
       }
     }).on('response', function(res){
-      var ProgressBar = require('progress');
-      var bar = new ProgressBar('[:bar]  :percent  :etas', {
+      // var ProgressBar = require('progress');
+      var bar = Multibar.newBar('[:bar]  :percent  :etas', {
         complete: '=',
         incomplete: ' ',
         width: 30,
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 24feb13360..d6f2b5b5e5 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -27,6 +27,39 @@ var fs = require('fs'),
     Ionic = require('../ionic').Ionic,
     IonicStats = require('./stats').IonicStats;
 
+  var config = shelljs.config;
+  config.silent = true;
+
+var iosBrowsers = [
+    {
+      platform: 'iOS',
+      name: 'WKWebView',
+      available: false
+    },
+    {
+      platform: 'iOS',
+      name: 'UIWebView (default)',
+      available: false
+    }
+  ],
+  androidBrowsers = [
+    {
+      platform: 'Android',
+      name: 'Crosswalk',
+      available: true
+    },
+    {
+      platform: 'Android',
+      name: 'GeckoView',
+      available: false
+    },
+    {
+      platform: 'Android',
+      name: 'Browser (default)',
+      available: true
+    }
+  ];
+
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
@@ -118,13 +151,13 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
 
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
-    console.log('Finished downloading cordova-android v4.0.x');
+    console.log('\nFinished downloading cordova-android v4.0.x');
     //Need to make certain files executable
     var cordovaAndroid4Path = path.join(tempZipFilePath, 'cordova-android-crosswalk', 'bin');
     var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
     shelljs.chmod('+x', path.join(cordovaAndroid4Path, '*'));
     shelljs.chmod('+x', path.join(android4BinPath, '*'))
-    console.log('Changed permissions')
+    console.log('\nAltered permissions for Android Paths')
     q.resolve();
   }, function(error) {
     console.log('Failed to download cordova-android v4.0.x ', error);
@@ -137,16 +170,19 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
 IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
   var command = 'cordova platform remove android';
   var result = shelljs.exec(command);
+  console.log('\nRemoved old Cordova Android platform')
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
   var command =  'cordova platform add ./engine/cordova-android-crosswalk/';
   var result = shelljs.exec(command);
+  console.log('\nAdded Cordova Android 4.0')
 }
 
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
   var command = 'cordova plugin add ./engine/cordova-crosswalk-engine-0.8';
   var result = shelljs.exec(command);
+  console.log('\nAdded Crosswalk Webview Engine')
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
@@ -165,19 +201,19 @@ IonicTask.prototype.downloadFiles = function downloadFiles() {
   var self = this;
   this.getCordovaCrosswalkEngine()
   .then(function(data) {
-    console.log('Downloaded cordova-crosswalk-engine');
+    console.log('\nDownloaded cordova-crosswalk-engine');
     return self.downloadCordova40x();
   })
   .then(function(data) {
-    console.log('Downloaded Cordova Android for Crosswalk');
+    console.log('\nDownloaded Cordova Android for Crosswalk');
     return self.getCrosswalkWebviews();
   })
   .then(function(data) {
-    console.log('Downloaded Crosswalk webviews');
+    console.log('\nDownloaded Crosswalk webviews');
     return self.getAndroidRuntimes();
   })
   .then(function(data) {
-    console.log('Downloaded Android runtime (API 19)');
+    console.log('\nDownloaded Android runtime (API 19)');
     q.resolve();
   }, function(error) {
     q.reject();
@@ -189,20 +225,101 @@ IonicTask.prototype.downloadFiles = function downloadFiles() {
   return q.promise;
 }
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.addBrowser = function() {
   var self = this;
-  this.ionic = ionic;
-
   this.downloadFiles()
   .then(function(data) {
     self.removeAndroidProject();
-
     self.addCordova40xProject();
-
     self.addCrosswalkPlugin();
-
     self.updateAndroidProject();
+
+    console.log('\nIonic Browser Add completed');
+  })
+  .catch(function(error){
+    console.log('An error with adding a browser occured')
+    console.log(error)
   })
+}
+
+IonicTask.prototype.removeBrowser = function() {
+  console.log('Removing', argv._[2], 'browser')
+
+  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk')
+  shelljs.exec('cordova platform rm android')
+  shelljs.exec('cordova platform add android')
+
+}
+
+var printBrowsers = function(browsers) {
+  for(var x = 0, y = browsers.length; x < y; x++) {
+    var browser = browsers[x];
+    var avail = browser.available ? 'Yes' : 'No';
+
+    if(browser.available) {
+      console.log('Available'.green.bold, '-', browser.name.green, '\'ionic browser add', browser.name, '\'')
+    } else {
+      console.log('Not Available'.red.bold, '-', browser.name.green)
+    }
+  }
+}
+
+IonicTask.prototype.listBrowsers = function() {
+
+  console.log('iOS - Browsers available:\n')
+
+  printBrowsers(iosBrowsers);
+
+  console.log('\n\nAndroid - Browsers available:\n')
+
+  printBrowsers(androidBrowsers);
+}
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+  this.ionic = ionic;
+
+  if(argv._.length < 2) {
+    return this.ionic.fail('Invalid command usage', 'browser');
+  }
+
+  var cmdArg, x, y, hasValidCmd = false;
+
+  cmdArg = argv._[1]
+
+  var validCommands = 'add remove rm list ls update up check'.split(' ');
+  for(y=0; y<validCommands.length; y++) {
+    if(cmdArg == validCommands[y]) {
+      hasValidCmd = true;
+      break;
+    }
+  }
+
+  if(!hasValidCmd) {
+    return this.ionic.fail('You did not supply a valid command', 'browser');
+  }
+
+
+  switch(cmdArg) {
+    case 'add':
+      this.addBrowser();
+      break;
+    case 'remove':
+    case 'rm':
+      this.removeBrowser();
+      break;
+    case 'list':
+    case 'ls':
+      this.listBrowsers();
+      break;
+    case 'update':
+    case 'up':
+      this.addBrowser();
+      break;
+    case 'check':
+      console.log('Checking for engine');
+      break;
+  }
 
   // IonicStats.t();
 
diff --git a/lib/ionic/multibar.js b/lib/ionic/multibar.js
new file mode 100644
index 0000000000..05de1e8f63
--- /dev/null
+++ b/lib/ionic/multibar.js
@@ -0,0 +1,103 @@
+var ProgressBar = require('progress');
+
+function Multibar(stream) {
+  this.stream     = stream || process.stderr;
+  this.cursor     = 0;
+  this.bars       = [];
+  this.terminates = 0;
+}
+
+Multibar.prototype = {
+  newBar: function(schema, options) {
+    options.stream = this.stream;
+    var bar = new ProgressBar(schema, options);
+    this.bars.push(bar);
+    var index = this.bars.length - 1;
+
+    // alloc line
+    this.move(index);
+    this.stream.write('\n');
+    this.cursor ++;
+
+    // replace original
+    var self  = this;
+    bar.otick = bar.tick;
+    bar.oterminate = bar.terminate;
+    bar.tick = function(value, options) {
+      self.tick(index, value, options);
+    }
+    bar.terminate = function() {
+      self.terminates++;
+      if (self.terminates == self.bars.length) {
+        self.terminate();
+      }
+    }
+
+    return bar;
+  },
+
+  terminate: function() {
+    this.move(this.bars.length);
+    this.stream.clearLine();
+    this.stream.cursorTo(0);
+  },
+
+  move: function(index) {
+    if (!this.stream.isTTY) return;
+    this.stream.moveCursor(0, index - this.cursor);
+    this.cursor = index;
+  },
+
+  tick: function(index, value, options) {
+    var bar = this.bars[index];
+    if (bar) {
+      this.move(index);
+      bar.otick(value, options);
+    }
+  }
+}
+
+// var mbars = new Multibar();
+// var bars  = [];
+
+// function addBar() {
+//   bars.push(mbars.newBar('  :title [:bar] :percent', {
+//       complete: '='
+//     , incomplete: ' '
+//     , width: 30
+//     , total: 100
+//   }));
+//   return bars[bars.length - 1];
+// }
+
+// function forward() {
+//   for (var i = 0; i < bars.length; i++) {
+//     bars[i].tick(1, { title: 'forward: ' });
+//   }
+//   if (bars[0].curr > 60) {
+//     addBar().tick(bars[0].curr);
+//     backward();
+//   } else {
+//     setTimeout(forward, 20);
+//   }
+// }
+
+// function backward() {
+//   for (var i = 0; i < bars.length; i++) {
+//     bars[i].tick(-1, { title: 'backward: ' });
+//   }
+//   if (bars[0].curr == 0) {
+//     mbars.terminate();
+//     console.log("End all");
+//   } else {
+//     setTimeout(backward, 20);
+//   }
+// }
+
+// for(var i = 0; i < 5; i++) {
+//   addBar();
+// }
+
+// forward();
+
+module.exports = new Multibar();

From ce89a88023d3e701639e5ffe61891784b342a444 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 5 Jan 2015 23:16:55 -0700
Subject: [PATCH 0331/1100] Updating npm shrinkwrap. Fixing an issue with
 'info' where it throws an exception if the user is not in an ionic project
 folder

---
 lib/ionic/info.js   | 11 +++---
 npm-shrinkwrap.json | 96 +++++++++++++++++++++++++++++++--------------
 2 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index d80cb55c6f..0c25be4a30 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -71,13 +71,14 @@ IonicTask.prototype.getIosSimInfo = function() {
 
 IonicTask.prototype.getIonicVersions = function(info) {
   var ionicCliVersion = require('../../package.json').version;
-  var ionicVersion = require( path.resolve('www/lib/ionic/version.json') ).version;
+  try {
+    var ionicVersionFile = require( path.resolve('www/lib/ionic/version.json') );
+    var ionicVersion = ionicVersionFile.version;
 
-  info.ionic_cli = ionicCliVersion;
-  info.ionic = ionicVersion;
+    info.ionic_cli = ionicCliVersion;
+    info.ionic = ionicVersion;
+  } catch(ex) {}
 
-  // console.log('Ionic CLI version', ionicCliVersion)
-  // console.log('Ionic version', ionicVersion)
 }
 
 // Windows XP  5.1.2600
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 46a68201d3..715e4d749c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -490,19 +490,14 @@
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "repeating": {
-                          "version": "1.1.0",
+                          "version": "1.1.1",
                           "from": "repeating@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
                               "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
-                            },
-                            "meow": {
-                              "version": "1.0.0",
-                              "from": "meow@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/meow/-/meow-1.0.0.tgz"
                             }
                           }
                         }
@@ -728,9 +723,9 @@
           }
         },
         "interpret": {
-          "version": "0.3.9",
+          "version": "0.3.10",
           "from": "interpret@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.9.tgz"
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
@@ -1429,6 +1424,49 @@
         }
       }
     },
+    "opbeat": {
+      "version": "1.0.8",
+      "from": "opbeat@>=1.0.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.0.8.tgz",
+      "dependencies": {
+        "after-all": {
+          "version": "2.0.1",
+          "from": "after-all@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
+          "dependencies": {
+            "once": {
+              "version": "1.3.1",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "dependencies": {
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+        },
+        "stackman": {
+          "version": "0.2.2",
+          "from": "stackman@>=0.2.2 <0.3.0",
+          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "dependencies": {
+            "stackback": {
+              "version": "0.0.2",
+              "from": "stackback@0.0.2",
+              "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
+            }
+          }
+        }
+      }
+    },
     "open": {
       "version": "0.0.5",
       "from": "open@0.0.5",
@@ -1583,7 +1621,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "forever-agent": {
@@ -1597,14 +1635,14 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
         },
         "http-signature": {
-          "version": "0.10.0",
+          "version": "0.10.1",
           "from": "http-signature@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
-              "version": "0.1.2",
-              "from": "assert-plus@0.1.2",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+              "version": "0.1.5",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
@@ -1612,9 +1650,9 @@
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
-              "version": "0.5.2",
-              "from": "ctype@0.5.2",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+              "version": "0.5.3",
+              "from": "ctype@0.5.3",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
@@ -1667,7 +1705,7 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.9 <1.3.0",
+          "from": "mime@1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
@@ -1693,9 +1731,9 @@
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
-              "version": "2.1.0",
+              "version": "2.1.1",
               "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz"
             },
             "depd": {
               "version": "1.0.0",
@@ -1726,7 +1764,7 @@
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@>=1.2.9 <1.3.0",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
@@ -1828,7 +1866,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
@@ -1913,7 +1951,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -1948,9 +1986,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.1",
+              "version": "4.3.2",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -1971,7 +2009,7 @@
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -2137,7 +2175,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {

From 2936415a6979b8da05d05b7e04c55d2a7fabbbf0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 5 Jan 2015 23:24:08 -0700
Subject: [PATCH 0332/1100] Fixing an issue - if you arent in an ionic project
 and you run ionic info, it wasnt displaying CLI version

---
 lib/ionic/info.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 0c25be4a30..80a534d2da 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -71,13 +71,15 @@ IonicTask.prototype.getIosSimInfo = function() {
 
 IonicTask.prototype.getIonicVersions = function(info) {
   var ionicCliVersion = require('../../package.json').version;
+
+  info.ionic_cli = ionicCliVersion;
+
   try {
-    var ionicVersionFile = require( path.resolve('www/lib/ionic/version.json') );
+    var ionicVersionFile = require(path.resolve('www/lib/ionic/version.json'));
     var ionicVersion = ionicVersionFile.version;
 
-    info.ionic_cli = ionicCliVersion;
     info.ionic = ionicVersion;
-  } catch(ex) {}
+  } catch (ex) {}
 
 }
 
@@ -198,7 +200,9 @@ IonicTask.prototype.printInfo = function(info) {
   console.log('OS:', info.os);
   console.log('Node Version:', info.node);
   console.log('Cordova CLI:', info.cordova);
-  console.log('Ionic Version:', info.ionic);
+  if (info.ionic) {
+    console.log('Ionic Version:', info.ionic);
+  }
   console.log('Ionic CLI Version:', info.ionic_cli);
   if(info.xcode) {
     console.log('Xcode version:', info.xcode);

From 822ba4b11c6a3f8ccf9a72c0fc1ad9b7041f51f4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 6 Jan 2015 11:44:10 -0700
Subject: [PATCH 0333/1100] Removing the update/up/check commands, adding
 revert command for browser <command>

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 3c0b44bbfc..f9dfc35694 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -273,7 +273,7 @@ var TASKS = [
     name: 'browser',
     summary: 'Add another broswer for a platform ' + '(beta)'.yellow,
     args: {
-      '<command>': '"add remove rm list ls update up check"',
+      '<command>': '"add remove rm list ls revert"',
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
     module: './ionic/browser'

From 9f2d28989e14729577798fcdc5e9a832e94166f2 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 6 Jan 2015 11:46:57 -0700
Subject: [PATCH 0334/1100] Adding in code for the revert steps. Fixing up the
 listBrowsers to have install commands as well as revert commands

---
 lib/ionic/browser.js | 119 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 98 insertions(+), 21 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index d6f2b5b5e5..9355b0eaa6 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -34,29 +34,34 @@ var iosBrowsers = [
     {
       platform: 'iOS',
       name: 'WKWebView',
-      available: false
+      available: false,
+      command: 'ionic browser add wkwebview'
     },
     {
       platform: 'iOS',
-      name: 'UIWebView (default)',
-      available: false
+      name: 'UIWebView',
+      available: false,
+      command: 'ionic browser revert ios'
     }
   ],
   androidBrowsers = [
     {
       platform: 'Android',
       name: 'Crosswalk',
-      available: true
+      available: true,
+      command: 'ionic browser add crosswalk'
     },
     {
       platform: 'Android',
-      name: 'GeckoView',
-      available: false
+      name: 'Browser (default)',
+      available: true,
+      command: 'ionic browser revert android'
     },
     {
       platform: 'Android',
-      name: 'Browser (default)',
-      available: true
+      name: 'GeckoView',
+      available: false,
+      command: 'ionic browser add geckoview'
     }
   ];
 
@@ -225,29 +230,97 @@ IonicTask.prototype.downloadFiles = function downloadFiles() {
   return q.promise;
 }
 
-IonicTask.prototype.addBrowser = function() {
+IonicTask.prototype.removeCrosswalk = function() {
+  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk')
+  shelljs.exec('cordova platform rm android')
+  shelljs.exec('cordova platform add android')
+}
+
+IonicTask.prototype.installCrosswalk = function() {
   var self = this;
-  this.downloadFiles()
+
+  self.downloadFiles()
   .then(function(data) {
     self.removeAndroidProject();
     self.addCordova40xProject();
     self.addCrosswalkPlugin();
     self.updateAndroidProject();
 
-    console.log('\nIonic Browser Add completed');
+    console.log('\nIonic Browser Add completed for Crosswalk');
   })
   .catch(function(error){
-    console.log('An error with adding a browser occured')
+    console.log('An error with adding Crosswalk browser occured')
     console.log(error)
   })
 }
 
+IonicTask.prototype.revertBrowser = function() {
+  var self = this;
+
+  var platform = argv._[2];
+
+  if (!platform) {
+    console.log('You did not specify a platform to revert the browser');
+    return;
+  }
+
+  console.log('Reverting', platform, 'browser');
+
+  var addCommand = ['cordova platform add', platform].join(' ');
+  var rmCommand = ['cordova platform rm', platform].join(' ');
+
+  shelljs.exec(rmCommand)
+  shelljs.exec(addCommand)
+
+  console.log('Reverted', platform, 'browser');
+}
+
+IonicTask.prototype.addBrowser = function() {
+  var self = this;
+
+  //Check which browser they wish to install
+  var browserToInstall = 'crosswalk';
+  if (argv._[2]) {
+    browserToInstall = argv._[2];
+  } else {
+    console.log('No browser specified. Nothing to do here.'.red.bold)
+    return;
+  }
+
+  switch(browserToInstall) {
+    case 'crosswalk':
+      console.log('Adding', browserToInstall, 'browser')
+      self.installCrosswalk();
+      break;
+    case 'default':
+      console.log('Adding', browserToInstall, 'browser')
+      self.installDefaultBrowser();
+      break;
+    default:
+      console.log('No accepted browser was specified.'.red.bold)
+      break;
+  }
+}
+
 IonicTask.prototype.removeBrowser = function() {
-  console.log('Removing', argv._[2], 'browser')
+  var browser = 'crosswalk';
+
+  if (argv._[2]) {
+    browser = argv._[2];
+    console.log('Removing', browser, 'browser')
+  } else {
+    console.log('You did not specify a browser to remove.'.red)
+    return;
+  }
 
-  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk')
-  shelljs.exec('cordova platform rm android')
-  shelljs.exec('cordova platform add android')
+  switch (browser) {
+    case 'crosswalk':
+      this.removeCrosswalk();
+      break;
+    case 'default':
+      this.removeDefault();
+      break;
+  }
 
 }
 
@@ -255,22 +328,23 @@ var printBrowsers = function(browsers) {
   for(var x = 0, y = browsers.length; x < y; x++) {
     var browser = browsers[x];
     var avail = browser.available ? 'Yes' : 'No';
+    var installCommand = browser.command ? browser.command : '';
 
     if(browser.available) {
-      console.log('Available'.green.bold, '-', browser.name.green, '\'ionic browser add', browser.name, '\'')
+      console.log('Available'.green.bold, '-', browser.name.green, '-', installCommand)
     } else {
-      console.log('Not Available'.red.bold, '-', browser.name.green)
+      console.log('Not Available Yet'.red.bold, '-', browser.name.green)
     }
   }
 }
 
 IonicTask.prototype.listBrowsers = function() {
 
-  console.log('iOS - Browsers available:\n')
+  console.log('iOS - Browsers Listing:\n')
 
   printBrowsers(iosBrowsers);
 
-  console.log('\n\nAndroid - Browsers available:\n')
+  console.log('\n\nAndroid - Browsers Listing:\n')
 
   printBrowsers(androidBrowsers);
 }
@@ -287,7 +361,7 @@ IonicTask.prototype.run = function(ionic) {
 
   cmdArg = argv._[1]
 
-  var validCommands = 'add remove rm list ls update up check'.split(' ');
+  var validCommands = 'add remove rm list ls revert'.split(' ');
   for(y=0; y<validCommands.length; y++) {
     if(cmdArg == validCommands[y]) {
       hasValidCmd = true;
@@ -308,6 +382,9 @@ IonicTask.prototype.run = function(ionic) {
     case 'rm':
       this.removeBrowser();
       break;
+    case 'revert':
+      this.revertBrowser();
+      break;
     case 'list':
     case 'ls':
       this.listBrowsers();

From 6ecea1b61a19278093701190906f97eba17e66c4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 6 Jan 2015 11:47:05 -0700
Subject: [PATCH 0335/1100] Adjusting beta version to beta1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 403c009bf8..8f15907edc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e3ecd817540e0da952d56d679c376e5fc927de39 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 6 Jan 2015 11:54:37 -0700
Subject: [PATCH 0336/1100] Showing default help if they type ionic help

---
 lib/ionic/help.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 1a16330256..d44b08cbd3 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -13,14 +13,19 @@ IonicTask.prototype.run = function(ionic) {
 
   self.ionic = ionic;
 
-  var command = argv._[1];
+  var command = argv._[1] ? argv._[1] : '';
 
   var task = self.ionic._getTaskWithName(command);
 
-  if(!task) {
-    console.log('Sorry .There is no "'.red.bold, command.cyan, '" command.'.red.bold)
+  if(command == '') {
+    self.ionic._printHelpLines();
+    return;
+  }
+  else if (!task) {
+    console.log('Command not found.'.red.bold)
     return
   }
+
   self.ionic._printIonic();
   process.stderr.write('\n=======================\n');
 

From fa2db2f93c69ab9e9301a17f3e53f7db3fba75cd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 6 Jan 2015 15:13:17 -0700
Subject: [PATCH 0337/1100] Updating npm-shrinkwrap

---
 npm-shrinkwrap.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1bf363c80c..b21118f6dd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -676,7 +676,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.2 <1.1.0",
+                  "from": "readable-stream@>=1.0.26 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -1455,7 +1455,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
@@ -1956,7 +1956,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2036,7 +2036,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2089,12 +2089,12 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {

From f8d985b522341e9d1073876d2b21444f287bb359 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 10:23:37 -0600
Subject: [PATCH 0338/1100] add splash preferences node to config.xml

---
 lib/ionic.js                    |  5 +++--
 lib/ionic/resources/generate.js | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 6fbff43bb6..b08720b07e 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -568,12 +568,13 @@ Ionic = {
 
   printVersionWarning: function() {
     if(this.npmVersion && this.npmVersion != settings.version.trim()) {
-      process.stdout.write('\n-------------------------\n'.red);
+      process.stdout.write('\n------------------------------------\n'.red);
       process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
       process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
       process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
+      process.stdout.write( (' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow );
       process.stdout.write( ' * Run '.yellow + 'npm update -g ionic'.bold + ' to update\n'.yellow );
-      process.stdout.write('-------------------------\n\n'.red);
+      process.stdout.write('------------------------------------\n\n'.red);
       this.npmVersion = null;
     }
   },
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index d01e60b6c7..4a92f6c552 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -530,6 +530,7 @@ function updateConfigData() {
     clearResourcesNodes();
     images.forEach(updateImageNode);
     buildDefaultIconNode();
+    buildPreferenceSplashNodes();
     writeConfigData();
   }
 
@@ -591,6 +592,35 @@ function updateConfigData() {
     }
   }
 
+  function buildPreferenceSplashNodes() {
+    var hasAndroid = _.find(images, function(image) {
+      return image.platform == 'android';
+    });
+
+    if (hasAndroid) {
+      if (!configData.widget.preference) {
+        configData.widget.preference = [];
+      }
+
+      var hasScreenPref = _.find(configData.widget.preference, function(d) {
+        return d && d.$ && d.$.name == 'SplashScreen';
+      });
+      if (!hasScreenPref) {
+        configData.widget.preference.push({ '$': { name: 'SplashScreen', value: 'screen' } });
+        madeChanges = true;
+      }
+
+      var hasDelayPref = _.find(configData.widget.preference, function(d) {
+        return d && d.$ && d.$.name == 'SplashScreenDelay';
+      });
+      if (!hasDelayPref) {
+        configData.widget.preference.push({ '$': { name: 'SplashScreenDelay', value: '3000' } });
+        madeChanges = true;
+      }
+    }
+
+  }
+
   function writeConfigData() {
     if (!madeChanges) return;
 

From 4bb2a2b74209921e8c4fa92b650fb79a667b7304 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 10:58:38 -0600
Subject: [PATCH 0339/1100] add splash preference for android splash build only

---
 lib/ionic/resources/generate.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 4a92f6c552..d15c4fc5ea 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -593,11 +593,11 @@ function updateConfigData() {
   }
 
   function buildPreferenceSplashNodes() {
-    var hasAndroid = _.find(images, function(image) {
-      return image.platform == 'android';
+    var hasAndroidSplash = _.find(images, function(image) {
+      return image.platform == 'android' && image.resType == 'splash';
     });
 
-    if (hasAndroid) {
+    if (hasAndroidSplash) {
       if (!configData.widget.preference) {
         configData.widget.preference = [];
       }

From e0e7a52ab5b651db53a6db3b524e7dcd12b34977 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 7 Jan 2015 10:56:47 -0700
Subject: [PATCH 0340/1100] Setting log level to fatal to stop spitting out
 opbeat errors to clients

---
 lib/ionic.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index f9dfc35694..f57f82d3ba 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -23,7 +23,8 @@ var argv = require('optimist').argv,
     opbeat = require('opbeat')({
       organizationId: '7456d1360946446791cde22d1ff90a56',
       appId: '1a3f490314',
-      secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b'
+      secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b',
+      clientLogLevel: 'fatal'
     });
 
 colors.setTheme({

From 179b0e9c01ee0d0acf41cc317f76657da357473c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:16:46 -0600
Subject: [PATCH 0341/1100] only build landscape/portrait splash from
 orientation config

If the app is locked in to landscape, then only generate landscape
splash screens, same for portrait. Otherwise generate both.
---
 README.md                       |   2 +-
 lib/ionic/resources/generate.js | 166 ++++++++++++++++++++++----------
 2 files changed, 116 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index 4ebafb006b..ed26fd2b0e 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ $ ionic resources --icon
 
 ### Splash Screen Source Image
 
-Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop splash screen template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone.
+Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop splash screen template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone. Additionally, when the `Orientation` [preference config](http://cordova.apache.org/docs/en/edge/config_ref_index.md.html#The%20config.xml%20File_global_preferences) is set to either `landscape` or `portrait` mode, then only the necessary images will be generated.
 
 ```bash
 $ ionic resources --splash
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index d15c4fc5ea..33edff9614 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -4,6 +4,7 @@ var fs = require('fs'),
     Q = require('q'),
     argv = require('optimist').argv,
     request = require('request'),
+    xml2js = require('xml2js'),
     _ = require('underscore'),
     crc = require('crc'),
     resSettings = require('./settings.js'),
@@ -18,7 +19,8 @@ IonicResources.prototype = new Task();
 var settings = resSettings.ResSettings;
 var platformConfigs = resSettings.ResPlatforms;
 var tmpDir = os.tmpdir();
-var buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
+var configData, buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
+var generateLandscape, generatePortrait, orientation;
 
 IonicResources.prototype.run = function() {
   buildPlatforms = [];
@@ -26,6 +28,9 @@ IonicResources.prototype.run = function() {
   generateQueue = [];
   sourceFiles = {};
   generatingImages = {};
+  generateLandscape = false;
+  generatePortrait = false;
+  orientation = 'default';
 
   if (!fs.existsSync(settings.configFile)) {
     console.error('Invalid ' + settings.configFile + ' file. Make sure the working directory is a Cordova project.');
@@ -49,30 +54,54 @@ IonicResources.prototype.run = function() {
     return;
   }
 
-  var promises = [];
+  getConfigData().then(function() {
 
-  if (argv.icon || argv.i) {
-    console.info('Ionic icon resources generator');
-    promises.push(queueResTypeImages('icon'));
+    if (argv.landscape || argv.l) {
+      generateLandscape = true;
+    }
+    if (argv.portrait || argv.p) {
+      generatePortrait = true;
+    }
+    if (!argv.landscape && !argv.l && !argv.portrait && !argv.p) {
 
-  } else if (argv.splash || argv.s) {
-    console.info('Ionic splash screen resources generator');
-    promises.push(queueResTypeImages('splash'));
+      orientation = getOrientationConfigData();
+      if (orientation == 'landscape') {
+        generateLandscape = true;
+      } else if (orientation == 'portrait') {
+        generatePortrait = true;
+      } else {
+        generateLandscape = true;
+        generatePortrait = true;
+      }
+    }
 
-  } else {
-    console.info('Ionic icon and splash screen resources generator');
-    promises.push(queueResTypeImages('icon'));
-    promises.push(queueResTypeImages('splash'));
-  }
+    var promises = [];
 
-  Q.all(promises)
-    .then(loadSourceImages)
-    .then(generateResourceImages)
-    .then(loadResourceImages)
-    .then(updateConfigData)
-    .catch(console.error);
+    if (argv.icon || argv.i) {
+      console.info('Ionic icon resources generator');
+      promises.push(queueResTypeImages('icon'));
+
+    } else if (argv.splash || argv.s) {
+      console.info('Ionic splash screen resources generator');
+      promises.push(queueResTypeImages('splash'));
+
+    } else {
+      console.info('Ionic icon and splash screen resources generator');
+      promises.push(queueResTypeImages('icon'));
+      promises.push(queueResTypeImages('splash'));
+    }
+
+    Q.all(promises)
+      .then(loadSourceImages)
+      .then(generateResourceImages)
+      .then(loadResourceImages)
+      .then(updateConfigData)
+      .catch(console.error);
+
+    IonicStats.t();
+
+  });
 
-  IonicStats.t();
 };
 
 function queueResTypeImages(resType) {
@@ -212,6 +241,13 @@ function queueResTypeImages(resType) {
                 image.imageId = sourceFile.imageId;
                 image.tmpPath = path.join(tmpDir, tmpFilename);
 
+                if (resType == 'splash') {
+                  if (!((image.width >= image.height && generateLandscape) || (image.height >= image.width && generatePortrait))) {
+                    image.skip = true;
+                    return;
+                  }
+                }
+
                 if (settings.cacheImages && fs.existsSync(image.tmpPath)) {
                   console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
 
@@ -494,46 +530,62 @@ function loadResourceImages() {
 }
 
 
-function updateConfigData() {
-  images = _.filter(images, function(image) {
-    return image.isValid && !image.skip;
-  });
-
-  if (!images.length) return;
-
-  var xml2js = require('xml2js');
-  var settings = resSettings.ResSettings;
-  var configData;
-  var madeChanges = false;
+function getConfigData() {
+  var deferred = Q.defer();
 
   try {
-    fs.readFile(settings.configFile, onConfigRead);
+    fs.readFile(resSettings.ResSettings.configFile, onConfigRead);
   } catch (err) {
     console.error('Error saveConfigData: ' + err);
+    deferred.reject();
   }
 
   function onConfigRead(err, data) {
-    if (err) return console.error('Error reading config file: ' + err);
+    if (err) {
+      console.error('Error reading config file: ' + err);
+      deferred.reject();
+      return;
+    }
 
     try {
       var parser = new xml2js.Parser();
       parser.parseString(data, onXmlParse);
     } catch (e) {
       console.error('Error xml2js parseString: ' + e);
+      deferred.reject();
     }
   }
 
   function onXmlParse(err, parsedData) {
-    if (err) return console.error('Error parsing config file: ' + err);
-
+    if (err) {
+      console.error('Error parsing config file: ' + err);
+      deferred.reject();
+      return;
+    }
     configData = parsedData;
-    clearResourcesNodes();
-    images.forEach(updateImageNode);
-    buildDefaultIconNode();
-    buildPreferenceSplashNodes();
-    writeConfigData();
+    deferred.resolve();
   }
 
+  return deferred.promise;
+}
+
+
+function updateConfigData() {
+  images = _.filter(images, function(image) {
+    return image.isValid && !image.skip;
+  });
+
+  if (!images.length || !configData) return;
+
+  var settings = resSettings.ResSettings;
+  var madeChanges = false;
+
+  clearResourcesNodes();
+  images.forEach(updateImageNode);
+  buildDefaultIconNode();
+  buildPreferenceSplashNodes();
+  writeConfigData();
+
   function clearResourcesNodes() {
     images.forEach(function(image) {
       if (!image) return;
@@ -636,22 +688,34 @@ function updateConfigData() {
     }
   }
 
-  function getPlatformConfigData(platform) {
-    if (configData.widget && configData.widget.platform) {
-      return _.find(configData.widget.platform, function(d) {
-        return d && d.$ && d.$.name == platform;
-      });
+}
+
+function getOrientationConfigData(platform) {
+  if (configData.widget && configData.widget.preference) {
+    var n = _.find(configData.widget.preference, function(d) {
+      return d && d.$ && d.$.name && d.$.name.toLowerCase() == 'orientation';
+    });
+    if (n && n.$ && n.$.value) {
+      return n.$.value.toLowerCase();
     }
   }
+  return 'default';
+}
 
-  function getResourceConfigNode(platformData, nodeName, src) {
-    if (platformData[nodeName]) {
-      return _.find(platformData[nodeName], function(d) {
-        return d && d.$ && d.$.src == src;
-      });
-    }
+function getPlatformConfigData(platform) {
+  if (configData.widget && configData.widget.platform) {
+    return _.find(configData.widget.platform, function(d) {
+      return d && d.$ && d.$.name == platform;
+    });
   }
+}
 
+function getResourceConfigNode(platformData, nodeName, src) {
+  if (platformData[nodeName]) {
+    return _.find(platformData[nodeName], function(d) {
+      return d && d.$ && d.$.src == src;
+    });
+  }
 }
 
 exports.IonicTask = IonicResources;

From 59b24568afa1ecac10c0c764d21aed220003691e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:24:03 -0600
Subject: [PATCH 0342/1100] whitelist resources args

---
 lib/ionic/stats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 4ea184cd2b..38e9eeda39 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -558,7 +558,7 @@ exports.IonicStats = {
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass --splash --icon'.split(' ');
 
       // collect only certain args, skip over everything else
       for(x=0; x<cmdArgs.length; x++) {

From 5cf453e671568454d0e76055a1cf7d6181e638ea Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 7 Jan 2015 11:27:29 -0700
Subject: [PATCH 0343/1100] Adjusting the android update sdk command to filter
 out and get android sdk tools 19.1.0

---
 lib/ionic/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 9355b0eaa6..0bf4ba508e 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -98,7 +98,7 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
 }
 
 IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
-  var command = 'echo "y" | android update sdk --no-ui --filter 19 --force';
+  var command = 'echo "y" | android update sdk --no-ui --all --filter 10';
   var result = shelljs.exec(command, { silent: true } );
 
   if(result.code != 0) {

From ff628654fd63815d131e7d6c82eb5d7daa3c4f19 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:41:47 -0600
Subject: [PATCH 0344/1100] splash screen updates

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f319662c..882d1e5e46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.3.0
+
+* Crosswalk
+* Automatically add the `SplashScreen` and `SplashScreenDelay` preference configs for Android splash screens
+* When an orientation is locked using the [preference config](http://cordova.apache.org/docs/en/edge/config_ref_index.md.html#The%20config.xml%20File_global_preferences), only build the necessary splash screen images
+
+
 ### 1.2.14
 
 * Automatically create icon resources from source file: `ionic resources --icon`

From 0cd3ddcceace91562f40747e2f991a5d9b127f9b Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:48:33 -0600
Subject: [PATCH 0345/1100] 1.2.14 blog link

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 882d1e5e46..7cc99cf093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Automatically create icon resources from source file: `ionic resources --icon`
 * Automatically create splash screen resources from source file: `ionic resources --splash`
 * Update config.xml resource platform nodes
+* [Automating Icons and Splash Screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/)
 
 
 ### 1.2.13

From 9c6ee328b397a50ecb900055b8918469f2499be6 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:53:10 -0600
Subject: [PATCH 0346/1100] ionic labs blog link

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cc99cf093..7d7f373620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,10 +35,10 @@
 
 ### 1.2.9
 
+* [Introduced Ionic Labs](http://ionicframework.com/blog/ionic-lab/) - a way to see preview iOS and Android side by side in the browser
 * Added proxy-middleware to provide proxying to APIs from the `serve` command
 * Updated README doc about how to use the proxy
 * Injects platform specific class to HTML to view it as an iOS or Android device in browser
-* Introduced Ionic Labs - a way to see preview iOS and Android side by side in the browser
 * Bumped `serve-static` to 1.7.1 to avoid some errors with the `serve` for users of Node 0.12
 * Added the `add` command to use ionic to manage bower components
 * Ionic now reads the Node environment variable `http_proxy` along with the passed `PROXY` variable to get around a local proxy

From 86869290ea57d70d3d9a4a57c9a17b276c087f4d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 7 Jan 2015 12:56:43 -0600
Subject: [PATCH 0347/1100] add icon/splash blog link

---
 CHANGELOG.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d7f373620..ea011c34bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,10 @@
 
 ### 1.2.14
 
+* [Automating Icons and Splash Screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/)
 * Automatically create icon resources from source file: `ionic resources --icon`
 * Automatically create splash screen resources from source file: `ionic resources --splash`
 * Update config.xml resource platform nodes
-* [Automating Icons and Splash Screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/)
 
 
 ### 1.2.13
diff --git a/README.md b/README.md
index ed26fd2b0e..cec5322062 100644
--- a/README.md
+++ b/README.md
@@ -173,7 +173,7 @@ $ ionic run ios [options]
 
 ## Icon and Splash Screen Image Generation
 
-Automatically generate icons and splash screens from source images to create each size needed for each platform, in addition to copying each resized and cropped image into each platform's resources directory. Source images can either be a `png`, `psd` __Photoshop__ or `ai` __Illustrator__ file. Images are generated using Ionic's image resizing and cropping server, instead of requiring special libraries and plugins to be installed locally.
+[Automatically generate icons and splash screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/) from source images to create each size needed for each platform, in addition to copying each resized and cropped image into each platform's resources directory. Source images can either be a `png`, `psd` __Photoshop__ or `ai` __Illustrator__ file. Images are generated using Ionic's image resizing and cropping server, instead of requiring special libraries and plugins to be installed locally.
 
 Since each platform has different image requirements, it's best to make a source image for the largest size needed, and let the CLI do all the resizing, cropping and copying for you. Newly generated images will be placed in the `resources` directory at the root of the Cordova project. Additionally, the CLI will update and add the correct `<platform>` configs to the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file.
 

From af7b8c534d87cc41c3eac6f1b76fd2b25c21f27f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 7 Jan 2015 15:38:13 -0700
Subject: [PATCH 0348/1100] Bumping to 1.3.0, adding changelog note

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea011c34bd..9198fde8b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### 1.3.0
 
-* Crosswalk
+* You can now use [Crosswalk in your Android projects](http://forum.ionicframework.com/t/crosswalk-integration-beta-in-ionic-cli/15190). Crosswalk is a way to package your Chrome Webview and use it with Cordova. Use the `ionic help browser` command to get more information about it.
 * Automatically add the `SplashScreen` and `SplashScreenDelay` preference configs for Android splash screens
 * When an orientation is locked using the [preference config](http://cordova.apache.org/docs/en/edge/config_ref_index.md.html#The%20config.xml%20File_global_preferences), only build the necessary splash screen images
 
diff --git a/package.json b/package.json
index 8f15907edc..cb3925d2b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.0-beta1",
+  "version": "1.3.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e67c93be2f5d32747d3c9e47092ca0c1ef2dcba6 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Jan 2015 21:23:44 -0600
Subject: [PATCH 0349/1100] set resource api url w/ cmd arg

---
 lib/ionic/resources/generate.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 33edff9614..eb8cfc99b7 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -75,6 +75,10 @@ IonicResources.prototype.run = function() {
       }
     }
 
+    if (argv['api']) {
+      settings.apiUrl = argv['api'];
+    }
+
     var promises = [];
 
     if (argv.icon || argv.i) {

From 3c650248bd2ecb85ffab0ebac5df1d0f63464204 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 9 Jan 2015 15:54:34 -0700
Subject: [PATCH 0350/1100] Adjusting the cookies - changing from request 2.57,
 now its cookie.key and the jar is the cookies array

---
 lib/ionic/login.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 7710f39fa6..91e6b6c732 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -33,10 +33,10 @@ IonicTask.prototype.get = function(ionic, callback) {
     // did not include cmd line flags, check for existing cookies
     var jar = this.cookieData.get(ionic.IONIC_DASH);
 
-    if(jar && jar.cookies && jar.cookies.length) {
-      for(var i in jar.cookies) {
-        var cookie = jar.cookies[i];
-        if(cookie.name == "sessionid" && new Date(cookie.expires) > new Date()) {
+    if(jar && jar.length) {
+      for(var i in jar) {
+        var cookie = jar[i];
+        if(cookie.key == "sessionid" && new Date(cookie.expires) > new Date()) {
           ionic.jar = jar;
           callback(jar);
           return;
@@ -121,7 +121,7 @@ IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
       if(!self.cookieData) {
         self.cookieData = new IonicStore('cookies');
       }
-      self.cookieData.set(ionic.IONIC_DASH, jar);
+      self.cookieData.set(ionic.IONIC_DASH, jar.getCookies(ionic.IONIC_DASH));
       self.cookieData.save();
     }
 

From 174c449d03abc42dfd523bb73b2c867bc5275bcb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 10 Jan 2015 09:58:03 -0700
Subject: [PATCH 0351/1100] Now specify which version of crosswalk you wish to
 use. downloads are checked before downloading - xwalk webviews,
 cordova-android 4.0x, and the cordova engine. Also lists browser versions
 with ionic browser list.

---
 lib/ionic/browser.js | 88 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 0bf4ba508e..feaa730d88 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -25,11 +25,31 @@ var fs = require('fs'),
     proxyMiddleware = require('proxy-middleware'),
     unzip = require('unzip'),
     Ionic = require('../ionic').Ionic,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    _ = require('underscore');
 
   var config = shelljs.config;
   config.silent = true;
 
+var crosswalkVersions = [
+  {
+    version: '8.37.189.12',
+    publish_date: '2014-09-30 02:43'
+  },
+  {
+    version: '8.37.189.14',
+    publish_date: '2014-10-10 03:26'
+  },
+  {
+    version: '9.38.208.10',
+    publish_date: '2014-11-25 11:45'
+  },
+  {
+    version: '10.39.235.15',
+    publish_date: ' 2014-12-31 13:16'
+  }
+]
+
 var iosBrowsers = [
     {
       platform: 'iOS',
@@ -49,7 +69,8 @@ var iosBrowsers = [
       platform: 'Android',
       name: 'Crosswalk',
       available: true,
-      command: 'ionic browser add crosswalk'
+      command: 'ionic browser add crosswalk',
+      versions: crosswalkVersions
     },
     {
       platform: 'Android',
@@ -76,7 +97,7 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
     shelljs.mkdir(path.join(process.cwd(), 'engine'));
   }
 
-  if(fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine'))) {
+  if(fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8'))) {
     q.resolve();
     return q.promise;
   }
@@ -99,6 +120,7 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
 
 IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   var command = 'echo "y" | android update sdk --no-ui --all --filter 10';
+  console.log('\nFetching Android SDK API 19.1.0')
   var result = shelljs.exec(command, { silent: true } );
 
   if(result.code != 0) {
@@ -118,6 +140,14 @@ function downloadCrosswalkWebview(architecture, version) {
     shelljs.mkdir(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
   }
 
+  var xwalkPath = ['crosswalk-webview-', version, '-', architecture].join('');
+  var xwalkArchPath = path.join(tempZipFilePath, xwalkPath)
+
+  if(fs.existsSync(xwalkArchPath)) {
+    q.resolve()
+    return;
+  }
+
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
     //Need to go copy to android directory.
@@ -131,15 +161,23 @@ function downloadCrosswalkWebview(architecture, version) {
 
     q.resolve(data);
   }, function(error) {
-    console.log('Crosswalk webviews failed to download - ', error)
+    console.log('Crosswalk webviews failed to download - ')
     q.reject(error);
   })
 
   return q.promise;
 }
 
-IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews() {
-  var version = '8.37.189.14';
+IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version) {
+  var version = version ? version : '8.37.189.14';
+
+  var xwalkVersion = _.findWhere(crosswalkVersions, { version: version });
+
+  if(!xwalkVersion) {
+    console.log('\nYou must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
+    // q.reject('You must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
+    throw new Error('Invalid version of Crosswalk specified');
+  }
 
   var armPromise = downloadCrosswalkWebview('arm', version);
   var x86Promise = downloadCrosswalkWebview('x86', version);
@@ -154,6 +192,11 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
 
   var tempZipFilePath = path.join(process.cwd(), 'engine');
 
+  if(fs.existsSync(path.join(tempZipFilePath, 'cordova-android-crosswalk'))) {
+    q.resolve();
+    return;
+  }
+
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
     console.log('\nFinished downloading cordova-android v4.0.x');
@@ -200,7 +243,7 @@ IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
   shelljs.cd('../../');
 }
 
-IonicTask.prototype.downloadFiles = function downloadFiles() {
+IonicTask.prototype.downloadFiles = function downloadFiles(version) {
   var q = Q.defer();
 
   var self = this;
@@ -211,7 +254,7 @@ IonicTask.prototype.downloadFiles = function downloadFiles() {
   })
   .then(function(data) {
     console.log('\nDownloaded Cordova Android for Crosswalk');
-    return self.getCrosswalkWebviews();
+    return self.getCrosswalkWebviews(version);
   })
   .then(function(data) {
     console.log('\nDownloaded Crosswalk webviews');
@@ -236,10 +279,10 @@ IonicTask.prototype.removeCrosswalk = function() {
   shelljs.exec('cordova platform add android')
 }
 
-IonicTask.prototype.installCrosswalk = function() {
+IonicTask.prototype.installCrosswalk = function(version) {
   var self = this;
 
-  self.downloadFiles()
+  self.downloadFiles(version)
   .then(function(data) {
     self.removeAndroidProject();
     self.addCordova40xProject();
@@ -249,8 +292,9 @@ IonicTask.prototype.installCrosswalk = function() {
     console.log('\nIonic Browser Add completed for Crosswalk');
   })
   .catch(function(error){
-    console.log('An error with adding Crosswalk browser occured')
-    console.log(error)
+    console.log('\nAn error with adding Crosswalk browser occured')
+    self.ionic.fail(error)
+    // console.log(error)
   })
 }
 
@@ -287,10 +331,19 @@ IonicTask.prototype.addBrowser = function() {
     return;
   }
 
+  var browserVersion = null;
+
+  if(browserToInstall.indexOf('@') !== -1) {
+    //Browser version specified. Find version number.
+    var browserVersionAttempt = argv._[2].split('@');
+    browserToInstall = browserVersionAttempt[0];
+    browserVersion = browserVersionAttempt[1];
+  }
+
   switch(browserToInstall) {
     case 'crosswalk':
       console.log('Adding', browserToInstall, 'browser')
-      self.installCrosswalk();
+      self.installCrosswalk(browserVersion);
       break;
     case 'default':
       console.log('Adding', browserToInstall, 'browser')
@@ -331,7 +384,13 @@ var printBrowsers = function(browsers) {
     var installCommand = browser.command ? browser.command : '';
 
     if(browser.available) {
-      console.log('Available'.green.bold, '-', browser.name.green, '-', installCommand)
+      console.log('\nAvailable'.green.bold, '-', browser.name.green, '-', installCommand)
+      if(browser.versions) {
+        for(version in browser.versions) {
+          var ver = browser.versions[version];
+          console.log('\tVersion'.blue, ver.version.yellow, 'Published'.cyan, new Date(ver.publish_date))
+        }
+      }
     } else {
       console.log('Not Available Yet'.red.bold, '-', browser.name.green)
     }
@@ -339,7 +398,6 @@ var printBrowsers = function(browsers) {
 }
 
 IonicTask.prototype.listBrowsers = function() {
-
   console.log('iOS - Browsers Listing:\n')
 
   printBrowsers(iosBrowsers);

From c116ba9287b05b3be963fe9860514c0a49227b5c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 12 Jan 2015 12:21:13 -0700
Subject: [PATCH 0352/1100] Bumping version to 1.3.1, updating changelog,
 shrinkwrapping

---
 CHANGELOG.md        |  7 ++++
 npm-shrinkwrap.json | 80 ++++++++++++++++++++++++++++-----------------
 package.json        |  2 +-
 3 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9198fde8b3..0314e045ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.3.1
+
+* See all the browsers available to install - `ionic browser list`. *NOTE: Only stable releases are allowed for now.*
+* You can now specify [which version of the Crosswalk run time](https://download.01.org/crosswalk/releases/crosswalk/android/stable/) you want to use - `ionic browser add crosswalk@8.37.189.14`.
+* Caching the Crosswalk downloads - once you’ve installed a version in a project, running `ionic browser add crosswalk` will not re-download the webviews if they have previously been downloaded.
+* Fixed an issue with `ionic upload` - now you should be able to log in and re-use your login cookies without errors.
+
 ### 1.3.0
 
 * You can now use [Crosswalk in your Android projects](http://forum.ionicframework.com/t/crosswalk-integration-beta-in-ionic-cli/15190). Crosswalk is a way to package your Chrome Webview and use it with Cordova. Use the `ionic help browser` command to get more information about it.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b21118f6dd..1f4ec74163 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.0-beta1",
+  "version": "1.3.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -423,7 +423,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -435,7 +435,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -453,13 +453,28 @@
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.1",
+          "version": "3.0.2",
           "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.2.tgz",
           "dependencies": {
+            "array-differ": {
+              "version": "1.0.0",
+              "from": "array-differ@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+            },
+            "array-uniq": {
+              "version": "1.0.2",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+            },
+            "beeper": {
+              "version": "1.0.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
+            },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.7-1.2.3 <2.0.0",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
@@ -468,9 +483,9 @@
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
                 },
                 "meow": {
-                  "version": "2.0.0",
+                  "version": "2.1.0",
                   "from": "meow@*",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
@@ -507,21 +522,11 @@
                           }
                         }
                       }
-                    },
-                    "object-assign": {
-                      "version": "1.0.0",
-                      "from": "object-assign@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"
                     }
                   }
                 }
               }
             },
-            "lodash": {
-              "version": "2.4.1",
-              "from": "lodash@>=2.4.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
-            },
             "lodash._reinterpolate": {
               "version": "2.4.1",
               "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
@@ -630,7 +635,7 @@
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.0 <0.2.0",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
@@ -669,14 +674,24 @@
                 }
               }
             },
+            "object-assign": {
+              "version": "2.0.0",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+            },
+            "replace-ext": {
+              "version": "0.0.1",
+              "from": "replace-ext@0.0.1",
+              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+            },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.1 <0.7.0",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.26 <1.1.0",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -1430,9 +1445,9 @@
       }
     },
     "opbeat": {
-      "version": "1.0.8",
+      "version": "1.1.0",
       "from": "opbeat@>=1.0.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.0.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
@@ -1453,6 +1468,11 @@
             }
           }
         },
+        "console-log-level": {
+          "version": "1.0.0",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
+        },
         "json-stringify-safe": {
           "version": "5.0.0",
           "from": "json-stringify-safe@>=5.0.0 <6.0.0",
@@ -1956,7 +1976,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2036,7 +2056,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2089,12 +2109,12 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -2221,7 +2241,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
@@ -2255,7 +2275,7 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "through2@>=0.6.3 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
diff --git a/package.json b/package.json
index cb3925d2b9..b38b9e7baa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6f1c609ab7af5fa8a3a49735aa38fb681166f352 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 12 Jan 2015 13:12:58 -0700
Subject: [PATCH 0353/1100] Updating readme for crosswalk browser instructions

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index cec5322062..aabafd1492 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,18 @@ $ ionic resources
 
 One source image can be used to generate images for each platform by placing the file within the `resources` directory, such as `resources/icon.png`. To use different source images for individual platforms, place the source image in the respective platform's directory. For example, to use a different icon for Android, it should follow this path: `resources/android/icon.png`, and a different image for iOS would use this path: `resources/ios/icon.png`.
 
+## Crosswalk for Android
+
+In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
+
+Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `8.37.189.14` version of Crosswalk.
+
+If you'd like to specify a different version of Crosswalk, run `ionic browser list` to see which browsers are available and what versions. Then run `ionic browser add crosswalk@10.39.235.15`.
+
+All that is left is to run the project as normal - `ionic run android`.
+
+*NOTE: To start with, we are only supporting stable versions of Crosswalk. We plan to add the beta and canary versions as we continue adding to this feature set*
+
 
 ## Update Ionic lib
 

From 6e449c5dcea404395195312d068b77d49ab52096 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 12 Jan 2015 13:23:05 -0700
Subject: [PATCH 0354/1100] Adding the blog post to the changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0314e045ce..1ef62c238d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### 1.3.1
 
+* [Adding the Crosswalk browser for Ionic](http://ionicframework.com/blog/crosswalk-comes-to-ionic/)
 * See all the browsers available to install - `ionic browser list`. *NOTE: Only stable releases are allowed for now.*
 * You can now specify [which version of the Crosswalk run time](https://download.01.org/crosswalk/releases/crosswalk/android/stable/) you want to use - `ionic browser add crosswalk@8.37.189.14`.
 * Caching the Crosswalk downloads - once you’ve installed a version in a project, running `ionic browser add crosswalk` will not re-download the webviews if they have previously been downloaded.

From 286de8a4b84eb00c6a2c6bc3c62ce0d3819e9cd5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 12 Jan 2015 14:47:06 -0700
Subject: [PATCH 0355/1100] Adding the (beta) and (canary) tags to the releases
 for crosswalk.

---
 lib/ionic/browser.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index feaa730d88..7bb8435cc9 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -46,7 +46,22 @@ var crosswalkVersions = [
   },
   {
     version: '10.39.235.15',
-    publish_date: ' 2014-12-31 13:16'
+    publish_date: '2014-12-31 13:16'
+  },
+  {
+    version: '11.40.277.1',
+    publish_date: '2015-01-05 02:52',
+    beta: true
+  },
+  {
+    version: '11.40.277.0',
+    publish_date: '2015-01-01 08:27',
+    canary: true
+  },
+  {
+    version: '12.40.283.0',
+    publish_date: '2015-01-12 08:27',
+    canary: true
   }
 ]
 
@@ -388,7 +403,20 @@ var printBrowsers = function(browsers) {
       if(browser.versions) {
         for(version in browser.versions) {
           var ver = browser.versions[version];
-          console.log('\tVersion'.blue, ver.version.yellow, 'Published'.cyan, new Date(ver.publish_date))
+
+          var betaCanaryMessage = null;
+
+          if(ver.beta) {
+            betaCanaryMessage = '(beta)\t'
+          } else if (ver.canary) {
+            betaCanaryMessage = '(canary)'
+          } else {
+            betaCanaryMessage = '\t';
+          }
+
+          // console.log('betacanary', betaCanaryMessage)
+          // console.log('beta canary msg', betaCanaryMessage)
+          console.log(betaCanaryMessage, 'Version'.blue, ver.version.yellow, 'Published'.cyan, new Date(ver.publish_date))
         }
       }
     } else {

From 4e6a96d900fb111345855deafddf288a042e8ae5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 12 Jan 2015 15:02:21 -0700
Subject: [PATCH 0356/1100] Passing in the version release type to get the
 proper download url

---
 lib/ionic/browser.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 7bb8435cc9..4e1b3453a7 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -143,10 +143,10 @@ IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   }
 }
 
-function downloadCrosswalkWebview(architecture, version) {
+function downloadCrosswalkWebview(architecture, version, releaseStatus) {
   var q = Q.defer();
 
-  var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/stable/' +
+  var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/' + releaseStatus + '/' +
     version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip';
 
   var tempZipFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
@@ -188,14 +188,24 @@ IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version
 
   var xwalkVersion = _.findWhere(crosswalkVersions, { version: version });
 
+  console.log('xwalk', xwalkVersion)
+
   if(!xwalkVersion) {
     console.log('\nYou must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
     // q.reject('You must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
     throw new Error('Invalid version of Crosswalk specified');
   }
 
-  var armPromise = downloadCrosswalkWebview('arm', version);
-  var x86Promise = downloadCrosswalkWebview('x86', version);
+  var releaseStatus = 'stable';
+
+  if(xwalkVersion.beta) {
+    releaseStatus = 'beta';
+  } else if(xwalkVersion.canary) {
+    releaseStatus = 'canary';
+  }
+
+  var armPromise = downloadCrosswalkWebview('arm', version, releaseStatus);
+  var x86Promise = downloadCrosswalkWebview('x86', version, releaseStatus);
 
   return Q.all([armPromise, x86Promise]);
 }

From c71c2c174c2e0c51d8bd94daba21ea521664b09f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 13 Jan 2015 13:58:15 -0700
Subject: [PATCH 0357/1100] Fixing the upload error with jar.cookies,
 cookie.name is now cookie.key

---
 lib/ionic/upload.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index a0bb4eb36f..e76a58402c 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -50,9 +50,9 @@ IonicTask.prototype.run = function(ionic, callback) {
 
       var csrftoken = '';
 
-      for (var i = 0; i < jar.cookies.length; i++) {
-        if (jar.cookies[i].name == 'csrftoken') {
-          csrftoken = jar.cookies[i].value;
+      for (var i = 0; i < jar.length; i++) {
+        if (jar[i].key == 'csrftoken') {
+          csrftoken = jar[i].value;
         }
       }
 
@@ -71,8 +71,8 @@ IonicTask.prototype.run = function(ionic, callback) {
         port: params.port,
         path: params.path,
         headers: form.getHeaders({
-          cookie: jar.cookies.map(function(c) {
-            return c.name + "=" + encodeURIComponent(c.value);
+          cookie: jar.map(function(c) {
+            return c.key + "=" + encodeURIComponent(c.value);
           }).join("; ")
         })
       }, function(err, response) {

From 77a307f2979dff9a08d3265e0336b6a3f5c88736 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 14 Jan 2015 10:01:14 -0700
Subject: [PATCH 0358/1100] Bumping version to 1.3.2 and wrapping it up

---
 npm-shrinkwrap.json | 24 ++++++++++++------------
 package.json        |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1f4ec74163..19e51c6c80 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -423,7 +423,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -435,7 +435,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -725,7 +725,7 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
+              "from": "vinyl@>=0.4.3 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
@@ -867,9 +867,9 @@
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
-              "version": "1.1.0",
+              "version": "1.1.1",
               "from": "user-home@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
         }
@@ -1971,12 +1971,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2091,9 +2091,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.2",
+              "version": "4.3.4",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.4.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -2300,7 +2300,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -2314,7 +2314,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "vinyl@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
diff --git a/package.json b/package.json
index b38b9e7baa..59b890fdef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From aa2c0dda2b448ceca10bc88ea13fbf2f62b9ff7c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 14 Jan 2015 10:59:00 -0700
Subject: [PATCH 0359/1100] Fixing the spelling for help text for browser

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d152b1a186..877683b464 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -272,7 +272,7 @@ var TASKS = [
    {
     title: 'browser',
     name: 'browser',
-    summary: 'Add another broswer for a platform ' + '(beta)'.yellow,
+    summary: 'Add another browser for a platform ' + '(beta)'.yellow,
     args: {
       '<command>': '"add remove rm list ls revert"',
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'

From 3f2e8f7b09fbd37036557f6b2d30af9f123f6452 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 14 Jan 2015 12:19:53 -0700
Subject: [PATCH 0360/1100] Enabling browser stats for ionic stats

---
 lib/ionic/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index feaa730d88..80d5e4eb17 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -456,7 +456,7 @@ IonicTask.prototype.run = function(ionic) {
       break;
   }
 
-  // IonicStats.t();
+  IonicStats.t();
 
 };
 

From cbf1e8d2983293f16ecbe2e710d00a66d126a1b0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 14 Jan 2015 14:59:52 -0700
Subject: [PATCH 0361/1100] Changelog for 1.3.2

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ef62c238d..ccc7d63fa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.2
+
+* Added another fix for the way the cookies were handled for `ionic upload` - changing from `cookie.name` to `cookie.key`
+
 ### 1.3.1
 
 * [Adding the Crosswalk browser for Ionic](http://ionicframework.com/blog/crosswalk-comes-to-ionic/)

From b8d482350928944b4c65e0009bc497253fc962a9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 14 Jan 2015 20:06:05 -0700
Subject: [PATCH 0362/1100] Adding in the ability to list all browser versions
 installed. Added the method to save the version and platform information

---
 lib/ionic/browser.js | 60 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 80d5e4eb17..b579f1f11d 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -26,7 +26,8 @@ var fs = require('fs'),
     unzip = require('unzip'),
     Ionic = require('../ionic').Ionic,
     IonicStats = require('./stats').IonicStats,
-    _ = require('underscore');
+    _ = require('underscore'),
+    IonicProject = require('./project');
 
   var config = shelljs.config;
   config.silent = true;
@@ -319,11 +320,38 @@ IonicTask.prototype.revertBrowser = function() {
   console.log('Reverted', platform, 'browser');
 }
 
+IonicTask.prototype.saveBrowserInstallation = function saveBrowserInstallation(platform, browser, version) {
+  var project = IonicProject.load();
+  var browsers = project.get('browsers') || [];
+  var platformExists = false, platformIndex = 0;
+  var browserEntry = { platform: platform, browser: browser, version: version };
+
+  for( ; platformIndex < browsers.length; platformIndex++) {
+    var platformBrowser = browsers[platformIndex];
+    if(platformBrowser.platform == platform) {
+      platformExists = true;
+      break;
+    }
+  }
+
+  if(platformExists) {
+    browsers[platformIndex] = browserEntry;
+  } else {
+    browsers.push(browserEntry)
+  }
+
+  project.set('browsers', browsers);
+  project.save();
+}
+
 IonicTask.prototype.addBrowser = function() {
   var self = this;
 
   //Check which browser they wish to install
-  var browserToInstall = 'crosswalk';
+  var browserToInstall = 'crosswalk',
+      platform = 'android',
+      browserVersion = null
+      validBrowserSpecified = false;
   if (argv._[2]) {
     browserToInstall = argv._[2];
   } else {
@@ -331,8 +359,6 @@ IonicTask.prototype.addBrowser = function() {
     return;
   }
 
-  var browserVersion = null;
-
   if(browserToInstall.indexOf('@') !== -1) {
     //Browser version specified. Find version number.
     var browserVersionAttempt = argv._[2].split('@');
@@ -344,15 +370,22 @@ IonicTask.prototype.addBrowser = function() {
     case 'crosswalk':
       console.log('Adding', browserToInstall, 'browser')
       self.installCrosswalk(browserVersion);
+      validBrowserSpecified = true;
       break;
     case 'default':
       console.log('Adding', browserToInstall, 'browser')
       self.installDefaultBrowser();
+      validBrowserSpecified = true;
       break;
     default:
       console.log('No accepted browser was specified.'.red.bold)
+      validBrowserSpecified = false;
       break;
   }
+
+  if(validBrowserSpecified) {
+    self.saveBrowserInstallation(platform, browserToInstall, browserVersion);
+  }
 }
 
 IonicTask.prototype.removeBrowser = function() {
@@ -407,6 +440,21 @@ IonicTask.prototype.listBrowsers = function() {
   printBrowsers(androidBrowsers);
 }
 
+IonicTask.prototype.listInstalledBrowsers = function listInstalledBrowsers() {
+  var project = IonicProject.load();
+
+  var browsers = project.get('browsers');
+
+  console.log('\nInstalled browsers:\n'.green)
+
+  for(browserIndex in browsers) {
+    var browser = browsers[browserIndex]
+    console.log('For', browser.platform, '-', browser.browser, browser.version)
+  }
+
+  console.log('\n')
+}
+
 IonicTask.prototype.run = function(ionic) {
   var self = this;
   this.ionic = ionic;
@@ -419,7 +467,7 @@ IonicTask.prototype.run = function(ionic) {
 
   cmdArg = argv._[1]
 
-  var validCommands = 'add remove rm list ls revert'.split(' ');
+  var validCommands = 'add remove rm list ls revert versions'.split(' ');
   for(y=0; y<validCommands.length; y++) {
     if(cmdArg == validCommands[y]) {
       hasValidCmd = true;
@@ -454,6 +502,8 @@ IonicTask.prototype.run = function(ionic) {
     case 'check':
       console.log('Checking for engine');
       break;
+    case 'versions':
+      this.listInstalledBrowsers();
   }
 
   IonicStats.t();

From 4bf6a95be62753a75ea688e689dc0d0cca1c28b4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 16 Jan 2015 15:47:26 -0600
Subject: [PATCH 0363/1100] Updating changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccc7d63fa2..270be6e95e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.3
+
+* Added the ability to specify an address when using `ionic serve` by specifying the address as an argument: `ionic serve --address 192.168.1.100`
+
 ### 1.3.2
 
 * Added another fix for the way the cookies were handled for `ionic upload` - changing from `cookie.name` to `cookie.key`

From e98ddc55746285f0cd53f0e73107a5ce4af205b9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 16 Jan 2015 15:49:15 -0600
Subject: [PATCH 0364/1100] Updating changelog for the beta/canary
 specification

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 270be6e95e..60c78b4837 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.3.3
 
 * Added the ability to specify an address when using `ionic serve` by specifying the address as an argument: `ionic serve --address 192.168.1.100`
+* Added the ability to download and target select versions of beta / canary versions of Crosswalk - see `ionic browser list` to see versions available.
 
 ### 1.3.2
 

From ae676c887ceda4ea4619a4d9ecf7782c9d6fc607 Mon Sep 17 00:00:00 2001
From: mhartington <mikehartington@gmail.com>
Date: Fri, 16 Jan 2015 18:02:19 -0500
Subject: [PATCH 0365/1100] change update to install

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 52ffbea6e1..1fd49536a8 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -606,7 +606,7 @@ Ionic = {
       process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
       process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
       process.stdout.write( (' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow );
-      process.stdout.write( ' * Run '.yellow + 'npm update -g ionic'.bold + ' to update\n'.yellow );
+      process.stdout.write( ' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow );
       process.stdout.write('------------------------------------\n\n'.red);
       this.npmVersion = null;
     }

From e23c42dbbe1ef20f46981cc9e6ea96965ea47d84 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tlancina@users.noreply.github.com>
Date: Sat, 17 Jan 2015 00:42:09 -0600
Subject: [PATCH 0366/1100] update README with watchPatterns info

---
 README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/README.md b/README.md
index aabafd1492..ce7a6788a4 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,39 @@ Use `ionic serve` to start a local development server for app dev and testing. T
 $ ionic serve [options]
 ```
 
+__LiveReload__
+
+By default, LiveReload will watch for changes in your `www/` directory, 
+excluding `www/lib/`.  To change this, you can specify a `watchPatterns` 
+property in the `ionic.project` file located in your project root to watch 
+(or not watch) for specific changes.
+
+```json
+{
+  "name": "myApp",
+  "app_id": "",
+  "watchPatterns": [
+    "www/js/*",
+    "!www/css/**/*"
+  ]
+}
+```
+
+For a reference on glob pattern syntax, check out 
+[globbing patterns](http://gruntjs.com/configuring-tasks#globbing-patterns) on 
+the Grunt website.
+
+Note: 
+
+```bash
+$ ionic setup sass 
+```
+
+will add a `watchPatterns` propery with the default values to your `ionic.project` 
+file that you can then edit, in addition to the `gulpStartupTasks` property 
+described in the [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) section.
+
+
 __Service Proxies:__
 
 The `serve` command can add some proxies to the http server. These proxies are useful if you are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.

From dad618af997d981d31493910811b2d5c36d1fbbe Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 12:08:10 -0700
Subject: [PATCH 0367/1100] Update connect-livereload to v0.5.2. Closes #187

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59b890fdef..0030f94f9b 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "archiver": "0.5.1",
     "colors": "0.6.2",
     "connect": "3.1.1",
-    "connect-livereload": "0.4.0",
+    "connect-livereload": "0.5.2",
     "crc": "3.2.1",
     "cross-spawn": "0.2.3",
     "event-stream": "3.0.x",

From fb75f42f268b1e9a583f7fc0079d662fe48bd367 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 14:38:31 -0700
Subject: [PATCH 0368/1100] Updating shrinkwrap

---
 npm-shrinkwrap.json | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 19e51c6c80..593c833eb9 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -41,7 +41,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -275,9 +275,9 @@
       }
     },
     "connect-livereload": {
-      "version": "0.4.0",
-      "from": "connect-livereload@0.4.0",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.4.0.tgz"
+      "version": "0.5.2",
+      "from": "connect-livereload@0.5.2",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
@@ -478,9 +478,9 @@
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
-                  "version": "3.0.2",
+                  "version": "4.0.0",
                   "from": "get-stdin@*",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.0.tgz"
                 },
                 "meow": {
                   "version": "2.1.0",
@@ -509,6 +509,11 @@
                       "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
+                        "get-stdin": {
+                          "version": "3.0.2",
+                          "from": "get-stdin@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
+                        },
                         "repeating": {
                           "version": "1.1.1",
                           "from": "repeating@>=1.1.0 <2.0.0",
@@ -686,7 +691,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.3 <0.7.0",
+              "from": "through2@>=0.6.1 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -1445,9 +1450,9 @@
       }
     },
     "opbeat": {
-      "version": "1.1.0",
+      "version": "1.1.2",
       "from": "opbeat@>=1.0.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
@@ -1475,7 +1480,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
@@ -1971,12 +1976,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2091,9 +2096,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.4",
+              "version": "4.3.5",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -2109,7 +2114,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2241,7 +2246,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
@@ -2275,7 +2280,7 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.3 <0.7.0",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
@@ -2300,7 +2305,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }

From 5ea4c1f25c6104deeff3d877eeea2f53ea932ea8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 14:39:28 -0700
Subject: [PATCH 0369/1100] This fixes the issue when a user types 'q' in the
 prompt. It will kill the ionic process and leave the gulp startup tasks
 running. This sets a reference to the spawn, and kills them when q is
 pressed. Closes #186

---
 lib/ionic/serve.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 971a916922..e7fee0b04d 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -98,6 +98,7 @@ IonicTask.prototype.loadSettings = function(cb) {
       self.printCommandTips();
 
     } else if(input == 'quit' || input == 'q') {
+      self.childProcess.kill('SIGTERM');
       process.exit();
 
     } else if(input == 'clear' || input == 'clr') {
@@ -127,6 +128,7 @@ IonicTask.prototype.start = function(ionic) {
   try {
     var self = this;
     var app = connect();
+    var childProcess = null;
 
     if (!fs.existsSync( path.resolve('www') )) {
       return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
@@ -139,7 +141,8 @@ IonicTask.prototype.start = function(ionic) {
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
       console.log('Gulp startup tasks:'.green.bold, tasks);
-      var childProcess = spawn('gulp', tasks);
+      childProcess = spawn('gulp', tasks);
+      self.childProcess = childProcess;
 
       childProcess.stdout.on('data', function (data) {
         process.stdout.write(data);

From a952623b619bbb7719f3fa5a22e5234a90ac1f8c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 14:55:14 -0700
Subject: [PATCH 0370/1100] Updating change log for fixes in 1.3.3

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60c78b4837..5f9b4bfab8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 * Added the ability to specify an address when using `ionic serve` by specifying the address as an argument: `ionic serve --address 192.168.1.100`
 * Added the ability to download and target select versions of beta / canary versions of Crosswalk - see `ionic browser list` to see versions available.
+* Fixed the issue with `ionic serve` - when typing 'q' or 'quit' in the prompt, it will properly kill the gulp spawned process. Previously, it was left behind.
+* Now when you type `ionic browser versions` - it will list all installed browsers and versions for the platform its installed for.
+* Bumped connect-livereload up to 0.5.2 to resolve [an issue](https://github.com/intesso/connect-livereload/issues/41) from its repository regarding cookies.
 
 ### 1.3.2
 

From 8cbe22918e9cc63d785cb9c40b3b62a1afcc1a01 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 17:54:34 -0700
Subject: [PATCH 0371/1100] Adding lab to the help text for serve. Closes #162

---
 lib/ionic.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 52ffbea6e1..24141f3aa8 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -92,7 +92,8 @@ var TASKS = [
       '--nobrowser|-b': 'Disable launching a browser',
       '--nolivereload': 'Do not start live reload',
       '--noproxy|-x': 'Do not add proxies',
-      '--address': 'Use specific address or return with failure'
+      '--address': 'Use specific address or return with failure',
+      '--lab': 'Test your apps on multiple screen sizes and platform types'
     },
     module: './ionic/serve'
   },

From 1970482cea0c086c386af9dd49b8de1ff0fc3006 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 19 Jan 2015 19:27:48 -0700
Subject: [PATCH 0372/1100] Adding the ability to list all ions available to
 download. Addresses #166

---
 lib/ionic.js      |  6 +++++
 lib/ionic/ions.js | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 lib/ionic/ions.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 24141f3aa8..0269ada324 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -319,6 +319,12 @@ var TASKS = [
     },
     module: './ionic/add',
     alt: ['ls']
+   },
+   {
+    title: 'ions',
+    name: 'ions',
+    summary: 'List available ions to add to your project',
+    module: './ionic/ions'
    }
 ];
 
diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
new file mode 100644
index 0000000000..419f4d8903
--- /dev/null
+++ b/lib/ionic/ions.js
@@ -0,0 +1,68 @@
+var argv = require('optimist').argv,
+    IonicProject = require('./project'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats,
+    _ = require('underscore');
+
+var ions = [
+  {
+    ion: 'ionic-ion-header-shrink',
+    name: 'Header Shrink',
+    description: 'A shrinking header effect like Facebook\'s'
+  },
+  {
+    ion: 'ionic-ion-drawer',
+    name: 'Android Drawer',
+    description: 'Android-style drawer menu'
+  },
+  {
+    ion: 'ionic-ion-ios-buttons',
+    name: 'iOS Rounded Buttons',
+    description: 'iOS "Squircle" style icons'
+  },
+  {
+    ion: 'ionic-ion-swipe-cards',
+    name: 'Swipeable Cards',
+    description: 'Swiping interaction as seen in Jelly'
+  },
+  {
+    ion: 'ionic-ion-tinder-cards',
+    name: 'Tinder Cards',
+    description: 'Tinder style card swiping interaction'
+  }
+]
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  console.log('Ionic Ions - ions power your app to be awesome.');
+  console.log('A curated collection of useful addons, components, and ux interactions for extending ionic.')
+
+  _.each(ions, function(ion) {
+
+    // console.log('\n');
+
+    var rightColumn = 20;
+    var dots = '';
+    var indent = '';
+    var x, arg;
+
+    var startStr = ion.name;
+
+    console.log('\n')
+
+    while( (startStr + dots).length < rightColumn + 1) {
+      dots += '.';
+    }
+
+    // Header Shrink ... A shrinking header effect like Facebook\'s .. 
+    var installStr = ['\'ionic add ', ion.ion, '\''].join('')
+    console.log(ion.name, dots, installStr)
+    console.log(ion.description, '\n')
+
+  })
+}
+
+exports.IonicTask = IonicTask;

From 30cf4285ced8be48e62bc2a9d8202f6a3753c139 Mon Sep 17 00:00:00 2001
From: Mehdy Dara <mdara@eleven-labs.com>
Date: Tue, 9 Dec 2014 17:06:47 +0100
Subject: [PATCH 0373/1100] spawn use option "stdio" inheritance

* http://nodejs.org/api/child_process.html#child_process_child_process_spawn_command_args_options
* Less code
* Color enabled
---
 lib/ionic/serve.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index e7fee0b04d..2d75d258b1 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -137,22 +137,10 @@ IonicTask.prototype.start = function(ionic) {
     // gulpStartupTasks should be an array of tasks set in the project config
     // watchSass is for backwards compatible sass: true project config
     if((this.gulpStartupTasks && this.gulpStartupTasks.length) || this.watchSass) {
-      var spawn = require('cross-spawn').spawn;
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
       console.log('Gulp startup tasks:'.green.bold, tasks);
-      childProcess = spawn('gulp', tasks);
-      self.childProcess = childProcess;
-
-      childProcess.stdout.on('data', function (data) {
-        process.stdout.write(data);
-      });
-
-      childProcess.stderr.on('data', function (data) {
-        if(data) {
-          process.stderr.write(data.toString().yellow);
-        }
-      });
+      require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
     }
 
     if(this.runLivereload) {

From 4d6170bfadd09521c807e1e183d065ef85d8c349 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 09:12:24 -0700
Subject: [PATCH 0374/1100] Improving formatting with newlines between ions

---
 lib/ionic/ions.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
index 419f4d8903..61aba3ba13 100644
--- a/lib/ionic/ions.js
+++ b/lib/ionic/ions.js
@@ -39,11 +39,10 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.run = function(ionic) {
   console.log('Ionic Ions - ions power your app to be awesome.');
   console.log('A curated collection of useful addons, components, and ux interactions for extending ionic.')
+  console.log('\n')
 
   _.each(ions, function(ion) {
 
-    // console.log('\n');
-
     var rightColumn = 20;
     var dots = '';
     var indent = '';
@@ -51,7 +50,6 @@ IonicTask.prototype.run = function(ionic) {
 
     var startStr = ion.name;
 
-    console.log('\n')
 
     while( (startStr + dots).length < rightColumn + 1) {
       dots += '.';
@@ -61,7 +59,6 @@ IonicTask.prototype.run = function(ionic) {
     var installStr = ['\'ionic add ', ion.ion, '\''].join('')
     console.log(ion.name, dots, installStr)
     console.log(ion.description, '\n')
-
   })
 }
 

From 32ea2a720c6f168085ad7dd9e89d2dcd62afdfc9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 09:36:03 -0700
Subject: [PATCH 0375/1100] Addresses the help text, clarifying add/remove/list
 to be used with ions, bower components, or addons. Closes #165

---
 lib/ionic.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0269ada324..50066ab37a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -294,18 +294,18 @@ var TASKS = [
    {
     title: 'add',
     name: 'add',
-    summary: 'Add a bower component to the project',
+    summary: 'Add an Ion, bower component, or addon to the project',
     args: {
-      'component name': ''
+      '[name]': 'The name of the ion, bower component, or addon you wish to install'
     },
     module: './ionic/add'
    },
    {
     title: 'remove',
     name: 'remove',
-    summary: 'Remove a bower component from the project',
+    summary: 'Remove an Ion, bower component, or addon from the project',
     args: {
-      'component name': ''
+      '[name]': 'The name of the Ion, bower component, or addon you wish to remove'
     },
     module: './ionic/add',
     alt: ['rm']
@@ -313,10 +313,7 @@ var TASKS = [
    {
     title: 'list',
     name: 'list',
-    summary: 'List bower components from the project',
-    args: {
-      'component name': ''
-    },
+    summary: 'List Ions, bower components, or addons in the project',
     module: './ionic/add',
     alt: ['ls']
    },

From 9909cb9118348b0dcb5e1e564e0dd2866530e964 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 09:36:37 -0700
Subject: [PATCH 0376/1100] Try/catch for when they run list in a directory
 thats not ionic. Lists message instead of failing

---
 lib/ionic/add.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index c18a919c74..5ea2b52117 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -42,10 +42,14 @@ IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(c
 }
 
 IonicTask.prototype.listComponents = function listComponents() {
-  var bowerJson = require(path.join(process.cwd(), 'bower.json'));
-  console.log('Components installed: '.info)
-  for (var bowerCompIndex in bowerJson.devDependencies) {
-    console.log(bowerCompIndex.green);
+  try {
+    var bowerJson = require(path.join(process.cwd(), 'bower.json'));
+    console.log('Ions, bower components, or addons installed: '.info)
+    for (var bowerCompIndex in bowerJson.devDependencies) {
+      console.log(bowerCompIndex.green);
+    }
+  }catch(ex) {
+    console.log('This command can only be used when in an Ionic project directory'.red.bold);
   }
 }
 

From b0b5df2565df5905cbddac6f4b78700d8509b57e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 11:09:06 -0700
Subject: [PATCH 0377/1100] Fixes an issue with the arguments for --sass and
 --no-cordova consuming values for other entries like directory and template.
 Closes #191

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 3f0466c6fa..0d30ce56be 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,7 +5,7 @@ var fs = require('fs'),
     path = require('path'),
     parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
-    argv = require('optimist').argv,
+    argv = require('optimist').boolean(['no-cordova', 'sass']).argv,
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),

From 04e99c007e100697b5b034bf129b9017ff2e72bf Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Tue, 20 Jan 2015 12:47:34 -0600
Subject: [PATCH 0378/1100] remove upload promise

---
 lib/ionic/upload.js | 89 +++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 51 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index e76a58402c..cf93cde5d5 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -7,8 +7,7 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask,
-    Q = require('q');
+    IonicLoginTask = require('./login').IonicTask;
 
 var IonicTask = function() {};
 
@@ -16,7 +15,6 @@ IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, callback) {
   var project = IonicProject.load();
-  var q = Q.defer();
   var self = this;
 
   // The note is a short, optional description for a version
@@ -83,66 +81,55 @@ IonicTask.prototype.run = function(ionic, callback) {
         }
 
         response.setEncoding('utf8');
-        response.on("data", function(data) {
-          try {
 
-            if (response.statusCode == 401) {
-              q.reject('not_logged_in');
-              return ionic.fail('Session expired (401). Please log in and run this command again.');
+        var data = "";
+        response.on('data', function(chunk){
+          data += chunk;
+        });
 
-            } else if (response.statusCode == 403) {
-              console.log(data);
-              q.reject('forbidden');
-              return ionic.fail('Forbidden upload (403)');
-            }
+        response.on('end', function() {
 
+          if ( response.statusCode == 401 ) {
+            return ionic.fail('Session expired (401). Please log in and run this command again.');
+          } else if ( response.statusCode == 403 ) {
+            return ionic.fail('Forbidden upload (403)');
+          } else if ( response.statusCode == 500 ) {
+            return ionic.fail('Server Error (500) :(');
+          } 
+
+          try {
             var d = JSON.parse(data);
-            if (d.errors && d.errors.length) {
-              for (var j = 0; j < d.errors.length; j++) {
-                console.error(d.errors[j]);
-              }
-              q.reject('upload_error');
-              return ionic.fail('Unable to upload app');
-            }
+          } catch ( parseEx ) {
+            // keep error msg reasonably short
+            return ionic.fail('Error malformed response: ' + parseEx +
+                                 '\nResponse: ' + data.substr(0, 80)); 
+          }
 
-            if (response.statusCode == 200) {
-              // Success
-              project.set('app_id', d.app_id);
-              project.save();
-              console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
-
-              if (callback) {
-                try {
-                  callback();
-                } catch (callbackEx) {
-                  q.reject('upload_error');
-                  return ionic.fail('Error upload callback: ' + callbackEx);
-                }
-              }
-
-            } else {
-              q.reject('upload_error');
+          if ( d.errors && d.errors.length ) {
+            for ( var j = 0; j < d.errors.length; j++ ) {
+              console.error(d.errors[j]);
             }
+            return ionic.fail('Unable to upload app');
+          }
 
-          } catch (parseEx) {
-            q.reject('upload_error');
-            return ionic.fail('Error upload response: ' + parseEx);
+          if ( response.statusCode == 200 ) {
+            // Success
+            project.set('app_id', d.app_id);
+            project.save();
+            console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
+          } 
+
+          if ( callback ) {
+            try {
+              callback();
+            } catch ( callbackEx ) {
+              return ionic.fail('Error upload callback: ' + callbackEx);
+            }
           }
         });
-
-        q.resolve(callback);
       });
     });
   });
-
-  q.promise.then(function(callback) {
-    // Exit if there was no callback
-    if (!callback) {
-      process.exit(0);
-    }
-  }, function(err) {
-    process.exit(1);
-  });
 };
 
 IonicTask.prototype.setNote = function(note) {

From 6c83022530223ab0b1f8fc8d8ba8dbdb1094815d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 13:01:58 -0700
Subject: [PATCH 0379/1100] Adding in the ability to list available starter
 templates, either with ionic start -l or ionic templates command. Address
 issue #159

---
 lib/ionic.js                   |   9 +-
 lib/ionic/start.js             |   8 +-
 lib/ionic/starter-templates.js | 622 +++++++++++++++++++++++++++++++++
 lib/ionic/templates.js         |  33 ++
 4 files changed, 670 insertions(+), 2 deletions(-)
 create mode 100644 lib/ionic/starter-templates.js
 create mode 100644 lib/ionic/templates.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 50066ab37a..da8f1442da 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -73,7 +73,8 @@ var TASKS = [
       '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
       '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
-      '--sass|-s': 'Setup the project to use Sass CSS precompiling'
+      '--sass|-s': 'Setup the project to use Sass CSS precompiling',
+      '--list|-l': 'List starter templates available'
     },
     module: './ionic/start'
   },
@@ -322,6 +323,12 @@ var TASKS = [
     name: 'ions',
     summary: 'List available ions to add to your project',
     module: './ionic/ions'
+   },
+   {
+    title: 'templates',
+    name: 'templates',
+    summary: 'List available Ionic starter templates',
+    module: './ionic/templates'
    }
 ];
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0d30ce56be..9d57d0901f 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,12 +5,13 @@ var fs = require('fs'),
     path = require('path'),
     parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
-    argv = require('optimist').boolean(['no-cordova', 'sass']).argv,
+    argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
     xml2js = require('xml2js'),
     IonicProject = require('./project'),
+    IonicTemplates = require('./templates').IonicTask,
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
 
@@ -35,6 +36,11 @@ IonicTask.prototype.run = function(ionic) {
   this.ionic = ionic;
   var self = this;
 
+  if(argv.list || argv.l) {
+    new IonicTemplates().run(ionic);
+    return;
+  }
+
   if(argv._.length < 2) {
     return this.ionic.fail('Invalid command', 'start');
   }
diff --git a/lib/ionic/starter-templates.js b/lib/ionic/starter-templates.js
new file mode 100644
index 0000000000..1cf5534ad6
--- /dev/null
+++ b/lib/ionic/starter-templates.js
@@ -0,0 +1,622 @@
+module.exports = {
+  "total_count": 7,
+  "incomplete_results": false,
+  "items": [
+    {
+      "id": 19252445,
+      "name": "ionic-starter-maps",
+      "full_name": "driftyco/ionic-starter-maps",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-maps",
+      "description": "An Ionic starter project using Google Maps and a side menu",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-maps",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/releases{/id}",
+      "created_at": "2014-04-28T20:16:01Z",
+      "updated_at": "2015-01-14T19:14:08Z",
+      "pushed_at": "2014-09-03T07:20:28Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-maps.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-maps.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-maps.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-maps",
+      "homepage": null,
+      "size": 1276,
+      "stargazers_count": 43,
+      "watchers_count": 43,
+      "language": "JavaScript",
+      "has_issues": true,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "forks_count": 21,
+      "mirror_url": null,
+      "open_issues_count": 2,
+      "forks": 21,
+      "open_issues": 2,
+      "watchers": 43,
+      "default_branch": "master",
+      "score": 23.098434
+    },
+    {
+      "id": 17988994,
+      "name": "ionic-starter-tabs",
+      "full_name": "driftyco/ionic-starter-tabs",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-tabs",
+      "description": "A starting project for Ionic using a simple tabbed interface",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-tabs",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/releases{/id}",
+      "created_at": "2014-03-21T17:56:04Z",
+      "updated_at": "2015-01-11T16:54:23Z",
+      "pushed_at": "2014-12-29T21:09:20Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-tabs.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-tabs.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-tabs.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-tabs",
+      "homepage": null,
+      "size": 8293,
+      "stargazers_count": 32,
+      "watchers_count": 32,
+      "language": "JavaScript",
+      "has_issues": false,
+      "has_downloads": true,
+      "has_wiki": false,
+      "has_pages": false,
+      "forks_count": 26,
+      "mirror_url": null,
+      "open_issues_count": 4,
+      "forks": 26,
+      "open_issues": 4,
+      "watchers": 32,
+      "default_branch": "master",
+      "score": 23.088171
+    },
+    {
+      "id": 18081193,
+      "name": "ionic-starter-sidemenu",
+      "full_name": "driftyco/ionic-starter-sidemenu",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-sidemenu",
+      "description": "A starting project for Ionic using a side menu with navigation in the content area",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/releases{/id}",
+      "created_at": "2014-03-24T22:31:35Z",
+      "updated_at": "2015-01-12T06:33:31Z",
+      "pushed_at": "2014-12-15T20:47:21Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-sidemenu.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-sidemenu.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-sidemenu",
+      "homepage": null,
+      "size": 1627,
+      "stargazers_count": 30,
+      "watchers_count": 30,
+      "language": "JavaScript",
+      "has_issues": false,
+      "has_downloads": true,
+      "has_wiki": false,
+      "has_pages": false,
+      "forks_count": 29,
+      "mirror_url": null,
+      "open_issues_count": 1,
+      "forks": 29,
+      "open_issues": 1,
+      "watchers": 30,
+      "default_branch": "master",
+      "score": 23.088171
+    },
+    {
+      "id": 17983811,
+      "name": "ionic-starter-blank",
+      "full_name": "driftyco/ionic-starter-blank",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-blank",
+      "description": "A blank starter project for Ionic",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-blank",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/releases{/id}",
+      "created_at": "2014-03-21T15:14:45Z",
+      "updated_at": "2014-12-10T23:36:01Z",
+      "pushed_at": "2014-05-14T15:26:21Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-blank.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-blank.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-blank.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-blank",
+      "homepage": null,
+      "size": 8302,
+      "stargazers_count": 4,
+      "watchers_count": 4,
+      "language": "JavaScript",
+      "has_issues": false,
+      "has_downloads": true,
+      "has_wiki": false,
+      "has_pages": false,
+      "forks_count": 12,
+      "mirror_url": null,
+      "open_issues_count": 0,
+      "forks": 12,
+      "open_issues": 0,
+      "watchers": 4,
+      "default_branch": "master",
+      "score": 15.398956
+    },
+    {
+      "id": 24473944,
+      "name": "ionic-starter-salesforce",
+      "full_name": "driftyco/ionic-starter-salesforce",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-salesforce",
+      "description": "A starter project for Ionic and Salesforce",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/releases{/id}",
+      "created_at": "2014-09-25T20:22:13Z",
+      "updated_at": "2015-01-06T10:08:01Z",
+      "pushed_at": "2014-11-06T18:57:36Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-salesforce.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-salesforce.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-salesforce.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-salesforce",
+      "homepage": null,
+      "size": 2123,
+      "stargazers_count": 16,
+      "watchers_count": 16,
+      "language": "JavaScript",
+      "has_issues": true,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "forks_count": 3,
+      "mirror_url": null,
+      "open_issues_count": 0,
+      "forks": 3,
+      "open_issues": 0,
+      "watchers": 16,
+      "default_branch": "master",
+      "score": 13.4681
+    },
+    {
+      "id": 24610601,
+      "name": "ionic-starter-tests",
+      "full_name": "driftyco/ionic-starter-tests",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-tests",
+      "description": "A test of different kinds of page navigation",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-tests",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/releases{/id}",
+      "created_at": "2014-09-29T19:57:25Z",
+      "updated_at": "2015-01-17T17:12:18Z",
+      "pushed_at": "2015-01-17T17:12:17Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-tests.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-tests.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-tests.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-tests",
+      "homepage": null,
+      "size": 6104,
+      "stargazers_count": 4,
+      "watchers_count": 4,
+      "language": "JavaScript",
+      "has_issues": false,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "forks_count": 1,
+      "mirror_url": null,
+      "open_issues_count": 0,
+      "forks": 1,
+      "open_issues": 0,
+      "watchers": 4,
+      "default_branch": "master",
+      "score": 6.7370434
+    },
+    {
+      "id": 27608851,
+      "name": "ionic-starter-complex-list",
+      "full_name": "driftyco/ionic-starter-complex-list",
+      "owner": {
+        "login": "driftyco",
+        "id": 3171503,
+        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/driftyco",
+        "html_url": "https://github.com/driftyco",
+        "followers_url": "https://api.github.com/users/driftyco/followers",
+        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
+        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
+        "organizations_url": "https://api.github.com/users/driftyco/orgs",
+        "repos_url": "https://api.github.com/users/driftyco/repos",
+        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/driftyco/received_events",
+        "type": "Organization",
+        "site_admin": false
+      },
+      "private": false,
+      "html_url": "https://github.com/driftyco/ionic-starter-complex-list",
+      "description": "A complex list starter template",
+      "fork": false,
+      "url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list",
+      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/forks",
+      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/teams",
+      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/hooks",
+      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/events",
+      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/tags",
+      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/languages",
+      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/stargazers",
+      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/contributors",
+      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/subscribers",
+      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/subscription",
+      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues/comments/{number}",
+      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/merges",
+      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/downloads",
+      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/labels{/name}",
+      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/releases{/id}",
+      "created_at": "2014-12-05T20:29:34Z",
+      "updated_at": "2014-12-06T05:12:52Z",
+      "pushed_at": "2014-12-05T20:29:34Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-complex-list.git",
+      "ssh_url": "git@github.com:driftyco/ionic-starter-complex-list.git",
+      "clone_url": "https://github.com/driftyco/ionic-starter-complex-list.git",
+      "svn_url": "https://github.com/driftyco/ionic-starter-complex-list",
+      "homepage": null,
+      "size": 0,
+      "stargazers_count": 1,
+      "watchers_count": 1,
+      "language": null,
+      "has_issues": true,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "forks_count": 1,
+      "mirror_url": null,
+      "open_issues_count": 0,
+      "forks": 1,
+      "open_issues": 0,
+      "watchers": 1,
+      "default_branch": "master",
+      "score": 3.8480284
+    }
+  ]
+}
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
new file mode 100644
index 0000000000..d8d4f3673a
--- /dev/null
+++ b/lib/ionic/templates.js
@@ -0,0 +1,33 @@
+var colors = require('colors'),
+    _ = require('underscore'),
+    Task = require('./task').Task;
+    IonicStats = require('./stats').IonicStats,
+    starterTemplates = require('./starter-templates');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.list = function list(templates) {
+  //Should have array of [{ name: 'name', description: 'desc' }]
+  _.each(templates, function(template) {
+    var rightColumn = 20, dots = '';
+    var shortName = template.name.replace('ionic-starter-', '');
+    while( (shortName + dots).length < rightColumn + 1) {
+      dots += '.';
+    }
+    var outStr = []
+    console.log(shortName.green, dots, template.description);
+  })
+}
+
+IonicTask.prototype.run = function(ionic) {
+  var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
+  console.log('Ionic Starter templates'.green);
+  this.list(templates);
+
+  IonicStats.t();
+
+}
+
+exports.IonicTask = IonicTask;

From 3b40b965a93428674c8731317a196d08a0b3dd52 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Tue, 20 Jan 2015 14:57:53 -0600
Subject: [PATCH 0380/1100] fix cookies for ionic app

---
 lib/ionic/app.js | 60 ++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 9bcc432209..68eaafc11d 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -63,31 +63,31 @@ IonicTask.prototype.versions = function(self) {
   var params = parseUrl(url);
 
   form.submit({
-      protocol: params.protocol,
-      hostname: params.hostname,
-      port: params.port,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: self.jar.cookies.map(function (c) {
-          return c.name + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    },
-    function (err, response) {
-      if (err) {
-        return self.ionic.fail('Error logging in: ' + err);
-      }
+    protocol: params.protocol,
+    hostname: params.hostname,
+    port: params.port,
+    path: params.path,
+    headers: form.getHeaders({
+      cookie: self.jar.map(function(c) {
+        return c.key + "=" + encodeURIComponent(c.value);
+      }).join("; ")
+    })
+  },
+  function (err, response) {
+    if (err) {
+      return self.ionic.fail('Error logging in: ' + err);
+    }
 
-      response.setEncoding('utf8');
-      response.on("data", function(data) {
-        try {
-          var d = JSON.parse(data);
-          if (d.errors && d.errors.length) {
-            for (var j = 0; j < d.errors.length; j++) {
-              console.log((d.errors[j]).bold.error);
-            }
-            return self.ionic.fail('Unable to fetch versions list');
+    response.setEncoding('utf8');
+    response.on("data", function(data) {
+      try {
+        var d = JSON.parse(data);
+        if (d.errors && d.errors.length) {
+          for (var j = 0; j < d.errors.length; j++) {
+            console.log((d.errors[j]).bold.error);
           }
+          return self.ionic.fail('Unable to fetch versions list');
+        }
 
           var heading = ['    UUID   ', ' Created ', '            Note '];
           var heading_underline = ['------------', '----------', '----------------------------']
@@ -122,11 +122,11 @@ IonicTask.prototype.deploy = function(self) {
         uuid: self.inputValues['uuid'],
         csrfmiddlewaretoken: self.getCsrfToken(self.jar)
       },
-      headers: {
-        cookie: self.jar.cookies.map(function (c) {
-          return c.name + "=" + encodeURIComponent(c.value);
+      headers: form.getHeaders({
+        cookie: jar.map(function(c) {
+          return c.key + "=" + encodeURIComponent(c.value);
         }).join("; ")
-      }
+      })
     },
     function (err, response, body) {
       if (err) {
@@ -167,9 +167,9 @@ IonicTask.prototype.getCmdLineOptions = function() {
 };
 
 IonicTask.prototype.getCsrfToken = function(jar) {
-  for (var i=0; i<jar.cookies.length; i++) {
-    if (jar.cookies[i].name == 'csrftoken') {
-      return jar.cookies[i].value;
+  for (var i = 0; i < jar.length; i++) {
+    if (jar[i].key == 'csrftoken') {
+      return jar[i].value;
     }
   }
   return '';

From b5676509458dcee41fc87dbec78066249b53d194 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:22:36 -0700
Subject: [PATCH 0381/1100] Renaing the js to json to be retrieved. Updating
 code to pull from github on this branch

---
 lib/ionic/starter-templates.js   | 622 -------------------------------
 lib/ionic/starter-templates.json |  66 ++++
 lib/ionic/templates.js           |  41 +-
 3 files changed, 105 insertions(+), 624 deletions(-)
 delete mode 100644 lib/ionic/starter-templates.js
 create mode 100644 lib/ionic/starter-templates.json

diff --git a/lib/ionic/starter-templates.js b/lib/ionic/starter-templates.js
deleted file mode 100644
index 1cf5534ad6..0000000000
--- a/lib/ionic/starter-templates.js
+++ /dev/null
@@ -1,622 +0,0 @@
-module.exports = {
-  "total_count": 7,
-  "incomplete_results": false,
-  "items": [
-    {
-      "id": 19252445,
-      "name": "ionic-starter-maps",
-      "full_name": "driftyco/ionic-starter-maps",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-maps",
-      "description": "An Ionic starter project using Google Maps and a side menu",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-maps",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-maps/releases{/id}",
-      "created_at": "2014-04-28T20:16:01Z",
-      "updated_at": "2015-01-14T19:14:08Z",
-      "pushed_at": "2014-09-03T07:20:28Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-maps.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-maps.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-maps.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-maps",
-      "homepage": null,
-      "size": 1276,
-      "stargazers_count": 43,
-      "watchers_count": 43,
-      "language": "JavaScript",
-      "has_issues": true,
-      "has_downloads": true,
-      "has_wiki": true,
-      "has_pages": false,
-      "forks_count": 21,
-      "mirror_url": null,
-      "open_issues_count": 2,
-      "forks": 21,
-      "open_issues": 2,
-      "watchers": 43,
-      "default_branch": "master",
-      "score": 23.098434
-    },
-    {
-      "id": 17988994,
-      "name": "ionic-starter-tabs",
-      "full_name": "driftyco/ionic-starter-tabs",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-tabs",
-      "description": "A starting project for Ionic using a simple tabbed interface",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-tabs",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-tabs/releases{/id}",
-      "created_at": "2014-03-21T17:56:04Z",
-      "updated_at": "2015-01-11T16:54:23Z",
-      "pushed_at": "2014-12-29T21:09:20Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-tabs.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-tabs.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-tabs.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-tabs",
-      "homepage": null,
-      "size": 8293,
-      "stargazers_count": 32,
-      "watchers_count": 32,
-      "language": "JavaScript",
-      "has_issues": false,
-      "has_downloads": true,
-      "has_wiki": false,
-      "has_pages": false,
-      "forks_count": 26,
-      "mirror_url": null,
-      "open_issues_count": 4,
-      "forks": 26,
-      "open_issues": 4,
-      "watchers": 32,
-      "default_branch": "master",
-      "score": 23.088171
-    },
-    {
-      "id": 18081193,
-      "name": "ionic-starter-sidemenu",
-      "full_name": "driftyco/ionic-starter-sidemenu",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-sidemenu",
-      "description": "A starting project for Ionic using a side menu with navigation in the content area",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-sidemenu/releases{/id}",
-      "created_at": "2014-03-24T22:31:35Z",
-      "updated_at": "2015-01-12T06:33:31Z",
-      "pushed_at": "2014-12-15T20:47:21Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-sidemenu.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-sidemenu.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-sidemenu",
-      "homepage": null,
-      "size": 1627,
-      "stargazers_count": 30,
-      "watchers_count": 30,
-      "language": "JavaScript",
-      "has_issues": false,
-      "has_downloads": true,
-      "has_wiki": false,
-      "has_pages": false,
-      "forks_count": 29,
-      "mirror_url": null,
-      "open_issues_count": 1,
-      "forks": 29,
-      "open_issues": 1,
-      "watchers": 30,
-      "default_branch": "master",
-      "score": 23.088171
-    },
-    {
-      "id": 17983811,
-      "name": "ionic-starter-blank",
-      "full_name": "driftyco/ionic-starter-blank",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-blank",
-      "description": "A blank starter project for Ionic",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-blank",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-blank/releases{/id}",
-      "created_at": "2014-03-21T15:14:45Z",
-      "updated_at": "2014-12-10T23:36:01Z",
-      "pushed_at": "2014-05-14T15:26:21Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-blank.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-blank.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-blank.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-blank",
-      "homepage": null,
-      "size": 8302,
-      "stargazers_count": 4,
-      "watchers_count": 4,
-      "language": "JavaScript",
-      "has_issues": false,
-      "has_downloads": true,
-      "has_wiki": false,
-      "has_pages": false,
-      "forks_count": 12,
-      "mirror_url": null,
-      "open_issues_count": 0,
-      "forks": 12,
-      "open_issues": 0,
-      "watchers": 4,
-      "default_branch": "master",
-      "score": 15.398956
-    },
-    {
-      "id": 24473944,
-      "name": "ionic-starter-salesforce",
-      "full_name": "driftyco/ionic-starter-salesforce",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-salesforce",
-      "description": "A starter project for Ionic and Salesforce",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-salesforce/releases{/id}",
-      "created_at": "2014-09-25T20:22:13Z",
-      "updated_at": "2015-01-06T10:08:01Z",
-      "pushed_at": "2014-11-06T18:57:36Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-salesforce.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-salesforce.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-salesforce.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-salesforce",
-      "homepage": null,
-      "size": 2123,
-      "stargazers_count": 16,
-      "watchers_count": 16,
-      "language": "JavaScript",
-      "has_issues": true,
-      "has_downloads": true,
-      "has_wiki": true,
-      "has_pages": false,
-      "forks_count": 3,
-      "mirror_url": null,
-      "open_issues_count": 0,
-      "forks": 3,
-      "open_issues": 0,
-      "watchers": 16,
-      "default_branch": "master",
-      "score": 13.4681
-    },
-    {
-      "id": 24610601,
-      "name": "ionic-starter-tests",
-      "full_name": "driftyco/ionic-starter-tests",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-tests",
-      "description": "A test of different kinds of page navigation",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-tests",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-tests/releases{/id}",
-      "created_at": "2014-09-29T19:57:25Z",
-      "updated_at": "2015-01-17T17:12:18Z",
-      "pushed_at": "2015-01-17T17:12:17Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-tests.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-tests.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-tests.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-tests",
-      "homepage": null,
-      "size": 6104,
-      "stargazers_count": 4,
-      "watchers_count": 4,
-      "language": "JavaScript",
-      "has_issues": false,
-      "has_downloads": true,
-      "has_wiki": true,
-      "has_pages": false,
-      "forks_count": 1,
-      "mirror_url": null,
-      "open_issues_count": 0,
-      "forks": 1,
-      "open_issues": 0,
-      "watchers": 4,
-      "default_branch": "master",
-      "score": 6.7370434
-    },
-    {
-      "id": 27608851,
-      "name": "ionic-starter-complex-list",
-      "full_name": "driftyco/ionic-starter-complex-list",
-      "owner": {
-        "login": "driftyco",
-        "id": 3171503,
-        "avatar_url": "https://avatars.githubusercontent.com/u/3171503?v=3",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/driftyco",
-        "html_url": "https://github.com/driftyco",
-        "followers_url": "https://api.github.com/users/driftyco/followers",
-        "following_url": "https://api.github.com/users/driftyco/following{/other_user}",
-        "gists_url": "https://api.github.com/users/driftyco/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/driftyco/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/driftyco/subscriptions",
-        "organizations_url": "https://api.github.com/users/driftyco/orgs",
-        "repos_url": "https://api.github.com/users/driftyco/repos",
-        "events_url": "https://api.github.com/users/driftyco/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/driftyco/received_events",
-        "type": "Organization",
-        "site_admin": false
-      },
-      "private": false,
-      "html_url": "https://github.com/driftyco/ionic-starter-complex-list",
-      "description": "A complex list starter template",
-      "fork": false,
-      "url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list",
-      "forks_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/forks",
-      "keys_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/keys{/key_id}",
-      "collaborators_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/collaborators{/collaborator}",
-      "teams_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/teams",
-      "hooks_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/hooks",
-      "issue_events_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues/events{/number}",
-      "events_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/events",
-      "assignees_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/assignees{/user}",
-      "branches_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/branches{/branch}",
-      "tags_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/tags",
-      "blobs_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/blobs{/sha}",
-      "git_tags_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/tags{/sha}",
-      "git_refs_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/refs{/sha}",
-      "trees_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/trees{/sha}",
-      "statuses_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/statuses/{sha}",
-      "languages_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/languages",
-      "stargazers_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/stargazers",
-      "contributors_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/contributors",
-      "subscribers_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/subscribers",
-      "subscription_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/subscription",
-      "commits_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/commits{/sha}",
-      "git_commits_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/git/commits{/sha}",
-      "comments_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/comments{/number}",
-      "issue_comment_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues/comments/{number}",
-      "contents_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/contents/{+path}",
-      "compare_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/compare/{base}...{head}",
-      "merges_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/merges",
-      "archive_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/{archive_format}{/ref}",
-      "downloads_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/downloads",
-      "issues_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/issues{/number}",
-      "pulls_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/pulls{/number}",
-      "milestones_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/milestones{/number}",
-      "notifications_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/notifications{?since,all,participating}",
-      "labels_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/labels{/name}",
-      "releases_url": "https://api.github.com/repos/driftyco/ionic-starter-complex-list/releases{/id}",
-      "created_at": "2014-12-05T20:29:34Z",
-      "updated_at": "2014-12-06T05:12:52Z",
-      "pushed_at": "2014-12-05T20:29:34Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-complex-list.git",
-      "ssh_url": "git@github.com:driftyco/ionic-starter-complex-list.git",
-      "clone_url": "https://github.com/driftyco/ionic-starter-complex-list.git",
-      "svn_url": "https://github.com/driftyco/ionic-starter-complex-list",
-      "homepage": null,
-      "size": 0,
-      "stargazers_count": 1,
-      "watchers_count": 1,
-      "language": null,
-      "has_issues": true,
-      "has_downloads": true,
-      "has_wiki": true,
-      "has_pages": false,
-      "forks_count": 1,
-      "mirror_url": null,
-      "open_issues_count": 0,
-      "forks": 1,
-      "open_issues": 0,
-      "watchers": 1,
-      "default_branch": "master",
-      "score": 3.8480284
-    }
-  ]
-}
diff --git a/lib/ionic/starter-templates.json b/lib/ionic/starter-templates.json
new file mode 100644
index 0000000000..b5fcd3502c
--- /dev/null
+++ b/lib/ionic/starter-templates.json
@@ -0,0 +1,66 @@
+{
+  "total_count": "7",
+  "incomplete_results": false,
+  "items": [
+    {
+      "name": "ionic-starter-maps",
+      "description": "An Ionic starter project using Google Maps and a side menu",
+      "created_at": "2014-04-28T20:16:01Z",
+      "updated_at": "2015-01-14T19:14:08Z",
+      "pushed_at": "2014-09-03T07:20:28Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-maps.git"
+    },
+    {
+      "name": "ionic-starter-tabs",
+      "description": "A starting project for Ionic using a simple tabbed interface",
+      "created_at": "2014-03-21T17:56:04Z",
+      "updated_at": "2015-01-11T16:54:23Z",
+      "pushed_at": "2014-12-29T21:09:20Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-tabs.git"
+    },
+    {
+      "name": "ionic-starter-sidemenu",
+      "description": "A starting project for Ionic using a side menu with navigation in the content area",
+      "created_at": "2014-03-24T22:31:35Z",
+      "updated_at": "2015-01-12T06:33:31Z",
+      "pushed_at": "2014-12-15T20:47:21Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git",
+    },
+    {
+      "id": 17983811,
+      "name": "ionic-starter-blank",
+      "description": "A blank starter project for Ionic",
+      "created_at": "2014-03-21T15:14:45Z",
+      "updated_at": "2014-12-10T23:36:01Z",
+      "pushed_at": "2014-05-14T15:26:21Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-blank.git"
+    },
+    {
+      "id": 24473944,
+      "name": "ionic-starter-salesforce",
+      "description": "A starter project for Ionic and Salesforce",
+      "created_at": "2014-09-25T20:22:13Z",
+      "updated_at": "2015-01-06T10:08:01Z",
+      "pushed_at": "2014-11-06T18:57:36Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-salesforce.git"
+    },
+    {
+      "id": 24610601,
+      "name": "ionic-starter-tests",
+      "description": "A test of different kinds of page navigation",
+      "created_at": "2014-09-29T19:57:25Z",
+      "updated_at": "2015-01-17T17:12:18Z",
+      "pushed_at": "2015-01-17T17:12:17Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-tests.git"
+    },
+    {
+      "id": 27608851,
+      "name": "ionic-starter-complex-list",
+      "description": "A complex list starter template",
+      "created_at": "2014-12-05T20:29:34Z",
+      "updated_at": "2014-12-06T05:12:52Z",
+      "pushed_at": "2014-12-05T20:29:34Z",
+      "git_url": "git://github.com/driftyco/ionic-starter-complex-list.git"
+    }
+  ]
+}
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index d8d4f3673a..10ce2b0b78 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -1,13 +1,39 @@
 var colors = require('colors'),
     _ = require('underscore'),
-    Task = require('./task').Task;
+    Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    starterTemplates = require('./starter-templates');
+    request = require('request');
+    // starterTemplates = require('./starter-templates')
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
+IonicTask.prototype.fetchStarterTemplates = function() {
+  var self = this;
+
+  //TODO: change this to master when merged in.
+  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/starter-templates-listing/lib/ionic/starter-templates.js';
+  var starterTemplateJsonPath = path.join('./', 'starter-templates.json');
+
+  console.log('\nDownloading Starter Templates'.bold, downloadUrl);
+
+  var q = Q.defer();
+
+  var proxy = process.env.PROXY || null;
+  request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
+    if(!err && res && res.statusCode === 200) {
+      fs.writeFileSync(starterTemplateJsonPath, html, 'utf8');
+      var templatesJson = require(starterTemplateJsonPath);
+      q.resolve(templatesJson);
+    } else {
+      console.log('Unable to fetch', err, res.statusCode);
+      q.reject(res);
+    }
+  });
+  return Q.all([q]);
+};
+
 IonicTask.prototype.list = function list(templates) {
   //Should have array of [{ name: 'name', description: 'desc' }]
   _.each(templates, function(template) {
@@ -22,6 +48,17 @@ IonicTask.prototype.list = function list(templates) {
 }
 
 IonicTask.prototype.run = function(ionic) {
+  var self = this;
+
+  console.log('About to fetch');
+
+  self.fetchStarterTemplates()
+  .then(function(starterTemplates) {
+    console.log('fetch', starterTemplates);
+
+    self.list(starterTemplates);
+  })
+
   var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
   console.log('Ionic Starter templates'.green);
   this.list(templates);

From ce053b8d09c1c26c0662933493b454ed2da036a7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:23:12 -0700
Subject: [PATCH 0382/1100] Changing to json ending

---
 lib/ionic/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 10ce2b0b78..8bd989b5b1 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -13,7 +13,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
   var self = this;
 
   //TODO: change this to master when merged in.
-  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/starter-templates-listing/lib/ionic/starter-templates.js';
+  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/starter-templates-listing/lib/ionic/starter-templates.json';
   var starterTemplateJsonPath = path.join('./', 'starter-templates.json');
 
   console.log('\nDownloading Starter Templates'.bold, downloadUrl);

From e77ffc58af22329733a1938a7cfa085bf1d49461 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:34:54 -0700
Subject: [PATCH 0383/1100] Fixing error with json. Adjusting the Q and fs
 requires, and fixing the downloading and requiring the json file downloaded

---
 lib/ionic/starter-templates.json |  2 +-
 lib/ionic/templates.js           | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/starter-templates.json b/lib/ionic/starter-templates.json
index b5fcd3502c..db0a21623f 100644
--- a/lib/ionic/starter-templates.json
+++ b/lib/ionic/starter-templates.json
@@ -24,7 +24,7 @@
       "created_at": "2014-03-24T22:31:35Z",
       "updated_at": "2015-01-12T06:33:31Z",
       "pushed_at": "2014-12-15T20:47:21Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git",
+      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git"
     },
     {
       "id": 17983811,
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 8bd989b5b1..95548e20ce 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -1,5 +1,8 @@
 var colors = require('colors'),
+    path = require('path'),
+    fs = require('fs'),
     _ = require('underscore'),
+    Q = require('q'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     request = require('request');
@@ -12,19 +15,31 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.fetchStarterTemplates = function() {
   var self = this;
 
+  console.log('About to fetch template');
+
+
   //TODO: change this to master when merged in.
   var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/starter-templates-listing/lib/ionic/starter-templates.json';
-  var starterTemplateJsonPath = path.join('./', 'starter-templates.json');
+  var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
-  console.log('\nDownloading Starter Templates'.bold, downloadUrl);
+  console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
 
   var q = Q.defer();
 
   var proxy = process.env.PROXY || null;
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
     if(!err && res && res.statusCode === 200) {
+      // console.log('got html', html)
       fs.writeFileSync(starterTemplateJsonPath, html, 'utf8');
-      var templatesJson = require(starterTemplateJsonPath);
+      var templatesJson = {};
+      try {
+        templatesJson = require(starterTemplateJsonPath);
+      }catch(ex) {
+        console.log('ex', ex)
+        q.reject('Error occured in download templates:', ex)
+        self.ionic.fail(ex);
+        return;
+      }
       q.resolve(templatesJson);
     } else {
       console.log('Unable to fetch', err, res.statusCode);

From 51e97eab5637f807bb8c381879c5bb10d0f13a74 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:43:19 -0700
Subject: [PATCH 0384/1100] Fixing the listing of templates. Now fetching from
 github and listing in console.

---
 lib/ionic/templates.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 95548e20ce..b02c2b0ee9 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -46,7 +46,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
       q.reject(res);
     }
   });
-  return Q.all([q]);
+  return q.promise;
 };
 
 IonicTask.prototype.list = function list(templates) {
@@ -65,13 +65,9 @@ IonicTask.prototype.list = function list(templates) {
 IonicTask.prototype.run = function(ionic) {
   var self = this;
 
-  console.log('About to fetch');
-
   self.fetchStarterTemplates()
   .then(function(starterTemplates) {
-    console.log('fetch', starterTemplates);
-
-    self.list(starterTemplates);
+    self.list(starterTemplates.items);
   })
 
   var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });

From c984c87936cf53528c52d84af51a0e39285e580c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:44:54 -0700
Subject: [PATCH 0385/1100] Changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f9b4bfab8..3919aca41e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Fixed the issue with `ionic serve` - when typing 'q' or 'quit' in the prompt, it will properly kill the gulp spawned process. Previously, it was left behind.
 * Now when you type `ionic browser versions` - it will list all installed browsers and versions for the platform its installed for.
 * Bumped connect-livereload up to 0.5.2 to resolve [an issue](https://github.com/intesso/connect-livereload/issues/41) from its repository regarding cookies.
+* Added the ability to list all Ionic starter templates available for Ionic.
 
 ### 1.3.2
 

From 178f702f28df847494758401fe6070708fc1cf0a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 15:57:14 -0700
Subject: [PATCH 0386/1100] Adding changelog updates for upload fixes. Closes
 #196

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f9b4bfab8..7a9e7f0806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Fixed the issue with `ionic serve` - when typing 'q' or 'quit' in the prompt, it will properly kill the gulp spawned process. Previously, it was left behind.
 * Now when you type `ionic browser versions` - it will list all installed browsers and versions for the platform its installed for.
 * Bumped connect-livereload up to 0.5.2 to resolve [an issue](https://github.com/intesso/connect-livereload/issues/41) from its repository regarding cookies.
+* Fixes for uploading - now provides more meaningful errors.
 
 ### 1.3.2
 

From c1c262ab84e387c69ef3d42269d29e3bf519bb87 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 16:04:26 -0700
Subject: [PATCH 0387/1100] Updating the download link to the 1.3.3 branch

---
 lib/ionic/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index b02c2b0ee9..518d19b69e 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -19,7 +19,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
 
   //TODO: change this to master when merged in.
-  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/starter-templates-listing/lib/ionic/starter-templates.json';
+  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/v1_3_3/lib/ionic/starter-templates.json';
   var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
   console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);

From 92b3e2d1b7777ea660afa78f147e8467b060b1a4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 17:06:07 -0700
Subject: [PATCH 0388/1100] Fixes the issue when passing the -r argument for
 'ionic run -r 37590 android' - now parses and sends correctly to cordova
 commands. Fixes #140

---
 lib/ionic/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 8ed6ea66fd..7b08b63536 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -67,8 +67,8 @@ IonicTask.prototype.runCordova = function(cmdName) {
   // clean out any cmds that may confuse cordova
   var cleanArgs = [];
   var port = argv.port || argv.p || '';
-  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.i || '';
-  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i'.split(' ');
+  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.r || '';
+  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i -r'.split(' ');
   var isValdCmd;
   for(x=0; x<cmdArgs.length; x++) {
     cmdArg = cmdArgs[x];

From c50599751855acccfacee501132cefaceaa1360f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 17:54:27 -0700
Subject: [PATCH 0389/1100] Including changes from zckrs, adjusting to previous
 fix for #186.

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 2d75d258b1..d384c1cbd9 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -140,7 +140,7 @@ IonicTask.prototype.start = function(ionic) {
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
       console.log('Gulp startup tasks:'.green.bold, tasks);
-      require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
+      self.childProcess = require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
     }
 
     if(this.runLivereload) {

From 21ba8b73c496e2baa1f3e635b6a0b6301cb0ccfb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 17:56:10 -0700
Subject: [PATCH 0390/1100] Adding changelog message for command coloring from
 PR #150

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b167c720c5..9395264de9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
 * Updating ionic help information to give better understanding to ions and bower components `ionic help add`, `ionic help remove` and `ionic help list`
 * Updating ionic help information about the `ionic serve --lab` feature to let users know how to use it.
 * Fixed a small bug when using `ionic start --sass dir template` - before the boolean command line arguments were eating the following argument. This has been fixed by adding boolean properties to optimist.
-
+* Added the stdio inheritance to have your gulp watch task inherit coloring.
 
 ### 1.3.2
 

From 82cbb77dc5ca67873a782a8029f6688c99996f1d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 20 Jan 2015 18:21:11 -0700
Subject: [PATCH 0391/1100] Adding readme updates for labs and address
 specification on serve

---
 README.md | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ce7a6788a4..c6d88c88a0 100644
--- a/README.md
+++ b/README.md
@@ -61,9 +61,9 @@ $ ionic serve [options]
 
 __LiveReload__
 
-By default, LiveReload will watch for changes in your `www/` directory, 
-excluding `www/lib/`.  To change this, you can specify a `watchPatterns` 
-property in the `ionic.project` file located in your project root to watch 
+By default, LiveReload will watch for changes in your `www/` directory,
+excluding `www/lib/`.  To change this, you can specify a `watchPatterns`
+property in the `ionic.project` file located in your project root to watch
 (or not watch) for specific changes.
 
 ```json
@@ -77,18 +77,18 @@ property in the `ionic.project` file located in your project root to watch
 }
 ```
 
-For a reference on glob pattern syntax, check out 
-[globbing patterns](http://gruntjs.com/configuring-tasks#globbing-patterns) on 
+For a reference on glob pattern syntax, check out
+[globbing patterns](http://gruntjs.com/configuring-tasks#globbing-patterns) on
 the Grunt website.
 
-Note: 
+Note:
 
 ```bash
-$ ionic setup sass 
+$ ionic setup sass
 ```
 
-will add a `watchPatterns` propery with the default values to your `ionic.project` 
-file that you can then edit, in addition to the `gulpStartupTasks` property 
+will add a `watchPatterns` propery with the default values to your `ionic.project`
+file that you can then edit, in addition to the `gulpStartupTasks` property
 described in the [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) section.
 
 
@@ -149,7 +149,20 @@ __Command-line flags/options:__
     [--nobrowser|-b] ........  Disable launching a browser
     [--nolivereload|-r] .....  Do not start live reload
     [--noproxy|-x] ..........  Do not add proxies
+    [--address] .............  Serves in the browser at the specified address
+    [--labs] ................  Serves both iOS and Android in the browser
 
+## Using Ionic Labs
+
+We've extended the serve command to open the new Lab UI that features iOS and Android side-by-side.
+
+```bash
+$ ionic serve --lab
+```
+
+If you've used the serve command before, you'll feel right at home with this one. Just like serve, it opens your app in a browser, but now it shows you what your app will look like on a phone, with both iOS and Android side by side.
+
+And of course, it supports Live Reload and all the other goodies we've added over the last couple of months.
 
 ## Adding a platform target
 

From f6c774e5dd00b6abd8e148b459b966a4ee23ce8a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 10:33:35 -0700
Subject: [PATCH 0392/1100] Merging in PR #136, adding the ability to specify a
 document root to be used with ionic serve.

---
 CHANGELOG.md |  1 +
 README.md    | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9395264de9..6a69a5f994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * Updating ionic help information about the `ionic serve --lab` feature to let users know how to use it.
 * Fixed a small bug when using `ionic start --sass dir template` - before the boolean command line arguments were eating the following argument. This has been fixed by adding boolean properties to optimist.
 * Added the stdio inheritance to have your gulp watch task inherit coloring.
+* Added the ability for you to specify an alternate document root  to use with `ionic serve` other than the default `www`. This is specified in your `ionic.project` file as a `documentRoot` property.
 
 ### 1.3.2
 
diff --git a/README.md b/README.md
index c6d88c88a0..f3abfb064a 100644
--- a/README.md
+++ b/README.md
@@ -164,6 +164,27 @@ If you've used the serve command before, you'll feel right at home with this one
 
 And of course, it supports Live Reload and all the other goodies we've added over the last couple of months.
 
+## Serving an alternate document root
+
+If you'd like to test your app in the browser and you use a folder other than the default of `www`, you can specify this folder in your `ionic.project` file.
+
+It is also advised you specify the watch patterns for this document root as well, as follows:
+
+```json
+{
+  "name": "SmoothRiders",
+   "gulpStartupTasks": [
+    "watch"
+  ],
+  "documentRoot": "app",
+  "watchPatterns": [
+    "app/js/*",
+    "!app/css/**/*"
+  ]
+}
+
+```
+
 ## Adding a platform target
 
 ```bash

From 6004d48c27ea2f98b61edab16bf1ff3ab371ac2b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 14:02:03 -0700
Subject: [PATCH 0393/1100] Adding a hook to remove Ionic SASS files from
 platforms folders (ios/android). Closes #59

---
 .../020_remove_sass_from_platforms.js         | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 lib/hooks/after_prepare/020_remove_sass_from_platforms.js

diff --git a/lib/hooks/after_prepare/020_remove_sass_from_platforms.js b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
new file mode 100644
index 0000000000..fdcdf31b66
--- /dev/null
+++ b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+/**
+ * After prepare, files are copied to the platforms/ios and platforms/android folders.
+ * Lets clean up some of those files that arent needed with this hook.
+ */
+var fs = require('fs');
+var path = require('path');
+
+var deleteFolderRecursive = function(removePath) {
+  if( fs.existsSync(removePath) ) {
+    fs.readdirSync(removePath).forEach(function(file,index){
+      var curPath = path.join(removePath, file);
+      console.log('Curr path', curPath)
+      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+        deleteFolderRecursive(curPath);
+      } else { // delete file
+        fs.unlinkSync(curPath);
+      }
+    });
+    fs.rmdirSync(removePath);
+  }
+};
+
+var iosPlatformsDir = path.resolve(__dirname, '../../platforms/ios/www/lib/ionic/scss');
+var androidPlatformsDir = path.resolve(__dirname, '../../platforms/android/assets/www/lib/ionic/scss');
+
+deleteFolderRecursive(iosPlatformsDir);
+deleteFolderRecursive(androidPlatformsDir);

From 461f4fb7fcb2f3b4eaeadd001aa9da7e63180797 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 14:02:37 -0700
Subject: [PATCH 0394/1100] Updating changelog for hook to remove sass

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a69a5f994..175c81dbe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Fixed a small bug when using `ionic start --sass dir template` - before the boolean command line arguments were eating the following argument. This has been fixed by adding boolean properties to optimist.
 * Added the stdio inheritance to have your gulp watch task inherit coloring.
 * Added the ability for you to specify an alternate document root  to use with `ionic serve` other than the default `www`. This is specified in your `ionic.project` file as a `documentRoot` property.
+* Adding a hook to remove Ionic SASS files from platforms folders. This should save you about 340K of space on your device builds!
 
 ### 1.3.2
 

From 7720e6ef6d7cc89254e4aee1ede054fb23e55d55 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 14:10:32 -0700
Subject: [PATCH 0395/1100] Adding cordova hook to ensure platforms and plugins
 folder exist before adding a platform. Closes #137

---
 .../before_platform_add/init_directories.js   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 lib/hooks/before_platform_add/init_directories.js

diff --git a/lib/hooks/before_platform_add/init_directories.js b/lib/hooks/before_platform_add/init_directories.js
new file mode 100644
index 0000000000..babde347a4
--- /dev/null
+++ b/lib/hooks/before_platform_add/init_directories.js
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+/**
+ * On a fresh clone, the local platforms/ and plugins/ directories will be
+ * missing, so ensure they get created before the first platform is added.
+ */
+var fs = require('fs');
+var path = require('path');
+
+var platformsDir = path.resolve(__dirname, '../../platforms');
+var pluginsDir = path.resolve(__dirname, '../../plugins');
+
+try {
+  fs.mkdirSync(platformsDir, function (err) {
+    if (err) { console.error(err); }
+  });
+} catch(ex) {}
+
+try {
+  fs.mkdirSync(pluginsDir, function (err) {
+    if (err) { console.error(err); }
+  });
+} catch(ex) {}

From 75386bbe25755cc9feedd6efa390f963fc49d10c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 14:11:06 -0700
Subject: [PATCH 0396/1100] Changelog updates

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 175c81dbe6..e16efe28a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@
 * Fixed a small bug when using `ionic start --sass dir template` - before the boolean command line arguments were eating the following argument. This has been fixed by adding boolean properties to optimist.
 * Added the stdio inheritance to have your gulp watch task inherit coloring.
 * Added the ability for you to specify an alternate document root  to use with `ionic serve` other than the default `www`. This is specified in your `ionic.project` file as a `documentRoot` property.
-* Adding a hook to remove Ionic SASS files from platforms folders. This should save you about 340K of space on your device builds!
+* Adding a cordova hook to remove Ionic SASS files from platforms folders. This should save you about 340K of space on your device builds.
+* Adding a cordova hook to ensure platforms and plugins folder exist before adding a platform.
 
 ### 1.3.2
 

From 2bfbcb2dfc265f0d7403358b9443d4279960d4d4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 21 Jan 2015 16:37:02 -0700
Subject: [PATCH 0397/1100] Resolving an issue where a user has
 gulpStartupTasks specified in their ionic.project file, but do not have gulp
 globally installed. This should close issue #110.

---
 lib/ionic/serve.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 49f4f34887..48b31f52bb 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -14,7 +14,8 @@ var fs = require('fs'),
     proxyMiddleware = require('proxy-middleware'),
     url = require('url'),
     xml2js = require('xml2js'),
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    shelljs = require('shelljs');
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
@@ -124,6 +125,15 @@ IonicTask.prototype.printCommandTips = function(ionic) {
   console.log('');
 };
 
+IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
+  var result = shelljs.exec('gulp -v', { silent: true });
+
+  if(result.code != 0) {
+    return false;
+  }
+  return true;
+}
+
 
 IonicTask.prototype.start = function(ionic) {
   try {
@@ -140,6 +150,11 @@ IonicTask.prototype.start = function(ionic) {
     if((this.gulpStartupTasks && this.gulpStartupTasks.length) || this.watchSass) {
       var tasks = this.gulpStartupTasks || ['sass','watch'];
 
+      if(!self.gulpInstalledGlobally()) {
+        var message = ['You have specified Gulp start up tasks in your ionic.project file.'.red, '\n', 'However, you do not have Gulp installed globally. Please run '.red, '`npm install -g gulp`'.green].join('');
+        return ionic.fail(message)
+      }
+
       console.log('Gulp startup tasks:'.green.bold, tasks);
       self.childProcess = require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
     }

From ba1df31527d6504d858ab50a60081d2b1a55250c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 22 Jan 2015 12:19:47 -0700
Subject: [PATCH 0398/1100] Removing console.log command from removing sass
 files

---
 lib/hooks/after_prepare/020_remove_sass_from_platforms.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/hooks/after_prepare/020_remove_sass_from_platforms.js b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
index fdcdf31b66..da3193a35a 100644
--- a/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
+++ b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
@@ -11,7 +11,6 @@ var deleteFolderRecursive = function(removePath) {
   if( fs.existsSync(removePath) ) {
     fs.readdirSync(removePath).forEach(function(file,index){
       var curPath = path.join(removePath, file);
-      console.log('Curr path', curPath)
       if(fs.lstatSync(curPath).isDirectory()) { // recurse
         deleteFolderRecursive(curPath);
       } else { // delete file

From 685d87329dcafb779db5120b4541899862fac35d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 22 Jan 2015 12:21:24 -0700
Subject: [PATCH 0399/1100] Adding hooks to install plugins after adding
 platform that are stored from hooks that add/remove plugins from package.json
 file as cordovaPlugins. Updating changelog

---
 CHANGELOG.md                                  |  3 +++
 .../after_platform_add/010_install_plugins.js | 20 +++++++++++++++++++
 .../after_plugin_add/010_register_plugin.js   | 16 +++++++++++++++
 .../after_plugin_rm/010_deregister_plugin.js  | 18 +++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 lib/hooks/after_platform_add/010_install_plugins.js
 create mode 100644 lib/hooks/after_plugin_add/010_register_plugin.js
 create mode 100644 lib/hooks/after_plugin_rm/010_deregister_plugin.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e16efe28a9..e4d7f8f504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 * Added the ability for you to specify an alternate document root  to use with `ionic serve` other than the default `www`. This is specified in your `ionic.project` file as a `documentRoot` property.
 * Adding a cordova hook to remove Ionic SASS files from platforms folders. This should save you about 340K of space on your device builds.
 * Adding a cordova hook to ensure platforms and plugins folder exist before adding a platform.
+* Adding a cordova hook to store plugins in package.json file as `cordovaPlugins` when a plugin is added or removed.
+* Adding a cordova hook to install plugins listed in package.json file as `cordovaPlugins` after a platform is added to the project.
+
 
 ### 1.3.2
 
diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
new file mode 100644
index 0000000000..4f958e0302
--- /dev/null
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+/**
+ * Install all plugins listed in package.json
+ * https://raw.githubusercontent.com/diegonetto/generator-ionic/master/templates/hooks/after_platform_add/install_plugins.js
+ */
+var exec = require('child_process').exec;
+var path = require('path');
+var sys = require('sys');
+
+var packageJSON = require('../../package.json');
+var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
+// var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+packageJSON.cordovaPlugins.forEach(function (plugin) {
+  exec('cordova plugin add ' + plugin, function (error, stdout, stderr) {
+    sys.puts(stdout);
+  });
+});
diff --git a/lib/hooks/after_plugin_add/010_register_plugin.js b/lib/hooks/after_plugin_add/010_register_plugin.js
new file mode 100644
index 0000000000..380cc5b34d
--- /dev/null
+++ b/lib/hooks/after_plugin_add/010_register_plugin.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+/**
+ * Push plugins to cordovaPlugins array after_plugin_add
+ */
+var fs = require('fs');
+var packageJSON = require('../../package.json');
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+  if(packageJSON.cordovaPlugins.indexOf(plugin) == -1) {
+    packageJSON.cordovaPlugins.push(plugin);
+  }
+});
+
+fs.writeFileSync('package.json', JSON.stringify(packageJSON, null, 2));
diff --git a/lib/hooks/after_plugin_rm/010_deregister_plugin.js b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
new file mode 100644
index 0000000000..65fa4cc7d3
--- /dev/null
+++ b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+
+/**
+ * Remove plugins from cordovaPlugins array after_plugin_rm
+ */
+var fs = require('fs');
+var packageJSON = require('../../package.json');
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+
+process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+  var index = packageJSON.cordovaPlugins.indexOf(plugin);
+  if (index > -1) {
+    packageJSON.cordovaPlugins.splice(index, 1);
+  }
+});
+
+fs.writeFile('package.json', JSON.stringify(packageJSON, null, 2));

From 7ea204c18dab9bfb110b290e40e789cfeb849429 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 22 Jan 2015 12:35:40 -0700
Subject: [PATCH 0400/1100] bumping to 1.3.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0030f94f9b..24ed4bfdb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 5052968dbbed21f6c25f0acbccb073954bee0edd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 28 Jan 2015 10:54:03 -0700
Subject: [PATCH 0401/1100] Updating browser to pull our versioned
 cordova-android libraries and crosswalk engines. Updated the process for
 better error handling. Updating the templates to pull from master.

---
 lib/ionic/browser.js   | 49 +++++++++++++++++++++++++++++++-----------
 lib/ionic/templates.js |  2 +-
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index a24e727aff..6d588cc9e5 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -29,8 +29,9 @@ var fs = require('fs'),
     _ = require('underscore'),
     IonicProject = require('./project');
 
-  var config = shelljs.config;
-  config.silent = true;
+shelljs.config.silent = true;
+
+var crosswalkEngineVersion = 'c0.5';
 
 var crosswalkVersions = [
   {
@@ -113,12 +114,15 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
     shelljs.mkdir(path.join(process.cwd(), 'engine'));
   }
 
-  if(fs.existsSync(path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8'))) {
+  var cordovaCrosswalkFolderName = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+
+  if(fs.existsSync(path.join(process.cwd(), 'engine', cordovaCrosswalkFolderName))) {
     q.resolve();
     return q.promise;
   }
 
-  var downloadUrl = 'https://github.com/driftyco/cordova-crosswalk-engine/archive/v0.8.zip';
+  // https://github.com/driftyco/cordova-crosswalk-engine/archive/c0.3.zip
+  var downloadUrl = ['https://github.com/driftyco/cordova-crosswalk-engine/archive/', crosswalkEngineVersion, '.zip'].join('');
 
   var tempZipFilePath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine.zip');
   var zipOutPath = path.join(process.cwd(), 'engine');
@@ -140,7 +144,9 @@ IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
   var result = shelljs.exec(command, { silent: true } );
 
   if(result.code != 0) {
-    console.log('error!');
+    var errorMessage = 'Had an error fetching the Android SDK required for Crosswalk.';
+    this.ionic.fail(errorMessage);
+    throw new Error(errorMessage);
   }
 }
 
@@ -168,10 +174,13 @@ function downloadCrosswalkWebview(architecture, version, releaseStatus) {
   .then(function(data) {
     //Need to go copy to android directory.
     var fileName = fs.readdirSync(tempZipFilePath);
+    var cordovaCrosswalkFolder = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+
+    // console.log('This is it ', cordovaCrosswalkFolder)
 
     var copySource = path.join(tempZipFilePath, fileName[0], '*');
 
-    var copyDestination = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library', '/');
+    var copyDestination = path.join(process.cwd(), 'engine', cordovaCrosswalkFolder, 'libs', 'xwalk_core_library', '/');
 
     var cpResult = shelljs.cp('-R', copySource, copyDestination);
 
@@ -189,7 +198,7 @@ IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version
 
   var xwalkVersion = _.findWhere(crosswalkVersions, { version: version });
 
-  console.log('xwalk', xwalkVersion)
+  // console.log('xwalk', xwalkVersion)
 
   if(!xwalkVersion) {
     console.log('\nYou must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
@@ -214,11 +223,13 @@ IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version
 IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   var q = Q.defer();
 
-  var downloadUrl = 'https://github.com/driftyco/cordova-android/archive/crosswalk.zip';
+  // var crosswalkEngineVersion = 'c0.3';
+  var crosswalkEngineUnzipName = ['cordova-android-', crosswalkEngineVersion].join('');
+  var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', crosswalkEngineVersion, '.zip'].join('');
 
   var tempZipFilePath = path.join(process.cwd(), 'engine');
 
-  if(fs.existsSync(path.join(tempZipFilePath, 'cordova-android-crosswalk'))) {
+  if(fs.existsSync(path.join(tempZipFilePath, crosswalkEngineUnzipName))) {
     q.resolve();
     return;
   }
@@ -227,7 +238,7 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   .then(function(data) {
     console.log('\nFinished downloading cordova-android v4.0.x');
     //Need to make certain files executable
-    var cordovaAndroid4Path = path.join(tempZipFilePath, 'cordova-android-crosswalk', 'bin');
+    var cordovaAndroid4Path = path.join(tempZipFilePath, crosswalkEngineUnzipName, 'bin');
     var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
     shelljs.chmod('+x', path.join(cordovaAndroid4Path, '*'));
     shelljs.chmod('+x', path.join(android4BinPath, '*'))
@@ -248,15 +259,26 @@ IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  'cordova platform add ./engine/cordova-android-crosswalk/';
+  var command =  ['cordova platform add ./engine/cordova-android-', crosswalkEngineVersion, '/'].join('');
+  // console.log('Running command for cordova 40x', command)
   var result = shelljs.exec(command);
-  console.log('\nAdded Cordova Android 4.0')
+
+  if(result.code != 0) {
+    var errorMessage = ['There was an error adding the Cordova Android library', result.output].join('\n');
+    this.ionic.fail(errorMessage);
+    throw new Error(errorMessage);
+  } else {
+    console.log('\nAdded Cordova Android 4.0')
+  }
+
 }
 
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
-  var command = 'cordova plugin add ./engine/cordova-crosswalk-engine-0.8';
+  var command = ['cordova plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+  // console.log('Running comand', command)
   var result = shelljs.exec(command);
   console.log('\nAdded Crosswalk Webview Engine')
+  // console.log('result', result)
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
@@ -293,6 +315,7 @@ IonicTask.prototype.downloadFiles = function downloadFiles(version) {
     q.reject();
   })
   .catch(function(error){
+    console.log('There was an error finishing the browser command - ', error);
     q.reject(error);
   })
 
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 518d19b69e..7b7671386b 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -19,7 +19,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
 
   //TODO: change this to master when merged in.
-  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/v1_3_3/lib/ionic/starter-templates.json';
+  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/master/lib/ionic/starter-templates.json';
   var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
   console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);

From a841679fe48fbde04840a38bee89a3a5f6582a19 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 28 Jan 2015 11:32:46 -0700
Subject: [PATCH 0402/1100] Fixing the bug with ionic versions. Defaults to the
 first version. Removed 8.37.189.12 from list.

---
 lib/ionic/browser.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 6d588cc9e5..5ba454a9af 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -34,10 +34,6 @@ shelljs.config.silent = true;
 var crosswalkEngineVersion = 'c0.5';
 
 var crosswalkVersions = [
-  {
-    version: '8.37.189.12',
-    publish_date: '2014-09-30 02:43'
-  },
   {
     version: '8.37.189.14',
     publish_date: '2014-10-10 03:26'
@@ -194,7 +190,7 @@ function downloadCrosswalkWebview(architecture, version, releaseStatus) {
 }
 
 IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version) {
-  var version = version ? version : '8.37.189.14';
+  // var version = version ? version : '8.37.189.14';
 
   var xwalkVersion = _.findWhere(crosswalkVersions, { version: version });
 
@@ -412,6 +408,8 @@ IonicTask.prototype.addBrowser = function() {
     var browserVersionAttempt = argv._[2].split('@');
     browserToInstall = browserVersionAttempt[0];
     browserVersion = browserVersionAttempt[1];
+  } else {
+    browserVersion = crosswalkVersions[0].version;
   }
 
   switch(browserToInstall) {

From 5aeb513f20a723c1787845d1a845cf18f6f80d71 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 28 Jan 2015 11:44:17 -0700
Subject: [PATCH 0403/1100] Updating shrinkwrap

---
 npm-shrinkwrap.json | 49 +++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 593c833eb9..453c63ceca 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -41,7 +41,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -369,7 +369,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -478,14 +478,14 @@
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "get-stdin@*",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
-                  "version": "2.1.0",
+                  "version": "3.0.0",
                   "from": "meow@*",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
@@ -523,6 +523,11 @@
                               "version": "1.0.0",
                               "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                            },
+                            "meow": {
+                              "version": "2.1.0",
+                              "from": "meow@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz"
                             }
                           }
                         }
@@ -691,7 +696,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.1 <0.7.0",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -730,7 +735,7 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.3 <0.5.0",
+              "from": "vinyl@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
@@ -1480,7 +1485,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
@@ -1645,9 +1650,9 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
-          "version": "0.9.3",
+          "version": "0.9.4",
           "from": "bl@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
@@ -1714,7 +1719,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
@@ -1976,7 +1981,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
@@ -2061,7 +2066,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2114,7 +2119,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2280,12 +2285,12 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "through2@>=0.6.3 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -2319,7 +2324,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.3 <0.5.0",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
@@ -2347,9 +2352,9 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.4.5",
+          "version": "2.4.6",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.6.tgz",
           "dependencies": {
             "lodash-node": {
               "version": "2.4.1",

From eb00cbbd110dadb1aabae875f56029c252be93ac Mon Sep 17 00:00:00 2001
From: Tyler Ewing <tewing10@gmail.com>
Date: Sun, 1 Feb 2015 00:32:15 -0500
Subject: [PATCH 0404/1100] Fix displaying starter template list

---
 README.md              | 11 ++++++-----
 lib/ionic/templates.js |  5 +----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index f3abfb064a..1f4be4009c 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,12 @@ __Local directory starters:__
 
 __Command-line flags/options:__
 
-    --appname, -a  .......  Human readable name for the app
-                            (Use quotes around the name)
-    --id, -i  ............  Package name set in the <widget id> config
-                            ex: com.mycompany.myapp
-    --no-cordova, -w  ....  Do not create an app targeted for Cordova
+    [--appname|-a]  .......  Human readable name for the app
+                             (Use quotes around the name)
+    [--id|-i]  ............  Package name set in the <widget id> config
+                             ex: com.mycompany.myapp
+    [--no-cordova|-w]  ....  Do not create an app targeted for Cordova
+    [--list|-l]  ..........  List starter templates available
 
 
 ## Testing in a Browser
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 7b7671386b..fa0eb7fabc 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -1,6 +1,5 @@
 var colors = require('colors'),
     path = require('path'),
-    fs = require('fs'),
     _ = require('underscore'),
     Q = require('q'),
     Task = require('./task').Task,
@@ -29,11 +28,9 @@ IonicTask.prototype.fetchStarterTemplates = function() {
   var proxy = process.env.PROXY || null;
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
     if(!err && res && res.statusCode === 200) {
-      // console.log('got html', html)
-      fs.writeFileSync(starterTemplateJsonPath, html, 'utf8');
       var templatesJson = {};
       try {
-        templatesJson = require(starterTemplateJsonPath);
+        templatesJson = JSON.parse(html);
       }catch(ex) {
         console.log('ex', ex)
         q.reject('Error occured in download templates:', ex)

From 7cdc4d0fa1ecbbd2c1dce373cf2a0ae5bf2c8797 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sun, 1 Feb 2015 11:05:06 -0700
Subject: [PATCH 0405/1100] Updating the revert command to remove older
 crosswalk plugin name as well as the new one. Updated the project to focus on
 the new name (org.crosswalk.engine). Updated functions to have proper names.
 Fixed the android update project command for the xwalk project.

---
 lib/ionic/browser.js | 79 +++++++++++++++++++++++++++++++-------------
 package.json         |  2 +-
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 5ba454a9af..c3e7849066 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -31,7 +31,8 @@ var fs = require('fs'),
 
 shelljs.config.silent = true;
 
-var crosswalkEngineVersion = 'c0.5';
+var crosswalkEngineVersion = 'c0.6.1';
+var cordovaAndroidVersion = 'c0.5.5';
 
 var crosswalkVersions = [
   {
@@ -171,9 +172,6 @@ function downloadCrosswalkWebview(architecture, version, releaseStatus) {
     //Need to go copy to android directory.
     var fileName = fs.readdirSync(tempZipFilePath);
     var cordovaCrosswalkFolder = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-
-    // console.log('This is it ', cordovaCrosswalkFolder)
-
     var copySource = path.join(tempZipFilePath, fileName[0], '*');
 
     var copyDestination = path.join(process.cwd(), 'engine', cordovaCrosswalkFolder, 'libs', 'xwalk_core_library', '/');
@@ -220,8 +218,8 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   var q = Q.defer();
 
   // var crosswalkEngineVersion = 'c0.3';
-  var crosswalkEngineUnzipName = ['cordova-android-', crosswalkEngineVersion].join('');
-  var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', crosswalkEngineVersion, '.zip'].join('');
+  var crosswalkEngineUnzipName = ['cordova-android-', cordovaAndroidVersion].join('');
+  var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', cordovaAndroidVersion, '.zip'].join('');
 
   var tempZipFilePath = path.join(process.cwd(), 'engine');
 
@@ -255,7 +253,7 @@ IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  ['cordova platform add ./engine/cordova-android-', crosswalkEngineVersion, '/'].join('');
+  var command =  ['cordova platform add ./engine/cordova-android-', cordovaAndroidVersion, '/'].join('');
   // console.log('Running command for cordova 40x', command)
   var result = shelljs.exec(command);
 
@@ -271,18 +269,19 @@ IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
 
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
   var command = ['cordova plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-  // console.log('Running comand', command)
   var result = shelljs.exec(command);
   console.log('\nAdded Crosswalk Webview Engine')
-  // console.log('result', result)
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
-  var xwalkLibraryPath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine-0.8', 'libs', 'xwalk_core_library');
+  var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+  var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
+  var updateCommand = ['android update lib-project --path "', xwalkLibraryPath, '" --target "4"'].join('');
+  // console.log('Running:', updateCommand)
 
   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
 
-  shelljs.exec('android update lib-project --path "' + xwalkLibraryPath + '" --target "4"', {silent: true});
+  shelljs.exec(updateCommand, {silent: true});
 
   shelljs.cd('../../');
 }
@@ -318,13 +317,14 @@ IonicTask.prototype.downloadFiles = function downloadFiles(version) {
   return q.promise;
 }
 
-IonicTask.prototype.removeCrosswalk = function() {
+IonicTask.prototype.removeCrosswalk = function removeCrosswalk() {
   shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk')
+  shelljs.exec('cordova plugin rm org.crosswalk.engine')
   shelljs.exec('cordova platform rm android')
   shelljs.exec('cordova platform add android')
 }
 
-IonicTask.prototype.installCrosswalk = function(version) {
+IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   var self = this;
 
   self.downloadFiles(version)
@@ -343,22 +343,52 @@ IonicTask.prototype.installCrosswalk = function(version) {
   })
 }
 
-IonicTask.prototype.revertBrowser = function() {
+IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk(addPlugin) {
+  if(typeof addPlugin == 'undefined') {
+    addPlugin = false;
+  }
+  //Old plugin name: org.apache.cordova.engine.crosswalk
+  //New plugin name: org.crosswalk.engine
+  var self = this;
+
+  var rmCmd = 'cordova plugin rm org.apache.cordova.engine.crosswalk';
+  getCordovaCrosswalkEngine()
+  .then(function success(data) {
+    console.log('data: ', data);
+    if(addPlugin) {
+      self.addCrosswalkPlugin();
+
+    }
+    console.log('Done')
+  })
+}
+
+IonicTask.prototype.revertBrowser = function revertBrowser() {
   var self = this;
 
   var platform = argv._[2];
 
   if (!platform) {
     console.log('You did not specify a platform to revert the browser');
-    return;
+    return
+  }
+
+  if(['android', 'ios'].indexOf(platform) == -1) {
+    console.log('You did not specify a valid platform.');
+    return
   }
 
   console.log('Reverting', platform, 'browser');
 
-  var addCommand = ['cordova platform add', platform].join(' ');
   var rmCommand = ['cordova platform rm', platform].join(' ');
+  var addCommand = ['cordova platform add', platform].join(' ');
 
   shelljs.exec(rmCommand)
+
+  if(platform == 'android') {
+    self.removeCrosswalk();
+  }
+
   shelljs.exec(addCommand)
 
   console.log('Reverted', platform, 'browser');
@@ -388,7 +418,7 @@ IonicTask.prototype.saveBrowserInstallation = function saveBrowserInstallation(p
   project.save();
 }
 
-IonicTask.prototype.addBrowser = function() {
+IonicTask.prototype.addBrowser = function addBrowser() {
   var self = this;
 
   //Check which browser they wish to install
@@ -409,7 +439,7 @@ IonicTask.prototype.addBrowser = function() {
     browserToInstall = browserVersionAttempt[0];
     browserVersion = browserVersionAttempt[1];
   } else {
-    browserVersion = crosswalkVersions[0].version;
+    browserVersion = crosswalkVersions[2].version;
   }
 
   switch(browserToInstall) {
@@ -434,7 +464,7 @@ IonicTask.prototype.addBrowser = function() {
   }
 }
 
-IonicTask.prototype.removeBrowser = function() {
+IonicTask.prototype.removeBrowser = function removeBrowser() {
   var browser = 'crosswalk';
 
   if (argv._[2]) {
@@ -456,7 +486,7 @@ IonicTask.prototype.removeBrowser = function() {
 
 }
 
-var printBrowsers = function(browsers) {
+var printBrowsers = function printBrowsers(browsers) {
   for(var x = 0, y = browsers.length; x < y; x++) {
     var browser = browsers[x];
     var avail = browser.available ? 'Yes' : 'No';
@@ -489,7 +519,7 @@ var printBrowsers = function(browsers) {
   }
 }
 
-IonicTask.prototype.listBrowsers = function() {
+IonicTask.prototype.listBrowsers = function listBrowsers() {
   console.log('iOS - Browsers Listing:\n')
 
   printBrowsers(iosBrowsers);
@@ -514,7 +544,7 @@ IonicTask.prototype.listInstalledBrowsers = function listInstalledBrowsers() {
   console.log('\n')
 }
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
 
@@ -526,7 +556,7 @@ IonicTask.prototype.run = function(ionic) {
 
   cmdArg = argv._[1]
 
-  var validCommands = 'add remove rm list ls revert versions'.split(' ');
+  var validCommands = 'add remove rm list ls revert versions upgrade'.split(' ');
   for(y=0; y<validCommands.length; y++) {
     if(cmdArg == validCommands[y]) {
       hasValidCmd = true;
@@ -554,6 +584,9 @@ IonicTask.prototype.run = function(ionic) {
     case 'ls':
       this.listBrowsers();
       break;
+    case 'upgrade':
+      this.upgradeCrosswalk();
+      break;
     case 'update':
     case 'up':
       this.addBrowser();
diff --git a/package.json b/package.json
index 24ed4bfdb9..560ef5a581 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a61bb4e59cde3e8fb6f995546cd1c7850629daa3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sun, 1 Feb 2015 13:37:00 -0700
Subject: [PATCH 0406/1100] Now removes old crosswalk engine plugin when doing
 an add. Upgrade command now removes old engine, and installs latest.

---
 lib/ionic/browser.js | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index c3e7849066..59403089c0 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -31,8 +31,9 @@ var fs = require('fs'),
 
 shelljs.config.silent = true;
 
-var crosswalkEngineVersion = 'c0.6.1';
-var cordovaAndroidVersion = 'c0.5.5';
+var crosswalkEngineVersion = 'c0.6.1',
+    cordovaAndroidVersion = 'c0.5.5',
+    platforms = ['android', 'ios'];
 
 var crosswalkVersions = [
   {
@@ -273,6 +274,11 @@ IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
   console.log('\nAdded Crosswalk Webview Engine')
 }
 
+IonicTask.prototype.removeOldCrosswalkEngine = function removeOldCrosswalkEngine() {
+  var rmCmd = 'cordova plugin rm org.apache.cordova.engine.crosswalk';
+  var result = shelljs.exec(rmCmd);
+}
+
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
   var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
   var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
@@ -331,6 +337,7 @@ IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   .then(function(data) {
     self.removeAndroidProject();
     self.addCordova40xProject();
+    self.removeOldCrosswalkEngine();
     self.addCrosswalkPlugin();
     self.updateAndroidProject();
 
@@ -344,22 +351,28 @@ IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
 }
 
 IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk(addPlugin) {
+
+  //Remove the old engine, download the latest, and add it.
   if(typeof addPlugin == 'undefined') {
     addPlugin = false;
   }
+
+  console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
   //Old plugin name: org.apache.cordova.engine.crosswalk
   //New plugin name: org.crosswalk.engine
   var self = this;
 
-  var rmCmd = 'cordova plugin rm org.apache.cordova.engine.crosswalk';
-  getCordovaCrosswalkEngine()
+  self.removeOldCrosswalkEngine();
+
+  self.getCordovaCrosswalkEngine()
   .then(function success(data) {
-    console.log('data: ', data);
+    console.log('Got cordova crosswalk engine: ', data);
     if(addPlugin) {
       self.addCrosswalkPlugin();
-
     }
     console.log('Done')
+  }, function failed(error){ 
+    self.ionic.fail('Failed retrieving the Crosswalk engine plugin');
   })
 }
 
@@ -373,7 +386,7 @@ IonicTask.prototype.revertBrowser = function revertBrowser() {
     return
   }
 
-  if(['android', 'ios'].indexOf(platform) == -1) {
+  if(platforms.indexOf(platform) == -1) {
     console.log('You did not specify a valid platform.');
     return
   }
@@ -585,7 +598,7 @@ IonicTask.prototype.run = function run(ionic) {
       this.listBrowsers();
       break;
     case 'upgrade':
-      this.upgradeCrosswalk();
+      this.upgradeCrosswalk(true);
       break;
     case 'update':
     case 'up':

From 351c485fb2b5de654aee463a98968cdc2eda5e69 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 2 Feb 2015 17:53:05 -0700
Subject: [PATCH 0407/1100] Adding in the news updates when ionic start
 completes.

---
 lib/ionic.js | 73 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 4 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 9c21e6fdfe..cd3107c306 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -277,7 +277,7 @@ var TASKS = [
     name: 'browser',
     summary: 'Add another browser for a platform ' + '(beta)'.yellow,
     args: {
-      '<command>': '"add remove rm list ls revert"',
+      '<command>': '"add remove rm versions upgrade list ls revert"',
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
     module: './ionic/browser'
@@ -623,10 +623,75 @@ Ionic = {
     }
   },
 
-  processExit: function(code) {
-    this.latestVersion.promise.then(function(){
-      process.exit(code);
+  printNewsUpdates: function printNewsUpdates(skipNewsCheck) {
+    if(typeof skipNewsCheck == 'undefined') {
+      skipNewsCheck = true;
+    } 
+
+    var q = this.cliNews = Q.defer();
+    var proxy = process.env.PROXY || null;
+    var IonicStore = require('./ionic/store').IonicStore;
+    var ionicConfig = new IonicStore('ionic.config');
+
+    var request = require('request');
+    var monthNames = [ "January", "February", "March", "April", "May", "June",
+    "July", "August", "September", "October", "November", "December" ];
+    var d = new Date();
+
+    var downloadUrl = 'http://code.ionicframework.com/content/cli-message.json';
+    request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
+      if(!err && res && res.statusCode === 200) {
+        try {
+          var newsId = ionicConfig.get('newsId');
+          var messagesJson = {};
+          messagesJson = JSON.parse(html);
+          if(skipNewsCheck || typeof newsId == 'undefined' || newsId != messagesJson.id) {
+            ionicConfig.set('newsId', messagesJson.id)
+            ionicConfig.save()
+          } else {
+            q.resolve();
+            return q.promise;
+          }
+
+          process.stdout.write('+---------------------------------------------------------+\n'.green);
+
+          var monthMessage = ['+ New Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').green;
+          process.stdout.write(monthMessage);
+
+          for(var i = 0, j = messagesJson.list.length; i < j; i++) {
+            var entry = messagesJson.list[i];
+            var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.yellow, '\n+\n'].join('');
+            process.stdout.write(entryMessage);
+          }
+          process.stdout.write('+---------------------------------------------------------+\n'.green);
+        }catch(ex) {
+          console.log('ex', ex)
+          q.reject('Error occured in downloading the CLI messages:', ex)
+          self.ionic.fail(ex);
+          q.reject(ex);
+          return
+        }
+        q.resolve(messagesJson);
+      } else {
+        process.stdout.write('Unable to fetch', err, res.statusCode);
+        q.reject(res);
+      }
     });
+    return q.promise;
+  },
+
+  processExit: function(code) {
+    if(this.cliNews.promise) {
+      Q.all([this.latestVersion.promise, this.cliNews.promise])
+      .then(function() {
+        process.exit(code);
+      })  
+    } else {
+      this.latestVersion.promise.then(function() {
+        process.exit(code);
+      })
+    }
+    
   },
 
   getContentSrc: function() {

From 3b2637cf0bfc9ab65d86df905d513612471aba35 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 2 Feb 2015 17:53:23 -0700
Subject: [PATCH 0408/1100] Making call to printNewsUpdates

---
 lib/ionic/start.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 9d57d0901f..fe76db1574 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -738,6 +738,8 @@ IonicTask.prototype.finalize = function() {
 
   this.printQuickHelp();
 
+  this.ionic.printNewsUpdates(true);
+
   IonicStats.t();
 };
 

From 5f0204050a8a92a63a79d6908eaed8d5b2ed16bc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 2 Feb 2015 17:53:49 -0700
Subject: [PATCH 0409/1100] Adjusting the starter templates to be pulled form
 the CDN

---
 lib/ionic/templates.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 7b7671386b..1277e05182 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -15,14 +15,12 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.fetchStarterTemplates = function() {
   var self = this;
 
-  console.log('About to fetch template');
-
-
-  //TODO: change this to master when merged in.
-  var downloadUrl = 'https://raw.githubusercontent.com/driftyco/ionic-cli/master/lib/ionic/starter-templates.json';
+  // console.log('About to fetch template');
+  var downloadUrl = 'http://code.ionicframework.com/content/starter-templates.json';
   var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
-  console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
+  // console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
+  console.log('\nDownloading Starter Templates'.bold, '-', downloadUrl);
 
   var q = Q.defer();
 
@@ -51,6 +49,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
 IonicTask.prototype.list = function list(templates) {
   //Should have array of [{ name: 'name', description: 'desc' }]
+  console.log('\n')
   _.each(templates, function(template) {
     var rightColumn = 20, dots = '';
     var shortName = template.name.replace('ionic-starter-', '');

From f54a9ce732a08557f2b82e21b493fbea8f19ba01 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 2 Feb 2015 17:54:19 -0700
Subject: [PATCH 0410/1100] Adjusting console message for completing upgrade

---
 lib/ionic/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 59403089c0..e66a305d03 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -366,7 +366,7 @@ IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk(addPlugin) {
 
   self.getCordovaCrosswalkEngine()
   .then(function success(data) {
-    console.log('Got cordova crosswalk engine: ', data);
+    console.log('Got cordova crosswalk engine');
     if(addPlugin) {
       self.addCrosswalkPlugin();
     }

From 2cd90ae4ded9f46c723fdc2eccae5584c51f43e3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Feb 2015 10:05:58 -0700
Subject: [PATCH 0411/1100] Upgrade command just calls install with the default
 version

---
 lib/ionic/browser.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index e66a305d03..1094430a3d 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -360,20 +360,9 @@ IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk(addPlugin) {
   console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
   //Old plugin name: org.apache.cordova.engine.crosswalk
   //New plugin name: org.crosswalk.engine
-  var self = this;
-
-  self.removeOldCrosswalkEngine();
 
-  self.getCordovaCrosswalkEngine()
-  .then(function success(data) {
-    console.log('Got cordova crosswalk engine');
-    if(addPlugin) {
-      self.addCrosswalkPlugin();
-    }
-    console.log('Done')
-  }, function failed(error){ 
-    self.ionic.fail('Failed retrieving the Crosswalk engine plugin');
-  })
+  this.installCrosswalk(crosswalkVersions[2].version);
+  
 }
 
 IonicTask.prototype.revertBrowser = function revertBrowser() {

From 05528f4bd5e0949affb458f8c02f6640eaf4ebb6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Feb 2015 14:51:55 -0700
Subject: [PATCH 0412/1100] Removing the fluff from upgradeCrosswalk

---
 lib/ionic/browser.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 1094430a3d..1772c9ba41 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -350,17 +350,10 @@ IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   })
 }
 
-IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk(addPlugin) {
-
-  //Remove the old engine, download the latest, and add it.
-  if(typeof addPlugin == 'undefined') {
-    addPlugin = false;
-  }
-
+IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk() {
   console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
   //Old plugin name: org.apache.cordova.engine.crosswalk
   //New plugin name: org.crosswalk.engine
-
   this.installCrosswalk(crosswalkVersions[2].version);
   
 }
@@ -587,7 +580,7 @@ IonicTask.prototype.run = function run(ionic) {
       this.listBrowsers();
       break;
     case 'upgrade':
-      this.upgradeCrosswalk(true);
+      this.upgradeCrosswalk();
       break;
     case 'update':
     case 'up':

From 88b71a84afbef4fe280e4ccdc487aa73e223f159 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Feb 2015 15:15:43 -0700
Subject: [PATCH 0413/1100] Updating shrinkwrap for 1.3.4

---
 npm-shrinkwrap.json | 195 +++++++++++++++++++-------------------------
 1 file changed, 85 insertions(+), 110 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 453c63ceca..385af9cfbc 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -41,7 +41,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.11 <0.3.0",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -453,9 +453,9 @@
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
@@ -537,109 +537,84 @@
                 }
               }
             },
-            "lodash._reinterpolate": {
-              "version": "2.4.1",
-              "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
+            "lodash.reescape": {
+              "version": "3.0.0",
+              "from": "lodash.reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz"
+            },
+            "lodash.reevaluate": {
+              "version": "3.0.0",
+              "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz"
+            },
+            "lodash.reinterpolate": {
+              "version": "3.0.0",
+              "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "2.4.1",
-              "from": "lodash.template@>=2.4.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
+              "version": "3.0.0",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
               "dependencies": {
-                "lodash.defaults": {
-                  "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._objecttypes": {
-                      "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                    }
-                  }
+                "lodash._basecopy": {
+                  "version": "3.0.0",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
-                "lodash.escape": {
-                  "version": "2.4.1",
-                  "from": "lodash.escape@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._escapehtmlchar": {
-                      "version": "2.4.1",
-                      "from": "lodash._escapehtmlchar@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._htmlescapes": {
-                          "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._reunescapedhtml": {
-                      "version": "2.4.1",
-                      "from": "lodash._reunescapedhtml@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._htmlescapes": {
-                          "version": "2.4.1",
-                          "from": "lodash._htmlescapes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"
-                        }
-                      }
-                    }
-                  }
+                "lodash._basetostring": {
+                  "version": "3.0.0",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
-                "lodash._escapestringchar": {
-                  "version": "2.4.1",
-                  "from": "lodash._escapestringchar@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"
+                "lodash._basevalues": {
+                  "version": "3.0.0",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+                },
+                "lodash._isiterateecall": {
+                  "version": "3.0.1",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
+                },
+                "lodash.iserror": {
+                  "version": "3.0.0",
+                  "from": "lodash.iserror@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz"
                 },
                 "lodash.keys": {
-                  "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "version": "3.0.2",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
                   "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                    "lodash.isarguments": {
+                      "version": "3.0.0",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
                     },
-                    "lodash.isobject": {
-                      "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._objecttypes": {
-                          "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                        }
-                      }
+                    "lodash.isarray": {
+                      "version": "3.0.0",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
                     },
-                    "lodash._shimkeys": {
-                      "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._objecttypes": {
-                          "version": "2.4.1",
-                          "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                        }
-                      }
+                    "lodash.isnative": {
+                      "version": "3.0.0",
+                      "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
                     }
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "2.4.1",
-                  "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
-                },
-                "lodash.values": {
-                  "version": "2.4.1",
-                  "from": "lodash.values@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"
+                  "version": "3.0.0",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
+                  "dependencies": {
+                    "lodash.escape": {
+                      "version": "3.0.0",
+                      "from": "lodash.escape@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                    }
+                  }
                 }
               }
             },
@@ -735,7 +710,7 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
+              "from": "vinyl@>=0.4.3 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
@@ -1704,14 +1679,14 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "mime-types": {
-              "version": "2.0.7",
+              "version": "2.0.8",
               "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.5.0",
-                  "from": "mime-db@>=1.5.0 <1.6.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
+                  "version": "1.6.0",
+                  "from": "mime-db@>=1.6.0 <1.7.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz"
                 }
               }
             }
@@ -1986,7 +1961,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2246,7 +2221,7 @@
         },
         "graceful-fs": {
           "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "from": "graceful-fs@>=3.0.2 <3.1.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
@@ -2285,12 +2260,12 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.3 <0.7.0",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -2352,14 +2327,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.4.6",
+          "version": "2.5.0",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.6.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.0.tgz",
           "dependencies": {
-            "lodash-node": {
-              "version": "2.4.1",
-              "from": "lodash-node@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+            "lodash": {
+              "version": "3.0.1",
+              "from": "lodash@>=3.0.1 <3.1.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.0.1.tgz"
             }
           }
         }

From 22bb7cdbccf66173b59d03671a5e20abc6f068b4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Feb 2015 15:25:22 -0700
Subject: [PATCH 0414/1100] Updating changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4d7f8f504..44aca1b213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.3.4
+
+* Added the ionic news updates for when `ionic start` finishes - alerts the users of the latest changes for ionic
+* Updated cordova android and the cordova crosswalk engine to be versioned. Now they pull the latest dev commits.
+* Due to the cordova crosswalk engine changing its plugin ID, the browser command now removes the older plugin name (org.apache.cordova.crosswalk.engine to org.crosswalk.engine)
+* Updated cordova android to have a gradle.properties file to give the user options to build multiple architectures by default
+
 ### 1.3.3
 
 * Added the ability to specify an address when using `ionic serve` by specifying the address as an argument: `ionic serve --address 192.168.1.100`

From d25376560b0b2464ade1b0bebae3ca08d48fd0e3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Feb 2015 17:03:59 -0700
Subject: [PATCH 0415/1100] Closes #199 - Fixes for IonicProject.load - now
 tries to parse and provides an error if one exists

---
 CHANGELOG.md         |  4 ++++
 lib/ionic/app.js     | 18 ++++++++++++++++--
 lib/ionic/browser.js | 19 +++++++++++++++++--
 lib/ionic/package.js | 11 ++++++++++-
 lib/ionic/project.js |  7 +++++--
 lib/ionic/serve.js   |  9 ++++++++-
 lib/ionic/setup.js   | 11 ++++++++++-
 lib/ionic/upload.js  | 11 ++++++++++-
 8 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44aca1b213..be23ca7a80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.5
+
+* Added a check in reading to read the ionic.project file in and catches and reports any exception that may from loading invalid characters in JSON.
+
 ### 1.3.4
 
 * Added the ionic news updates for when `ionic start` finishes - alerts the users of the latest changes for ionic
diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 68eaafc11d..735e150b0a 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -49,7 +49,14 @@ IonicTask.prototype.run = function(ionic) {
 };
 
 IonicTask.prototype.versions = function(self) {
-  var project = IonicProject.load();
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    self.ionic.fail(ex.message);
+    return
+  }
 
   if (!project.get('app_id')) {
     console.log("No versions uploaded!".bold.red);
@@ -110,7 +117,14 @@ IonicTask.prototype.versions = function(self) {
 }
 
 IonicTask.prototype.deploy = function(self) {
-  var project = IonicProject.load();
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    self.ionic.fail(ex.message);
+    return
+  }
 
   var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/deploy';
 
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 1772c9ba41..da0aa863b1 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -390,7 +390,15 @@ IonicTask.prototype.revertBrowser = function revertBrowser() {
 }
 
 IonicTask.prototype.saveBrowserInstallation = function saveBrowserInstallation(platform, browser, version) {
-  var project = IonicProject.load();
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
+
   var browsers = project.get('browsers') || [];
   var platformExists = false, platformIndex = 0;
   var browserEntry = { platform: platform, browser: browser, version: version };
@@ -525,7 +533,14 @@ IonicTask.prototype.listBrowsers = function listBrowsers() {
 }
 
 IonicTask.prototype.listInstalledBrowsers = function listInstalledBrowsers() {
-  var project = IonicProject.load();
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
 
   var browsers = project.get('browsers');
 
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 61bbb67d95..39949ef5fb 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -21,7 +21,16 @@ IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
 
-  self.project = IonicProject.load();
+  self.project = null;
+
+  try {
+    self.project = IonicProject.load();
+  } catch (ex) {
+    self.ionic.fail(ex.message);
+    return
+  }
+
+
   self.inputFiles = {};
   self.inputValues = {};
   self.useCmdArgs = false;
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
index d5c294fa01..d72872a481 100644
--- a/lib/ionic/project.js
+++ b/lib/ionic/project.js
@@ -11,8 +11,11 @@ module.exports = {
     this.file = this.PROJECT_FILE;
 
     if(fs.existsSync(this.file)) {
-      this.data = JSON.parse(fs.readFileSync(this.file));
-
+      try {
+        this.data = JSON.parse(fs.readFileSync(this.file));      
+      } catch(ex) {
+        throw new Error('There was an error loading your ionic.project file: ' + ex.message);
+      }
     } else {
       if(fs.existsSync('www')) {
         var parts = path.resolve('./').split(path.sep);
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 48b31f52bb..890c74438e 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -50,7 +50,14 @@ IonicTask.prototype.run = function(ionic) {
 
 
 IonicTask.prototype.loadSettings = function(cb) {
-  var project = IonicProject.load();
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
   var self = this;
 
   this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 8a4adc01e1..818cbceb69 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -34,6 +34,7 @@ IonicTask.prototype.run = function(ionic) {
 IonicTask.prototype.sassSetup = function(ionic) {
   var q = Q.defer();
   var self = this;
+  self.ionic = ionic;
 
   this.npmInstall().then(function(){
 
@@ -70,7 +71,15 @@ IonicTask.prototype.sassSetup = function(ionic) {
         }
       }
 
-      var project = IonicProject.load();
+      var project = null;
+
+      try {
+        project = IonicProject.load();
+      } catch (ex) {
+        self.ionic.fail(ex.message);
+        return
+      }
+
       var gulpStartupTasks = project.get('gulpStartupTasks') || [];
       var hasSass, hasWatch;
       gulpStartupTasks.forEach(function(taskName){
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index cf93cde5d5..f6904e4640 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -14,7 +14,16 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, callback) {
-  var project = IonicProject.load();
+  var project = null;
+  this.ionic = ionic;
+
+  try {
+    project = IonicProject.load();
+  }catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
+
   var self = this;
 
   // The note is a short, optional description for a version

From e2eb5045f22c7e577d60a324e36232dc8072350d Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Tue, 3 Feb 2015 20:51:30 -0600
Subject: [PATCH 0416/1100] Added signup prompt

---
 lib/ionic/start.js  |   53 ++-
 npm-shrinkwrap.json | 1075 +++++++++++++++++++++++++++----------------
 package.json        |    4 +-
 3 files changed, 736 insertions(+), 396 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index fe76db1574..729daa3523 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,9 +9,11 @@ var fs = require('fs'),
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
+    open = require('open'),
     xml2js = require('xml2js'),
     IonicProject = require('./project'),
     IonicTemplates = require('./templates').IonicTask,
+    IonicStore = require('./store').IonicStore,
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats;
 
@@ -219,7 +221,7 @@ IonicTask.prototype.loadAppSetup = function() {
 IonicTask.prototype.fetchCreatorApp = function() {
   var self = this;
   var appId = this.template.split(':')[1];
-  var downloadUrl = Ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
+  var downloadUrl = ionic.ionic_dash + path.join('/api/v1/creator', appId, 'download/html');
   var wwwPath = path.join(this.targetPath, 'www');
 
   console.log('\nDownloading Creator Prototype:'.bold, downloadUrl);
@@ -695,8 +697,52 @@ IonicTask.prototype.updateLibFiles = function() {
   }
 };
 
+IonicTask.prototype.promptLogin = function() {
+  var ionicConfig = new IonicStore('ionic.config');
+
+  if(ionicConfig) {
+    // Check if we already asked
+    var didPrompt = ionicConfig.get('accountPrompt');
+    if(didPrompt == 'y') {
+      /*
+      console.log('\n' + 'New!'.green.bold + ' Create an ionic.io account and try the View App!\n' + Ionic.IONIC_DASH + '/signup');
+      */
+      return;
+    }
+    ionicConfig.set('accountPrompt', 'y');
+    ionicConfig.save();
+  }
+
+  console.log('\nCreate an ionic.io account to use the Ionic View app and other features?');
+
+
+  var promptProperties = {
+    shouldCreate: {
+      name: 'shouldCreate',
+      description: '(Y/n):'.yellow.bold,
+    }
+  };
+
+  prompt.override = argv;
+  prompt.message = '';
+  prompt.delimiter = '';
+  prompt.start();
+
+  prompt.get({properties: promptProperties}, function (err, promptResult) {
+    if(err) {
+      return console.log(err);
+    }
+
+    var areYouSure = promptResult.shouldCreate.toLowerCase().trim();
+    if(areYouSure.toLowerCase() != 'n') {
+      // If they want to, let's open a thing
+      open(Ionic.IONIC_DASH + '/signup');
+    }
+  });
+};
 
 IonicTask.prototype.finalize = function() {
+  var self = this;
 
   this.updateLibFiles();
 
@@ -738,9 +784,12 @@ IonicTask.prototype.finalize = function() {
 
   this.printQuickHelp();
 
-  this.ionic.printNewsUpdates(true);
+  this.ionic.printNewsUpdates(true).then(function() {
+    self.promptLogin();
+  });
 
   IonicStats.t();
+
 };
 
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 385af9cfbc..42e47dfc6d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -8,13 +8,13 @@
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
-          "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "version": "1.1.13-1",
+          "from": "readable-stream@~1.1.9",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@~1.0.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -23,30 +23,30 @@
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "version": "0.10.25-1",
+              "from": "string_decoder@~0.10.x",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@~2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "from": "zip-stream@~0.1.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.27-1",
+              "from": "readable-stream@~1.0.24",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@~1.0.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -55,47 +55,47 @@
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "version": "0.10.25-1",
+                  "from": "string_decoder@~0.10.x",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "from": "lodash.defaults@~2.4.1",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "lodash.keys@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "lodash._isnative@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "lodash.isobject@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "lodash._shimkeys@~2.4.1",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "from": "lodash._objecttypes@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
+          "from": "lazystream@~0.1.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.27-1",
+              "from": "readable-stream@~1.0.2",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "core-util-is@~1.0.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -123,13 +123,13 @@
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "version": "0.10.25-1",
+                  "from": "string_decoder@~0.10.x",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
+          "from": "file-utils@~0.1.5",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
+              "from": "lodash@~2.1.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "from": "iconv-lite@~0.2.11",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "rimraf@~2.2.2",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
+              "from": "glob@~3.2.6",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "minimatch@0.3",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "lru-cache@2",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "sigmund@~1.0.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,139 +187,139 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@~0.2.12",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "lru-cache@2",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "sigmund@~1.0.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "findup-sync@~0.1.2",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "lodash@~2.4.1",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "from": "isbinaryfile@~0.1.9",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@~2.4.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "colors@^0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
+          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
+      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "crc@3.2.1",
+      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "event-stream@3.0.x",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
-          "version": "2.3.6",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+          "version": "2.3.4",
+          "from": "through@~2.3.1",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "duplexer@~0.1.1",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "from@~0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.5",
-          "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
+          "version": "0.0.4",
+          "from": "map-stream@~0.0.3",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -328,49 +328,49 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "split@0.2",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "stream-combiner@~0.0.3",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "form-data@~0.1.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "version": "0.0.5",
+          "from": "combined-stream@~0.0.4",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -381,152 +381,152 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "mime@~1.2.9",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@>=0.9.0 <0.10.0",
+          "from": "async@~0.9.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "gulp@3.8.8",
+      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
+          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.3",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.11 <2.0.0",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@*",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.0.0",
-                  "from": "meow@*",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "get-stdin": {
                           "version": "3.0.2",
-                          "from": "get-stdin@>=3.0.0 <4.0.0",
+                          "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
                         },
                         "repeating": {
                           "version": "1.1.1",
-                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "2.1.0",
-                              "from": "meow@>=2.0.0 <3.0.0",
+                              "from": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz"
                             }
                           }
@@ -539,79 +539,79 @@
             },
             "lodash.reescape": {
               "version": "3.0.0",
-              "from": "lodash.reescape@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz"
             },
             "lodash.reevaluate": {
               "version": "3.0.0",
-              "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz"
             },
             "lodash.reinterpolate": {
               "version": "3.0.0",
-              "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.0.0",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.1",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
                 },
                 "lodash.iserror": {
                   "version": "3.0.0",
-                  "from": "lodash.iserror@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.2",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.0",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
                     },
                     "lodash.isnative": {
                       "version": "3.0.0",
-                      "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
                     }
                   }
                 },
                 "lodash.templatesettings": {
                   "version": "3.0.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
                   "dependencies": {
                     "lodash.escape": {
                       "version": "3.0.0",
-                      "from": "lodash.escape@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                     }
                   }
@@ -620,37 +620,37 @@
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -661,66 +661,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "object-assign@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
+              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.3 <0.7.0",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.3 <0.5.0",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
+                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -729,42 +729,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
+          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
+          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -773,51 +773,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -826,34 +826,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
+          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "user-home@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -867,7 +867,7 @@
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1431,22 +1431,22 @@
     },
     "opbeat": {
       "version": "1.1.2",
-      "from": "opbeat@>=1.0.7 <2.0.0",
+      "from": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
       "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
-          "from": "after-all@>=2.0.1 <3.0.0",
+          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "once@>=1.3.0 <2.0.0",
+              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -1455,22 +1455,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "stackman@>=0.2.2 <0.3.0",
+          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "stackback@0.0.2",
+              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -1479,7 +1479,7 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -1489,12 +1489,12 @@
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "wordwrap@~0.0.2",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "minimist@~0.0.1",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1511,34 +1511,34 @@
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "pkginfo@0.x.x",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "read@1.0.x",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "mute-stream@~0.0.4",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "revalidator@0.1.x",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "utile@0.2.x",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "async@~0.2.9",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
@@ -1548,12 +1548,12 @@
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "i@0.3.x",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@0.x.x",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1565,44 +1565,44 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2.x.x",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "winston@0.6.x",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "async@0.1.x",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "cycle@1.0.x",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "eyes@0.1.x",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "pkginfo@0.2.x",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "request@2.9.x",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "stack-trace@0.0.x",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1611,47 +1611,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "q@^1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "request@2.51.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
+          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1660,32 +1660,32 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
+          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "async": {
               "version": "0.9.0",
-              "from": "async@>=0.9.0 <0.10.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "mime-types": {
               "version": "2.0.8",
-              "from": "mime-types@>=2.0.3 <2.1.0",
+              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.6.0",
-                  "from": "mime-db@>=1.6.0 <1.7.0",
+                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz"
                 }
               }
@@ -1694,113 +1694,113 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.2",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
           "version": "0.12.1",
-          "from": "tough-cookie@>=0.12.0",
+          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "punycode@>=0.2.0",
+              "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
               "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
+          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "ctype@0.5.3",
+              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "hawk@1.1.1",
+          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
+              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "stringstream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -1809,81 +1809,81 @@
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.1",
-              "from": "debug@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz"
             },
             "depd": {
               "version": "1.0.0",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -1900,27 +1900,27 @@
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "qs@~0.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "faye-websocket@~0.4.3",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
+          "from": "noptify@~0.0.3",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "nopt@~2.0.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "abbrev@1",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1929,14 +1929,14 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "debug@~0.7.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
+      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
@@ -1945,88 +1945,81 @@
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
-          "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "version": "0.1.29",
+          "from": "fstream@~0.1.21",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.5",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+              "version": "3.0.2",
+              "from": "graceful-fs@~3.0.2",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@~2.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
-              "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
+              "version": "0.3.5",
+              "from": "mkdirp@0.3",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@2.x.x",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
-          "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "version": "0.4.0",
+          "from": "pullstream@~0.4.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "over@~0.0.5",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
-              "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+              "version": "0.0.0",
+              "from": "slice-stream@0.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "binary@~0.3.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "chainsaw@~0.1.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "traverse@>=0.3.0 <0.4",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@~0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "version": "1.0.27-1",
+          "from": "readable-stream@~1.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "core-util-is@~1.0.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -2035,30 +2028,30 @@
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "version": "0.10.25-1",
+              "from": "string_decoder@~0.10.x",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@~2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "setimmediate@~1.0.1",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "match-stream@~0.0.2",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "buffers@~0.1.1",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -2067,44 +2060,32 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
-          "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "version": "3.1.15",
+          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.5",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
+              "version": "4.0.6",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -2112,103 +2093,89 @@
               }
             },
             "minimatch": {
-              "version": "2.0.1",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
               "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.0",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                    }
-                  }
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "ordered-read-streams": {
-              "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+              "version": "0.0.8",
+              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
             },
             "glob2base": {
-              "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "dependencies": {
-                "find-index": {
-                  "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                }
-              }
+              "version": "0.0.11",
+              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2220,96 +2187,91 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.2 <3.1.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+          "version": "3.0.4",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "version": "1.0.33-1",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "version": "0.4.3",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
           "dependencies": {
-            "clone": {
-              "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-            },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2318,23 +2280,352 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@0.4.4",
+      "from": "xml2js@^0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
-          "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+          "version": "0.6.0",
+          "from": "sax@0.6.x",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.0.tgz"
         },
         "xmlbuilder": {
-          "version": "2.5.0",
+          "version": "2.3.0",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.3.0.tgz",
           "dependencies": {
-            "lodash": {
-              "version": "3.0.1",
-              "from": "lodash@>=3.0.1 <3.1.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.0.1.tgz"
+            "lodash.assign": {
+              "version": "2.4.1",
+              "from": "lodash.assign@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
+              "dependencies": {
+                "lodash._basecreatecallback": {
+                  "version": "2.4.1",
+                  "from": "lodash._basecreatecallback@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash.bind": {
+                      "version": "2.4.1",
+                      "from": "lodash.bind@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._createwrapper": {
+                          "version": "2.4.1",
+                          "from": "lodash._createwrapper@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
+                          "dependencies": {
+                            "lodash._basebind": {
+                              "version": "2.4.1",
+                              "from": "lodash._basebind@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
+                              "dependencies": {
+                                "lodash._basecreate": {
+                                  "version": "2.4.1",
+                                  "from": "lodash._basecreate@~2.4.1",
+                                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                                  "dependencies": {
+                                    "lodash._isnative": {
+                                      "version": "2.4.1",
+                                      "from": "lodash._isnative@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                                    },
+                                    "lodash.noop": {
+                                      "version": "2.4.1",
+                                      "from": "lodash.noop@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash._basecreatewrapper": {
+                              "version": "2.4.1",
+                              "from": "lodash._basecreatewrapper@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
+                              "dependencies": {
+                                "lodash._basecreate": {
+                                  "version": "2.4.1",
+                                  "from": "lodash._basecreate@~2.4.1",
+                                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                                  "dependencies": {
+                                    "lodash._isnative": {
+                                      "version": "2.4.1",
+                                      "from": "lodash._isnative@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                                    },
+                                    "lodash.noop": {
+                                      "version": "2.4.1",
+                                      "from": "lodash.noop@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash._slice": {
+                          "version": "2.4.1",
+                          "from": "lodash._slice@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash.identity": {
+                      "version": "2.4.1",
+                      "from": "lodash.identity@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"
+                    },
+                    "lodash._setbinddata": {
+                      "version": "2.4.1",
+                      "from": "lodash._setbinddata@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash.noop": {
+                          "version": "2.4.1",
+                          "from": "lodash.noop@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash.support": {
+                      "version": "2.4.1",
+                      "from": "lodash.support@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash.keys": {
+                  "version": "2.4.1",
+                  "from": "lodash.keys@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1",
+                      "from": "lodash._isnative@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                    },
+                    "lodash._shimkeys": {
+                      "version": "2.4.1",
+                      "from": "lodash._shimkeys@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                    }
+                  }
+                },
+                "lodash._objecttypes": {
+                  "version": "2.4.1",
+                  "from": "lodash._objecttypes@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                }
+              }
+            },
+            "lodash.create": {
+              "version": "2.4.1",
+              "from": "lodash.create@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-2.4.1.tgz",
+              "dependencies": {
+                "lodash._basecreate": {
+                  "version": "2.4.1",
+                  "from": "lodash._basecreate@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._isnative": {
+                      "version": "2.4.1",
+                      "from": "lodash._isnative@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                    },
+                    "lodash.noop": {
+                      "version": "2.4.1",
+                      "from": "lodash.noop@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash.isobject": {
+              "version": "2.4.1",
+              "from": "lodash.isobject@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+              "dependencies": {
+                "lodash._objecttypes": {
+                  "version": "2.4.1",
+                  "from": "lodash._objecttypes@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                }
+              }
+            },
+            "lodash.isarray": {
+              "version": "2.4.1",
+              "from": "lodash.isarray@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz",
+              "dependencies": {
+                "lodash._isnative": {
+                  "version": "2.4.1",
+                  "from": "lodash._isnative@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                }
+              }
+            },
+            "lodash.isfunction": {
+              "version": "2.4.1",
+              "from": "lodash.isfunction@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"
+            },
+            "lodash.isempty": {
+              "version": "2.4.1",
+              "from": "lodash.isempty@~2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-2.4.1.tgz",
+              "dependencies": {
+                "lodash.forown": {
+                  "version": "2.4.1",
+                  "from": "lodash.forown@~2.4.1",
+                  "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash._basecreatecallback": {
+                      "version": "2.4.1",
+                      "from": "lodash._basecreatecallback@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash.bind": {
+                          "version": "2.4.1",
+                          "from": "lodash.bind@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
+                          "dependencies": {
+                            "lodash._createwrapper": {
+                              "version": "2.4.1",
+                              "from": "lodash._createwrapper@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
+                              "dependencies": {
+                                "lodash._basebind": {
+                                  "version": "2.4.1",
+                                  "from": "lodash._basebind@~2.4.1",
+                                  "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
+                                  "dependencies": {
+                                    "lodash._basecreate": {
+                                      "version": "2.4.1",
+                                      "from": "lodash._basecreate@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                                      "dependencies": {
+                                        "lodash._isnative": {
+                                          "version": "2.4.1",
+                                          "from": "lodash._isnative@~2.4.1",
+                                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                                        },
+                                        "lodash.noop": {
+                                          "version": "2.4.1",
+                                          "from": "lodash.noop@~2.4.1",
+                                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "lodash._basecreatewrapper": {
+                                  "version": "2.4.1",
+                                  "from": "lodash._basecreatewrapper@~2.4.1",
+                                  "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
+                                  "dependencies": {
+                                    "lodash._basecreate": {
+                                      "version": "2.4.1",
+                                      "from": "lodash._basecreate@~2.4.1",
+                                      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
+                                      "dependencies": {
+                                        "lodash._isnative": {
+                                          "version": "2.4.1",
+                                          "from": "lodash._isnative@~2.4.1",
+                                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                                        },
+                                        "lodash.noop": {
+                                          "version": "2.4.1",
+                                          "from": "lodash.noop@~2.4.1",
+                                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash._slice": {
+                              "version": "2.4.1",
+                              "from": "lodash._slice@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
+                            }
+                          }
+                        },
+                        "lodash.identity": {
+                          "version": "2.4.1",
+                          "from": "lodash.identity@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"
+                        },
+                        "lodash._setbinddata": {
+                          "version": "2.4.1",
+                          "from": "lodash._setbinddata@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
+                          "dependencies": {
+                            "lodash._isnative": {
+                              "version": "2.4.1",
+                              "from": "lodash._isnative@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                            },
+                            "lodash.noop": {
+                              "version": "2.4.1",
+                              "from": "lodash.noop@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
+                            }
+                          }
+                        },
+                        "lodash.support": {
+                          "version": "2.4.1",
+                          "from": "lodash.support@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
+                          "dependencies": {
+                            "lodash._isnative": {
+                              "version": "2.4.1",
+                              "from": "lodash._isnative@~2.4.1",
+                              "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "from": "lodash.keys@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1",
+                          "from": "lodash._shimkeys@~2.4.1",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@~2.4.1",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                    }
+                  }
+                }
+              }
             }
           }
         }
diff --git a/package.json b/package.json
index 560ef5a581..9fd5a06605 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -57,7 +57,7 @@
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat": "^1.0.7",
-    "open": "0.0.5",
+    "open": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
     "optimist": "0.6.0",
     "progress": "1.1.7",
     "prompt": "0.2.12",

From 45e72c6b8188f15124e862933cab8d4401e8f8f3 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Tue, 3 Feb 2015 20:58:20 -0600
Subject: [PATCH 0417/1100] Fixed bad lowercasing

---
 lib/ionic/start.js | 2 +-
 package.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 729daa3523..ec7b9c2456 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -221,7 +221,7 @@ IonicTask.prototype.loadAppSetup = function() {
 IonicTask.prototype.fetchCreatorApp = function() {
   var self = this;
   var appId = this.template.split(':')[1];
-  var downloadUrl = ionic.ionic_dash + path.join('/api/v1/creator', appId, 'download/html');
+  var downloadUrl = ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
   var wwwPath = path.join(this.targetPath, 'www');
 
   console.log('\nDownloading Creator Prototype:'.bold, downloadUrl);
diff --git a/package.json b/package.json
index 9fd5a06605..dd2092f922 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a9fd6a3a0baacad57d457415a18febc153d22b95 Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Tue, 3 Feb 2015 20:59:59 -0600
Subject: [PATCH 0418/1100] Another vim thing

---
 lib/ionic/start.js | 2 +-
 package.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ec7b9c2456..a065d8e432 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -221,7 +221,7 @@ IonicTask.prototype.loadAppSetup = function() {
 IonicTask.prototype.fetchCreatorApp = function() {
   var self = this;
   var appId = this.template.split(':')[1];
-  var downloadUrl = ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
+  var downloadUrl = Ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
   var wwwPath = path.join(this.targetPath, 'www');
 
   console.log('\nDownloading Creator Prototype:'.bold, downloadUrl);
diff --git a/package.json b/package.json
index dd2092f922..d5976099ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 715b59cd6d862f92160673e58a20722ddf9c16c6 Mon Sep 17 00:00:00 2001
From: jvannistelrooy <jvannistelrooy@gmail.com>
Date: Wed, 4 Feb 2015 09:58:49 +0100
Subject: [PATCH 0419/1100] Update README

The ionic serve flag `--labs` should be `--lab`
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3abfb064a..e4e229ff43 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ __Command-line flags/options:__
     [--nolivereload|-r] .....  Do not start live reload
     [--noproxy|-x] ..........  Do not add proxies
     [--address] .............  Serves in the browser at the specified address
-    [--labs] ................  Serves both iOS and Android in the browser
+    [--lab] ................  Serves both iOS and Android in the browser
 
 ## Using Ionic Labs
 

From a14766e1ee30ace59d5397d5cac80bc8175e69c3 Mon Sep 17 00:00:00 2001
From: jvannistelrooy <jvannistelrooy@gmail.com>
Date: Wed, 4 Feb 2015 09:59:49 +0100
Subject: [PATCH 0420/1100] Update README

Add a dot for correct spacing
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4e229ff43..319b6cbf18 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ __Command-line flags/options:__
     [--nolivereload|-r] .....  Do not start live reload
     [--noproxy|-x] ..........  Do not add proxies
     [--address] .............  Serves in the browser at the specified address
-    [--lab] ................  Serves both iOS and Android in the browser
+    [--lab] .................  Serves both iOS and Android in the browser
 
 ## Using Ionic Labs
 

From f384a699fc34751411ce6f27f944036a9076ecaf Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Feb 2015 09:52:31 -0700
Subject: [PATCH 0421/1100] Updating changelog

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44aca1b213..331b943a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### 1.3.7
+
+* Fixed some capitalization errors on the Ionic download url
+
+### 1.3.6
+
+* Fixed some bad lowercasing in the sign up prompt with IONIC_DASH
+
+### 1.3.5
+
+* Added a sign up prompt after starting a new ionic app to create an ionic.io account to take advantage of all the extra features Ionic has to provide.
+
 ### 1.3.4
 
 * Added the ionic news updates for when `ionic start` finishes - alerts the users of the latest changes for ionic

From 2b10375c703ae45be40b09aa3649075becf2f9b9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Feb 2015 14:47:24 -0700
Subject: [PATCH 0422/1100] Adding a clean command to clean up old cordova
 android and engine remnants. Added the copying over of xwalk libraries to
 crosswalk engine, and made sure those run if the xwalk libs are already
 downloaded. Removed the update android sdk methods

---
 lib/ionic/browser.js | 105 ++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index da0aa863b1..37f4f4e5f4 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -136,20 +136,39 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
   return q.promise;
 }
 
-IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
-  var command = 'echo "y" | android update sdk --no-ui --all --filter 10';
-  console.log('\nFetching Android SDK API 19.1.0')
-  var result = shelljs.exec(command, { silent: true } );
+// IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
+//   var command = 'echo "y" | android update sdk --no-ui --all --filter 10';
+//   console.log('\nFetching Android SDK API 19.1.0')
+//   // var result = shelljs.exec(command, { silent: true } );
+
+//   // if(result.code != 0) {
+//   //   var errorMessage = 'Had an error fetching the Android SDK required for Crosswalk.';
+//   //   this.ionic.fail(errorMessage);
+//   //   throw new Error(errorMessage);
+//   // }
+// }
+
+IonicTask.prototype.copyInCrosswalkLibrariesToCrosswalkEngine = function copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version) {
+  var copyMessage = ['\nCopying over Crosswalk Webview (', architecture, ') to the Crosswalk Engine\n'].join('');
+  console.log(copyMessage)
+  var xwalkFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
+  var fileName = fs.readdirSync(xwalkFilePath);
+  var cordovaCrosswalkFolder = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+  var copySource = path.join(xwalkFilePath, fileName[0], '*');
+
+  var copyDestination = path.join(process.cwd(), 'engine', cordovaCrosswalkFolder, 'libs', 'xwalk_core_library', '/');
+
+  // console.log('copying - ', copySource, copyDestination)
+
+  shelljs.cp('-R', copySource, copyDestination);
+  var copyCompleteMessage = ['Finished copying Crosswalk Webview (', architecture, ') to the Crosswalk Engine'].join('');
+  console.log(copyCompleteMessage)
 
-  if(result.code != 0) {
-    var errorMessage = 'Had an error fetching the Android SDK required for Crosswalk.';
-    this.ionic.fail(errorMessage);
-    throw new Error(errorMessage);
-  }
 }
 
-function downloadCrosswalkWebview(architecture, version, releaseStatus) {
+IonicTask.prototype.downloadCrosswalkWebview = function downloadCrosswalkWebview(architecture, version, releaseStatus) {
   var q = Q.defer();
+  var self = this;
 
   var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/' + releaseStatus + '/' +
     version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip';
@@ -164,21 +183,15 @@ function downloadCrosswalkWebview(architecture, version, releaseStatus) {
   var xwalkArchPath = path.join(tempZipFilePath, xwalkPath)
 
   if(fs.existsSync(xwalkArchPath)) {
+    //We've already downloaded it. Copy it over!
+    self.copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version)
     q.resolve()
     return;
   }
 
   Ionic.fetchArchive(tempZipFilePath, downloadUrl)
   .then(function(data) {
-    //Need to go copy to android directory.
-    var fileName = fs.readdirSync(tempZipFilePath);
-    var cordovaCrosswalkFolder = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-    var copySource = path.join(tempZipFilePath, fileName[0], '*');
-
-    var copyDestination = path.join(process.cwd(), 'engine', cordovaCrosswalkFolder, 'libs', 'xwalk_core_library', '/');
-
-    var cpResult = shelljs.cp('-R', copySource, copyDestination);
-
+    self.copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version)
     q.resolve(data);
   }, function(error) {
     console.log('Crosswalk webviews failed to download - ')
@@ -209,8 +222,8 @@ IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version
     releaseStatus = 'canary';
   }
 
-  var armPromise = downloadCrosswalkWebview('arm', version, releaseStatus);
-  var x86Promise = downloadCrosswalkWebview('x86', version, releaseStatus);
+  var armPromise = this.downloadCrosswalkWebview('arm', version, releaseStatus);
+  var x86Promise = this.downloadCrosswalkWebview('x86', version, releaseStatus);
 
   return Q.all([armPromise, x86Promise]);
 }
@@ -274,16 +287,15 @@ IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
   console.log('\nAdded Crosswalk Webview Engine')
 }
 
-IonicTask.prototype.removeOldCrosswalkEngine = function removeOldCrosswalkEngine() {
-  var rmCmd = 'cordova plugin rm org.apache.cordova.engine.crosswalk';
-  var result = shelljs.exec(rmCmd);
+IonicTask.prototype.removeCrosswalkEngines = function removeCrosswalkEngines() {
+  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk');
+  shelljs.exec('cordova plugin rm org.crosswalk.engine');
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
   var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
   var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
   var updateCommand = ['android update lib-project --path "', xwalkLibraryPath, '" --target "4"'].join('');
-  // console.log('Running:', updateCommand)
 
   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
 
@@ -305,12 +317,12 @@ IonicTask.prototype.downloadFiles = function downloadFiles(version) {
     console.log('\nDownloaded Cordova Android for Crosswalk');
     return self.getCrosswalkWebviews(version);
   })
+  // .then(function(data) {
+  //   console.log('\nDownloaded Crosswalk webviews');
+  //   return self.getAndroidRuntimes();
+  // })
   .then(function(data) {
     console.log('\nDownloaded Crosswalk webviews');
-    return self.getAndroidRuntimes();
-  })
-  .then(function(data) {
-    console.log('\nDownloaded Android runtime (API 19)');
     q.resolve();
   }, function(error) {
     q.reject();
@@ -336,8 +348,8 @@ IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   self.downloadFiles(version)
   .then(function(data) {
     self.removeAndroidProject();
+    self.removeCrosswalkEngines();
     self.addCordova40xProject();
-    self.removeOldCrosswalkEngine();
     self.addCrosswalkPlugin();
     self.updateAndroidProject();
 
@@ -350,10 +362,15 @@ IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   })
 }
 
+IonicTask.prototype.clean = function clean() {
+  console.log('Cleaning up Ionic browser artifacts'.green)
+  shelljs.rm('-rf', './engine');
+  console.log('Cleaned'.yellow)
+}
+
 IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk() {
   console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
-  //Old plugin name: org.apache.cordova.engine.crosswalk
-  //New plugin name: org.crosswalk.engine
+  this.clean();
   this.installCrosswalk(crosswalkVersions[2].version);
   
 }
@@ -390,15 +407,7 @@ IonicTask.prototype.revertBrowser = function revertBrowser() {
 }
 
 IonicTask.prototype.saveBrowserInstallation = function saveBrowserInstallation(platform, browser, version) {
-  var project = null;
-
-  try {
-    project = IonicProject.load();
-  } catch (ex) {
-    this.ionic.fail(ex.message);
-    return
-  }
-
+  var project = IonicProject.load();
   var browsers = project.get('browsers') || [];
   var platformExists = false, platformIndex = 0;
   var browserEntry = { platform: platform, browser: browser, version: version };
@@ -533,14 +542,7 @@ IonicTask.prototype.listBrowsers = function listBrowsers() {
 }
 
 IonicTask.prototype.listInstalledBrowsers = function listInstalledBrowsers() {
-  var project = null;
-
-  try {
-    project = IonicProject.load();
-  } catch (ex) {
-    this.ionic.fail(ex.message);
-    return
-  }
+  var project = IonicProject.load();
 
   var browsers = project.get('browsers');
 
@@ -566,7 +568,7 @@ IonicTask.prototype.run = function run(ionic) {
 
   cmdArg = argv._[1]
 
-  var validCommands = 'add remove rm list ls revert versions upgrade'.split(' ');
+  var validCommands = 'add remove rm list ls revert versions clean upgrade'.split(' ');
   for(y=0; y<validCommands.length; y++) {
     if(cmdArg == validCommands[y]) {
       hasValidCmd = true;
@@ -583,6 +585,9 @@ IonicTask.prototype.run = function run(ionic) {
     case 'add':
       this.addBrowser();
       break;
+    case 'clean':
+      this.clean();
+      break;
     case 'remove':
     case 'rm':
       this.removeBrowser();

From 00050d05e87cf70a582831c59cbf5cfe404d7d80 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Feb 2015 14:50:15 -0700
Subject: [PATCH 0423/1100] Updating latest to 1.3.8, updating changelog

---
 CHANGELOG.md | 4 +++-
 package.json | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 743b253d09..6b7a5cf471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
-### NEXT
+### 1.3.8
 
 * Added a check in reading to read the ionic.project file in and catches and reports any exception that may from loading invalid characters in JSON.
+* Added in an additional browser command `ionic browser clean` that will clean out all the artifacts from the browser additions
+* Modified the browser addition process by copying crosswalk libraries over as its own method, and calling this even if the xwalk libraries are downloaded.
 
 ### 1.3.7
 
diff --git a/package.json b/package.json
index d5976099ca..9a1c58a40b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e917348bb4662c890f8dd336a23079c223c87076 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Feb 2015 15:19:05 -0700
Subject: [PATCH 0424/1100] Updating the error message

---
 lib/ionic/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 1277e05182..260434ff43 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -40,7 +40,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
       }
       q.resolve(templatesJson);
     } else {
-      console.log('Unable to fetch', err, res.statusCode);
+      console.log('Unable to fetch the starter templates. Please check your internet connection'.red);
       q.reject(res);
     }
   });

From 0c49c3bc397cc2167f8f582a6c83d8a93aaafc9d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Feb 2015 15:20:31 -0700
Subject: [PATCH 0425/1100] Fixing the message for when fetching the file fails

---
 lib/ionic/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 1fc2157f5b..369b63030c 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -37,7 +37,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
       }
       q.resolve(templatesJson);
     } else {
-      console.log('Unable to fetch', err, res.statusCode);
+      console.log('Unable to fetch the starter templates. Please check your internet connection'.red);
       q.reject(res);
     }
   });

From a93b162c23bd871870bf7a870655b1364c738de4 Mon Sep 17 00:00:00 2001
From: Chris Duell <me@chrisduell.com>
Date: Thu, 5 Feb 2015 10:34:11 +1100
Subject: [PATCH 0426/1100] Fix for livereload on IP based addresses

postToLiveReload was assuming that the server was running localhost, this allows it to run on an IP based address
---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 890c74438e..ad9f23df6a 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -593,7 +593,7 @@ IonicTask.prototype._goToHistory = function(goHistory) {
 
 IonicTask.prototype._postToLiveReload = function(files) {
 
-  request.post('http://localhost:' + this.liveReloadPort + '/changed', {
+  request.post('http://' + this.address + ':' + this.liveReloadPort + '/changed', {
     path: '/changed',
     method: 'POST',
     body: JSON.stringify({

From 3f66ce223c972dda515ed78fecec06a1679418b3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Feb 2015 17:07:34 -0700
Subject: [PATCH 0427/1100] Fixing a bug where if no gulp processes are
 spawned, it wouldnt try to kill a non-existent process

---
 lib/ionic/serve.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 890c74438e..bdb781872f 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -107,7 +107,9 @@ IonicTask.prototype.loadSettings = function(cb) {
       self.printCommandTips();
 
     } else if(input == 'quit' || input == 'q') {
-      self.childProcess.kill('SIGTERM');
+      if(self.childProcess) {
+        self.childProcess.kill('SIGTERM');
+      }
       process.exit();
 
     } else if(input == 'clear' || input == 'clr') {

From 856d51610dee62105a8947383a4fdb2de1c325cf Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Feb 2015 17:11:00 -0700
Subject: [PATCH 0428/1100] Fixing an error where it tries to read a promise
 from a null/undefined object.

---
 lib/ionic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index cd3107c306..9dc547044a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -681,7 +681,7 @@ Ionic = {
   },
 
   processExit: function(code) {
-    if(this.cliNews.promise) {
+    if(this.cliNews && this.cliNews.promise) {
       Q.all([this.latestVersion.promise, this.cliNews.promise])
       .then(function() {
         process.exit(code);

From 11b367f2fce04845f1edd712340ca38b309d083b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 6 Feb 2015 09:27:15 -0700
Subject: [PATCH 0429/1100] Updating changelog for previous changes

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7a5cf471..1dacf0c230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Next
+
+* Fixed an error where running `ionic serve` and then pressing `q` in the console would have an error trying to close a non-existent process
+* Fixing an error where it tries to read a promise from a null/undefined object.
+* Updating the error message for if/when `ionic templates` fails to download latest templates
+
+
 ### 1.3.8
 
 * Added a check in reading to read the ionic.project file in and catches and reports any exception that may from loading invalid characters in JSON.

From 6351380e8fd7b4e1a75be8e41bd5206b267f3b53 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 6 Feb 2015 10:32:24 -0700
Subject: [PATCH 0430/1100] Adding version checking for cordova cli and node.
 Set minimums to 4.2.0 and 0.10.33 respectively. Added in semver as node
 module to help with version checking

---
 CHANGELOG.md         |  4 +++-
 lib/ionic/browser.js |  9 ++++++++-
 lib/ionic/info.js    | 31 ++++++++++++++++++++++++++++++-
 package.json         |  1 +
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dacf0c230..c79ff9adbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@
 * Fixed an error where running `ionic serve` and then pressing `q` in the console would have an error trying to close a non-existent process
 * Fixing an error where it tries to read a promise from a null/undefined object.
 * Updating the error message for if/when `ionic templates` fails to download latest templates
-
+* Added semver to the required node modules for version checking
+* Added a version checking utility for cordova cli and node - `ionic info` tells you what you need to run correctly
+* Added a version check in the browser command - that way you can stay up to date where it matters
 
 ### 1.3.8
 
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 37f4f4e5f4..3f15509f27 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -27,7 +27,8 @@ var fs = require('fs'),
     Ionic = require('../ionic').Ionic,
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
-    IonicProject = require('./project');
+    IonicProject = require('./project'),
+    IonicInfo = require('./info').IonicTask;
 
 shelljs.config.silent = true;
 
@@ -560,6 +561,12 @@ IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
 
+  var infoChecker = new IonicInfo();
+  if(!infoChecker.checkRuntime()) {
+    console.log('\nPlease update your runtime environment before running the browser command');
+    return
+  }
+
   if(argv._.length < 2) {
     return this.ionic.fail('Invalid command usage', 'browser');
   }
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 80a534d2da..d724bbcd50 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -5,7 +5,13 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     IonicProject = require('./project'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    semver = require('semver');
+
+var requirements = {
+  node: '0.10.33',
+  cordova: '4.2.0'
+}
 
 var IonicTask = function() {};
 
@@ -214,10 +220,33 @@ IonicTask.prototype.printInfo = function(info) {
   console.log('\n');
 }
 
+IonicTask.prototype.checkRuntime = function checkRuntime() {
+  var info = this.gatherInfo();
+  var validRuntime = true;
+
+  if(!semver.satisfies(info.node, requirements.node)) {
+    var updateMessage = ['Please update your Node runtime to version >=', requirements.node].join(' ');
+    console.log(updateMessage.red.bold);
+    validRuntime = false;
+  }
+
+  if(!semver.satisfies(info.cordova, requirements.cordova)) {
+    var updateMessage = ['Please update your Cordova CLI to version >=', requirements.cordova, '`npm install -g cordova`'].join(' ')
+    console.log(updateMessage.red.bold);
+    validRuntime = false;
+  }
+
+  return validRuntime;
+}
+
 IonicTask.prototype.run = function(ionic) {
 
   var info = this.gatherInfo();
+  this.ionic = ionic;
   this.printInfo(info);
+
+  this.checkRuntime();
+
   IonicStats.t();
 }
 
diff --git a/package.json b/package.json
index 9a1c58a40b..e07d0da0f7 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
     "request": "2.51.0",
+    "semver": "^4.2.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",

From 6601e979a216eeaddad3d52e01f7d87d97f4d875 Mon Sep 17 00:00:00 2001
From: Jeremy Wilken <gnomeontherun@users.noreply.github.com>
Date: Sat, 7 Feb 2015 11:18:40 -0600
Subject: [PATCH 0431/1100] Suggest changing file permissions on OSX

Inform users who don't want to (because you probably shouldn't) use `sudo` to install node modules globally how to update their file permissions.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3abfb064a..9c3cc45f4d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Use the `ionic --help` command for more detailed task information.
 $ npm install -g ionic
 ```
 
-*Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo`.*
+*Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo` or can setup [proper file permissions on OSX for npm](http://www.johnpapa.net/how-to-use-npm-global-without-sudo-on-osx/) to install without `sudo`. *
 
 
 ## Starting an Ionic App

From 0b6eeadafc7638c9e85c300a4262f08bddbbec44 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 11:45:16 -0700
Subject: [PATCH 0432/1100] Outputting system info when a failure occurs

---
 lib/ionic.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 9dc547044a..7cee7e61e1 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -554,6 +554,11 @@ Ionic = {
     if(msg) {
       process.stderr.write(msg.error.bold);
       process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
+      
+      var IonicInfo = require('./ionic/info').IonicTask;
+      var infoChecker = new IonicInfo();
+      var info = infoChecker.gatherInfo();
+      infoChecker.printInfo(info);
     }
     if(taskHelp) {
       for(var i = 0; i < TASKS.length; i++) {

From 9e3af93ca2aa254902579d757f8d0a8c14b0df42 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 11:48:01 -0700
Subject: [PATCH 0433/1100] Adding the platform for cordova-android from ionic
 to ensure hooks. Modified the method to chmod to use fs instead of shelljs.

---
 lib/ionic/browser.js | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 3f15509f27..a6d5d01e68 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -231,14 +231,21 @@ IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version
 
 IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   var q = Q.defer();
+  var self = this;
 
   // var crosswalkEngineVersion = 'c0.3';
   var crosswalkEngineUnzipName = ['cordova-android-', cordovaAndroidVersion].join('');
   var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', cordovaAndroidVersion, '.zip'].join('');
 
   var tempZipFilePath = path.join(process.cwd(), 'engine');
+  var cordovaAndroid4Path = path.join(tempZipFilePath, crosswalkEngineUnzipName, 'bin');
+  var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
 
   if(fs.existsSync(path.join(tempZipFilePath, crosswalkEngineUnzipName))) {
+
+    self.setPermissionsForFolder(cordovaAndroid4Path);
+    self.setPermissionsForFolder(android4BinPath);
+
     q.resolve();
     return;
   }
@@ -247,10 +254,8 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   .then(function(data) {
     console.log('\nFinished downloading cordova-android v4.0.x');
     //Need to make certain files executable
-    var cordovaAndroid4Path = path.join(tempZipFilePath, crosswalkEngineUnzipName, 'bin');
-    var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
-    shelljs.chmod('+x', path.join(cordovaAndroid4Path, '*'));
-    shelljs.chmod('+x', path.join(android4BinPath, '*'))
+    self.setPermissionsForFolder(cordovaAndroid4Path)
+    self.setPermissionsForFolder(android4BinPath)
     console.log('\nAltered permissions for Android Paths')
     q.resolve();
   }, function(error) {
@@ -261,6 +266,22 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   return q.promise;
 }
 
+IonicTask.prototype.setPermissionsForFolder = function setPermissionsForFolder(folderName) {
+  var self = this;
+
+  fs.readdir(folderName, function(err, files){
+    if(err) return;
+    for(var x=0; x<files.length; x++) {
+      var file = path.join(folderName, files[x]);
+      try {
+        fs.chmodSync(file, '755');
+      }catch (ex) {
+        self.ionic.fail(['Error setting file permissions for file', file, ex].join(' '))
+      }
+    }
+  });
+}
+
 IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
   var command = 'cordova platform remove android';
   var result = shelljs.exec(command);
@@ -268,8 +289,7 @@ IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
 }
 
 IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  ['cordova platform add ./engine/cordova-android-', cordovaAndroidVersion, '/'].join('');
-  // console.log('Running command for cordova 40x', command)
+  var command =  ['ionic platform add ./engine/cordova-android-', cordovaAndroidVersion, '/'].join('');
   var result = shelljs.exec(command);
 
   if(result.code != 0) {

From ac22feaa8184b709da0f8a4728e4914c8c480398 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 11:48:23 -0700
Subject: [PATCH 0434/1100] Adjusting minimum requirements for node and cordova
 to include >=

---
 lib/ionic/info.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index d724bbcd50..7cb6d02df3 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -9,8 +9,8 @@ var fs = require('fs'),
     semver = require('semver');
 
 var requirements = {
-  node: '0.10.33',
-  cordova: '4.2.0'
+  node: '>=0.10.33',
+  cordova: '>=4.2.0'
 }
 
 var IonicTask = function() {};

From a24b0e74c1d3cf9c02ded032fcc98e69803275ae Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 14:56:25 -0700
Subject: [PATCH 0435/1100] Update changelog, updating 1.3.9 and shrinkwrap

---
 CHANGELOG.md        |    3 +
 npm-shrinkwrap.json | 1082 ++++++++++++++++---------------------------
 package.json        |    2 +-
 3 files changed, 402 insertions(+), 685 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c79ff9adbb..2c6bb69a09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 * Added semver to the required node modules for version checking
 * Added a version checking utility for cordova cli and node - `ionic info` tells you what you need to run correctly
 * Added a version check in the browser command - that way you can stay up to date where it matters
+* Modified browser process addition process to use `ionic platform add` to ensure hooks are set up properly
+* Modified browser process to change permissions on files using `fs` instead of `shelljs`
+* Now upon receiving an error, the CLI will dump system environment information to help the user copy/paste to issues
 
 ### 1.3.8
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 42e47dfc6d..cec159e9df 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.4",
+  "version": "1.3.9",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -8,13 +8,13 @@
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
-          "version": "1.1.13-1",
-          "from": "readable-stream@~1.1.9",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+          "version": "1.1.13",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -23,30 +23,30 @@
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
-              "version": "0.10.25-1",
-              "from": "string_decoder@~0.10.x",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@~0.1.0",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.27-1",
-              "from": "readable-stream@~1.0.24",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -55,47 +55,47 @@
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.25-1",
-                  "from": "string_decoder@~0.10.x",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@~2.4.1",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,17 +104,17 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@~0.1.0",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.27-1",
-              "from": "readable-stream@~1.0.2",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
@@ -123,13 +123,13 @@
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
-                  "version": "0.10.25-1",
-                  "from": "string_decoder@~0.10.x",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@~0.1.5",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@~2.1.0",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@~0.2.11",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@~2.2.2",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@~3.2.6",
+              "from": "glob@>=3.2.6 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@2",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@~1.0.0",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,139 +187,139 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@~0.2.12",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@2",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@~2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@~0.1.9",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@~2.4.1",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@^0.6.2",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "from": "escape-html@1.0.1",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
+      "from": "connect-livereload@0.5.2",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+      "from": "crc@3.2.1",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.x",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
-          "version": "2.3.4",
-          "from": "through@~2.3.1",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+          "version": "2.3.6",
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@~0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@~0",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.4",
-          "from": "map-stream@~0.0.3",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.4.tgz"
+          "version": "0.0.5",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -328,49 +328,49 @@
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@~0.0.3",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@~0.1.0",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
-          "version": "0.0.5",
-          "from": "combined-stream@~0.0.4",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
@@ -381,152 +381,152 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@~1.2.9",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         },
         "async": {
           "version": "0.9.0",
-          "from": "async@~0.9.0",
+          "from": "async@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "from": "archy@>=0.0.2 <0.0.3",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.3",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
+              "from": "beeper@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
+                  "from": "meow@*",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.0",
-                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
                       "dependencies": {
                         "get-stdin": {
                           "version": "3.0.2",
-                          "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz",
+                          "from": "get-stdin@>=3.0.0 <4.0.0",
                           "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
                         },
                         "repeating": {
                           "version": "1.1.1",
-                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
+                          "from": "repeating@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             },
                             "meow": {
                               "version": "2.1.0",
-                              "from": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz",
+                              "from": "meow@>=2.0.0 <3.0.0",
                               "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz"
                             }
                           }
@@ -539,79 +539,79 @@
             },
             "lodash.reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz",
+              "from": "lodash.reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz"
             },
             "lodash.reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz",
+              "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz"
             },
             "lodash.reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz",
+              "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
                 },
                 "lodash.iserror": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz",
+                  "from": "lodash.iserror@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.2",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
                     },
                     "lodash.isnative": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz",
+                      "from": "lodash.isnative@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
                     }
                   }
                 },
                 "lodash.templatesettings": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
                   "dependencies": {
                     "lodash.escape": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                      "from": "lodash.escape@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                     }
                   }
@@ -620,37 +620,37 @@
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -661,66 +661,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+              "from": "object-assign@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.3",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@>=0.4.3 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -729,42 +729,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@>=0.12.0 <0.13.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -773,51 +773,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "from": "resolve@>=0.7.0 <0.8.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "from": "minimist@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.0",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -826,34 +826,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
+          "from": "semver@>=3.0.1 <4.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -867,7 +867,7 @@
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1431,22 +1431,22 @@
     },
     "opbeat": {
       "version": "1.1.2",
-      "from": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
+      "from": "opbeat@>=1.0.7 <2.0.0",
       "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
-          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
+          "from": "after-all@>=2.0.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "from": "once@>=1.3.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -1455,22 +1455,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "from": "stackman@>=0.2.2 <0.3.0",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+              "from": "stackback@0.0.2",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -1479,7 +1479,7 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -1489,12 +1489,12 @@
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@~0.0.2",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@~0.0.1",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
@@ -1511,34 +1511,34 @@
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.x.x",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.x",
+          "from": "read@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@~0.0.4",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.x",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.x",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@~0.2.9",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
@@ -1548,12 +1548,12 @@
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@0.3.x",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.x.x",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1565,44 +1565,44 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.x.x",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.x",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.x",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.x",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.x",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.x",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.x",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.x",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1611,47 +1611,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@^1.0.1",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1660,32 +1660,32 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "from": "caseless@>=0.8.0 <0.9.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "async": {
               "version": "0.9.0",
-              "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+              "from": "async@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "mime-types": {
               "version": "2.0.8",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
+              "from": "mime-types@>=2.0.3 <2.1.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.6.0",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz",
+                  "from": "mime-db@>=1.6.0 <1.7.0",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz"
                 }
               }
@@ -1694,196 +1694,201 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "from": "mime-types@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.2",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "from": "qs@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+          "from": "tough-cookie@>=0.12.0",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+              "from": "punycode@>=0.2.0",
               "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+              "from": "ctype@0.5.3",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+          "from": "stringstream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         }
       }
     },
+    "semver": {
+      "version": "4.2.0",
+      "from": "semver@*",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz"
+    },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz",
+              "from": "debug@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz"
             },
             "depd": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
+              "from": "depd@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
@@ -1900,27 +1905,27 @@
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@~0.5.2",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@~0.4.3",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@~0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@~2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -1929,14 +1934,14 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@~0.7.0",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "from": "underscore@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
@@ -1945,81 +1950,88 @@
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
-          "version": "0.1.29",
-          "from": "fstream@~0.1.21",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz",
+          "version": "0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.2",
-              "from": "graceful-fs@~3.0.2",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+              "version": "3.0.5",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
-              "version": "0.3.5",
-              "from": "mkdirp@0.3",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+              "version": "0.5.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@2.x.x",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
         },
         "pullstream": {
-          "version": "0.4.0",
-          "from": "pullstream@~0.4.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz",
+          "version": "0.4.1",
+          "from": "pullstream@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@~0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
-              "version": "0.0.0",
-              "from": "slice-stream@0.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz"
+              "version": "1.0.0",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@~0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@~0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
-          "version": "1.0.27-1",
-          "from": "readable-stream@~1.0.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
@@ -2028,30 +2040,30 @@
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
-              "version": "0.10.25-1",
-              "from": "string_decoder@~0.10.x",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@~1.0.1",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@~0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -2060,32 +2072,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
-          "version": "3.1.15",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.15.tgz",
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.0.6",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "version": "4.3.5",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
               "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -2093,89 +2117,103 @@
               }
             },
             "minimatch": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+              "version": "2.0.1",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
               "dependencies": {
-                "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                },
-                "sigmund": {
-                  "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                "brace-expansion": {
+                  "version": "1.1.0",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    }
+                  }
                 }
               }
             },
             "ordered-read-streams": {
-              "version": "0.0.8",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.8.tgz"
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
-              "version": "0.0.11",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.11.tgz"
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2187,91 +2225,96 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.4",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+          "version": "3.0.5",
+          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
-              "version": "1.0.33-1",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz",
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
-          "version": "0.4.3",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.3.tgz",
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2280,352 +2323,23 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@^0.4.4",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
-          "version": "0.6.0",
-          "from": "sax@0.6.x",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.0.tgz"
+          "version": "0.6.1",
+          "from": "sax@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.3.0",
+          "version": "2.5.0",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.0.tgz",
           "dependencies": {
-            "lodash.assign": {
-              "version": "2.4.1",
-              "from": "lodash.assign@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz",
-              "dependencies": {
-                "lodash._basecreatecallback": {
-                  "version": "2.4.1",
-                  "from": "lodash._basecreatecallback@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash.bind": {
-                      "version": "2.4.1",
-                      "from": "lodash.bind@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._createwrapper": {
-                          "version": "2.4.1",
-                          "from": "lodash._createwrapper@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
-                          "dependencies": {
-                            "lodash._basebind": {
-                              "version": "2.4.1",
-                              "from": "lodash._basebind@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
-                              "dependencies": {
-                                "lodash._basecreate": {
-                                  "version": "2.4.1",
-                                  "from": "lodash._basecreate@~2.4.1",
-                                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-                                  "dependencies": {
-                                    "lodash._isnative": {
-                                      "version": "2.4.1",
-                                      "from": "lodash._isnative@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                                    },
-                                    "lodash.noop": {
-                                      "version": "2.4.1",
-                                      "from": "lodash.noop@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash._basecreatewrapper": {
-                              "version": "2.4.1",
-                              "from": "lodash._basecreatewrapper@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
-                              "dependencies": {
-                                "lodash._basecreate": {
-                                  "version": "2.4.1",
-                                  "from": "lodash._basecreate@~2.4.1",
-                                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-                                  "dependencies": {
-                                    "lodash._isnative": {
-                                      "version": "2.4.1",
-                                      "from": "lodash._isnative@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                                    },
-                                    "lodash.noop": {
-                                      "version": "2.4.1",
-                                      "from": "lodash.noop@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash._slice": {
-                          "version": "2.4.1",
-                          "from": "lodash._slice@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash.identity": {
-                      "version": "2.4.1",
-                      "from": "lodash.identity@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"
-                    },
-                    "lodash._setbinddata": {
-                      "version": "2.4.1",
-                      "from": "lodash._setbinddata@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        },
-                        "lodash.noop": {
-                          "version": "2.4.1",
-                          "from": "lodash.noop@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash.support": {
-                      "version": "2.4.1",
-                      "from": "lodash.support@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "lodash.keys": {
-                  "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                    },
-                    "lodash._shimkeys": {
-                      "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                    }
-                  }
-                },
-                "lodash._objecttypes": {
-                  "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                }
-              }
-            },
-            "lodash.create": {
-              "version": "2.4.1",
-              "from": "lodash.create@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-2.4.1.tgz",
-              "dependencies": {
-                "lodash._basecreate": {
-                  "version": "2.4.1",
-                  "from": "lodash._basecreate@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                    },
-                    "lodash.noop": {
-                      "version": "2.4.1",
-                      "from": "lodash.noop@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "lodash.isobject": {
-              "version": "2.4.1",
-              "from": "lodash.isobject@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-              "dependencies": {
-                "lodash._objecttypes": {
-                  "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                }
-              }
-            },
-            "lodash.isarray": {
-              "version": "2.4.1",
-              "from": "lodash.isarray@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz",
-              "dependencies": {
-                "lodash._isnative": {
-                  "version": "2.4.1",
-                  "from": "lodash._isnative@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                }
-              }
-            },
-            "lodash.isfunction": {
-              "version": "2.4.1",
-              "from": "lodash.isfunction@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"
-            },
-            "lodash.isempty": {
-              "version": "2.4.1",
-              "from": "lodash.isempty@~2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-2.4.1.tgz",
-              "dependencies": {
-                "lodash.forown": {
-                  "version": "2.4.1",
-                  "from": "lodash.forown@~2.4.1",
-                  "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._basecreatecallback": {
-                      "version": "2.4.1",
-                      "from": "lodash._basecreatecallback@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash.bind": {
-                          "version": "2.4.1",
-                          "from": "lodash.bind@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz",
-                          "dependencies": {
-                            "lodash._createwrapper": {
-                              "version": "2.4.1",
-                              "from": "lodash._createwrapper@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz",
-                              "dependencies": {
-                                "lodash._basebind": {
-                                  "version": "2.4.1",
-                                  "from": "lodash._basebind@~2.4.1",
-                                  "resolved": "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz",
-                                  "dependencies": {
-                                    "lodash._basecreate": {
-                                      "version": "2.4.1",
-                                      "from": "lodash._basecreate@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-                                      "dependencies": {
-                                        "lodash._isnative": {
-                                          "version": "2.4.1",
-                                          "from": "lodash._isnative@~2.4.1",
-                                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                                        },
-                                        "lodash.noop": {
-                                          "version": "2.4.1",
-                                          "from": "lodash.noop@~2.4.1",
-                                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "lodash._basecreatewrapper": {
-                                  "version": "2.4.1",
-                                  "from": "lodash._basecreatewrapper@~2.4.1",
-                                  "resolved": "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz",
-                                  "dependencies": {
-                                    "lodash._basecreate": {
-                                      "version": "2.4.1",
-                                      "from": "lodash._basecreate@~2.4.1",
-                                      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz",
-                                      "dependencies": {
-                                        "lodash._isnative": {
-                                          "version": "2.4.1",
-                                          "from": "lodash._isnative@~2.4.1",
-                                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                                        },
-                                        "lodash.noop": {
-                                          "version": "2.4.1",
-                                          "from": "lodash.noop@~2.4.1",
-                                          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash._slice": {
-                              "version": "2.4.1",
-                              "from": "lodash._slice@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"
-                            }
-                          }
-                        },
-                        "lodash.identity": {
-                          "version": "2.4.1",
-                          "from": "lodash.identity@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"
-                        },
-                        "lodash._setbinddata": {
-                          "version": "2.4.1",
-                          "from": "lodash._setbinddata@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz",
-                          "dependencies": {
-                            "lodash._isnative": {
-                              "version": "2.4.1",
-                              "from": "lodash._isnative@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                            },
-                            "lodash.noop": {
-                              "version": "2.4.1",
-                              "from": "lodash.noop@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"
-                            }
-                          }
-                        },
-                        "lodash.support": {
-                          "version": "2.4.1",
-                          "from": "lodash.support@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz",
-                          "dependencies": {
-                            "lodash._isnative": {
-                              "version": "2.4.1",
-                              "from": "lodash._isnative@~2.4.1",
-                              "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "lodash.keys": {
-                      "version": "2.4.1",
-                      "from": "lodash.keys@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        },
-                        "lodash._shimkeys": {
-                          "version": "2.4.1",
-                          "from": "lodash._shimkeys@~2.4.1",
-                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._objecttypes": {
-                      "version": "2.4.1",
-                      "from": "lodash._objecttypes@~2.4.1",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                    }
-                  }
-                }
-              }
+            "lodash": {
+              "version": "3.0.1",
+              "from": "lodash@>=3.0.1 <3.1.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.0.1.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index e07d0da0f7..cc0cebec3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 736de09bf1abaa991160d9c4cff34119d92d434d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 15:20:58 -0700
Subject: [PATCH 0436/1100] Putting version on changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c6bb69a09..fcb540153d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Next
+### 1.3.9
 
 * Fixed an error where running `ionic serve` and then pressing `q` in the console would have an error trying to close a non-existent process
 * Fixing an error where it tries to read a promise from a null/undefined object.

From 743d0994f1378866a970d43b8559419033afedc5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 16:54:49 -0700
Subject: [PATCH 0437/1100] Adding in the fix for install_plugins to check and
 display properly. Updating Changelog. Closes #211

---
 CHANGELOG.md                                        |  4 ++++
 lib/hooks/after_platform_add/010_install_plugins.js | 11 ++++++++++-
 lib/ionic.js                                        |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcb540153d..68c8840481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Next
+
+* Updating after_platform_add hook 010_install_plugins.js to check to see if the directory running the commands is in fact a valid Ionic project directory.
+
 ### 1.3.9
 
 * Fixed an error where running `ionic serve` and then pressing `q` in the console would have an error trying to close a non-existent process
diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
index 4f958e0302..b23635c304 100644
--- a/lib/hooks/after_platform_add/010_install_plugins.js
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -8,7 +8,16 @@ var exec = require('child_process').exec;
 var path = require('path');
 var sys = require('sys');
 
-var packageJSON = require('../../package.json');
+var packageJSON = null;
+
+try {
+  packageJSON = require('../../package.json');
+} catch(ex) {
+  console.log('\nThere was an error fetching your package.json file.')
+  console.log('\nPlease ensure a valid package.json is in the root of this project\n')
+  return;
+}
+
 var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
 // var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
 
diff --git a/lib/ionic.js b/lib/ionic.js
index 7cee7e61e1..dffe8d2dfb 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -853,6 +853,12 @@ Ionic = {
           return self.fail('Error parsing ' + configXmlPath + ': ' + err);
         }
 
+        if(!jsonConfig.widget) {
+          throw new Error('\nYour config.xml file is invalid. You must have a <widget> element.');
+        } else if(jsonConfig.widget && !jsonConfig.widget.content) {
+          throw new Error('\nYour config.xml file does not have a <content> element. \nAdd something like: <content src="index.html"/>');
+        }
+
         if(options.devServer) {
           if( !jsonConfig.widget.content[0].$['original-src'] ) {
             jsonConfig.widget.content[0].$['original-src'] = jsonConfig.widget.content[0].$.src;

From 7f7e60f41ac0aefc9c890fa3698dae1bf78756c9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Feb 2015 21:06:47 -0700
Subject: [PATCH 0438/1100] Closes #246 - prevents ionic start with using a '.'

---
 lib/ionic/start.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a065d8e432..5441c84c00 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -47,6 +47,11 @@ IonicTask.prototype.run = function(ionic) {
     return this.ionic.fail('Invalid command', 'start');
   }
 
+  if(argv._[1] == '.') {
+    console.log('Please name your Ionic project something meaningful other than \'.\''.red);
+    return
+  }
+
   // Grab the app's relative directory name
   this.appDirectory = argv._[1];
 

From 05f7d5444c2105d1dd48ae8f092428e2b0e39d14 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Feb 2015 07:59:48 -0700
Subject: [PATCH 0439/1100] Closes #230, correctly displays the OS version of
 Mavericks when their version is 13.x from the node method os.release()

---
 lib/ionic/info.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 7cb6d02df3..8a7fa5e619 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -28,6 +28,10 @@ IonicTask.prototype.getMacInfo = function() {
       macVersion = 'Yosemite';
       break;
     case '13.0.0':
+    case '13.1.0':
+    case '13.2.0':
+    case '13.3.0':
+    case '13.4.0':
       macVersion = 'Mavericks';
       break;
     case '12.0.0':

From a585f6f9e04321801cea5b0b79c158ec88fd8d31 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Feb 2015 09:34:26 -0700
Subject: [PATCH 0440/1100] Updating changelog, bumping version to 1.3.10

---
 CHANGELOG.md        | 7 ++++++-
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68c8840481..a3ef22e917 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
-### Next
+### 1.3.10
 
 * Updating after_platform_add hook 010_install_plugins.js to check to see if the directory running the commands is in fact a valid Ionic project directory.
+* ionic start now checks that you pass a valid directory name, no longer accepting '.'
+* Fix for install_plugins to check that is in a valid ionic project
+* Checks for invalid contents of your config.xml file and reports those to help you fix the errors
+* Fix for `ionic info` - now properly displays OSX Mavericks as operating system if it is indeed Mavericks
+* 
 
 ### 1.3.9
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cec159e9df..7d054d41d7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index cc0cebec3c..e0d43ae902 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 07bd9c8752e72cc4baed864e172be1b2bb1f6218 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Feb 2015 15:07:39 -0700
Subject: [PATCH 0441/1100] Bumping cordova-android and
 cordova-crosswalk-engine to c0.5.6 and c0.6.2 respectively. Set
 defaultCrosswalkVersion as a variable to be used throughout.

---
 lib/ionic/browser.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index a6d5d01e68..6203f59863 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -32,8 +32,8 @@ var fs = require('fs'),
 
 shelljs.config.silent = true;
 
-var crosswalkEngineVersion = 'c0.6.1',
-    cordovaAndroidVersion = 'c0.5.5',
+var crosswalkEngineVersion = 'c0.6.2',
+    cordovaAndroidVersion = 'c0.5.6',
     platforms = ['android', 'ios'];
 
 var crosswalkVersions = [
@@ -64,7 +64,9 @@ var crosswalkVersions = [
     publish_date: '2015-01-12 08:27',
     canary: true
   }
-]
+];
+
+var defaultCrosswalkVersion = crosswalkVersions[3].version;
 
 var iosBrowsers = [
     {
@@ -120,7 +122,6 @@ IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngi
     return q.promise;
   }
 
-  // https://github.com/driftyco/cordova-crosswalk-engine/archive/c0.3.zip
   var downloadUrl = ['https://github.com/driftyco/cordova-crosswalk-engine/archive/', crosswalkEngineVersion, '.zip'].join('');
 
   var tempZipFilePath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine.zip');
@@ -233,7 +234,6 @@ IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
   var q = Q.defer();
   var self = this;
 
-  // var crosswalkEngineVersion = 'c0.3';
   var crosswalkEngineUnzipName = ['cordova-android-', cordovaAndroidVersion].join('');
   var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', cordovaAndroidVersion, '.zip'].join('');
 
@@ -392,7 +392,7 @@ IonicTask.prototype.clean = function clean() {
 IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk() {
   console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
   this.clean();
-  this.installCrosswalk(crosswalkVersions[2].version);
+  this.installCrosswalk(defaultCrosswalkVersion);
   
 }
 
@@ -472,7 +472,7 @@ IonicTask.prototype.addBrowser = function addBrowser() {
     browserToInstall = browserVersionAttempt[0];
     browserVersion = browserVersionAttempt[1];
   } else {
-    browserVersion = crosswalkVersions[2].version;
+    browserVersion = defaultCrosswalkVersion;
   }
 
   switch(browserToInstall) {

From 2693c912802eab6340a7ea9fe466ed14b5332a47 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Feb 2015 15:26:52 -0700
Subject: [PATCH 0442/1100] Closes #219, closes #220 - reordering task
 information on help printout, as well as keeping the README document the most
 used information near the top, and more advanced options near the bottom

---
 README.md    | 222 ++++++++++++++++++++++++++-------------------------
 lib/ionic.js |  32 ++++----
 2 files changed, 129 insertions(+), 125 deletions(-)

diff --git a/README.md b/README.md
index 1f4be4009c..fab67a5ff6 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,10 @@ __Named template starters:__
 
 * [tabs](https://github.com/driftyco/ionic-starter-tabs) (Default)
 * [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
+* [maps](https://github.com/driftyco/ionic-starter-maps)
+* [salesforce](https://github.com/driftyco/ionic-starter-salesforce)
+* [tests](https://github.com/driftyco/ionic-starter-tests)
+* [complex-list](https://github.com/driftyco/ionic-starter-complex-list)
 * [blank](https://github.com/driftyco/ionic-starter-blank)
 
 __Github Repo starters:__
@@ -49,8 +53,14 @@ __Command-line flags/options:__
     [--id|-i]  ............  Package name set in the <widget id> config
                              ex: com.mycompany.myapp
     [--no-cordova|-w]  ....  Do not create an app targeted for Cordova
+    [--sass|-s] ...........  Setup the project to use Sass CSS precompiling
     [--list|-l]  ..........  List starter templates available
 
+## Adding a platform target
+
+```bash
+$ ionic platform ios android
+```
 
 ## Testing in a Browser
 
@@ -60,6 +70,109 @@ Use `ionic serve` to start a local development server for app dev and testing. T
 $ ionic serve [options]
 ```
 
+## Building your app
+
+```bash
+$ ionic build ios
+```
+
+## Live Reload App During Development (beta)
+
+The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network, and the device must support [web sockets](http://caniuse.com/websockets).
+
+With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
+
+__Command-line flags/options for `run` and `emulate`:__
+
+    [--livereload|-l] .......  Live Reload app dev files from the device (beta)
+    [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)
+    [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
+    [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
+    [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
+    [--debug|--release]
+
+While the server is running for live reload, you can use the following commands within the CLI:
+
+    restart or r to restart the client app from the root
+    goto or g and a url to have the app navigate to the given url
+    consolelogs or c to enable/disable console log output
+    serverlogs or s to enable/disable server log output
+    quit or q to shutdown the server and exit
+
+
+## Emulating your app
+
+Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`.
+
+```bash
+$ ionic emulate ios [options]
+```
+
+## Running your app
+
+Deploys the Ionic app on specified platform devices. If a device is not found it'll then deploy to an emulator/simulator.
+
+```bash
+$ ionic run ios [options]
+```
+
+## Icon and Splash Screen Image Generation
+
+[Automatically generate icons and splash screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/) from source images to create each size needed for each platform, in addition to copying each resized and cropped image into each platform's resources directory. Source images can either be a `png`, `psd` __Photoshop__ or `ai` __Illustrator__ file. Images are generated using Ionic's image resizing and cropping server, instead of requiring special libraries and plugins to be installed locally.
+
+Since each platform has different image requirements, it's best to make a source image for the largest size needed, and let the CLI do all the resizing, cropping and copying for you. Newly generated images will be placed in the `resources` directory at the root of the Cordova project. Additionally, the CLI will update and add the correct `<platform>` configs to the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file.
+
+During the build process, Cordova (v3.6 or later) will look through the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file and copy the newly created resource images to the platform's specific resource folder. For example, Android's resource folder can be found in `platforms/android/res`, and iOS uses `platforms/ios/APP_NAME/Resources`.
+
+
+### Icon Source Image
+
+Save an `icon.png`, `icon.psd` or `icon.ai` file within the `resources` directory at the root of the Cordova project. The icon image's minimum dimensions should be 192x192 px, and should have __no__ rounded corners. Note that each platform will apply it's own mask and effects to the icons. For example, iOS will automatically apply it's custom rounded corners, so the source file should not already come with rounded corners. This [Photoshop icon template](http://code.ionicframework.com/resources/icon.psd) provides the recommended size and guidelines of the artwork's safe zone.
+
+```bash
+$ ionic resources --icon
+```
+
+- [Photoshop Icon Template](http://code.ionicframework.com/resources/icon.psd)
+
+
+### Splash Screen Source Image
+
+Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop splash screen template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone. Additionally, when the `Orientation` [preference config](http://cordova.apache.org/docs/en/edge/config_ref_index.md.html#The%20config.xml%20File_global_preferences) is set to either `landscape` or `portrait` mode, then only the necessary images will be generated.
+
+```bash
+$ ionic resources --splash
+```
+
+- [Photoshop Splash Screen Template](http://code.ionicframework.com/resources/splash.psd)
+
+
+### Generating Icons and Splash Screens
+
+To generate both icons and splash screens, follow the instructions above and run:
+
+```bash
+$ ionic resources
+```
+
+### Platform Specific Resource Images
+
+One source image can be used to generate images for each platform by placing the file within the `resources` directory, such as `resources/icon.png`. To use different source images for individual platforms, place the source image in the respective platform's directory. For example, to use a different icon for Android, it should follow this path: `resources/android/icon.png`, and a different image for iOS would use this path: `resources/ios/icon.png`.
+
+## Crosswalk for Android
+
+In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
+
+Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `8.37.189.14` version of Crosswalk.
+
+If you'd like to specify a different version of Crosswalk, run `ionic browser list` to see which browsers are available and what versions. Then run `ionic browser add crosswalk@10.39.235.15`.
+
+All that is left is to run the project as normal - `ionic run android`.
+
+*NOTE: To start with, we are only supporting stable versions of Crosswalk. We plan to add the beta and canary versions as we continue adding to this feature set*
+
+## Advanced serve options
+
 __LiveReload__
 
 By default, LiveReload will watch for changes in your `www/` directory,
@@ -186,115 +299,6 @@ It is also advised you specify the watch patterns for this document root as well
 
 ```
 
-## Adding a platform target
-
-```bash
-$ ionic platform ios android
-```
-
-## Building your app
-
-```bash
-$ ionic build ios
-```
-
-## Live Reload App During Development (beta)
-
-The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network, and the device must support [web sockets](http://caniuse.com/websockets).
-
-With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
-
-__Command-line flags/options for `run` and `emulate`:__
-
-    [--livereload|-l] .......  Live Reload app dev files from the device (beta)
-    [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)
-    [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
-    [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
-    [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
-    [--debug|--release]
-
-While the server is running for live reload, you can use the following commands within the CLI:
-
-    restart or r to restart the client app from the root
-    goto or g and a url to have the app navigate to the given url
-    consolelogs or c to enable/disable console log output
-    serverlogs or s to enable/disable server log output
-    quit or q to shutdown the server and exit
-
-
-## Emulating your app
-
-Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`.
-
-```bash
-$ ionic emulate ios [options]
-```
-
-
-## Running your app
-
-Deploys the Ionic app on specified platform devices. If a device is not found it'll then deploy to an emulator/simulator.
-
-```bash
-$ ionic run ios [options]
-```
-
-## Icon and Splash Screen Image Generation
-
-[Automatically generate icons and splash screens](http://ionicframework.com/blog/automating-icons-and-splash-screens/) from source images to create each size needed for each platform, in addition to copying each resized and cropped image into each platform's resources directory. Source images can either be a `png`, `psd` __Photoshop__ or `ai` __Illustrator__ file. Images are generated using Ionic's image resizing and cropping server, instead of requiring special libraries and plugins to be installed locally.
-
-Since each platform has different image requirements, it's best to make a source image for the largest size needed, and let the CLI do all the resizing, cropping and copying for you. Newly generated images will be placed in the `resources` directory at the root of the Cordova project. Additionally, the CLI will update and add the correct `<platform>` configs to the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file.
-
-During the build process, Cordova (v3.6 or later) will look through the project's [config.xml](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html#Icons%20and%20Splash%20Screens) file and copy the newly created resource images to the platform's specific resource folder. For example, Android's resource folder can be found in `platforms/android/res`, and iOS uses `platforms/ios/APP_NAME/Resources`.
-
-
-### Icon Source Image
-
-Save an `icon.png`, `icon.psd` or `icon.ai` file within the `resources` directory at the root of the Cordova project. The icon image's minimum dimensions should be 192x192 px, and should have __no__ rounded corners. Note that each platform will apply it's own mask and effects to the icons. For example, iOS will automatically apply it's custom rounded corners, so the source file should not already come with rounded corners. This [Photoshop icon template](http://code.ionicframework.com/resources/icon.psd) provides the recommended size and guidelines of the artwork's safe zone.
-
-```bash
-$ ionic resources --icon
-```
-
-- [Photoshop Icon Template](http://code.ionicframework.com/resources/icon.psd)
-
-
-### Splash Screen Source Image
-
-Save a `splash.png`, `splash.psd` or `splash.ai` file within the `resources` directory at the root of the Cordova project. Splash screen dimensions vary for each platform, device and orientation, so a square source image is required the generate each of various sizes. The source image's minimum dimensions should be 2208x2208 px, and its artwork should be centered within the square, knowning that each generated image will be center cropped into landscape and portait images. The splash screen's artwork should roughly fit within a center square (1200x1200 px). This [Photoshop splash screen template](http://code.ionicframework.com/resources/splash.psd) provides the recommended size and guidelines of the artwork's safe zone. Additionally, when the `Orientation` [preference config](http://cordova.apache.org/docs/en/edge/config_ref_index.md.html#The%20config.xml%20File_global_preferences) is set to either `landscape` or `portrait` mode, then only the necessary images will be generated.
-
-```bash
-$ ionic resources --splash
-```
-
-- [Photoshop Splash Screen Template](http://code.ionicframework.com/resources/splash.psd)
-
-
-### Generating Icons and Splash Screens
-
-To generate both icons and splash screens, follow the instructions above and run:
-
-```bash
-$ ionic resources
-```
-
-### Platform Specific Resource Images
-
-One source image can be used to generate images for each platform by placing the file within the `resources` directory, such as `resources/icon.png`. To use different source images for individual platforms, place the source image in the respective platform's directory. For example, to use a different icon for Android, it should follow this path: `resources/android/icon.png`, and a different image for iOS would use this path: `resources/ios/icon.png`.
-
-## Crosswalk for Android
-
-In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
-
-Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `8.37.189.14` version of Crosswalk.
-
-If you'd like to specify a different version of Crosswalk, run `ionic browser list` to see which browsers are available and what versions. Then run `ionic browser add crosswalk@10.39.235.15`.
-
-All that is left is to run the project as normal - `ionic run android`.
-
-*NOTE: To start with, we are only supporting stable versions of Crosswalk. We plan to add the beta and canary versions as we continue adding to this feature set*
-
-
 ## Update Ionic lib
 
 Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
diff --git a/lib/ionic.js b/lib/ionic.js
index dffe8d2dfb..d981ed5212 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -43,21 +43,6 @@ colors.setTheme({
 
 
 var TASKS = [
-  {
-    title: 'info',
-    name: 'info',
-    summary: 'List information about the users runtime environment',
-    module: './ionic/info'
-  },
-  {
-    title: 'help',
-    name: 'help',
-    summary: 'Provides help for a certain command',
-    args: {
-      '[command]': 'The command you desire help with'
-    },
-    module: './ionic/help'
-  },
   {
     title: 'start',
     name: 'start',
@@ -329,7 +314,22 @@ var TASKS = [
     name: 'templates',
     summary: 'List available Ionic starter templates',
     module: './ionic/templates'
-   }
+   },
+   {
+     title: 'info',
+     name: 'info',
+     summary: 'List information about the users runtime environment',
+     module: './ionic/info'
+   },
+   {
+     title: 'help',
+     name: 'help',
+     summary: 'Provides help for a certain command',
+     args: {
+       '[command]': 'The command you desire help with'
+     },
+     module: './ionic/help'
+   },
 ];
 
 Ionic = {

From 668b836ade7a445d0c1c3e85ea3af1619d4ed8f6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 11 Feb 2015 10:42:56 -0700
Subject: [PATCH 0443/1100] Updating changelog

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3ef22e917..0fb3f0335c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Next-release
+
+* Updating task order in the CLI output for help - putting more important tasks at the top, and lesser used ones at the bottom
+* Updated README to have basic info at top, more advanced information at bottom
+* Bumping cordova-android to our fork version of c0.5.6 to have latest commits from the Cordova-android team.
+* Bumping cordova-crosswalk-engine to our fork version of c0.6.2 for latest changes by the Mobile chrome team.
+
 ### 1.3.10
 
 * Updating after_platform_add hook 010_install_plugins.js to check to see if the directory running the commands is in fact a valid Ionic project directory.
@@ -5,7 +12,6 @@
 * Fix for install_plugins to check that is in a valid ionic project
 * Checks for invalid contents of your config.xml file and reports those to help you fix the errors
 * Fix for `ionic info` - now properly displays OSX Mavericks as operating system if it is indeed Mavericks
-* 
 
 ### 1.3.9
 

From 8e131ce5d2ae6b3184a0e2b0cb00e593a9f60da5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Feb 2015 15:39:40 -0700
Subject: [PATCH 0444/1100] Including update for hook to add a local path
 plugin, search its plugin.xml, and then add it to the cordovaPlugins element
 in package.json

---
 .../after_plugin_add/010_register_plugin.js   | 49 +++++++++++++++++--
 .../after_plugin_rm/010_deregister_plugin.js  |  9 ++++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/lib/hooks/after_plugin_add/010_register_plugin.js b/lib/hooks/after_plugin_add/010_register_plugin.js
index 380cc5b34d..b0e9d35481 100644
--- a/lib/hooks/after_plugin_add/010_register_plugin.js
+++ b/lib/hooks/after_plugin_add/010_register_plugin.js
@@ -3,13 +3,54 @@
 /**
  * Push plugins to cordovaPlugins array after_plugin_add
  */
-var fs = require('fs');
-var packageJSON = require('../../package.json');
+var fs = require('fs'),
+    packageJSON = require('../../package.json'),
+    path = require('path');
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
 process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
-  if(packageJSON.cordovaPlugins.indexOf(plugin) == -1) {
-    packageJSON.cordovaPlugins.push(plugin);
+  var configString,
+      idRegEx,
+      id,
+      pluginXmlPath,
+      pluginToAdd;
+
+  if(plugin.indexOf('https') != -1 || plugin.indexOf('git') != -1) {
+    console.log('Installing plugin from url');
+  }
+
+  if(plugin.indexOf('/') != -1) {
+    try {
+      pluginXmlPath = path.resolve(plugin, 'plugin.xml');
+      console.log('got pluginXmlPath:', pluginXmlPath);
+      if (!fs.existsSync(pluginXmlPath)) {
+        var errorMessage = ['There was no plugin.xml file found for path: ', pluginXmlPath].join('');
+        return;
+      }
+
+      configString = fs.readFileSync(pluginXmlPath,{encoding: 'utf8'});
+      idRegEx = new RegExp('<plugin[^>]*id="(.*)"', 'i');
+      id = idRegEx.exec(configString)[1]
+      pluginToAdd = {id: id, locator: plugin};
+    } catch(ex) {
+      console.log('There was an error retrieving the plugin.xml filr from the 010_register_plugin.js hook', ex);
+    }
+  } else {
+    pluginToAdd = plugin;
+  }
+
+  if(typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) == -1) {
+    packageJSON.cordovaPlugins.push(pluginToAdd);
+  } else if (typeof pluginToAdd == 'object') {
+    var pluginExists = false;
+    packageJSON.cordovaPlugins.forEach(function(checkPlugin) {
+      if(typeof checkPlugin == 'object' && checkPlugin.id == pluginToAdd.id) {
+        pluginExists = true;
+      }
+    })
+    if(!pluginExists) {
+      packageJSON.cordovaPlugins.push(pluginToAdd);
+    }
   }
 });
 
diff --git a/lib/hooks/after_plugin_rm/010_deregister_plugin.js b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
index 65fa4cc7d3..4f4c6b892e 100644
--- a/lib/hooks/after_plugin_rm/010_deregister_plugin.js
+++ b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
@@ -12,6 +12,15 @@ process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
   var index = packageJSON.cordovaPlugins.indexOf(plugin);
   if (index > -1) {
     packageJSON.cordovaPlugins.splice(index, 1);
+  } else {
+    //If it didnt find a match, it may be listed as {id,locator}
+    for(var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i++) {
+      var packagePlugin = packageJSON.cordovaPlugins[i];
+      if(typeof packagePlugin == 'object' && packagePlugin.id == plugin) {
+        packageJSON.cordovaPlugins.splice(index, 1);
+        break;
+      }
+    }
   }
 });
 

From cc021b16c9729a00a8444304efbc834dfd436c3b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Feb 2015 15:43:35 -0700
Subject: [PATCH 0445/1100] Adding in the extra capture to capture ionic info
 before sending the uncaught exception information to opbeat. Updating module
 to point at our fork on npm

---
 lib/ionic.js | 22 ++++++++++++++--------
 package.json |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index d981ed5212..a4448b9348 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -13,19 +13,26 @@ Licensed under the MIT license. See LICENSE For more.
 
 Copyright 2014 Drifty (http://drifty.com/)
 */
-
 var argv = require('optimist').argv,
     colors = require('colors'),
     Q = require('q'),
     settings = require('../package.json'),
+    IonicInfo = require('./ionic/info').IonicTask;
     shelljs = require('shelljs/global'),
     Multibar = require('./ionic/multibar');
-    opbeat = require('opbeat')({
-      organizationId: '7456d1360946446791cde22d1ff90a56',
-      appId: '1a3f490314',
-      secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b',
-      clientLogLevel: 'fatal'
-    });
+
+var reportExtras = function reportExtras() {
+  var ionicInfo = new IonicInfo();
+  return ionicInfo.gatherInfo();
+}
+
+var opbeat = require('opbeat')({
+  organizationId: '7456d1360946446791cde22d1ff90a56',
+  appId: '1a3f490314',
+  secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b',
+  clientLogLevel: 'fatal',
+  prerequestMethod: reportExtras
+});
 
 colors.setTheme({
   silly: 'rainbow',
@@ -555,7 +562,6 @@ Ionic = {
       process.stderr.write(msg.error.bold);
       process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
       
-      var IonicInfo = require('./ionic/info').IonicTask;
       var infoChecker = new IonicInfo();
       var info = infoChecker.gatherInfo();
       infoChecker.printInfo(info);
diff --git a/package.json b/package.json
index e0d43ae902..6387800b80 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "gulp": "3.8.8",
     "ncp": "0.4.2",
     "npm": "2.1.3",
-    "opbeat": "^1.0.7",
+    "opbeat-ionic": "^1.1.3",
     "open": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
     "optimist": "0.6.0",
     "progress": "1.1.7",

From 02610bbcc6fd8cd6e22d5791bf16802d2637b770 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Feb 2015 15:46:28 -0700
Subject: [PATCH 0446/1100] Updated changelog for opbeat extra information

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fb3f0335c..401480bcbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 * Updated README to have basic info at top, more advanced information at bottom
 * Bumping cordova-android to our fork version of c0.5.6 to have latest commits from the Cordova-android team.
 * Bumping cordova-crosswalk-engine to our fork version of c0.6.2 for latest changes by the Mobile chrome team.
+* Updated README to have proper `ionic serve` flag for `--lab`
+* Updated README to give user instructions to avoid using sudo.
+* Changed module for opbeat to use forked version - `opbeat-ionic` that will help us log uncaught exceptions with ionic-cli and user environment runtime information
+
 
 ### 1.3.10
 

From 33d957998de597589ab60b18b21c4d1afe6cbb25 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Feb 2015 16:14:44 -0700
Subject: [PATCH 0447/1100] Closes #223 - added address to the livereload
 server

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fb3f0335c..25b0548d6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ### Next-release
 
-* Updating task order in the CLI output for help - putting more important tasks at the top, and lesser used ones at the bottom
-* Updated README to have basic info at top, more advanced information at bottom
+* Updating task order in the CLI output for help - putting more important tasks at the top, and lesser used ones at the bottom.
+* Updated README to have basic info at top, more advanced information at bottom.
 * Bumping cordova-android to our fork version of c0.5.6 to have latest commits from the Cordova-android team.
 * Bumping cordova-crosswalk-engine to our fork version of c0.6.2 for latest changes by the Mobile chrome team.
+* Added option to have your livereload server run off the address passed from the `--address` argument.
 
 ### 1.3.10
 

From f24451f97efa460e28a7dbc0670f577ee37ed7cc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Feb 2015 16:33:33 -0700
Subject: [PATCH 0448/1100] Adding in capturing the command line arguments for
 when uncaught exceptions occur

---
 lib/ionic.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index a4448b9348..6458a18481 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -23,10 +23,14 @@ var argv = require('optimist').argv,
 
 var reportExtras = function reportExtras() {
   var ionicInfo = new IonicInfo();
-  return ionicInfo.gatherInfo();
+  var commandLineInfo = process.argv;
+  var info = ionicInfo.gatherInfo();
+  info.command = commandLineInfo;
+  console.log('Command line stuff:', commandLineInfo);
+  return info;
 }
 
-var opbeat = require('opbeat')({
+var opbeat = require('opbeat-ionic')({
   organizationId: '7456d1360946446791cde22d1ff90a56',
   appId: '1a3f490314',
   secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b',

From 226c9c87af0da610e571dfff08844c5408b4a7dd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sun, 15 Feb 2015 09:06:47 -0700
Subject: [PATCH 0449/1100] Committing shrinkwrap for opbeat

---
 npm-shrinkwrap.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7d054d41d7..3f28630cc2 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1429,10 +1429,9 @@
         }
       }
     },
-    "opbeat": {
-      "version": "1.1.2",
-      "from": "opbeat@>=1.0.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/opbeat/-/opbeat-1.1.2.tgz",
+    "opbeat-ionic": {
+      "version": "1.1.3",
+      "from": "opbeat-ionic@*",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",

From 8688dabe5ab980ec0570781f4329f31747f8adcb Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Thu, 15 Jan 2015 00:11:04 -0600
Subject: [PATCH 0450/1100] Adding basic working version of push

---
 lib/ionic/push.js | 267 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 267 insertions(+)
 create mode 100644 lib/ionic/push.js

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
new file mode 100644
index 0000000000..1b6336e5fe
--- /dev/null
+++ b/lib/ionic/push.js
@@ -0,0 +1,267 @@
+var fs = require('fs'),
+    path = require('path'),
+    parseUrl = require('url').parse,
+    request = require('request'),
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    FormData = require('form-data'),
+    IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+    Task = require('./task').Task,
+    IonicLoginTask = require('./login').IonicTask;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+
+  self.ionic = ionic;
+  self.inputValues = {};
+  self.inputFiles = {};
+  self.useCmdArgs = false;
+
+  this.getCmdLineOptions();
+
+  var login = new IonicLoginTask();
+  login.get(ionic, function(jar) {
+    self.jar = jar;
+
+    if (argv['notify'] || argv.p) {
+      // Dev wants to send a push notification
+      // This will require a list of device id's somehow
+    } else if (argv['ios-dev-cert'] || argv['ios-prod-cert'] || argv.d || argv.p) {
+      // Dev wants to upload an ios push cert
+      self.upload_cert(self);
+    } else if (argv['production-mode'] || argv.l) {
+      // Dev wants to switch between test/live mode
+      // this will look like --live-mode=[y/n]
+      // where y will put into live and n will put into dev
+      self.set_production_mode(self);
+    }
+  
+  });
+};
+
+IonicTask.prototype.set_production_mode = function(self) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("You need to upload your app first!".bold.red);
+    return false;
+  }
+
+  if (self.inputValues['production-mode'] === true) {
+    console.log("You need to specify a value [y/n] to set the production mode!".bold.red);
+    return false;
+  }
+
+  self.inputValues['production-mode'] = self.inputValues['production-mode'].toLowerCase();
+
+  if (self.inputValues['production-mode'] != 'y' && self.inputValues['production-mode'] != 'n') {
+    console.log("You need to specify a value [y/n] to set the production mode!".bold.red);
+    return false;
+  }
+
+  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/set-production-mode';
+    var params = parseUrl(url);
+
+    var form = new FormData();
+    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+    form.append('production_mode', self.inputValues['production-mode']);
+
+    form.submit({
+        protocol: params.protocol,
+        hostname: params.hostname,
+        port: params.port,
+        path: params.path,
+        headers: form.getHeaders({
+          cookie: self.jar.map(function(c) {
+            return c.key + "=" + encodeURIComponent(c.value);
+          }).join("; ")
+        })
+      },
+      function (err, response) {
+        if (err) {
+          return self.ionic.fail('Error uploading certificate: ' + err);
+        }
+
+        response.setEncoding('utf8');
+        response.on("data", function(data) {
+          if (err) {
+            return self.ionic.fail('Error setting mode: ' + err);
+          }
+
+          try {
+            var d = JSON.parse(data);
+            if (d.errors && d.errors.length) {
+              for (var j = 0; j < d.errors.length; j++) {
+                console.log((d.errors[j]).bold.error);
+              }
+              return self.ionic.fail('Unable to set mode');
+            }
+
+            if (self.inputValues['production-mode'] == 'y') {
+              console.log("Successfully set production mode");
+            } else {
+              console.log("Successfully set development mode");
+            }
+
+          } catch (parseEx) {
+            return self.ionic.fail('Error response: ' + parseEx);
+          }
+        });
+      }
+    );
+};
+
+IonicTask.prototype.upload_cert = function(self) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("You need to upload your app first!".bold.red);
+    return false;
+  }
+
+
+  var promptProperties = {};
+  var prodCert = '0';
+
+  if (argv['ios-dev-cert']) {
+    promptProperties['ios-push-cert'] = {
+      name: 'ios-push-cert',
+      description: 'iOS Dev Push Certificate File (.p12)'.yellow.bold,
+      required: true,
+      conform: fileExists,
+      isFile: true
+    };
+  } else if (argv['ios-prod-cert']) {
+    promptProperties['ios-push-cert'] = {
+      name: 'ios-push-cert',
+      description: 'iOS Prod Push Certificate File (.p12)'.yellow.bold,
+      required: true,
+      conform: fileExists,
+      isFile: true
+    };
+
+    prodCert = '1';
+  }
+
+  prompt.start();
+
+  prompt.get({properties: promptProperties}, function(err, promptResult) {
+    if (err) {
+      return self.ionic.fail('Error: ' + err);
+    }
+
+    var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/upload-push-cert';
+    var params = parseUrl(url);
+
+    var form = new FormData();
+    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+
+    try {
+      inputFile = promptResult['ios-push-cert'].replace(/\\ /g, ' ').trim();
+      form.append('ios_push_cert', fs.createReadStream( resolvePath(inputFile) ) );
+    } catch(e) {
+      return self.ionic.fail("Error loading " + resolvePath(inputFile));
+    }
+
+    // Set the flag for if this is a production or dev cert
+    form.append('prod_cert', prodCert);
+
+    form.submit({
+        protocol: params.protocol,
+        hostname: params.hostname,
+        port: params.port,
+        path: params.path,
+        headers: form.getHeaders({
+          cookie: self.jar.map(function(c) {
+            return c.key + "=" + encodeURIComponent(c.value);
+          }).join("; ")
+        })
+      },
+      function (err, response) {
+        if (err) {
+          return self.ionic.fail('Error uploading certificate: ' + err);
+        }
+
+        response.setEncoding('utf8');
+        response.on("data", function(data) {
+          if (err) {
+            return self.ionic.fail('Error uploading certificate: ' + err);
+          }
+
+          try {
+            var d = JSON.parse(data);
+            if (d.errors && d.errors.length) {
+              for (var j = 0; j < d.errors.length; j++) {
+                console.log((d.errors[j]).bold.error);
+              }
+              return self.ionic.fail('Unable to upload certificate');
+            }
+
+            console.log("Successfully uploaded certificate");
+
+          } catch (parseEx) {
+            return self.ionic.fail('Error response: ' + parseEx);
+          }
+        });
+      }
+    );
+  });
+}
+
+IonicTask.prototype.getCmdLineOptions = function() {
+  var self = this;
+
+  function getCmdArgValue(propertyName, shortName) {
+    var value = argv[propertyName] || argv[shortName];
+    if(value) {
+      self.inputValues[propertyName] = value;
+      self.useCmdArgs = true;
+    }
+  }
+
+  function getCmdArgFile(propertyName, shortName) {
+    var value = argv[propertyName] || argv[shortName];
+    if(value) {
+      if(!fileExists(value)) {
+        return self.ionic.fail("Unable to find file: " + argv[propertyName]);
+      }
+      self.inputFiles[propertyName] = value;
+      self.useCmdArgs = true;
+    }
+  }
+
+  getCmdArgValue('production-mode', 'l');
+
+  getCmdArgFile('ios-push-dev-cert', 'd');
+  getCmdArgFile('ios-push-prod-cert', 'p');
+};
+
+IonicTask.prototype.getCsrfToken = function(jar) {
+  for (var i = 0; i < jar.length; i++) {
+    if (jar[i].key == 'csrftoken') {
+      return jar[i].value;
+    }
+  }
+  return '';
+}
+
+function fileExists(filePath) {
+  // check if a file exists with a relative path or absolute path
+  filePath = filePath.replace(/\\ /g, ' ').trim();
+  return fs.existsSync(resolvePath(filePath));
+}
+
+function resolvePath (p) {
+  if (p.substr(0, 1) === '~') {
+    p = process.env.HOME + p.substr(1);
+  }
+  return path.resolve(p);
+}
+
+exports.IonicTask = IonicTask;

From 09388339db680196ef75dc6bc968667d9f6fa057 Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Mon, 19 Jan 2015 22:46:09 -0600
Subject: [PATCH 0451/1100] Adding the minimal config so the push task can be
 called

---
 lib/ionic.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index dffe8d2dfb..a77182ba2a 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -272,6 +272,11 @@ var TASKS = [
     // },
     module: './ionic/app'
    },
+   {
+    title: 'push',
+    name: 'push',
+    module: './ionic/push'
+   },
    {
     title: 'browser',
     name: 'browser',

From e84bc731e88168c2d82a5f6f4b1fba6987ad0cbb Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Mon, 26 Jan 2015 11:30:05 -0600
Subject: [PATCH 0452/1100] Adding initial send support

---
 lib/ionic/push.js | 83 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 1b6336e5fe..43e84bcc64 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -29,9 +29,9 @@ IonicTask.prototype.run = function(ionic) {
   login.get(ionic, function(jar) {
     self.jar = jar;
 
-    if (argv['notify'] || argv.p) {
+    if (argv['send'] || argv.s) {
       // Dev wants to send a push notification
-      // This will require a list of device id's somehow
+      self.send_push(self);
     } else if (argv['ios-dev-cert'] || argv['ios-prod-cert'] || argv.d || argv.p) {
       // Dev wants to upload an ios push cert
       self.upload_cert(self);
@@ -45,6 +45,85 @@ IonicTask.prototype.run = function(ionic) {
   });
 };
 
+IonicTask.prototype.send_push = function(self) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("You need to upload your app first!".bold.red);
+    return false;
+  }
+
+  // So, we need the push API key to send notifications.
+  var promptProperties = {};
+
+  promptProperties['push-api-key'] = {
+    name: 'push-api-key',
+    description: 'What is your push API key'.yellow.bold,
+    required: true,
+    isFile: false
+  };
+
+  promptProperties['alert'] = {
+    name: 'alert',
+    description: 'Notification alert message'.yellow.bold,
+    required: false,
+    isFile: false
+  };
+
+  promptProperties['badge'] = {
+    name: 'badge',
+    description: 'Badge count'.yellow.bold,
+    required: false,
+    isFile: false
+  }
+
+  promptProperties['sound'] = {
+    name: 'sound',
+    description: 'Sound file name'.yellow.bold,
+    required: false,
+    isFile: false
+  }
+  
+  prompt.start();
+
+  prompt.get({properties: promptProperties}, function(err, promptResult) {
+    if (err) {
+      return self.ionic.fail('Error: ' + err);
+    }
+
+    var api_key = promptResult['push-api-key'];
+
+    var notification = {
+      platform: 'ios',
+      notification: {
+        alert: promptResult['alert'],
+        badge: promptResult['badge'],
+        sound: promptResult['sound']
+      }
+    }
+
+    var options = {
+      url: 'http://push.ionic.io/api/v1/push',
+      method: 'POST',
+      json: true,
+      headers: {
+        'X-Ionic-Application-Id': project.get('app_id'), 
+        'X-Ionic-API-Key': api_key
+      },
+      body: notification
+    };
+    
+    request(options, function(err, response, body) {
+      if (!err && response.statusCode == 202) {
+        console.log("Successfully queued push notification");
+      } else {
+        console.log("Error queueing push notification", err);
+      }
+    });
+  });
+
+};
+
 IonicTask.prototype.set_production_mode = function(self) {
   var project = IonicProject.load();
 

From 993533622193bf9abbb3384dee3976ff3cca47f2 Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Wed, 28 Jan 2015 17:47:54 -0600
Subject: [PATCH 0453/1100] Adding set webhook command.  Changing send task to
 require a token to send to

---
 lib/ionic/push.js | 144 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 101 insertions(+), 43 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 43e84bcc64..f458486435 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -29,7 +29,13 @@ IonicTask.prototype.run = function(ionic) {
   login.get(ionic, function(jar) {
     self.jar = jar;
 
-    if (argv['send'] || argv.s) {
+    if (argv._[1] && argv._[1].trim() == 'webhook_url') {
+      if (argv._[2]) {
+        self.set_webhook_url(self, argv._[2].trim());
+      } else {
+        console.log('You need to specify a webhook url!'.bold.red);
+      }
+    } else if (argv['send'] || argv.s) {
       // Dev wants to send a push notification
       self.send_push(self);
     } else if (argv['ios-dev-cert'] || argv['ios-prod-cert'] || argv.d || argv.p) {
@@ -45,6 +51,50 @@ IonicTask.prototype.run = function(ionic) {
   });
 };
 
+IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("You need to upload your app first!".bold.red);
+    return false;
+  }
+
+  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/webhook-url';
+  var params = parseUrl(url);
+
+  var form = new FormData();
+  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+  form.append('webhook_url', webhook_url);
+
+  form.submit({
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: self.jar.map(function(c) {
+          return c.key + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      })
+    },
+    function (err, response) {
+      response.on("data", function(data) {
+        if (err) {
+          return self.ionic.fail('Error setting Webhook URL: ' + err);
+        }
+
+        if (response.statusCode == '200') {
+          console.log("Webhook URL set to", webhook_url);
+        } else {
+          return self.ionic.fail('App not found');
+        }
+      })
+    }
+  );
+
+  return true;
+};
+
 IonicTask.prototype.send_push = function(self) {
   var project = IonicProject.load();
 
@@ -63,6 +113,13 @@ IonicTask.prototype.send_push = function(self) {
     isFile: false
   };
 
+  promptProperties['device-token'] = {
+    name: 'device-token',
+    description: 'What device token do you want to send to'.yellow.bold,
+    required: true,
+    isFile: false
+  }
+
   promptProperties['alert'] = {
     name: 'alert',
     description: 'Notification alert message'.yellow.bold,
@@ -95,6 +152,7 @@ IonicTask.prototype.send_push = function(self) {
 
     var notification = {
       platform: 'ios',
+      tokens: [promptResult['device-token']],
       notification: {
         alert: promptResult['alert'],
         badge: promptResult['badge'],
@@ -145,55 +203,55 @@ IonicTask.prototype.set_production_mode = function(self) {
   }
 
   var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/set-production-mode';
-    var params = parseUrl(url);
-
-    var form = new FormData();
-    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
-    form.append('production_mode', self.inputValues['production-mode']);
+  var params = parseUrl(url);
+
+  var form = new FormData();
+  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+  form.append('production_mode', self.inputValues['production-mode']);
+
+  form.submit({
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: self.jar.map(function(c) {
+          return c.key + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      })
+    },
+    function (err, response) {
+      if (err) {
+        return self.ionic.fail('Error uploading certificate: ' + err);
+      }
 
-    form.submit({
-        protocol: params.protocol,
-        hostname: params.hostname,
-        port: params.port,
-        path: params.path,
-        headers: form.getHeaders({
-          cookie: self.jar.map(function(c) {
-            return c.key + "=" + encodeURIComponent(c.value);
-          }).join("; ")
-        })
-      },
-      function (err, response) {
+      response.setEncoding('utf8');
+      response.on("data", function(data) {
         if (err) {
-          return self.ionic.fail('Error uploading certificate: ' + err);
+          return self.ionic.fail('Error setting mode: ' + err);
         }
 
-        response.setEncoding('utf8');
-        response.on("data", function(data) {
-          if (err) {
-            return self.ionic.fail('Error setting mode: ' + err);
-          }
-
-          try {
-            var d = JSON.parse(data);
-            if (d.errors && d.errors.length) {
-              for (var j = 0; j < d.errors.length; j++) {
-                console.log((d.errors[j]).bold.error);
-              }
-              return self.ionic.fail('Unable to set mode');
-            }
-
-            if (self.inputValues['production-mode'] == 'y') {
-              console.log("Successfully set production mode");
-            } else {
-              console.log("Successfully set development mode");
+        try {
+          var d = JSON.parse(data);
+          if (d.errors && d.errors.length) {
+            for (var j = 0; j < d.errors.length; j++) {
+              console.log((d.errors[j]).bold.error);
             }
+            return self.ionic.fail('Unable to set mode');
+          }
 
-          } catch (parseEx) {
-            return self.ionic.fail('Error response: ' + parseEx);
+          if (self.inputValues['production-mode'] == 'y') {
+            console.log("Successfully set production mode");
+          } else {
+            console.log("Successfully set development mode");
           }
-        });
-      }
-    );
+
+        } catch (parseEx) {
+          return self.ionic.fail('Error response: ' + parseEx);
+        }
+      });
+    }
+  );
 };
 
 IonicTask.prototype.upload_cert = function(self) {

From dc38444b1d463f68562f15c8ab158ca21b875412 Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Wed, 11 Feb 2015 13:09:52 -0600
Subject: [PATCH 0454/1100] Adding Google API Key upload

---
 lib/ionic/push.js | 58 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index f458486435..95d24cfc6d 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -35,6 +35,12 @@ IonicTask.prototype.run = function(ionic) {
       } else {
         console.log('You need to specify a webhook url!'.bold.red);
       }
+    } else if (argv._[1] && argv._[1].trim() == 'google-api-key') {
+      if (argv._[2]) {
+        self.set_google_api_key(self, argv._[2].trim());
+      } else {
+        console.log('You need to specify a Google API Key!'.bold.red);
+      }
     } else if (argv['send'] || argv.s) {
       // Dev wants to send a push notification
       self.send_push(self);
@@ -95,6 +101,52 @@ IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
   return true;
 };
 
+
+IonicTask.prototype.set_google_api_key = function(self, google_api_key) {
+  var project = IonicProject.load();
+
+  if (!project.get('app_id')) {
+    console.log("You need to upload your app first!".bold.red);
+    return false;
+  }
+
+  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/google-api-key';
+  var params = parseUrl(url);
+
+  var form = new FormData();
+  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+  form.append('android_api_key', google_api_key);
+
+  form.submit({
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: self.jar.map(function(c) {
+          return c.key + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      })
+    },
+    function (err, response) {
+      response.on("data", function(data) {
+        if (err) {
+          return self.ionic.fail('Error setting Google API Key: ' + err);
+        }
+
+        if (response.statusCode == '200') {
+          console.log("Google API Key Saved".green);
+        } else {
+          return self.ionic.fail('App not found');
+        }
+      })
+    }
+  );
+
+  return true;
+};
+
+
 IonicTask.prototype.send_push = function(self) {
   var project = IonicProject.load();
 
@@ -155,8 +207,10 @@ IonicTask.prototype.send_push = function(self) {
       tokens: [promptResult['device-token']],
       notification: {
         alert: promptResult['alert'],
-        badge: promptResult['badge'],
-        sound: promptResult['sound']
+        ios: {
+          badge: promptResult['badge'],
+          sound: promptResult['sound']
+        }
       }
     }
 

From ba66f3516b7d9f5c82d7a64f174bd48d0037d18b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 17 Feb 2015 10:53:04 -0700
Subject: [PATCH 0455/1100] Bumping prerelease version

---
 npm-shrinkwrap.json | 152 ++++++++++++++++++++++++++------------------
 package.json        |   2 +-
 2 files changed, 91 insertions(+), 63 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7d054d41d7..8d7b19303b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.10",
+  "version": "1.4.0-alpha.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -41,7 +41,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -369,7 +369,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -423,7 +423,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -435,7 +435,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -505,29 +505,19 @@
                       }
                     },
                     "indent-string": {
-                      "version": "1.2.0",
+                      "version": "1.2.1",
                       "from": "indent-string@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
-                        "get-stdin": {
-                          "version": "3.0.2",
-                          "from": "get-stdin@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
-                        },
                         "repeating": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "repeating@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
                               "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
-                            },
-                            "meow": {
-                              "version": "2.1.0",
-                              "from": "meow@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz"
                             }
                           }
                         }
@@ -538,34 +528,55 @@
               }
             },
             "lodash.reescape": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reescape": {
+                  "version": "3.0.0",
+                  "from": "lodash._reescape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+                }
+              }
             },
             "lodash.reevaluate": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reevaluate": {
+                  "version": "3.0.0",
+                  "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+                }
+              }
             },
             "lodash.reinterpolate": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reinterpolate": {
+                  "version": "3.0.0",
+                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+                }
+              }
             },
             "lodash.template": {
-              "version": "3.0.0",
+              "version": "3.2.0",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
                   "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
-                "lodash._basetostring": {
-                  "version": "3.0.0",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                "lodash._baseslice": {
+                  "version": "3.0.1",
+                  "from": "lodash._baseslice@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
@@ -577,15 +588,15 @@
                   "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
                 },
-                "lodash.iserror": {
+                "lodash._reinterpolate": {
                   "version": "3.0.0",
-                  "from": "lodash.iserror@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz"
+                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
                 },
                 "lodash.keys": {
-                  "version": "3.0.2",
+                  "version": "3.0.3",
                   "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
@@ -605,14 +616,31 @@
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "3.0.0",
+                  "version": "3.0.1",
                   "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz",
                   "dependencies": {
+                    "lodash._reescape": {
+                      "version": "3.0.0",
+                      "from": "lodash._reescape@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+                    },
+                    "lodash._reevaluate": {
+                      "version": "3.0.0",
+                      "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+                    },
                     "lodash.escape": {
                       "version": "3.0.0",
                       "from": "lodash.escape@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                      "dependencies": {
+                        "lodash._basetostring": {
+                          "version": "3.0.0",
+                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 }
@@ -1479,7 +1507,7 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -1542,9 +1570,9 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
-              "version": "0.2.1",
+              "version": "1.0.0",
               "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.2",
@@ -1553,7 +1581,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1565,7 +1593,7 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
@@ -1679,14 +1707,14 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "mime-types": {
-              "version": "2.0.8",
+              "version": "2.0.9",
               "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.6.0",
-                  "from": "mime-db@>=1.6.0 <1.7.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz"
+                  "version": "1.7.0",
+                  "from": "mime-db@>=1.7.0 <1.8.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
                 }
               }
             }
@@ -1808,9 +1836,9 @@
       }
     },
     "semver": {
-      "version": "4.2.0",
-      "from": "semver@*",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz"
+      "version": "4.3.0",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
@@ -2026,7 +2054,7 @@
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "from": "readable-stream@>=1.0.26 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
@@ -2046,7 +2074,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2265,12 +2293,12 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "through2@>=0.6.3 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -2304,7 +2332,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "vinyl@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
@@ -2332,14 +2360,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.5.0",
+          "version": "2.5.2",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.0.1",
-              "from": "lodash@>=3.0.1 <3.1.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.0.1.tgz"
+              "version": "3.2.0",
+              "from": "lodash@>=3.2.0 <3.3.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index e0d43ae902..7075b0c265 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.10",
+  "version": "1.4.0-alpha.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 533feacf4120a9829719491653d571d8193560c5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 17 Feb 2015 14:32:07 -0700
Subject: [PATCH 0456/1100] Adding the JSON.stringify and JSON.parse to update
 the data to be exactly what is saved. Updated login to use the transformed
 cookies, instead of whatever cookie jar object comes back from the request
 module. Updated package to use this new login cookies

---
 lib/ionic/app.js     |  7 +++----
 lib/ionic/login.js   | 14 ++++++++++++--
 lib/ionic/package.js | 36 +++++++++++++++++-------------------
 lib/ionic/store.js   |  4 +++-
 lib/ionic/upload.js  |  9 +++------
 lib/ionic/utils.js   | 27 +++++++++++++++++++++++++++
 6 files changed, 65 insertions(+), 32 deletions(-)
 create mode 100644 lib/ionic/utils.js

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 735e150b0a..1f663890c1 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -9,7 +9,8 @@ var fs = require('fs'),
     IonicStats = require('./stats').IonicStats;
     Task = require('./task').Task,
     IonicLoginTask = require('./login').IonicTask,
-    IonicUploadTask = require('./upload').IonicTask;
+    IonicUploadTask = require('./upload').IonicTask,
+    IonicUtils = require('./utils');
 
 var IonicTask = function() {};
 
@@ -75,9 +76,7 @@ IonicTask.prototype.versions = function(self) {
     port: params.port,
     path: params.path,
     headers: form.getHeaders({
-      cookie: self.jar.map(function(c) {
-        return c.key + "=" + encodeURIComponent(c.value);
-      }).join("; ")
+      cookie: IonicUtils.transformCookies(self.jar)
     })
   },
   function (err, response) {
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 91e6b6c732..adc48dce14 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -94,6 +94,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
 IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
   var self = this;
+  var transformedCookies = null;
 
   var jar = request.jar();
   request({
@@ -123,15 +124,24 @@ IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
       }
       self.cookieData.set(ionic.IONIC_DASH, jar.getCookies(ionic.IONIC_DASH));
       self.cookieData.save();
+
+      transformedCookies = self.cookieData.get(ionic.IONIC_DASH);
+    } else {
+      try {
+        var jsonString = JSON.stringify(jar.getCookies(ionic.IONIC_DASH, null, 2));
+        transformedCookies = JSON.parse(jsonString);
+      } catch(ex) {
+        console.log('Invalid cookies from jar.getCookies'.red.bold);
+      }
     }
 
     // save in memory
-    ionic.jar = jar;
+    ionic.jar = transformedCookies;
 
     console.log('Logged in! :)'.green);
 
     if(callback) {
-      callback(jar);
+      callback(transformedCookies);
     }
   });
 };
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 39949ef5fb..8db135b709 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -11,7 +11,8 @@ var fs = require('fs'),
     Task = require('./task').Task,
     IonicUploadTask = require('./upload').IonicTask,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask;
+    IonicLoginTask = require('./login').IonicTask,
+    IonicUtils = require('./utils');
 
 var IonicTask = function() {};
 
@@ -173,9 +174,7 @@ IonicTask.prototype.loadAppSigning = function(callback) {
   var options = {
     url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/signing',
     headers: {
-      cookie: self.jar.cookies.map(function (c) {
-        return c.name + "=" + encodeURIComponent(c.value);
-      }).join("; "),
+      cookie: IonicUtils.transformCookies(self.jar),
       cck: cck
     },
     proxy: process.env.PROXY || process.env.http_proxy || null
@@ -335,13 +334,17 @@ IonicTask.prototype.buildPromptProperties = function() {
 
 
 IonicTask.prototype.buildPostRequest = function(platform) {
+  var csrfmiddlewaretoken = null;
+
+  csrfmiddlewaretoken = IonicUtils.retrieveCsrfToken(this.jar)
+
   var form = new FormData();
 
   form.append('build_status_email', this.buildStatusEmail.toString());
   form.append('name', this.project.get('name') || '');
   form.append('platform', platform);
   form.append('build_mode', this.mode);
-  form.append('csrfmiddlewaretoken', this.jar.cookies[0].value);
+  form.append('csrfmiddlewaretoken', csrfmiddlewaretoken);
 
   for (var i = 0; i < this.plugins.length; i++) {
     form.append('plugin_' + i, this.plugins[i].repo ? this.plugins[i].repo : this.plugins[i].name);
@@ -382,24 +385,23 @@ IonicTask.prototype.buildPostRequest = function(platform) {
 IonicTask.prototype.submitPostRequest = function(form, platform) {
   var self = this;
   var params = parseUrl(self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/package');
-
   var privateData = new IonicStore(this.project.get('app_id'));
+  var headersToTransform = {cookie: IonicUtils.transformCookies(self.jar)};
 
-  console.log( (platform + ' ' + self.mode + ' building...').bold );
+  console.log((platform + ' ' + self.mode + ' building...').bold);
+  if(privateData.get('cck')) {
+    headersToTransform['cck'] = privateData.get('cck');
+  }
 
   form.submit({
     protocol: params.protocol,
     hostname: params.hostname,
     port: params.port,
     path: params.path,
-    headers: form.getHeaders({
-      cookie: self.jar.cookies.map(function (c) {
-        return c.name + "=" + encodeURIComponent(c.value);
-      }).join("; "),
-      cck: privateData.get('cck')
-    })
+    headers: form.getHeaders(headersToTransform)
   },
   function(err, response) {
+
     if(err) {
       return self.ionic.fail("Error packaging " + platform + ": " + err);
     }
@@ -421,9 +423,7 @@ IonicTask.prototype.submitPostRequest = function(form, platform) {
             var requestOptions = {
               url: d.build_status_url,
               headers: {
-                cookie: self.jar.cookies.map(function (c) {
-                  return c.name + "=" + encodeURIComponent(c.value);
-                }).join("; ")
+                cookie: IonicUtils.transformCookies(self.jar)
               }
             };
             pingBuildStatus(self.ionic, requestOptions, platform, 1);
@@ -468,9 +468,7 @@ IonicTask.prototype.clearSigning = function() {
     var options = {
       url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + appId + '/signing/clear',
       headers: {
-        cookie: jar.cookies.map(function (c) {
-          return c.name + "=" + encodeURIComponent(c.value);
-        }).join("; ")
+        cookie: IonicUtils.transformCookies(self.jar)
       },
       proxy: process.env.PROXY || null
     };
diff --git a/lib/ionic/store.js b/lib/ionic/store.js
index 0743efc0c8..18376f4d74 100644
--- a/lib/ionic/store.js
+++ b/lib/ionic/store.js
@@ -46,7 +46,9 @@ IonicStore.prototype.remove = function(k) {
 
 IonicStore.prototype.save = function() {
   try {
-    fs.writeFileSync(this.filePath, JSON.stringify(this.data, null, 2));
+    var dataStoredAsString = JSON.stringify(this.data, null, 2);
+    fs.writeFileSync(this.filePath, dataStoredAsString);
+    this.data = JSON.parse(dataStoredAsString);
   } catch(e) {
     console.error('Unable to save ionic data:', this.filePath, e);
   }
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index f6904e4640..dd3002a9e1 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -7,7 +7,8 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask;
+    IonicLoginTask = require('./login').IonicTask,
+    IonicUtils = require('./utils');
 
 var IonicTask = function() {};
 
@@ -57,11 +58,7 @@ IonicTask.prototype.run = function(ionic, callback) {
 
       var csrftoken = '';
 
-      for (var i = 0; i < jar.length; i++) {
-        if (jar[i].key == 'csrftoken') {
-          csrftoken = jar[i].value;
-        }
-      }
+      csrftoken = IonicUtils.retrieveCsrfToken(jar);
 
       var form = new FormData();
       form.append('name', project.get('name'));
diff --git a/lib/ionic/utils.js b/lib/ionic/utils.js
new file mode 100644
index 0000000000..2f581a155b
--- /dev/null
+++ b/lib/ionic/utils.js
@@ -0,0 +1,27 @@
+var transformCookies = function transformCookies(jar) {
+  return jar.map(function(c) {
+    return c.key + "=" + encodeURIComponent(c.value);
+  }).join("; ");
+}
+
+var retrieveCsrfToken = function retrieveCsrfToken(jar) {
+  // console.log('retrieveCsrfToken', jar)
+  if(!jar || typeof jar == 'undefined' || jar.length == 0) {
+    // console.log('no jar folks')
+    return '';
+  }
+  var csrftoken = '';
+  for (var i = 0; i < jar.length; i++) {
+    if (jar[i].key == 'csrftoken') {
+      csrftoken = jar[i].value;
+      break;
+    }
+  }
+  return csrftoken;
+}
+
+
+module.exports = {
+  retrieveCsrfToken: retrieveCsrfToken,
+  transformCookies: transformCookies
+}

From 92074267fe4234493ed61a6462442490d99d50f3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 17 Feb 2015 16:53:47 -0700
Subject: [PATCH 0457/1100] Bumping to v1.3.11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6387800b80..a87d1a955b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 62e0ba47ce9f7dce50039b80209b83444118d5f0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 17 Feb 2015 16:58:08 -0700
Subject: [PATCH 0458/1100] Updating shrinkwrap

---
 npm-shrinkwrap.json | 150 ++++++++++++++++++++++++++------------------
 1 file changed, 89 insertions(+), 61 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3f28630cc2..a31fb39317 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -41,7 +41,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -369,7 +369,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -505,29 +505,19 @@
                       }
                     },
                     "indent-string": {
-                      "version": "1.2.0",
+                      "version": "1.2.1",
                       "from": "indent-string@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
-                        "get-stdin": {
-                          "version": "3.0.2",
-                          "from": "get-stdin@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"
-                        },
                         "repeating": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "repeating@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
                               "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
-                            },
-                            "meow": {
-                              "version": "2.1.0",
-                              "from": "meow@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/meow/-/meow-2.1.0.tgz"
                             }
                           }
                         }
@@ -538,34 +528,55 @@
               }
             },
             "lodash.reescape": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reescape": {
+                  "version": "3.0.0",
+                  "from": "lodash._reescape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+                }
+              }
             },
             "lodash.reevaluate": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reevaluate": {
+                  "version": "3.0.0",
+                  "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+                }
+              }
             },
             "lodash.reinterpolate": {
-              "version": "3.0.0",
+              "version": "3.0.1",
               "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz",
+              "dependencies": {
+                "lodash._reinterpolate": {
+                  "version": "3.0.0",
+                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+                }
+              }
             },
             "lodash.template": {
-              "version": "3.0.0",
+              "version": "3.2.0",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
                   "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
-                "lodash._basetostring": {
-                  "version": "3.0.0",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                "lodash._baseslice": {
+                  "version": "3.0.1",
+                  "from": "lodash._baseslice@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
@@ -577,15 +588,15 @@
                   "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
                 },
-                "lodash.iserror": {
+                "lodash._reinterpolate": {
                   "version": "3.0.0",
-                  "from": "lodash.iserror@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.0.0.tgz"
+                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
                 },
                 "lodash.keys": {
-                  "version": "3.0.2",
+                  "version": "3.0.3",
                   "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
@@ -605,14 +616,31 @@
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "3.0.0",
+                  "version": "3.0.1",
                   "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz",
                   "dependencies": {
+                    "lodash._reescape": {
+                      "version": "3.0.0",
+                      "from": "lodash._reescape@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+                    },
+                    "lodash._reevaluate": {
+                      "version": "3.0.0",
+                      "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+                    },
                     "lodash.escape": {
                       "version": "3.0.0",
                       "from": "lodash.escape@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                      "dependencies": {
+                        "lodash._basetostring": {
+                          "version": "3.0.0",
+                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 }
@@ -1431,7 +1459,7 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "opbeat-ionic@*",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
@@ -1478,7 +1506,7 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -1541,9 +1569,9 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
-              "version": "0.2.1",
+              "version": "1.0.0",
               "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.2",
@@ -1678,14 +1706,14 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
             },
             "mime-types": {
-              "version": "2.0.8",
+              "version": "2.0.9",
               "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.6.0",
-                  "from": "mime-db@>=1.6.0 <1.7.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.6.0.tgz"
+                  "version": "1.7.0",
+                  "from": "mime-db@>=1.7.0 <1.8.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
                 }
               }
             }
@@ -1693,7 +1721,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
@@ -1807,9 +1835,9 @@
       }
     },
     "semver": {
-      "version": "4.2.0",
-      "from": "semver@*",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz"
+      "version": "4.3.0",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
@@ -1960,12 +1988,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2045,7 +2073,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2225,7 +2253,7 @@
         },
         "graceful-fs": {
           "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
@@ -2269,7 +2297,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -2331,14 +2359,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.5.0",
+          "version": "2.5.2",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.0.1",
-              "from": "lodash@>=3.0.1 <3.1.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.0.1.tgz"
+              "version": "3.2.0",
+              "from": "lodash@>=3.2.0 <3.3.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
             }
           }
         }

From ee48a64cb2036a1d1960b6b8e7741cab5ae522c2 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 18 Feb 2015 10:12:23 -0700
Subject: [PATCH 0459/1100] Changelog updates

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a67d084de0..e190578265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Next-release
+### 1.3.11
 
 * Updating task order in the CLI output for help - putting more important tasks at the top, and lesser used ones at the bottom.
 * Updated README to have basic info at top, more advanced information at bottom.

From 018f08c25950653a7f58f7aa3bae106eca1c87cb Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Wed, 18 Feb 2015 13:21:57 -0600
Subject: [PATCH 0460/1100] updating the push test to use the new authorization
 header

---
 lib/ionic/push.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 95d24cfc6d..4ac02c48ae 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -215,12 +215,12 @@ IonicTask.prototype.send_push = function(self) {
     }
 
     var options = {
-      url: 'http://push.ionic.io/api/v1/push',
+      url: 'https://push.ionic.io/api/v1/push',
       method: 'POST',
       json: true,
       headers: {
         'X-Ionic-Application-Id': project.get('app_id'), 
-        'X-Ionic-API-Key': api_key
+        'authorization': 'Basic ' + new Buffer(api_key + ':').toString('base64')
       },
       body: notification
     };

From 74fb0ef444fef0bc7ead92de4ff63bf1967083c8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 25 Feb 2015 09:15:10 -0700
Subject: [PATCH 0461/1100] Closes #269 - updates to README to contain
 information about gulpStartupTasks and Gulp Integration

---
 README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3f947623d4..a41944a5e5 100644
--- a/README.md
+++ b/README.md
@@ -195,7 +195,23 @@ For a reference on glob pattern syntax, check out
 [globbing patterns](http://gruntjs.com/configuring-tasks#globbing-patterns) on
 the Grunt website.
 
-Note:
+__Gulp Integration__
+
+When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by putting them into your `ionic.project` as a `gulpStartupTasks` property, as follows:
+
+```json
+{
+  "name": "SmoothRiders",
+   "gulpStartupTasks": [
+    "watch"
+  ]
+}
+
+```
+
+Now, when you run `ionic serve`, it will run the `watch` task while starting the Ionic server.
+
+NOTE:
 
 ```bash
 $ ionic setup sass

From 2c2a60eeddbf6261aef272023cdced997cdf875f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 2 Mar 2015 18:05:01 -0700
Subject: [PATCH 0462/1100] Adding in changes using the ionic-app-lib

---
 lib/ionic.js       |  4 ++++
 lib/ionic/start.js | 42 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 3a51a96cc8..df2db642dc 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -21,6 +21,10 @@ var argv = require('optimist').argv,
     shelljs = require('shelljs/global'),
     Multibar = require('./ionic/multibar');
 
+var ionicCliLib = require('ionic-cli-lib');
+
+ionicCliLib.events.on('log', console.log)
+
 var reportExtras = function reportExtras() {
   var ionicInfo = new IonicInfo();
   var commandLineInfo = process.argv;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5441c84c00..9dda78d543 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -15,8 +15,10 @@ var fs = require('fs'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task;
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    cliLib = require('ionic-cli-lib');
 
+var Start = cliLib.start;
 
 var IonicTask = function() {};
 
@@ -102,14 +104,48 @@ IonicTask.prototype.run = function(ionic) {
       var areYouSure = promptResult.areYouSure.toLowerCase().trim();
       if(areYouSure == 'yes' || areYouSure == 'y') {
         rm('-rf', self.targetPath);
-        self.startApp();
+        // self.startApp();
+        var options = {
+          targetPath: self.targetPath,
+          template: self.template,
+          packageName: self.packageName,
+          isCordovaProject: self.isCordovaProject,
+          setupSass: (argv.sass || this.appSetup.sass)
+        }
+          // result.targetPath = options.targetPath || null;
+          // result.template = options.template || 'blank';
+          // result.packageName = options.packageName || null;
+          // result.appName = options.appName || '';
+          // result.isCordovaProject = options.isCordovaProject || true;
+          // result.setupSass = options.setupSass || true;
+        Start.startApp(options)
+        .then(function(data) {
+          self.finalize();
+        })
       }
     });
 
   } else {
     // create the app directory
     fs.mkdirSync(this.targetPath);
-    this.startApp();
+    // console.log('Making options for start app from lib')
+
+    var options = {
+      targetPath: self.targetPath,
+      template: self.template,
+      packageName: self.packageName,
+      isCordovaProject: self.isCordovaProject,
+      setupSass: argv.sass
+    }
+    // console.log('Starting app from lib')
+
+    Start.startApp(options)
+    .then(function(data) {
+      self.finalize();
+    })
+    .catch(function(err) {
+      console.log('Error!', err.stack)
+    })
   }
 
 };

From 27204e4106676d736634e7d71607ee7b6ead04bc Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 3 Mar 2015 08:57:48 -0600
Subject: [PATCH 0463/1100] generate specific platform resources from cmd

---
 CHANGELOG.md                    |  5 +++++
 README.md                       |  9 +++++++++
 lib/ionic/resources/generate.js | 16 ++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e190578265..6400df8b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.3.12
+
+* Explicitly state which platform resources should be built by providing a platform name in the command
+
+
 ### 1.3.11
 
 * Updating task order in the CLI output for help - putting more important tasks at the top, and lesser used ones at the bottom.
diff --git a/README.md b/README.md
index a41944a5e5..6ca007972f 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,15 @@ $ ionic resources
 
 One source image can be used to generate images for each platform by placing the file within the `resources` directory, such as `resources/icon.png`. To use different source images for individual platforms, place the source image in the respective platform's directory. For example, to use a different icon for Android, it should follow this path: `resources/android/icon.png`, and a different image for iOS would use this path: `resources/ios/icon.png`.
 
+### Generating Exact Platform Resources
+
+By default the `ionic resources` command will automatically figure out which platforms it should generate according to what platforms have been added to your project. However, you can also explicitly state which resources should be built by providing a platform name in the command. The example below would generate only `ios` resources (even if the platform hasn't been added to the project).
+
+```bash
+$ ionic resources ios
+```
+
+
 ## Crosswalk for Android
 
 In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index eb8cfc99b7..4251f90fd4 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -42,15 +42,27 @@ IonicResources.prototype.run = function() {
   }
 
   var hasPlatforms = true;
-  if (!fs.existsSync('platforms')) {
+  if (_.contains(argv._, 'ios')) {
+    buildPlatforms.push('ios');
+
+  } else if (_.contains(argv._, 'android')) {
+    buildPlatforms.push('android');
+
+  } else if (_.contains(argv._, 'wp8')) {
+    buildPlatforms.push('wp8');
+
+  } else if (!fs.existsSync('platforms')) {
     hasPlatforms = false;
+
   } else {
     buildPlatforms = fs.readdirSync('platforms');
     hasPlatforms = buildPlatforms.length;
   }
 
   if (!hasPlatforms) {
-    console.error('No platforms have been added. Please add a platform, for example: ionic platform add ios');
+    console.error('No platforms have been added.');
+    console.error('Please add a platform, for example: ionic platform add ios');
+    console.error('Or provide a platform name, for example: ionic resources android');
     return;
   }
 

From d5e777d7974069a7c2b1563f47b51158decf271d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 3 Mar 2015 16:25:37 -0700
Subject: [PATCH 0464/1100] Adding the shortcut arguments to the help output

---
 lib/ionic.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 3a51a96cc8..d21db5b0ac 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -26,7 +26,6 @@ var reportExtras = function reportExtras() {
   var commandLineInfo = process.argv;
   var info = ionicInfo.gatherInfo();
   info.command = commandLineInfo;
-  console.log('Command line stuff:', commandLineInfo);
   return info;
 }
 
@@ -87,10 +86,10 @@ var TASKS = [
       '--port|-p': 'Dev server HTTP port (8100 default)',
       '--livereload-port|-r': 'Live Reload port (35729 default)',
       '--nobrowser|-b': 'Disable launching a browser',
-      '--nolivereload': 'Do not start live reload',
+      '--nolivereload|-d': 'Do not start live reload',
       '--noproxy|-x': 'Do not add proxies',
       '--address': 'Use specific address or return with failure',
-      '--lab': 'Test your apps on multiple screen sizes and platform types'
+      '--lab|-l': 'Test your apps on multiple screen sizes and platform types'
     },
     module: './ionic/serve'
   },

From 77d2957bc649329c43975ed6cdc64a350631fa1e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 00:42:29 -0700
Subject: [PATCH 0465/1100] Adding in the ionic serve with a browser specified,
 closes #276. Now alerts the user if the ionic server port/host or the live
 reload port/host is in use, and if so, gets another port number to use. Added
 in ports.js - from node-portfinder

---
 CHANGELOG.md       |   2 +
 lib/ionic.js       |   2 +-
 lib/ionic/ports.js | 211 +++++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/serve.js | 161 ++++++++++++++++++++++++++--------
 package.json       |   5 +-
 5 files changed, 340 insertions(+), 41 deletions(-)
 create mode 100644 lib/ionic/ports.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6400df8b1e..5a0740407e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ### 1.3.12
 
 * Explicitly state which platform resources should be built by providing a platform name in the command
+* The serve command now allows you to specify a browser to open other than your default - `ionic serve --browser safari`
+* The serve command now checks for existing server and live reload ports before trying to start up servers. If either serve host/port is used, then the port is incremented and informs the user of the change, then starts the server to avoid Address conflicts.
 
 
 ### 1.3.11
diff --git a/lib/ionic.js b/lib/ionic.js
index d21db5b0ac..9df585b96f 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -344,7 +344,7 @@ var TASKS = [
        '[command]': 'The command you desire help with'
      },
      module: './ionic/help'
-   },
+   }
 ];
 
 Ionic = {
diff --git a/lib/ionic/ports.js b/lib/ionic/ports.js
new file mode 100644
index 0000000000..9125aacfe6
--- /dev/null
+++ b/lib/ionic/ports.js
@@ -0,0 +1,211 @@
+/*
+ * portfinder.js: A simple tool to find an open port on the current machine.
+ *
+ * (C) 2011, Charlie Robbins
+ *
+ */
+ 
+var fs = require('fs'),
+    net = require('net'),
+    path = require('path'),
+    async = require('async');
+    // mkdirp = require('mkdirp').mkdirp;
+
+//
+// ### @basePort {Number}
+// The lowest port to begin any port search from
+//
+exports.basePort = 8000;
+
+//
+// ### @basePath {string}
+// Default path to begin any socket search from
+//
+exports.basePath = '/tmp/portfinder'
+
+exports.getPort = function (options, callback) {
+  if (!callback) {
+    callback = options;
+    options = {}; 
+  }
+
+  // console.log('Testing out - ', options)
+  
+  options.port   = options.port   || exports.basePort;
+  options.host   = options.host   || null;
+  options.server = options.server || net.createServer(function () {
+    //
+    // Create an empty listener for the port testing server.
+    //
+  });
+  
+  function onListen () {
+    options.server.removeListener('error', onError);
+    // console.log('onListen')
+    options.server.close();
+    callback(null, options.port)
+  }
+  
+  function onError (err) {
+    // console.log('Error:', err)
+    options.server.removeListener('listening', onListen);
+
+    if (err.code !== 'EADDRINUSE' && err.code !== 'EACCES') {
+      return callback(err);
+    }
+
+    exports.getPort({
+      port: exports.nextPort(options.port),
+      host: options.host,
+      server: options.server
+    }, callback);
+  }
+
+  options.server.once('error', onError);
+  options.server.once('listening', onListen);
+  options.server.listen(options.port, options.host);
+};
+
+exports.getPorts = function (count, options, callback) {
+  if (!callback) {
+    callback = options;
+    options = {};
+  }
+
+  // console.log('calling getPorts')
+
+  var lastPort = null;
+  async.timesSeries(count, function(index, asyncCallback) {
+    if (lastPort) {
+      options.port = exports.nextPort(lastPort);
+    }
+
+    exports.getPort(options, function (err, port) {
+      if (err) {
+        asyncCallback(err);
+      } else {
+        lastPort = port;
+        asyncCallback(null, port);
+      }
+    });
+  }, callback);
+};
+
+//
+// ### function getSocket (options, callback)
+// #### @options {Object} Settings to use when finding the necessary port
+// #### @callback {function} Continuation to respond to when complete.
+// Responds with a unbound socket using the specified directory and base
+// name on the current machine.
+//
+exports.getSocket = function (options, callback) {
+  if (!callback) {
+    callback = options;
+    options = {};
+  }
+
+  options.mod  = options.mod    || 0755;
+  options.path = options.path   || exports.basePath + '.sock';
+  
+  //
+  // Tests the specified socket
+  //
+  function testSocket () {
+    fs.stat(options.path, function (err) {
+      //
+      // If file we're checking doesn't exist (thus, stating it emits ENOENT),
+      // we should be OK with listening on this socket.
+      //
+      if (err) {
+        if (err.code == 'ENOENT') {
+          callback(null, options.path);
+        }
+        else {
+          callback(err);
+        }
+      }
+      else {
+        //
+        // This file exists, so it isn't possible to listen on it. Lets try
+        // next socket.
+        //
+        options.path = exports.nextSocket(options.path);
+        exports.getSocket(options, callback);
+      }
+    });
+  }
+  
+  //
+  // Create the target `dir` then test connection
+  // against the socket.
+  //
+  function createAndTestSocket (dir) {
+    mkdirp(dir, options.mod, function (err) {
+      if (err) {
+        return callback(err);
+      }
+      
+      options.exists = true;
+      testSocket();
+    });
+  }
+  
+  //
+  // Check if the parent directory of the target
+  // socket path exists. If it does, test connection
+  // against the socket. Otherwise, create the directory
+  // then test connection. 
+  //
+  function checkAndTestSocket () {
+    var dir = path.dirname(options.path);
+    
+    fs.stat(dir, function (err, stats) {
+      if (err || !stats.isDirectory()) {
+        return createAndTestSocket(dir);
+      }
+
+      options.exists = true;
+      testSocket();
+    });
+  }
+  
+  //
+  // If it has been explicitly stated that the 
+  // target `options.path` already exists, then 
+  // simply test the socket.
+  //
+  return options.exists 
+    ? testSocket()
+    : checkAndTestSocket();
+};
+
+//
+// ### function nextPort (port)
+// #### @port {Number} Port to increment from.
+// Gets the next port in sequence from the 
+// specified `port`.
+//
+exports.nextPort = function (port) {
+  return port + 1;
+};
+
+//
+// ### function nextSocket (socketPath)
+// #### @socketPath {string} Path to increment from
+// Gets the next socket path in sequence from the 
+// specified `socketPath`.
+//
+exports.nextSocket = function (socketPath) {
+  var dir = path.dirname(socketPath),
+      name = path.basename(socketPath, '.sock'),
+      match = name.match(/^([a-zA-z]+)(\d*)$/i),
+      index = parseInt(match[2]),
+      base = match[1];
+  
+  if (isNaN(index)) {
+    index = 0;
+  }
+  
+  index += 1;
+  return path.join(dir, base + index + '.sock');
+};
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 237f2a63d0..91c075af1e 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,11 +1,12 @@
 var fs = require('fs'),
+    Q = require('q'),
     path = require('path'),
     argv = require('optimist').argv,
     connect = require('connect'),
     finalhandler = require('finalhandler'),
     http = require('http'),
     serveStatic = require('serve-static'),
-    tinylr = require('tiny-lr-fork'),
+    tinylr = require('tiny-lr'),
     lr = require('connect-livereload'),
     vfs = require('vinyl-fs'),
     request = require('request'),
@@ -15,7 +16,8 @@ var fs = require('fs'),
     url = require('url'),
     xml2js = require('xml2js'),
     IonicStats = require('./stats').IonicStats,
-    shelljs = require('shelljs');
+    shelljs = require('shelljs'),
+    ports = require('./ports');
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
@@ -31,23 +33,63 @@ IonicTask.prototype.run = function(ionic) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
-  this.loadSettings(function(){
+  this.loadSettings();
 
+  this.getAddress()
+  .then(function() {
+    return self.checkPorts(true, self.port, self.address);
+  })
+  .then(function() {
+    if(self.runLivereload) {
+      return self.checkPorts(false, self.liveReloadPort, self.address);
+    }
+  })
+  .then(function() {
     if(self.isAddressCmd) {
       console.log( self.address );
       process.exit();
     }
-
-    self.start(ionic);
+    self.start(ionic)
 
     if(ionic.hasFailed) return;
 
     ionic.latestVersion.promise.then(function(){
       ionic.printVersionWarning();
     });
-  });
+  })
+  .catch(function(error) {
+
+  })
+
 };
 
+//isIonicServer = true when serving www directory, false when live reload
+IonicTask.prototype.checkPorts = function(isIonicServer, testPort) {
+  var q = Q.defer();
+
+  var self = this,
+      message = [],
+      testHost;
+
+  testHost = this.address == 'localhost' ? null : this.address;
+
+  ports.getPort({port: testPort, host: testHost},
+    function(err, port) {
+    if(port != testPort) {
+      message = ['The port ', testPort, ' was taken on the host ', self.address, ' - using port ', port, ' instead'].join('');
+      console.log(message.red.bold);
+      if(isIonicServer) {
+        self.port = port;
+      } else {
+        self.liveReloadPort = port;
+      }
+    }
+    q.resolve();
+  });
+
+  return q.promise;
+}
+
 
 IonicTask.prototype.loadSettings = function(cb) {
   var project = null;
@@ -61,15 +103,18 @@ IonicTask.prototype.loadSettings = function(cb) {
   var self = this;
 
   this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
-  this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
-
+  this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv.r || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
   this.launchBrowser = !argv.nobrowser && !argv.b;
-  this.launchLab = this.launchBrowser && argv.lab;
-  this.runLivereload = !argv.nolivereload && !argv.r;
+  this.launchLab = this.launchBrowser && (argv.lab || argv.l);
+  this.runLivereload = !(argv.nolivereload || argv.d);
   this.useProxy = !argv.noproxy && !argv.x;
   this.proxies = project.get('proxies') || [];
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.gulpStartupTasks = project.get('gulpStartupTasks');
+  
+  this.browser = argv.browser || '';
+  this.browserOption = argv.browserOption || '';
+
   this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
@@ -77,7 +122,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.documentRoot = project.get('documentRoot') || 'www';
   this.contentSrc = path.join(this.documentRoot, this.ionic.getContentSrc());
 
-  this.getAddress(cb);
+  // this.getAddress(cb);
 
   process.stdin.on('readable', function() {
     var input = process.stdin.read();
@@ -143,6 +188,33 @@ IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
   return true;
 }
 
+IonicTask.prototype.showFinishedServeMessage = function() {
+
+  if(this.launchLab || this.launchBrowser) {
+    var open = require('open');
+    var openUrl = this.launchLab ? [this.host(this.port), IONIC_LAB_URL] : [this.host(this.port)];
+    if(this.browserOption) {
+      openUrl.push(this.browserOption)
+    }
+
+    // console.log('Launching - openUrl', openUrl, 'and browser:', this.browser);
+    try {
+      open(openUrl.join(''), this.browser);
+    } catch (ex) {
+      console.log('Error, ',ex)
+    }
+  }
+
+  // if(this.launchLab) {
+  //   var open = require('open');
+  //   open(this.host(this.port) + IONIC_LAB_URL);
+  //   // open(this.host(this.port), this.browser);
+  // } else if (this.launchBrowser) {
+  //   var open = require('open');
+  //   open(this.host(this.port));
+  // }
+  this.printCommandTips();
+}
 
 IonicTask.prototype.start = function(ionic) {
   try {
@@ -177,22 +249,19 @@ IonicTask.prototype.start = function(ionic) {
       self.liveReloadServer = self.host(self.liveReloadPort);
 
       var lrServer = tinylr();
-      lrServer.listen(this.liveReloadPort, function(err) {
-        if(err) {
-          return ionic.fail('Unable to start live reload server:', err);
-        } else {
-          console.log('Running live reload server:'.green.bold, self.liveReloadServer );
-          console.log('Watching :'.green.bold, self.watchPatterns);
-          if(self.launchLab) {
-            var open = require('open');
-            open( self.host(self.port) + IONIC_LAB_URL );
-          } else if(self.launchBrowser) {
-            var open = require('open');
-            open( self.host(self.port) );
+      try {
+        lrServer.listen(self.liveReloadPort, function(err) {
+          if(err) {
+            return ionic.fail('Unable to start live reload server:', err);
+          } else {
+            console.log('Running live reload server:'.green.bold, self.liveReloadServer );
+            console.log('Watching :'.green.bold, self.watchPatterns);
+            self.showFinishedServeMessage();
           }
-          self.printCommandTips();
-        }
-      });
+        });
+      } catch(ex) {
+        self.ionic.fail('Live Reload failed to start, error: ', ex.message)
+      }
 
       app.use(require('connect-livereload')({
         port: this.liveReloadPort
@@ -209,7 +278,6 @@ IonicTask.prototype.start = function(ionic) {
       }
     }
 
-
     this.devServer = this.host(this.port);
 
     // Serve up the www folder by default
@@ -321,10 +389,19 @@ IonicTask.prototype.start = function(ionic) {
 
     // Listen
     app.use(server);
-    app.listen(this.port);
+    try {
+      app.listen(this.port);
+    }catch(ex) {
+      self.ionic.fail('Failed to start the Ionic server: ', ex.message)
+    }
 
     console.log('Running dev server:'.green.bold, this.devServer);
 
+    if(!self.runLivereload) {
+      self.showFinishedServeMessage();
+    }
+
+
   } catch(e) {
     var msg;
     if(e && (e + '').indexOf('EMFILE') > -1) {
@@ -611,6 +688,7 @@ IonicTask.prototype._postToLiveReload = function(files) {
 
 
 IonicTask.prototype.getAddress = function(cb) {
+  var q = Q.defer();
   try {
     var self = this;
     var addresses = [];
@@ -649,21 +727,23 @@ IonicTask.prototype.getAddress = function(cb) {
     if(tryAddress) {
       if(tryAddress == 'localhost') {
         self.address = tryAddress;
-        cb();
-        return;
+        // cb();
+        q.resolve();
+        return q.promise;
       }
       for(var x=0; x<addresses.length; x++) {
         // double check if this address is still available
         if(addresses[x].address == tryAddress)
         {
           self.address = addresses[x].address;
-          cb();
-          return;
+          // cb();
+          q.resolve();
+          return q.promise;
         }
       }
       if (argv.address) {
         self.ionic.fail('Address ' + argv.address + ' not available.');
-        return;
+        return q.promise;
       }
     }
 
@@ -682,8 +762,9 @@ IonicTask.prototype.getAddress = function(cb) {
 
       if(addresses.length === 1) {
         self.address = addresses[0].address;
-        cb();
-        return;
+        // cb();
+        q.resolve();
+        return q.promise;
       }
 
       for(var x=0; x<addresses.length; x++) {
@@ -717,8 +798,9 @@ IonicTask.prototype.getAddress = function(cb) {
               console.log('Selected address: '.green.bold + self.address);
             }
             ionicConfig.set(addressConfigKey, self.address);
-            cb();
-            return;
+            // cb();
+            q.resolve();
+            return q.promise;
           }
         }
 
@@ -732,12 +814,15 @@ IonicTask.prototype.getAddress = function(cb) {
     } else {
       // no address found, but doesn't matter if it doesn't need an ip address and localhost will do
       self.address = 'localhost';
-      cb();
+      // cb();
+      q.resolve();
     }
 
   } catch(e) {
     self.ionic.fail('Error getting IPv4 address: ' + e);
   }
+
+  return q.promise;
 };
 
 IonicTask.prototype.host = function(port) {
diff --git a/package.json b/package.json
index a87d1a955b..6cb36fbecb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -45,6 +45,7 @@
   "license": "MIT",
   "dependencies": {
     "archiver": "0.5.1",
+    "async": "^0.9.0",
     "colors": "0.6.2",
     "connect": "3.1.1",
     "connect-livereload": "0.5.2",
@@ -67,7 +68,7 @@
     "semver": "^4.2.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
-    "tiny-lr-fork": "0.0.5",
+    "tiny-lr": "^0.1.5",
     "underscore": "~1.7.0",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",

From a6e0b862c483eb7002a99c12f72fc92cbd59a003 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 00:45:46 -0700
Subject: [PATCH 0466/1100] Adding in ascii art with ionitron - Occasionally,
 it will even display an emotion.

---
 lib/ionic.js          |  7 ++++++-
 lib/ionic/ionitron.js | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 lib/ionic/ionitron.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 9df585b96f..1553ef4355 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -19,7 +19,8 @@ var argv = require('optimist').argv,
     settings = require('../package.json'),
     IonicInfo = require('./ionic/info').IonicTask;
     shelljs = require('shelljs/global'),
-    Multibar = require('./ionic/multibar');
+    Multibar = require('./ionic/multibar'),
+    ionitron = require('./ionic/ionitron');
 
 var reportExtras = function reportExtras() {
   var ionicInfo = new IonicInfo();
@@ -537,6 +538,10 @@ Ionic = {
       self.printVersionWarning();
     });
 
+    if(argv.ionitron) {
+      return ionitron.print();
+    }
+
     if( (argv.version || argv.v) && !argv._.length) {
       return this.version();
     }
diff --git a/lib/ionic/ionitron.js b/lib/ionic/ionitron.js
new file mode 100644
index 0000000000..f165b4c22a
--- /dev/null
+++ b/lib/ionic/ionitron.js
@@ -0,0 +1,36 @@
+var colors = require('colors'),
+    path = require('path'),
+    fs = require('fs');
+
+var ionitronStatements = [
+  'Hello human, what shall we build today?',
+  '*BEEP BEEP* ALL YOUR BASE ARE BELONG TO US *BEEP BEEP*',
+  'Prepare to dominate your hybrid app. Engaging now.',
+  'My sensors indicate you have an undying love for ionic,         |\n       |  or is it just me?\t\t\t\t\t\t',
+  'That\'s a nice looking app you have there. \t\t\t  |\n       |  Definitely one of the better human made apps I\'ve seen.\t',
+  'Oh, hi there. I was just not indexing your hard drive,          |\n       |  definitely not doing that.                                    ',
+  'That would need bee\'s approval',
+  'Fork you! Oh, I\'m sorry, wrong branch.'
+];
+
+var ionictronAsciiFile = 'ionitron.txt';
+
+module.exports.print = function print() {
+  var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
+  var contents = fs.readFileSync(ionitronPath, 'utf8');
+  var messageContent = [ionitronStatements[Math.floor(Math.random() * (ionitronStatements.length - 0) + 0)]].join('');
+  var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
+  // console.log(messageContent.length, replaceString.length)
+  if (messageContent.length < replaceString.length) {
+    var diff = (replaceString.length) - messageContent.length;
+    var i = 0;
+    // console.log(diff, i)
+    while (i < diff) {
+      messageContent = messageContent + ' ';
+      i++;
+    }
+  }
+  contents = contents.replace(replaceString, messageContent)
+  console.log(contents.cyan);
+  return;
+}

From 2254c053918e78bb55ccbca57db0913872d8d317 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 00:45:57 -0700
Subject: [PATCH 0467/1100] Including ascii file

---
 lib/ionic/assets/ionitron.txt | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 lib/ionic/assets/ionitron.txt

diff --git a/lib/ionic/assets/ionitron.txt b/lib/ionic/assets/ionitron.txt
new file mode 100644
index 0000000000..77a6540069
--- /dev/null
+++ b/lib/ionic/assets/ionitron.txt
@@ -0,0 +1,47 @@
+                                                                                
+                                                                                
+                                                                                
+                               h                                                
+                            `-oooooo/`.++                                       
+                          ::-oooooooo...                                        
+                         `:.`:oooooo/                                           
+                            ```-:oo`                                            
+                                 /o.                                            
+                                 ./:--:::::--..`                                
+                            .-/+ooooooooooooooooo+/:.                           
+                        `-/ooooooooooooooooooooooooooo+:.                       
+                      -+ooooooooooooooooooooooooooooooooo+:`                    
+                    :ooooooooooooooooooooooooooooooooooooooo/`                  
+                  :ooooooooooooooooooooooooooooooooooooooooooo/`                
+                `+oooooooooooooooooooooooooooooooooooooooooooooo-               
+               -ooooooooooooooooooooooooooooooooooooooooooooooooo/              
+              -ooooooooooooooooooooooooooooooooooooooooooooooooooo/.-.          
+             -ooooooooooooooooooooooooooooooooooooooooooooooooooooo/+o+`        
+            `ooooooooooooooooooooooooooooooooooooooooooooooooooooooo:ooo`       
+            /ooooooooooooooooooooooooooooooooooooooooooooooooooooooo+ooo/       
+        -+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo+oooh      
+       -ooooooo+ooooooooooooooooooooooooooooooooooooooooooooooooooooooooo       
+       ooooooooo:oooooooooooooooooooooooooooooooooooooooooooooooooooooooo       
+       ooooooooo+:ooooooooooooooooooooooooooooooooooooooooooooooooooooooo       
+       oooooooooo.oooooooooooooooooooooooooooooooooooooooooooooooooooooo+       
+       oooooooooo:/oooooooooooooooooooooooooooooooooooooooooooooooooooo+`       
+       +ooooooooo//oooooooooooooooooooooooooooooooooooooooooooooooooo``         
+       .ooooooooo/+oooooooooooooooooooooo:.-+oooooooo:  `/oooooooooo-           
+        :oooooooo/oooooooooooooooooooooo:   `oooooooo.   :ooooooooo/            
+         :ooooooooooooooooooooooooooooooo:--+ooooooooo+/oooooooooo/             
+          `:////ooooooooooooooooooooooooooooooooooooooooooooooooo:              
+                `+oooooooooooooooooooooooooooooooooooooooooooooo.               
+                  -ooooooooooooooooooooooooooooooooooooooooooo:`                
+                   `:ooooooooooooooooooooooooooooooooooooooo/`                  
+                      ./ooooooooooooooooooooooooooooooooo+-`                    
+                        `-/ooooooooooooooooooooooooooo/-\`\                       
+                            `-:+ooooooooooooooooo+/-.    \ \                     
+                                  '\:--::::--/'          |  \                     
+                                                         /   \                    
+         -----------------------------------------------*     *---------                   
+        /                                                                \
+       /                                                                  \
+       |  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  |
+       \                                                                  /
+        \                                                                /
+         *--------------------------------------------------------------*        

From 330c2df7bde7e70059bb6c16435a7cc3acaa8630 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 00:54:24 -0700
Subject: [PATCH 0468/1100] Updating readme and task instructions for serve.
 Adding in the short args for browser and browser option, -w and -o
 respectively

---
 README.md          |  2 ++
 lib/ionic.js       |  2 ++
 lib/ionic/serve.js | 13 ++-----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6ca007972f..e6edf437be 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,8 @@ __Command-line flags/options for `run` and `emulate`:__
     [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
     [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
     [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
+    [--browser|-w] ..........  Specifies the browser to use (safari, firefox, chrome)
+    [--browseroption|-o] ....  Specifies a path to open to (/#/tab/dash)
     [--debug|--release]
 
 While the server is running for live reload, you can use the following commands within the CLI:
diff --git a/lib/ionic.js b/lib/ionic.js
index 9df585b96f..a81a1991a8 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -89,6 +89,8 @@ var TASKS = [
       '--nolivereload|-d': 'Do not start live reload',
       '--noproxy|-x': 'Do not add proxies',
       '--address': 'Use specific address or return with failure',
+      '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
+      '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
       '--lab|-l': 'Test your apps on multiple screen sizes and platform types'
     },
     module: './ionic/serve'
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 91c075af1e..9e4f022d52 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -112,8 +112,8 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
   this.gulpStartupTasks = project.get('gulpStartupTasks');
   
-  this.browser = argv.browser || '';
-  this.browserOption = argv.browserOption || '';
+  this.browser = argv.browser || argv.w || '';
+  this.browserOption = argv.browserOption || argv.o || '';
 
   this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
@@ -197,7 +197,6 @@ IonicTask.prototype.showFinishedServeMessage = function() {
       openUrl.push(this.browserOption)
     }
 
-    // console.log('Launching - openUrl', openUrl, 'and browser:', this.browser);
     try {
       open(openUrl.join(''), this.browser);
     } catch (ex) {
@@ -205,14 +204,6 @@ IonicTask.prototype.showFinishedServeMessage = function() {
     }
   }
 
-  // if(this.launchLab) {
-  //   var open = require('open');
-  //   open(this.host(this.port) + IONIC_LAB_URL);
-  //   // open(this.host(this.port), this.browser);
-  // } else if (this.launchBrowser) {
-  //   var open = require('open');
-  //   open(this.host(this.port));
-  // }
   this.printCommandTips();
 }
 

From 54fe7ce43b01a42531d8b7bb4119f80035bb8106 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 00:55:31 -0700
Subject: [PATCH 0469/1100] Changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a0740407e..9a2c65282d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Explicitly state which platform resources should be built by providing a platform name in the command
 * The serve command now allows you to specify a browser to open other than your default - `ionic serve --browser safari`
+* The serve command now allows you to specify a path to start the browser in so you can go straight to what you want to test - `ionic serve -o /#/tab/dash`
 * The serve command now checks for existing server and live reload ports before trying to start up servers. If either serve host/port is used, then the port is incremented and informs the user of the change, then starts the server to avoid Address conflicts.
 
 

From b75b7224c0697550c4c2ab8dd809628c9aa4730f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 01:02:15 -0700
Subject: [PATCH 0470/1100] Closes #274 - provides the proxyNoAgent property to
 specify opting out of connection pooling

---
 lib/ionic/serve.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 9e4f022d52..7c3c8e9558 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -264,7 +264,11 @@ IonicTask.prototype.start = function(ionic) {
       for(var x=0; x<this.proxies.length; x++) {
         var proxy = this.proxies[x];
 
-        app.use(proxy.path, proxyMiddleware(url.parse(proxy.proxyUrl)));
+        var opts = url.parse(proxy.proxyUrl);
+        if(proxy.proxyNoAgent)
+            opts.agent = false;
+
+        app.use(proxy.path, proxyMiddleware(opts));
         console.log('Proxy added:'.green.bold, proxy.path + " => " + url.format(proxy.proxyUrl));
       }
     }

From 11688bcda64913825ca7d9bc6d0a7bad9d896cb8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 10:57:53 -0700
Subject: [PATCH 0471/1100] Closes #272 - providing help for resources command
 to tell preferred image sizes.

---
 CHANGELOG.md | 1 +
 lib/ionic.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a2c65282d..b131311202 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * The serve command now allows you to specify a browser to open other than your default - `ionic serve --browser safari`
 * The serve command now allows you to specify a path to start the browser in so you can go straight to what you want to test - `ionic serve -o /#/tab/dash`
 * The serve command now checks for existing server and live reload ports before trying to start up servers. If either serve host/port is used, then the port is incremented and informs the user of the change, then starts the server to avoid Address conflicts.
+* Added in the `proxyNoAgent` property on `ionic.project` proxies to be true/false, if true opts out of connection pooling, see [HttpAgent](http://nodejs.org/api/http.html#http_class_http_agent)
 
 
 ### 1.3.11
diff --git a/lib/ionic.js b/lib/ionic.js
index a81a1991a8..57f2100dd0 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -51,6 +51,13 @@ colors.setTheme({
   error: 'red'
 });
 
+var resourcesSummary = [
+  'Automatically create icon and splash screen resources' + ' (beta)'.yellow, 
+  'Put your images in the ./resources directory, named splash or icon.',
+  'Accepted file types are .png, .ai, and .psd.',
+  'Icons should be 192x192 px without rounded corners.',
+  'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
+].join('\n\t\t\t\t\t     ');
 
 var TASKS = [
   {
@@ -181,7 +188,7 @@ var TASKS = [
   {
     title: 'resources',
     name: 'resources',
-    summary: 'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
+    summary: resourcesSummary,
     options: {
       '--icon|-i': 'Generate icon resources',
       '--splash|-s': 'Generate splash screen resources'

From 79ab90ff7ffa015fe1ae0ba2c7f705a3fec8bcce Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 16:19:59 -0700
Subject: [PATCH 0472/1100] Going back to the tiny-lr-fork version

---
 lib/ionic/serve.js | 2 +-
 package.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 7c3c8e9558..9283e5b1c6 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -6,7 +6,7 @@ var fs = require('fs'),
     finalhandler = require('finalhandler'),
     http = require('http'),
     serveStatic = require('serve-static'),
-    tinylr = require('tiny-lr'),
+    tinylr = require('tiny-lr-fork'),
     lr = require('connect-livereload'),
     vfs = require('vinyl-fs'),
     request = require('request'),
diff --git a/package.json b/package.json
index 6cb36fbecb..509f5a7e64 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "semver": "^4.2.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
-    "tiny-lr": "^0.1.5",
+    "tiny-lr-fork": "0.0.5",
     "underscore": "~1.7.0",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",

From 810e61abd550d44b3c94dbf6a320bfc0c9a38132 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 16:26:01 -0700
Subject: [PATCH 0473/1100] Fixing the run command to properly work with live
 reload, by using the new serve task args/settings

---
 lib/ionic/cordova.js | 31 +++++++++++++++++++++++++++----
 lib/ionic/serve.js   | 28 ++++++++++++++--------------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 7b08b63536..276326c3f7 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -154,23 +154,46 @@ IonicTask.prototype.setupLiveReload = function() {
   serveTask.ionic = this.ionic;
   serveTask.isPlatformServe = true;
 
-  serveTask.loadSettings(function(){
+  serveTask.loadSettings();
+
+  serveTask.getAddress()
+  .then(function() {
+    return serveTask.checkPorts(true, serveTask.port, 'localhost');
+  })
+  .then(function() {
+    if(serveTask.runLivereload) {
+      return serveTask.checkPorts(false, serveTask.liveReloadPort, serveTask.address);
+    }
+  })
+  .then(function() {
+
     serveTask.runLivereload = true;
     serveTask.launchBrowser = false;
-    serveTask.start(self.ionic);
+    serveTask.launchLab = false;
+    serveTask.start(self.ionic)
+
+    if(self.ionic.hasFailed) return;
 
     self.ionic.setConfigXml({
       devServer: serveTask.devServer
     }).then(function(){
       d.resolve();
     });
+  })
+  .catch(function(error) {
+
+  })
+
+
+  // function(){
+  
+  // serveTask.start(self.ionic);
+
 
-  });
 
   return d.promise;
 };
 
-
 IonicTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 9283e5b1c6..c260e6546d 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -77,7 +77,7 @@ IonicTask.prototype.checkPorts = function(isIonicServer, testPort) {
     function(err, port) {
     if(port != testPort) {
       message = ['The port ', testPort, ' was taken on the host ', self.address, ' - using port ', port, ' instead'].join('');
-      console.log(message.red.bold);
+      console.log(message.yellow.bold);
       if(isIonicServer) {
         self.port = port;
       } else {
@@ -189,7 +189,6 @@ IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
 }
 
 IonicTask.prototype.showFinishedServeMessage = function() {
-
   if(this.launchLab || this.launchBrowser) {
     var open = require('open');
     var openUrl = this.launchLab ? [this.host(this.port), IONIC_LAB_URL] : [this.host(this.port)];
@@ -200,7 +199,7 @@ IonicTask.prototype.showFinishedServeMessage = function() {
     try {
       open(openUrl.join(''), this.browser);
     } catch (ex) {
-      console.log('Error, ',ex)
+      console.log('Error opening the browser - ', ex)
     }
   }
 
@@ -407,7 +406,7 @@ IonicTask.prototype.start = function(ionic) {
             'In the command above, it\'s setting the default to watch a max of 1000 files.\n\n'.error.bold;
 
     } else {
-      msg = ('server start error: ' + e).error.bold;
+      msg = ('server start error: ' + e.stack).error.bold;
     }
     console.log(msg);
     process.exit(1);
@@ -666,8 +665,8 @@ IonicTask.prototype._goToHistory = function(goHistory) {
 
 
 IonicTask.prototype._postToLiveReload = function(files) {
-
-  request.post('http://' + this.address + ':' + this.liveReloadPort + '/changed', {
+  var postUrl = [this.liveReloadServer, '/changed'].join('')
+  request.post(postUrl, {
     path: '/changed',
     method: 'POST',
     body: JSON.stringify({
@@ -675,11 +674,11 @@ IonicTask.prototype._postToLiveReload = function(files) {
     })
   }, function(err, res, body) {
     if(err) {
-      console.error('Unable to update live reload:', err);
+      console.log('Unable to update live reload:', err);
     }
   });
 
-};
+}
 
 
 IonicTask.prototype.getAddress = function(cb) {
@@ -743,12 +742,7 @@ IonicTask.prototype.getAddress = function(cb) {
     }
 
     if(addresses.length > 0) {
-      console.log('\nMultiple addresses available.'.error.bold);
-      console.log('Please select which address to use by entering its number from the list below:'.error.bold);
-      if(self.isPlatformServe) {
-        console.log('Note that the emulator/device must be able to access the given IP address'.small);
-      }
-
+      
       if(!self.isPlatformServe) {
         addresses.push({
           address: 'localhost'
@@ -760,6 +754,12 @@ IonicTask.prototype.getAddress = function(cb) {
         // cb();
         q.resolve();
         return q.promise;
+      } 
+
+      console.log('\nMultiple addresses available.'.error.bold);
+      console.log('Please select which address to use by entering its number from the list below:'.error.bold);
+      if(self.isPlatformServe) {
+        console.log('Note that the emulator/device must be able to access the given IP address'.small);
       }
 
       for(var x=0; x<addresses.length; x++) {

From 553f07d6a0fef2173bfc0556fdd66c787a3be0e7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 4 Mar 2015 16:42:54 -0700
Subject: [PATCH 0474/1100] Shrinkwrapping

---
 npm-shrinkwrap.json | 222 +++++++++++++++++++++++---------------------
 1 file changed, 115 insertions(+), 107 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 02eebf0200..baa55355fa 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -153,7 +153,7 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -228,6 +228,11 @@
         }
       }
     },
+    "async": {
+      "version": "0.9.0",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+    },
     "colors": {
       "version": "0.6.2",
       "from": "colors@0.6.2",
@@ -383,11 +388,6 @@
           "version": "1.2.11",
           "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-        },
-        "async": {
-          "version": "0.9.0",
-          "from": "async@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
         }
       }
     },
@@ -412,9 +412,9 @@
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
-              "version": "1.0.2",
+              "version": "1.0.3",
               "from": "escape-string-regexp@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
@@ -453,9 +453,9 @@
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.3",
+          "version": "3.0.4",
           "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
@@ -472,6 +472,57 @@
               "from": "beeper@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
+            "chalk": {
+              "version": "1.0.0",
+              "from": "chalk@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.0.1",
+                  "from": "ansi-styles@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "1.0.3",
+                  "from": "has-ansi@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "1.1.1",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                    },
+                    "get-stdin": {
+                      "version": "4.0.1",
+                      "from": "get-stdin@*",
+                      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "2.0.1",
+                  "from": "strip-ansi@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "1.1.1",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "1.3.0",
+                  "from": "supports-color@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz"
+                }
+              }
+            },
             "dateformat": {
               "version": "1.0.11",
               "from": "dateformat@>=1.0.11 <2.0.0",
@@ -483,9 +534,9 @@
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
-                  "version": "3.0.0",
+                  "version": "3.1.0",
                   "from": "meow@*",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
@@ -527,56 +578,35 @@
                 }
               }
             },
-            "lodash.reescape": {
-              "version": "3.0.1",
-              "from": "lodash.reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz",
-              "dependencies": {
-                "lodash._reescape": {
-                  "version": "3.0.0",
-                  "from": "lodash._reescape@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-                }
-              }
+            "lodash._reescape": {
+              "version": "3.0.0",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
-            "lodash.reevaluate": {
-              "version": "3.0.1",
-              "from": "lodash.reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz",
-              "dependencies": {
-                "lodash._reevaluate": {
-                  "version": "3.0.0",
-                  "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-                }
-              }
+            "lodash._reevaluate": {
+              "version": "3.0.0",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
-            "lodash.reinterpolate": {
-              "version": "3.0.1",
-              "from": "lodash.reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz",
-              "dependencies": {
-                "lodash._reinterpolate": {
-                  "version": "3.0.0",
-                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-                }
-              }
+            "lodash._reinterpolate": {
+              "version": "3.0.0",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.2.0",
+              "version": "3.3.0",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
                   "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
-                "lodash._baseslice": {
-                  "version": "3.0.1",
-                  "from": "lodash._baseslice@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz"
+                "lodash._basetostring": {
+                  "version": "3.0.0",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
@@ -584,14 +614,14 @@
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.1",
+                  "version": "3.0.3",
                   "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.3.tgz"
                 },
-                "lodash._reinterpolate": {
+                "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.3",
@@ -616,33 +646,9 @@
                   }
                 },
                 "lodash.templatesettings": {
-                  "version": "3.0.1",
+                  "version": "3.1.0",
                   "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz",
-                  "dependencies": {
-                    "lodash._reescape": {
-                      "version": "3.0.0",
-                      "from": "lodash._reescape@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-                    },
-                    "lodash._reevaluate": {
-                      "version": "3.0.0",
-                      "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-                    },
-                    "lodash.escape": {
-                      "version": "3.0.0",
-                      "from": "lodash.escape@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
-                      "dependencies": {
-                        "lodash._basetostring": {
-                          "version": "3.0.0",
-                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
@@ -840,7 +846,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -1580,7 +1586,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -1592,7 +1598,7 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             }
           }
@@ -1700,11 +1706,6 @@
           "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
-            "async": {
-              "version": "0.9.0",
-              "from": "async@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
-            },
             "mime-types": {
               "version": "2.0.9",
               "from": "mime-types@>=2.0.3 <2.1.0",
@@ -1835,9 +1836,9 @@
       }
     },
     "semver": {
-      "version": "4.3.0",
+      "version": "4.3.1",
       "from": "semver@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
@@ -1860,9 +1861,16 @@
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
-              "version": "2.1.1",
+              "version": "2.1.2",
               "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz"
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.7.0",
+                  "from": "ms@0.7.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                }
+              }
             },
             "depd": {
               "version": "1.0.0",
@@ -1927,7 +1935,7 @@
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "tiny-lr-fork@>=0.0.5 <0.0.6",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
@@ -2053,7 +2061,7 @@
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
@@ -2108,9 +2116,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.3.5",
+              "version": "4.4.1",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.1.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -2292,7 +2300,7 @@
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.3 <0.7.0",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
@@ -2331,7 +2339,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.3 <0.5.0",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
@@ -2359,14 +2367,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.5.2",
+          "version": "2.6.1",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.1.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.2.0",
-              "from": "lodash@>=3.2.0 <3.3.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
+              "version": "3.3.1",
+              "from": "lodash@>=3.3.0 <3.4.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.3.1.tgz"
             }
           }
         }

From b4d677d0950c20a3d1c0f267bcc6d06c4b460806 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Mar 2015 00:29:20 -0700
Subject: [PATCH 0475/1100] Closes #260 - now correctly prompts for multiple
 addresses. Before it was overridding the input for addresses by listening for
 input for the console commands for the server running

---
 lib/ionic/serve.js | 92 ++++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index c260e6546d..1dce91ce88 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -49,8 +49,11 @@ IonicTask.prototype.run = function(ionic) {
       console.log( self.address );
       process.exit();
     }
+
     self.start(ionic)
 
+    self.listenForServerCommands();
+
     if(ionic.hasFailed) return;
 
     ionic.latestVersion.promise.then(function(){
@@ -63,6 +66,51 @@ IonicTask.prototype.run = function(ionic) {
 
 };
 
+IonicTask.prototype.listenForServerCommands = function listenForServerCommands() {
+  var self = this;
+  process.stdin.on('readable', function() {
+    var input = process.stdin.read();
+    if (input === null) return;
+    input = (input + '').trim();
+
+    if(input == 'restart' || input == 'r') {
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
+
+    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
+      var url = input.replace('goto ', '').replace('g ', '');
+      self._goToUrl(url);
+
+    } else if(input == 'consolelogs' || input == 'c') {
+      self.printConsoleLogs = !self.printConsoleLogs;
+      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
+
+    } else if(input == 'serverlogs' || input == 's') {
+      self.printServerLogs = !self.printServerLogs;
+      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
+
+    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
+      self._goToHistory(input);
+
+    } else if(input == 'help' || input == 'h') {
+      self.printCommandTips();
+
+    } else if(input == 'quit' || input == 'q') {
+      if(self.childProcess) {
+        self.childProcess.kill('SIGTERM');
+      }
+      process.exit();
+
+    } else if(input == 'clear' || input == 'clr') {
+      process.stdout.write("\u001b[2J\u001b[0;0H");
+
+    } else {
+      console.log('\nInvalid ionic server command'.error.bold);
+      self.printCommandTips();
+    }
+  });
+}
+
 //isIonicServer = true when serving www directory, false when live reload
 IonicTask.prototype.checkPorts = function(isIonicServer, testPort) {
   var q = Q.defer();
@@ -122,50 +170,6 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.documentRoot = project.get('documentRoot') || 'www';
   this.contentSrc = path.join(this.documentRoot, this.ionic.getContentSrc());
 
-  // this.getAddress(cb);
-
-  process.stdin.on('readable', function() {
-    var input = process.stdin.read();
-    if (input === null) return;
-    input = (input + '').trim();
-
-    if(input == 'restart' || input == 'r') {
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
-      var url = input.replace('goto ', '').replace('g ', '');
-      self._goToUrl(url);
-
-    } else if(input == 'consolelogs' || input == 'c') {
-      self.printConsoleLogs = !self.printConsoleLogs;
-      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input == 'serverlogs' || input == 's') {
-      self.printServerLogs = !self.printServerLogs;
-      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
-
-    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
-      self._goToHistory(input);
-
-    } else if(input == 'help' || input == 'h') {
-      self.printCommandTips();
-
-    } else if(input == 'quit' || input == 'q') {
-      if(self.childProcess) {
-        self.childProcess.kill('SIGTERM');
-      }
-      process.exit();
-
-    } else if(input == 'clear' || input == 'clr') {
-      process.stdout.write("\u001b[2J\u001b[0;0H");
-
-    } else {
-      console.log('\nInvalid ionic server command'.error.bold);
-      self.printCommandTips();
-    }
-
-  });
 };
 
 

From 6aa3371bb5a6eb3070addfd87820edde0a6c2a91 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Mar 2015 13:02:44 -0700
Subject: [PATCH 0476/1100] Fixing issues that may pop up with livereload
 specifying the host, since it listens on 0.0.0.0, we shouldnt specify it. For
 the dev server, we should. Added flag in

---
 lib/ionic/ports.js |  2 --
 lib/ionic/serve.js | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/ports.js b/lib/ionic/ports.js
index 9125aacfe6..5fe7a1a7e4 100644
--- a/lib/ionic/ports.js
+++ b/lib/ionic/ports.js
@@ -28,8 +28,6 @@ exports.getPort = function (options, callback) {
     callback = options;
     options = {}; 
   }
-
-  // console.log('Testing out - ', options)
   
   options.port   = options.port   || exports.basePort;
   options.host   = options.host   || null;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 1dce91ce88..928ae4d807 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -112,14 +112,17 @@ IonicTask.prototype.listenForServerCommands = function listenForServerCommands()
 }
 
 //isIonicServer = true when serving www directory, false when live reload
-IonicTask.prototype.checkPorts = function(isIonicServer, testPort) {
+IonicTask.prototype.checkPorts = function(isIonicServer, testPort, testHost) {
   var q = Q.defer();
 
   var self = this,
-      message = [],
-      testHost;
+      message = [];
 
-  testHost = this.address == 'localhost' ? null : this.address;
+  if(isIonicServer) {
+    testHost = this.address == 'localhost' ? null : this.address;
+  } else {
+    testHost = null;
+  }
 
   ports.getPort({port: testPort, host: testHost},
     function(err, port) {
@@ -388,7 +391,7 @@ IonicTask.prototype.start = function(ionic) {
     // Listen
     app.use(server);
     try {
-      app.listen(this.port);
+      app.listen(this.port, this.address);
     }catch(ex) {
       self.ionic.fail('Failed to start the Ionic server: ', ex.message)
     }

From 3b14a85935bc9691b8a0382814191fc1116d8cfb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Mar 2015 14:15:10 -0700
Subject: [PATCH 0477/1100] CHANGELOG update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a2c65282d..5260eaa17e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * The serve command now allows you to specify a browser to open other than your default - `ionic serve --browser safari`
 * The serve command now allows you to specify a path to start the browser in so you can go straight to what you want to test - `ionic serve -o /#/tab/dash`
 * The serve command now checks for existing server and live reload ports before trying to start up servers. If either serve host/port is used, then the port is incremented and informs the user of the change, then starts the server to avoid Address conflicts.
+* There was a bug when multiple addresses were available - it gave the option to select the address but immediately started listening to console commands for the server. This has been corrected, and now correctly prompts for the address.
 
 
 ### 1.3.11

From 779cd974e20cb58b6a2ccf60d84f87d99fd4baf3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Mar 2015 15:06:37 -0700
Subject: [PATCH 0478/1100] PR - Closes #270 - now provides a
 createDocumentRoot to have ionic serve create the folder for you, as well as
 use the documentRoot for the error message

---
 CHANGELOG.md       | 5 +++++
 README.md          | 6 +++++-
 lib/ionic/serve.js | 7 ++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5260eaa17e..449f5c15e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.13
+
+* Added the ionic.project property `createDocumentRoot` to aid users with build systems to create the folder and run tasks before calling serve.
+
 ### 1.3.12
 
 * Explicitly state which platform resources should be built by providing a platform name in the command
@@ -5,6 +9,7 @@
 * The serve command now allows you to specify a path to start the browser in so you can go straight to what you want to test - `ionic serve -o /#/tab/dash`
 * The serve command now checks for existing server and live reload ports before trying to start up servers. If either serve host/port is used, then the port is incremented and informs the user of the change, then starts the server to avoid Address conflicts.
 * There was a bug when multiple addresses were available - it gave the option to select the address but immediately started listening to console commands for the server. This has been corrected, and now correctly prompts for the address.
+* The serve command proxy now accepts another property `proxyNoAgent`: (optional) true/false, if true opts out of connection pooling, see [HttpAgent](http://nodejs.org/api/http.html#http_class_http_agent)
 
 
 ### 1.3.11
diff --git a/README.md b/README.md
index e6edf437be..e245a80dcd 100644
--- a/README.md
+++ b/README.md
@@ -237,10 +237,11 @@ __Service Proxies:__
 
 The `serve` command can add some proxies to the http server. These proxies are useful if you are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
 
-In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with two properties:
+In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with the following properties:
 
 * `path`: string that will be matched against the beginning of the incoming request URL.
 * `proxyUrl`: a string with the url of where the proxied request should go.
+* `proxyNoAgent`: (optional) true/false, if true opts out of connection pooling, see [HttpAgent](http://nodejs.org/api/http.html#http_class_http_agent)
 
 ```json
 {
@@ -309,6 +310,8 @@ And of course, it supports Live Reload and all the other goodies we've added ove
 
 If you'd like to test your app in the browser and you use a folder other than the default of `www`, you can specify this folder in your `ionic.project` file.
 
+You might also want to have the document root be created if you use some sort of build system, we suggest using `createDocumentRoot` for that so that `ionic serve` will create that folder for you.
+
 It is also advised you specify the watch patterns for this document root as well, as follows:
 
 ```json
@@ -318,6 +321,7 @@ It is also advised you specify the watch patterns for this document root as well
     "watch"
   ],
   "documentRoot": "app",
+  "createDocumentRoot": "app",
   "watchPatterns": [
     "app/js/*",
     "!app/css/**/*"
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 928ae4d807..09547365b1 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -171,6 +171,7 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
   this.isAddressCmd = argv._[0].toLowerCase() == 'address';
   this.documentRoot = project.get('documentRoot') || 'www';
+  this.createDocumentRoot = project.get('createDocumentRoot') || null;
   this.contentSrc = path.join(this.documentRoot, this.ionic.getContentSrc());
 
 };
@@ -220,7 +221,11 @@ IonicTask.prototype.start = function(ionic) {
     var childProcess = null;
 
     if (!fs.existsSync( path.resolve(this.documentRoot) )) {
-      return ionic.fail('"www" directory cannot be found. Please make sure the working directory is an Ionic project.');
+      if (this.createDocumentRoot) {
+        fs.mkdirSync(this.documentRoot);
+      } else {
+        return ionic.fail('"' + this.documentRoot + '" directory cannot be found. Please make sure the working directory is an Ionic project.');
+      }
     }
 
     // gulpStartupTasks should be an array of tasks set in the project config

From 009f6305a991d8b262e6f734b698ced655bdb08e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 5 Mar 2015 16:27:21 -0600
Subject: [PATCH 0479/1100] fix(push): shorten push labels

---
 lib/ionic/push.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 4ac02c48ae..b9a2e26bf5 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -160,14 +160,14 @@ IonicTask.prototype.send_push = function(self) {
 
   promptProperties['push-api-key'] = {
     name: 'push-api-key',
-    description: 'What is your push API key'.yellow.bold,
+    description: 'Your private API key'.yellow.bold,
     required: true,
     isFile: false
   };
 
   promptProperties['device-token'] = {
     name: 'device-token',
-    description: 'What device token do you want to send to'.yellow.bold,
+    description: 'Device token'.yellow.bold,
     required: true,
     isFile: false
   }

From 83f0f3c6c3380d87e61f10f7ca61494771cb220f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Mar 2015 15:50:21 -0700
Subject: [PATCH 0480/1100] Bumping versions

---
 npm-shrinkwrap.json | 165 ++++++++++++++++++++++++++++++++++++++------
 package.json        |   2 +-
 2 files changed, 143 insertions(+), 24 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index baa55355fa..0bf954bd2f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.12",
+  "version": "1.3.1-3.beta.2",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -153,7 +153,7 @@
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.11 <0.3.0",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -499,7 +499,7 @@
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@*",
+                      "from": "get-stdin@>=4.0.1 <5.0.0",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
@@ -530,7 +530,7 @@
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@*",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
@@ -705,7 +705,7 @@
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.3 <0.7.0",
+              "from": "through2@>=0.6.1 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
@@ -1597,9 +1597,71 @@
               }
             },
             "rimraf": {
-              "version": "2.2.8",
+              "version": "2.3.1",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.4.2",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.1",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
@@ -1722,7 +1784,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
@@ -1731,9 +1793,9 @@
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
-          "version": "1.4.2",
+          "version": "1.4.3",
           "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
@@ -1935,7 +1997,7 @@
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@>=0.0.5 <0.0.6",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
@@ -1996,12 +2058,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2012,9 +2074,66 @@
               }
             },
             "rimraf": {
-              "version": "2.2.8",
+              "version": "2.3.1",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.4.2",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "2.0.1",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
@@ -2081,7 +2200,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -2116,9 +2235,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.4.1",
+              "version": "4.4.2",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -2261,7 +2380,7 @@
         },
         "graceful-fs": {
           "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "from": "graceful-fs@>=3.0.2 <3.1.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
@@ -2305,7 +2424,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -2339,7 +2458,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "vinyl@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
diff --git a/package.json b/package.json
index 509f5a7e64..10010606f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.12",
+  "version": "1.3.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From f601d33b507e6fa08d26efd38e258a90e3b891db Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Mar 2015 11:01:39 -0600
Subject: [PATCH 0481/1100] Closes #286 - fixes the issue when ionic run or
 ionic emulate doesnt accept server commands

---
 lib/ionic/cordova.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 276326c3f7..c605bbf373 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -170,7 +170,10 @@ IonicTask.prototype.setupLiveReload = function() {
     serveTask.runLivereload = true;
     serveTask.launchBrowser = false;
     serveTask.launchLab = false;
-    serveTask.start(self.ionic)
+    serveTask.start(self.ionic);
+
+    serveTask.listenForServerCommands();
+
 
     if(self.ionic.hasFailed) return;
 

From 13a4b270e55e9b59e3401068cf502833f0c99955 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Mar 2015 11:22:13 -0600
Subject: [PATCH 0482/1100] Adding in the ionic link command - this will allow
 the user to set the app ID

---
 lib/ionic.js      | 12 ++++++++++++
 lib/ionic/link.js | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 lib/ionic/link.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 5caa80e30e..4d63a42df6 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -354,6 +354,18 @@ var TASKS = [
        '[command]': 'The command you desire help with'
      },
      module: './ionic/help'
+   },
+   {
+    title: 'link',
+    name: 'link',
+    summary: 'Sets your Ionic App ID for your project',
+    args: {
+      '[appId]': 'The app ID you wish to set for this project'
+    },
+    options: {
+      '--reset|-r': 'This will reset the Ionic App ID'
+    },
+    module: './ionic/link'
    }
 ];
 
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
new file mode 100644
index 0000000000..469b77994a
--- /dev/null
+++ b/lib/ionic/link.js
@@ -0,0 +1,39 @@
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    IonicProject = require('./project'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function run(ionic) {
+  this.ionic = ionic;
+  var self = this;
+
+  if(argv.reset || argv.r) {
+    this.setAppId('')
+  } else {
+    this.setAppId(argv._[1]);  
+  }
+
+  console.log('Your Ionic App ID was set'.green)
+
+}
+
+IonicTask.prototype.setAppId = function setAppId(appId) {
+  var project = null;
+
+  try {
+    project = IonicProject.load();
+    project.set('app_id', appId);
+    project.save();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
+}
+
+exports.IonicTask = IonicTask;

From 72d42c620ae82301a8664c18076f3ade1b277272 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Mar 2015 11:40:55 -0600
Subject: [PATCH 0483/1100] Fixing issues where no ionic.project file is
 available, or no app id is passed

---
 lib/ionic/link.js   | 12 ++++++++++++
 npm-shrinkwrap.json |  2 +-
 package.json        |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 469b77994a..7bc7d567ac 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -13,6 +13,18 @@ IonicTask.prototype.run = function run(ionic) {
   this.ionic = ionic;
   var self = this;
 
+  var ionicProjectFile = path.resolve('.', 'ionic.project');
+
+  if(!fs.existsSync(ionicProjectFile)) {
+    console.log('You cannot run this command unless you are in an Ionic Project folder'.red.bold)
+    return
+  }
+
+  if(!argv._[1]) {
+    console.log('Please supply an Ionic App ID with this command or pass the --reset option'.red.bold);
+    return
+  }
+
   if(argv.reset || argv.r) {
     this.setAppId('')
   } else {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0bf954bd2f..0bead0b97b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.1-3.beta.2",
+  "version": "1.3.14-beta.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 10010606f0..f9bcca916a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.13",
+  "version": "1.3.14-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6a934c618740e04fa994fe3c30321808475d0fe1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Mar 2015 11:45:33 -0600
Subject: [PATCH 0484/1100] Updating version 1.3.14 - fixes for emulate/run and
 ionic link command

---
 CHANGELOG.md        | 5 +++++
 README.md           | 5 +++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8221410bf..60d3616bb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.3.14
+
+* Fixing the `ionic emulate --livereload` and `ionic run --livereload` to continue to accept user input for server commands.
+* Added the `ionic link` command to allow you to specify your Ionic App ID.
+
 ### 1.3.13
 
 * Added the ionic.project property `createDocumentRoot` to aid users with build systems to create the folder and run tasks before calling serve.
diff --git a/README.md b/README.md
index e245a80dcd..e6e23b5642 100644
--- a/README.md
+++ b/README.md
@@ -393,3 +393,8 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 3. Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 4. Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
 5. In the `ionic.project` file, add the JavaScript property `"gulpStartupTasks": ["sass", "watch"]` (this can also be customized to whatever gulp tasks you'd like).
+
+
+# Set your Ionic Project App ID
+
+Use the `ionic link <appId>` command to set your Ionic App ID to continue working with the same app with the Ionic platform across development enviroments.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0bead0b97b..d5a2af484b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.14-beta.1",
+  "version": "1.3.14",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index f9bcca916a..0f76088d01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.14-beta.1",
+  "version": "1.3.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From db7303efae3ed2e6a1c489468f982751a33b0c9a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Mar 2015 16:55:25 -0600
Subject: [PATCH 0485/1100] Removing the old way of stdin.on('readable') to use
 readline directly

---
 lib/ionic/cordova.js |  2 +-
 lib/ionic/serve.js   | 95 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index c605bbf373..bc55845008 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -158,7 +158,7 @@ IonicTask.prototype.setupLiveReload = function() {
 
   serveTask.getAddress()
   .then(function() {
-    return serveTask.checkPorts(true, serveTask.port, 'localhost');
+    return serveTask.checkPorts(true, serveTask.port, serveTask.address);
   })
   .then(function() {
     if(serveTask.runLivereload) {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 09547365b1..20606598d5 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -68,7 +68,93 @@ IonicTask.prototype.run = function(ionic) {
 
 IonicTask.prototype.listenForServerCommands = function listenForServerCommands() {
   var self = this;
+  var readline = require('readline');
+  if(process.platform === "win32") {
+    var rl = readLine.createInterface ({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    rl.on("SIGINT", function (){
+      process.emit("SIGINT");
+    });
+  }
+
+  process.on("SIGINT", function(){
+    process.exit();
+  });
+
+  var rl = readline.createInterface(process.stdin, process.stdout);
+
+  rl.setPrompt('ionic> ');
+  rl.prompt();
+  rl.on('line', function(entry) {
+
+    if(entry === null) return;
+    // console.log('entry', entry)
+    var input = (entry + '').trim();
+
+    if (input === 'quit' || input === 'q') rl.close();
+
+    if (input === null) return;
+    input = (input + '').trim();
+
+    // console.log('input received:', input)
+
+    if(input == 'restart' || input == 'r') {
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
+
+    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
+      var url = input.replace('goto ', '').replace('g ', '');
+      self._goToUrl(url);
+
+    } else if(input == 'consolelogs' || input == 'c') {
+      self.printConsoleLogs = !self.printConsoleLogs;
+      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
+      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
+
+    } else if(input == 'serverlogs' || input == 's') {
+      self.printServerLogs = !self.printServerLogs;
+      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
+
+    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
+      self._goToHistory(input);
+
+    } else if(input == 'help' || input == 'h') {
+      self.printCommandTips();
+
+    } else if(input == 'quit' || input == 'q') {
+      if(self.childProcess) {
+        self.childProcess.kill('SIGTERM');
+      }
+      process.exit();
+
+    } else if(input == 'clear' || input == 'clr') {
+      process.stdout.write("\u001b[2J\u001b[0;0H");
+
+    } else {
+      console.log('\nInvalid ionic server command'.error.bold);
+      self.printCommandTips();
+    }
+
+    // console.log('input: ', input);
+    rl.prompt();
+  }).on('close', function() {
+    process.exit(0);
+  });
+
+}
+
+IonicTask.prototype.OLDListentoServerCommands = function OLDListentoServerCommands() {
+  var self = this;
+  console.log('listenForServerCommands - stdin')
+  process.stdin.resume();
+  process.stdin.pause();
+  // console.log(process.stdin)
   process.stdin.on('readable', function() {
+    console.log('listenForServerCommands - now listening on readable')
+  // process.stdin.resume();
+
     var input = process.stdin.read();
     if (input === null) return;
     input = (input + '').trim();
@@ -396,6 +482,7 @@ IonicTask.prototype.start = function(ionic) {
     // Listen
     app.use(server);
     try {
+      console.log('Listening here: ', this.address)
       app.listen(this.port, this.address);
     }catch(ex) {
       self.ionic.fail('Failed to start the Ionic server: ', ex.message)
@@ -778,6 +865,9 @@ IonicTask.prototype.getAddress = function(cb) {
         console.log( (' ' + (x+1) + ') ' + addresses[x].address + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
       }
 
+      console.log('Std in before prompt')
+      // console.log(process.stdin)
+
       var prompt = require('prompt');
       var promptProperties = {
         selection: {
@@ -806,6 +896,11 @@ IonicTask.prototype.getAddress = function(cb) {
             }
             ionicConfig.set(addressConfigKey, self.address);
             // cb();
+            prompt.resume();
+            console.log('\n\n\n\nResuming prompt\n\n')
+            console.log('Stdin after prompt')
+            // console.log(process.stdin)
+            // process.stdin.resume();
             q.resolve();
             return q.promise;
           }

From 2cffef608c75d18ebb7de5a2b9f98dfe9fff033e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Mar 2015 16:58:53 -0600
Subject: [PATCH 0486/1100] Changing prompt to $, removing the old listen
 command:

---
 lib/ionic/serve.js | 54 +---------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 20606598d5..2eee160efa 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -86,7 +86,7 @@ IonicTask.prototype.listenForServerCommands = function listenForServerCommands()
 
   var rl = readline.createInterface(process.stdin, process.stdout);
 
-  rl.setPrompt('ionic> ');
+  rl.setPrompt('ionic $ ');
   rl.prompt();
   rl.on('line', function(entry) {
 
@@ -145,58 +145,6 @@ IonicTask.prototype.listenForServerCommands = function listenForServerCommands()
 
 }
 
-IonicTask.prototype.OLDListentoServerCommands = function OLDListentoServerCommands() {
-  var self = this;
-  console.log('listenForServerCommands - stdin')
-  process.stdin.resume();
-  process.stdin.pause();
-  // console.log(process.stdin)
-  process.stdin.on('readable', function() {
-    console.log('listenForServerCommands - now listening on readable')
-  // process.stdin.resume();
-
-    var input = process.stdin.read();
-    if (input === null) return;
-    input = (input + '').trim();
-
-    if(input == 'restart' || input == 'r') {
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
-      var url = input.replace('goto ', '').replace('g ', '');
-      self._goToUrl(url);
-
-    } else if(input == 'consolelogs' || input == 'c') {
-      self.printConsoleLogs = !self.printConsoleLogs;
-      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input == 'serverlogs' || input == 's') {
-      self.printServerLogs = !self.printServerLogs;
-      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
-
-    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
-      self._goToHistory(input);
-
-    } else if(input == 'help' || input == 'h') {
-      self.printCommandTips();
-
-    } else if(input == 'quit' || input == 'q') {
-      if(self.childProcess) {
-        self.childProcess.kill('SIGTERM');
-      }
-      process.exit();
-
-    } else if(input == 'clear' || input == 'clr') {
-      process.stdout.write("\u001b[2J\u001b[0;0H");
-
-    } else {
-      console.log('\nInvalid ionic server command'.error.bold);
-      self.printCommandTips();
-    }
-  });
-}
-
 //isIonicServer = true when serving www directory, false when live reload
 IonicTask.prototype.checkPorts = function(isIonicServer, testPort, testHost) {
   var q = Q.defer();

From 6a66fd8061e69370a646e73cd783947a8cea193a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 11 Mar 2015 13:05:16 -0600
Subject: [PATCH 0487/1100] Fixing issues with readline and windows

---
 lib/ionic/serve.js  | 22 +++++------
 npm-shrinkwrap.json | 94 ++++++++++++++++++++++-----------------------
 package.json        |  2 +-
 3 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 2eee160efa..0a86c37d98 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -69,22 +69,21 @@ IonicTask.prototype.run = function(ionic) {
 IonicTask.prototype.listenForServerCommands = function listenForServerCommands() {
   var self = this;
   var readline = require('readline');
-  if(process.platform === "win32") {
-    var rl = readLine.createInterface ({
-        input: process.stdin,
-        output: process.stdout
-    });
-
-    rl.on("SIGINT", function (){
-      process.emit("SIGINT");
-    });
-  }
 
   process.on("SIGINT", function(){
     process.exit();
   });
 
-  var rl = readline.createInterface(process.stdin, process.stdout);
+  var rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  if(process.platform === "win32") {
+    rl.on("SIGINT", function (){
+      process.emit("SIGINT");
+    });
+  }
 
   rl.setPrompt('ionic $ ');
   rl.prompt();
@@ -430,7 +429,6 @@ IonicTask.prototype.start = function(ionic) {
     // Listen
     app.use(server);
     try {
-      console.log('Listening here: ', this.address)
       app.listen(this.port, this.address);
     }catch(ex) {
       self.ionic.fail('Failed to start the Ionic server: ', ex.message)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d5a2af484b..f0208627f2 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.14",
+  "version": "1.3.15-beta.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -187,7 +187,7 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "minimatch@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
@@ -223,7 +223,7 @@
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
@@ -374,7 +374,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -386,7 +386,7 @@
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "mime@1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
@@ -423,7 +423,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -435,7 +435,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -499,7 +499,7 @@
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@>=4.0.1 <5.0.0",
+                      "from": "get-stdin@*",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
@@ -530,7 +530,7 @@
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
@@ -594,9 +594,9 @@
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.3.0",
+              "version": "3.3.2",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
@@ -614,9 +614,9 @@
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.3",
+                  "version": "3.0.4",
                   "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.3.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
@@ -624,9 +624,9 @@
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
-                  "version": "3.0.3",
+                  "version": "3.0.4",
                   "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
@@ -744,7 +744,7 @@
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.3 <0.5.0",
+              "from": "vinyl@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
@@ -1493,7 +1493,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
@@ -1597,14 +1597,14 @@
               }
             },
             "rimraf": {
-              "version": "2.3.1",
+              "version": "2.3.2",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.4.2",
+                  "version": "4.5.1",
                   "from": "glob@>=4.4.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -1620,13 +1620,13 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.1",
+                      "version": "2.0.3",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -1746,7 +1746,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1784,7 +1784,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
@@ -2053,7 +2053,7 @@
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.5",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
             },
             "inherits": {
@@ -2063,7 +2063,7 @@
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -2074,14 +2074,14 @@
               }
             },
             "rimraf": {
-              "version": "2.3.1",
+              "version": "2.3.2",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.4.2",
-                  "from": "glob@>=4.4.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
+                  "version": "4.5.1",
+                  "from": "glob@>=4.3.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2096,9 +2096,9 @@
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.1",
+                      "version": "2.0.3",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -2235,9 +2235,9 @@
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.4.2",
+              "version": "4.5.1",
               "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
@@ -2271,9 +2271,9 @@
               }
             },
             "minimatch": {
-              "version": "2.0.1",
+              "version": "2.0.3",
               "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
@@ -2380,12 +2380,12 @@
         },
         "graceful-fs": {
           "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
@@ -2458,7 +2458,7 @@
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.3 <0.5.0",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
@@ -2486,14 +2486,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.6.1",
+          "version": "2.6.2",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.1.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.3.1",
-              "from": "lodash@>=3.3.0 <3.4.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.3.1.tgz"
+              "version": "3.5.0",
+              "from": "lodash@>=3.5.0 <3.6.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index 0f76088d01..a5949d0794 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.14",
+  "version": "1.3.15-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 1ece4b41775e0ff82fb3a76a255ce8f6ef82bc4d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 11 Mar 2015 14:09:37 -0600
Subject: [PATCH 0488/1100] Showing final message and listening for console
 input in the same method now

---
 lib/ionic/serve.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 0a86c37d98..0fe3768ce1 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -52,7 +52,9 @@ IonicTask.prototype.run = function(ionic) {
 
     self.start(ionic)
 
-    self.listenForServerCommands();
+    // self.printCommandTips();
+    // console.log('listenForServerCommands')
+    // self.listenForServerCommands();
 
     if(ionic.hasFailed) return;
 
@@ -245,6 +247,8 @@ IonicTask.prototype.showFinishedServeMessage = function() {
   }
 
   this.printCommandTips();
+  this.listenForServerCommands();
+
 }
 
 IonicTask.prototype.start = function(ionic) {

From 8eba42721e75eeb106c50847fbd0655e85a0610d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 11 Mar 2015 14:53:02 -0600
Subject: [PATCH 0489/1100] Fixing the duplicate input from readline

---
 lib/ionic/cordova.js | 3 ---
 lib/ionic/serve.js   | 4 ----
 npm-shrinkwrap.json  | 2 +-
 package.json         | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index bc55845008..ade9985d9a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -172,9 +172,6 @@ IonicTask.prototype.setupLiveReload = function() {
     serveTask.launchLab = false;
     serveTask.start(self.ionic);
 
-    serveTask.listenForServerCommands();
-
-
     if(self.ionic.hasFailed) return;
 
     self.ionic.setConfigXml({
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 0fe3768ce1..bc7ea0633c 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -847,10 +847,6 @@ IonicTask.prototype.getAddress = function(cb) {
             ionicConfig.set(addressConfigKey, self.address);
             // cb();
             prompt.resume();
-            console.log('\n\n\n\nResuming prompt\n\n')
-            console.log('Stdin after prompt')
-            // console.log(process.stdin)
-            // process.stdin.resume();
             q.resolve();
             return q.promise;
           }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f0208627f2..ab13acd8aa 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.15-beta.1",
+  "version": "1.3.15-beta.3",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index a5949d0794..2f40d8e134 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.15-beta.1",
+  "version": "1.3.15-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From b102437fa968bc9c05d7474df4612d9329a28283 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 11 Mar 2015 15:23:24 -0600
Subject: [PATCH 0490/1100] Setting terminal to false to stop duplication on
 windows

---
 lib/ionic/serve.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index bc7ea0633c..b236999e1e 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -78,7 +78,8 @@ IonicTask.prototype.listenForServerCommands = function listenForServerCommands()
 
   var rl = readline.createInterface({
     input: process.stdin,
-    output: process.stdout
+    output: process.stdout,
+    terminal: false
   });
 
   if(process.platform === "win32") {

From 82f40e9cfef0425d74ddc637cf47b7a9aae21dde Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 01:18:15 -0600
Subject: [PATCH 0491/1100] Fixed a bug where reset wouldnt be allowed

---
 lib/ionic/link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 7bc7d567ac..757404391a 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -20,7 +20,7 @@ IonicTask.prototype.run = function run(ionic) {
     return
   }
 
-  if(!argv._[1]) {
+  if(!argv._[1] && !argv.reset) {
     console.log('Please supply an Ionic App ID with this command or pass the --reset option'.red.bold);
     return
   }

From 2733b77beb5ab81a9f1eb0425c166805dcde8aab Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 01:53:01 -0600
Subject: [PATCH 0492/1100] Closes #204 - provides better output for uploads
 when the internet connection is not available

---
 lib/ionic/upload.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index dd3002a9e1..f548787467 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -83,7 +83,15 @@ IonicTask.prototype.run = function(ionic, callback) {
 
         rm('-f', TEMP_FILENAME);
         if (err) {
-          return ionic.fail("Error uploading: " + err);
+          console.log('There was an error trying to upload your app.'.red.bold);
+          var errorMessage;
+          if(err.code === 'ENOTFOUND' || err.code === 'EPIPE') {
+            errorMessage = 'The address you are trying to reach could not be found. \n' +
+            'This could be your internet connection or the server itself is having issues.';
+          } else {
+            errorMessage = 'The specific error message: ' + err;
+          }
+          return ionic.fail(errorMessage.red.bold);
         }
 
         response.setEncoding('utf8');

From e7b0f9c63a4ce5d1f0bf9df77a6bf7828b2b91bd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 22:16:55 -0600
Subject: [PATCH 0493/1100] Updating Crosswalk versions to be including canary
 of 13.41.318.0 and beta of 12.41.296.4

---
 lib/ionic/browser.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 6203f59863..6e1ccc89ca 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -50,18 +50,17 @@ var crosswalkVersions = [
     publish_date: '2014-12-31 13:16'
   },
   {
-    version: '11.40.277.1',
-    publish_date: '2015-01-05 02:52',
-    beta: true
+    version: '11.40.277.7',
+    publish_date: '2015-02-26 07:03'
   },
   {
-    version: '11.40.277.0',
-    publish_date: '2015-01-01 08:27',
-    canary: true
+    version: '12.41.296.4',
+    publish_date: '2015-03-05 13:19',
+    beta: true
   },
   {
-    version: '12.40.283.0',
-    publish_date: '2015-01-12 08:27',
+    version: '13.41.318.0',
+    publish_date: '2015-03-11 09:22',
     canary: true
   }
 ];

From c0586cb09f955aded807e518012a1bcb2128b2df Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 22:17:21 -0600
Subject: [PATCH 0494/1100] Closes #298 - adjusts for users who have capital
 letters in their email

---
 lib/ionic/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index adc48dce14..8e37604b42 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -102,7 +102,7 @@ IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
     url: ionic.IONIC_DASH + ionic.IONIC_API + 'user/login',
     jar: jar,
     form: {
-      username: self.email.toString().toLowerCase(),
+      username: self.email.toString(),
       password: self.password
     },
     proxy: process.env.PROXY || process.env.http_proxy || null

From 751b40a8d66d70d0d5a852e01b84f744fa2c1e81 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 22:17:46 -0600
Subject: [PATCH 0495/1100] Adding task to bump cli version and set tags
 appropriately

---
 lib/tasks/bumpversion.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 lib/tasks/bumpversion.js

diff --git a/lib/tasks/bumpversion.js b/lib/tasks/bumpversion.js
new file mode 100644
index 0000000000..8396a74e41
--- /dev/null
+++ b/lib/tasks/bumpversion.js
@@ -0,0 +1,39 @@
+var colors = require('colors'),
+    path = require('path'),
+    semver = require('semver'),
+    shelljs = require('shelljs'),
+    args = require('optimist').argv,
+    fs = require('fs'),
+    jsonPath = path.join(__dirname, '../', '../', 'package.json'),
+    packageJson = require(jsonPath),
+    bumpLevel = args.level || 'patch',
+    version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel),
+    bumpVersionMessage = ['Bumping from ', packageJson.version, ' by ', bumpLevel, ' resulting in ', version].join('');
+
+if(args.npmInstall) {
+  shelljs.rm('-rf', 'node_modules');
+  shelljs.exec('npm install');
+}
+
+console.log(bumpVersionMessage.green)
+
+packageJson.version = version;
+
+shelljs.rm('npm-shrinkwrap.json');
+
+fs.writeFileSync(jsonPath, JSON.stringify(packageJson, null, 2));
+
+shelljs.exec('npm shrinkwrap')
+
+if(args.git) {
+  console.log('git commands')
+  // shelljs.exec('git add npm-srhinkwrap.json');
+  // shelljs.exec(['git commit -m "', bumpVersionMessage, '"'].join(''));
+  // shelljs.exec(['git tag ', version].join(''));
+  // shelljs.exec(['git push origin ', version].join(''))
+}
+
+if(args.npmPublish) {
+  console.log('npm publish commands')
+  // shelljs.exec('npm publish');
+}

From 66447f447926549cbbf45338872f328813d01120 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 12 Mar 2015 22:20:06 -0600
Subject: [PATCH 0496/1100] Updating changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60d3616bb3..1bdad7a8f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 1.3.15
+
+* Updated the `ionic link` command to work properly with the `--reset` option
+* Fixed the `ionic run --livereload` on windows - now properly gives the prompt for server commands.
+* Updated Crosswalk Versions for Canary 13.41.318.0 and beta of 12.41.296.4.
+* Fixed the `ionic login` command to properly look at email addresses without lowercasing them.
+
 ### 1.3.14
 
 * Fixing the `ionic emulate --livereload` and `ionic run --livereload` to continue to accept user input for server commands.

From 879d03744e2f423c1817e01bc82cc61683039c7a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Mar 2015 10:01:09 -0600
Subject: [PATCH 0497/1100] Fixing bumpversion script to have correct version
 and beta bumps, adding in scripts to call bumpversion in package.json file

---
 lib/tasks/bumpversion.js | 32 ++++++++++++++++++++++++--------
 package.json             | 11 +++++++++--
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/tasks/bumpversion.js b/lib/tasks/bumpversion.js
index 8396a74e41..f162c6ea81 100644
--- a/lib/tasks/bumpversion.js
+++ b/lib/tasks/bumpversion.js
@@ -6,19 +6,31 @@ var colors = require('colors'),
     fs = require('fs'),
     jsonPath = path.join(__dirname, '../', '../', 'package.json'),
     packageJson = require(jsonPath),
-    bumpLevel = args.level || 'patch',
-    version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel),
-    bumpVersionMessage = ['Bumping from ', packageJson.version, ' by ', bumpLevel, ' resulting in ', version].join('');
-
-if(args.npmInstall) {
-  shelljs.rm('-rf', 'node_modules');
-  shelljs.exec('npm install');
+    version = null,
+    bumpLevel = null;
+
+// version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel),
+
+if(args.level && args.level == 'pre') {
+  var id = args.identifier || 'beta';
+  bumpLevel = [args.level, id].join('');
+  version = semver.inc(packageJson.version, args.level, id)
+} else {
+  bumpLevel = args.level || 'patch';
+  version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel)
 }
 
+var bumpVersionMessage = ['Bumping from ', packageJson.version, ' by ', bumpLevel, ' resulting in ', version].join('');
+
 console.log(bumpVersionMessage.green)
 
 packageJson.version = version;
 
+if(args.npmInstall) {
+  shelljs.rm('-rf', 'node_modules');
+  shelljs.exec('npm install');
+}
+
 shelljs.rm('npm-shrinkwrap.json');
 
 fs.writeFileSync(jsonPath, JSON.stringify(packageJson, null, 2));
@@ -33,7 +45,11 @@ if(args.git) {
   // shelljs.exec(['git push origin ', version].join(''))
 }
 
-if(args.npmPublish) {
+if(args.npmPublishTag) {
   console.log('npm publish commands')
+  var publishTagCmd = ['npm publish --tag ', version].join('');
+  console.log(publishTagCmd);
   // shelljs.exec('npm publish');
+} else if(args.npmPublish) {
+  console.log('npm publish')
 }
diff --git a/package.json b/package.json
index 2f40d8e134..18b0712e04 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,19 @@
 {
   "name": "ionic",
-  "version": "1.3.15-beta.3",
+  "version": "1.3.14-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
   "bin": {
     "ionic": "bin/ionic"
   },
+  "scripts": {
+    "bump": "node lib/tasks/bumpversion",
+    "beta-bump": "node lib/tasks/bumpversion --level pre --identifier beta",
+    "publish-release": "node lib/tasks/bumpversion --npmPublish",
+    "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
+    "git-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish"
+  },
   "keywords": [
     "ionic",
     "ionic framework",
@@ -74,4 +81,4 @@
     "vinyl-fs": "0.3.7",
     "xml2js": "0.4.4"
   }
-}
+}
\ No newline at end of file

From dc0a1da81cc1b893c994d7473990eef8082aca52 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 13 Mar 2015 11:31:26 -0600
Subject: [PATCH 0498/1100] Adding fixes for the various urls supplied for
 Codepen urls

---
 lib/ionic/start.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5441c84c00..2a231926c7 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -254,6 +254,23 @@ IonicTask.prototype.fetchCodepen = function() {
   var codepenUrl = this.template.split('?')[0].split('#')[0];
   var wwwPath = path.join(this.targetPath, 'www');
 
+  //Given any of these urls:
+  // http://codepen.io/ionic/pen/QwamEW
+  // http://codepen.io/ionic/live/QwamEW
+  // http://codepen.io/ionic/details/QwamEW/
+  // http://codepen.io/ionic/full/QwamEW/
+
+  // we want to parse out and get the /pen/ID link if its not already a /pen link
+  if (codepenUrl.indexOf('/pen') == -1) {
+    if(codepenUrl[codepenUrl.length - 1] == '/') {
+      codepenUrl = codepenUrl.substr(0, codepenUrl.length - 1);
+    }
+    var codePenSplit = codepenUrl.split('/')
+    var codePenId = codePenSplit[codePenSplit.length - 1];
+    var codePenOrg = codePenSplit[3];
+    codepenUrl = ['http://codepen.io/', codePenOrg, '/pen/', codePenId].join('')
+  }
+
   console.log('\nDownloading Codepen:'.bold, codepenUrl);
 
   var qHTML = Q.defer();

From f89d5e077a39b86f0103c5d6811af2f1efc8764d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 16 Mar 2015 10:35:17 -0600
Subject: [PATCH 0499/1100] Adding in the plnkr starter via plnkr url -
 incomplete because the api serves invalid zip files after the first request.

---
 lib/ionic/start.js | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 2a231926c7..7ce7b1e0ca 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -180,6 +180,14 @@ IonicTask.prototype.fetchSeed = function() {
     return this.fetchCodepen();
   }
 
+  console.log('this template:', this.template)
+
+  if(/plnkr.co\//i.test(this.template)) {
+    this.seedType = 'plnkr';
+    console.log('plnkr')
+    return this.fetchPlnkr();
+  }
+
   if( /creator:/i.test(this.template) ) {
     this.seedType = 'creator';
     return this.fetchCreatorApp();
@@ -839,5 +847,68 @@ IonicTask.prototype.printQuickHelp = function() {
   console.log('\nFor more help use', 'ionic --help'.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs\n'.bold);
 };
 
+IonicTask.prototype.fetchPlnkr = function fetchPlnkr() {
+  var self = this;
+  var q = Q.defer();
+
+  var plnkrUrl = this.template.split('?')[0].split('#')[0];
+
+  var plnkrId = null;
+
+  //Given any of these urls - we need to extract the ID
+  //http://embed.plnkr.co/dFvL8n/preview
+  //http://run.plnkr.co/plunks/dFvL8n/#/tabs/friends
+  //http://api.plnkr.co/plunks/dFvL8n
+
+  // http://embed.plnkr.co/BZrnKPlCJt93orQp58H3/preview
+
+  //To download, we want http://api.plnkr.co/plunks/dFvL8n.zip
+
+  if (plnkrUrl[plnkrUrl.length - 1] == '/') {
+    plnkrUrl = plnkrUrl.substr(0, plnkrUrl.length -1);
+  }
+
+  var plnkrSplit = plnkrUrl.split('/');
+
+  // api link - need zip on end.
+  if (plnkrUrl.indexOf('embed.plnkr.co') != -1) {
+    plnkrId = plnkrSplit[3];
+  } else if (plnkrUrl.indexOf('run.plnkr.co') != -1 || plnkrUrl.indexOf('api.plnkr.co') != -1) {
+    plnkrId = plnkrSplit[plnkrSplit.length - 1];
+
+    if(plnkrId.indexOf('.zip') != -1) {
+      plnkrId = plnkrId.replace('.zip', '')
+    }
+  }
+
+  plnkrUrl = ['http://api.plnkr.co/plunks/', plnkrId, '.zip'].join('');
+
+  console.log('\nDownloading Plnkr url:', plnkrUrl)
+
+  console.log('self.targetPath', self.targetPath);
+
+  Ionic.fetchArchive(self.targetPath, plnkrUrl)
+  .then(function() {
+    // console.log('Done downloading')
+    try {
+      // Move the content of this repo into the www folder
+      var copyDir = [self.targetPath + '/' + plnkrId].join('');
+      console.log('copy dir', copyDir);
+
+      cp('-Rf', copyDir, 'www');
+
+      // Clean up start template folder
+      rm('-rf', copyDir + '/');
+
+      q.resolve();
+
+    } catch(e) {
+      q.reject(e);
+    }
+  })
+
+  return q.promise;
+}
+
 
 exports.IonicTask = IonicTask;

From 9f5f63fe615433c2321afb8b63688d14e22c8f06 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 16 Mar 2015 10:42:19 -0600
Subject: [PATCH 0500/1100] Bumping shrinkwrap to 1.3.15

---
 npm-shrinkwrap.json | 719 ++++++++++++++++++++++----------------------
 1 file changed, 360 insertions(+), 359 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ab13acd8aa..b741482d0d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,101 +1,101 @@
 {
   "name": "ionic",
-  "version": "1.3.15-beta.3",
+  "version": "1.3.15",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "archiver@0.5.1",
+      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,32 +104,32 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
+          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.5.0",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,387 +187,387 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.11 <0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.5.0",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "async": {
       "version": "0.9.0",
-      "from": "async@>=0.9.0 <0.10.0",
+      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
+          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
+      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "crc@3.2.1",
+      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.5.0",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.6",
-          "from": "through@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "map-stream@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
+          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@1.2.11",
+          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "gulp@3.8.8",
+      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
+          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.4",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "chalk@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "ansi-styles@>=2.0.1 <3.0.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "has-ansi@>=1.0.3 <2.0.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@*",
+                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "strip-ansi@>=2.0.1 <3.0.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "1.3.0",
-                  "from": "supports-color@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.11 <2.0.0",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@*",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "meow@*",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.2",
-                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             }
                           }
@@ -580,111 +580,111 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.3.2",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.0",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.4",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.4",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.0",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.0",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
                     },
                     "lodash.isnative": {
                       "version": "3.0.0",
-                      "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
                     }
                   }
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -695,66 +695,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "object-assign@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
+              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.3",
-              "from": "through2@>=0.6.1 <0.7.0",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
+                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -763,42 +763,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
+          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
+          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -807,51 +807,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
-          "version": "1.1.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"
+          "version": "1.1.1",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -860,34 +860,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
+          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "user-home@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -896,12 +896,12 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2",
+      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -1465,21 +1465,22 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
+      "from": "opbeat-ionic@1.1.3",
+      "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.1",
-          "from": "after-all@>=2.0.1 <3.0.0",
+          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "once@>=1.3.0 <2.0.0",
+              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -1488,22 +1489,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "stackman@>=0.2.2 <0.3.0",
+          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "stackback@0.0.2",
+              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -1517,130 +1518,130 @@
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "optimist@0.6.0",
+      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7",
+      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "deep-equal@*",
+              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.2",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/i/-/i-0.3.2.tgz",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.1",
-                  "from": "glob@>=4.4.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
+                  "version": "4.5.2",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.3",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
+                      "version": "2.0.4",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -1649,12 +1650,12 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -1667,37 +1668,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -1706,47 +1707,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "request@2.51.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
+          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1755,27 +1756,27 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
+          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
               "version": "2.0.9",
-              "from": "mime-types@>=2.0.3 <2.1.0",
+              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.7.0",
-                  "from": "mime-db@>=1.7.0 <1.8.0",
+                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
                 }
               }
@@ -1784,113 +1785,113 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
           "version": "0.12.1",
-          "from": "tough-cookie@>=0.12.0",
+          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "punycode@>=0.2.0",
+              "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
               "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
+          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "ctype@0.5.3",
+              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "hawk@1.1.1",
+          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
+              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "stringstream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -1899,130 +1900,130 @@
     },
     "semver": {
       "version": "4.3.1",
-      "from": "semver@>=4.2.0 <5.0.0",
+      "from": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.2",
-              "from": "debug@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "ms@0.7.0",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.0",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -2031,88 +2032,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
+      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
+          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.5",
-              "from": "graceful-fs@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+              "version": "3.0.6",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.1",
-                  "from": "glob@>=4.3.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
+                  "version": "4.5.2",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.3",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
+                      "version": "2.0.4",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -2121,12 +2122,12 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -2139,85 +2140,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -2226,44 +2227,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.5.1",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.1.tgz",
+              "version": "4.5.2",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -2271,23 +2272,23 @@
               }
             },
             "minimatch": {
-              "version": "2.0.3",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.3.tgz",
+              "version": "2.0.4",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -2296,78 +2297,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
+              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.1",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.5.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -2379,96 +2380,96 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.5",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+          "version": "3.0.6",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.3",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -2477,22 +2478,22 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@0.4.4",
+      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.6.2",
-          "from": "xmlbuilder@>=1.0.0",
+          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.5.0",
-              "from": "lodash@>=3.5.0 <3.6.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
             }
           }

From 920d843f3ff7896038e4555c520a9607536de1e9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 16 Mar 2015 10:50:23 -0600
Subject: [PATCH 0501/1100] fixing bumpversion to use the correct name for
 npm-shrinkwrap.json, bumping version

---
 lib/tasks/bumpversion.js | 2 +-
 package.json             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/bumpversion.js b/lib/tasks/bumpversion.js
index f162c6ea81..c3b7327a7c 100644
--- a/lib/tasks/bumpversion.js
+++ b/lib/tasks/bumpversion.js
@@ -39,7 +39,7 @@ shelljs.exec('npm shrinkwrap')
 
 if(args.git) {
   console.log('git commands')
-  // shelljs.exec('git add npm-srhinkwrap.json');
+  // shelljs.exec('git add npm-shrinkwrap.json');
   // shelljs.exec(['git commit -m "', bumpVersionMessage, '"'].join(''));
   // shelljs.exec(['git tag ', version].join(''));
   // shelljs.exec(['git push origin ', version].join(''))
diff --git a/package.json b/package.json
index 18b0712e04..0fddcaf92e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.14-beta.3",
+  "version": "1.3.15",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -12,7 +12,7 @@
     "beta-bump": "node lib/tasks/bumpversion --level pre --identifier beta",
     "publish-release": "node lib/tasks/bumpversion --npmPublish",
     "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
-    "git-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish"
+    "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish"
   },
   "keywords": [
     "ionic",
@@ -81,4 +81,4 @@
     "vinyl-fs": "0.3.7",
     "xml2js": "0.4.4"
   }
-}
\ No newline at end of file
+}

From e6944985a60a8a8aeb2fb1034828d93d3c266b5a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 16 Mar 2015 11:25:17 -0600
Subject: [PATCH 0502/1100] Closes #210 - adding in the small icon for iphone 6

---
 lib/ionic/resources/settings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/resources/settings.js b/lib/ionic/resources/settings.js
index 39db81b8c8..6fce0748a2 100644
--- a/lib/ionic/resources/settings.js
+++ b/lib/ionic/resources/settings.js
@@ -68,7 +68,8 @@ exports.ResPlatforms = {
         { name: 'icon-76.png',          width: 76,    height: 76 },
         { name: 'icon-76@2x.png',       width: 152,   height: 152 },
         { name: 'icon-small.png',       width: 29,    height: 29 },
-        { name: 'icon-small@2x.png',    width: 58,    height: 58 }
+        { name: 'icon-small@2x.png',    width: 58,    height: 58 },
+        { name: 'icon-small@3x.png',    width: 87,    height: 87 }
       ],
       nodeName: 'icon',
       nodeAttributes: ['src', 'width', 'height']

From 084c74c096cd2f2d49ac21ac8df0d24bc7485150 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 16 Mar 2015 15:04:10 -0600
Subject: [PATCH 0503/1100] Now complete for plunker integration - copies files
 from the plunker url directly into www. Closes #299

---
 lib/ionic/start.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 7ce7b1e0ca..a8579b2d47 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -180,11 +180,8 @@ IonicTask.prototype.fetchSeed = function() {
     return this.fetchCodepen();
   }
 
-  console.log('this template:', this.template)
-
   if(/plnkr.co\//i.test(this.template)) {
     this.seedType = 'plnkr';
-    console.log('plnkr')
     return this.fetchPlnkr();
   }
 
@@ -885,21 +882,17 @@ IonicTask.prototype.fetchPlnkr = function fetchPlnkr() {
 
   console.log('\nDownloading Plnkr url:', plnkrUrl)
 
-  console.log('self.targetPath', self.targetPath);
+  var extractPath = path.join(self.targetPath, 'plnkr');
 
-  Ionic.fetchArchive(self.targetPath, plnkrUrl)
+  Ionic.fetchArchive(extractPath, plnkrUrl)
   .then(function() {
     // console.log('Done downloading')
     try {
       // Move the content of this repo into the www folder
-      var copyDir = [self.targetPath + '/' + plnkrId].join('');
-      console.log('copy dir', copyDir);
-
+      var copyDir = [extractPath, '/*'].join('');
       cp('-Rf', copyDir, 'www');
-
       // Clean up start template folder
-      rm('-rf', copyDir + '/');
-
+      rm('-rf', extractPath + '/');
       q.resolve();
 
     } catch(e) {

From 6178a98692c2f35f2470d6b75a062539a7ab0a20 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 16 Mar 2015 20:02:00 -0500
Subject: [PATCH 0504/1100] feat(share): Share your app with someone

---
 lib/ionic.js        |  9 +++++
 lib/ionic/share.js  | 94 +++++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/upload.js |  1 +
 3 files changed, 104 insertions(+)
 create mode 100644 lib/ionic/share.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 4d63a42df6..dcedcf487d 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -233,6 +233,15 @@ var TASKS = [
     alt: ['up'],
     module: './ionic/upload'
   },
+  {
+    title: 'share',
+    name: 'share',
+    summary: 'Share an app with a client, co-worker, friend, or customer',
+    args: {
+      '<EMAIL>': 'The email to share the app with',
+    },
+    module: './ionic/share'
+  },
   {
     title: 'lib',
     name: 'lib',
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
new file mode 100644
index 0000000000..b15e2b3c15
--- /dev/null
+++ b/lib/ionic/share.js
@@ -0,0 +1,94 @@
+var fs = require('fs'),
+    os = require('os'),
+    request = require('request'),
+    ncp = require('ncp').ncp,
+    path = require('path'),
+    parseUrl = require('url').parse,
+    shelljs = require('shelljs/global'),
+    argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
+    Q = require('q'),
+    open = require('open'),
+    xml2js = require('xml2js'),
+    FormData = require('form-data'),
+    IonicProject = require('./project'),
+    IonicTemplates = require('./templates').IonicTask,
+    IonicStore = require('./store').IonicStore,
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats,
+    IonicLoginTask = require('./login').IonicTask;
+
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.getCsrfToken = function(jar) {
+  for (var i = 0; i < jar.length; i++) {
+    if (jar[i].key == 'csrftoken') {
+      return jar[i].value;
+    }
+  }
+  return '';
+}
+
+IonicTask.prototype.run = function(ionic) {
+  this.ionic = ionic;
+  var self = this;
+
+  if(argv._.length < 2) {
+    return this.ionic.fail('Invalid command', 'share');
+  }
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return
+  }
+  
+  var email = argv._[1];
+  if(email.indexOf('@') < 0) {
+    return this.ionic.fail('Invalid email address', 'share');
+  }
+
+  console.log('Sharing app', project.get('app_id'), 'with', email);
+
+  var login = new IonicLoginTask();
+  login.get(ionic, function(jar) {
+    self.jar = jar;
+
+    var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/share';
+    var params = parseUrl(url);
+
+    var form = new FormData();
+    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+    form.append('e', email);
+    form.submit({
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: jar.map(function(c) {
+          return c.key + "=" + encodeURIComponent(c.value);
+        }).join("; ")
+      })
+    }, function (err, response) {
+      if(err) {
+        return ionic.fail('Error sharing: ' + err);
+      }
+      response.on("data", function(data) {
+        if(err || response.statusCode !== 200) {
+          console.log(body);
+          return ionic.fail('Error sharing: ' + err);
+        }
+        console.log('An invite to view your app was sent.');
+        //console.log('\n', data.toString('utf-8'));
+      })
+    });
+    
+  });
+
+}
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index f548787467..79b51b37b3 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -131,6 +131,7 @@ IonicTask.prototype.run = function(ionic, callback) {
             project.set('app_id', d.app_id);
             project.save();
             console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
+            console.log(('Share your beautiful app with someone:\n\n$ ionic share EMAIL\n').bold);
           } 
 
           if ( callback ) {

From cdb90de9bdd3b3f68cde2cbee7a6dde16e7bdd6f Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 16 Mar 2015 20:02:24 -0500
Subject: [PATCH 0505/1100] VBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0fddcaf92e..31aea9cb36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 39fea4db95684b2b319a3781b423ad3c7b34a594 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 18 Mar 2015 10:41:40 -0600
Subject: [PATCH 0506/1100] Adding in default ionic icons for new apps - when
 ionic platform add (ios/android) is run - default resources will be added if
 previous resources are not specified

---
 lib/ionic/cordova.js            | 76 ++++++++++++++++++++++++++++++++-
 lib/ionic/resources/generate.js | 40 +++++++++--------
 2 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index ade9985d9a..6bfc12430a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -5,7 +5,10 @@ var Task = require('./task').Task,
     argv = require('optimist').argv,
     path = require('path'),
     exec = require('child_process').exec,
-    colors = require('colors');
+    colors = require('colors'),
+    shelljs = require('shelljs'),
+    generate = require('./resources/generate'),
+    settings = require('./resources/settings');
 
 var IonicTask = function() {};
 
@@ -56,10 +59,16 @@ IonicTask.prototype.runCordova = function(cmdName) {
         }
       }
     }
+    
+    if(cmdArgs[0] == 'add') {
+      this.addIonicIcons(cmdArgs[1]);
+    }
+
     if(!hasCordovaCmd) {
       cmdArgs.unshift('add');
     }
   }
+
   this.addHooks();
 
   cmdArgs.unshift(cmdName);
@@ -269,4 +278,69 @@ IonicTask.prototype.addHooks = function() {
 
 };
 
+IonicTask.prototype.addIonicIcons = function(platform) {
+
+  // console.log('generate:', generate)
+  // console.log('settings:', settings, '\n\n\n\n\n\n\n')
+
+  //If the user already has the resources folder set up, 
+  //we shouldnt need to do much here.
+  if(fs.existsSync(path.join('./', 'resources'))) {
+    console.log('Resources folder exists - no default resources shall be added'.red.bold);
+    return;
+  }
+
+  //First we check to see if platforms exist in config.xml
+  //If they do - let's not over write them.
+  //If they dont - we need to go through the settings and place them there
+  //then write config.xml file
+
+  console.log('Adding icons for platform:'.blue.bold, platform.green)
+
+  generate.getConfigData()
+  .then(function(data) {
+    if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
+      copyIconFilesIntoResources(platform)
+      addPlatformIcons(platform, data)
+    } else {
+      console.log('Platform exists. Doing nothing'.red.bold);
+    }
+
+  })
+  .catch(function(error) {
+    console.log('Error happened:', error)
+  })
+
+
+}
+
+function copyIconFilesIntoResources(platform) {
+  var unzipPath = path.join('resources');
+
+  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
+  // console.log('uzip to: ', unzipPath)
+  console.log('Downloading Default Ionic Resources'.yellow);
+  Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
+  .then(function() {
+    shelljs.config.silent = true
+    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
+    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
+    console.log('Done!')
+  })
+}
+
+function addPlatformIcons(platform, configData) {
+  var platElem = { '$': { name: platform }, icon: [] };
+  if(!configData.widget.platform) {
+    configData.widget.platform = [];
+  }
+  configData.widget.platform.push(platElem);
+  settings.ResPlatforms[platform].icon.images.forEach(function(image) {
+    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
+    platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
+  });
+
+  generate.writeConfigData(configData);
+}
+
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 4251f90fd4..d0bf379ef2 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -579,7 +579,7 @@ function getConfigData() {
       return;
     }
     configData = parsedData;
-    deferred.resolve();
+    deferred.resolve(configData);
   }
 
   return deferred.promise;
@@ -600,7 +600,7 @@ function updateConfigData() {
   images.forEach(updateImageNode);
   buildDefaultIconNode();
   buildPreferenceSplashNodes();
-  writeConfigData();
+  writeConfigData(configData);
 
   function clearResourcesNodes() {
     images.forEach(function(image) {
@@ -689,21 +689,6 @@ function updateConfigData() {
 
   }
 
-  function writeConfigData() {
-    if (!madeChanges) return;
-
-    try {
-      var builder = new xml2js.Builder();
-      var xmlString = builder.buildObject(configData);
-
-      fs.writeFile(settings.configFile, xmlString, function(err) {
-        if (err) console.error('Error writing config data: ' + err);
-      });
-    } catch (e) {
-      console.error('Error writeConfigData: ' + e);
-    }
-  }
-
 }
 
 function getOrientationConfigData(platform) {
@@ -734,4 +719,23 @@ function getResourceConfigNode(platformData, nodeName, src) {
   }
 }
 
-exports.IonicTask = IonicResources;
+function writeConfigData(configData) {
+  // if (!madeChanges) return;
+
+  try {
+    var builder = new xml2js.Builder();
+    var xmlString = builder.buildObject(configData);
+
+    fs.writeFile(settings.configFile, xmlString, function(err) {
+      if (err) console.error('Error writing config data: ' + err);
+    });
+  } catch (e) {
+    console.error('Error writeConfigData: ' + e);
+  }
+}
+
+module.exports = {
+  IonicTask: IonicResources,
+  getConfigData: getConfigData,
+  writeConfigData: writeConfigData
+}

From b2b07184a4e76c90fec8208d545e23011b538373 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 18 Mar 2015 14:50:49 -0600
Subject: [PATCH 0507/1100] Updating changelog for ionic share command

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bdad7a8f9..b9998474ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.16
+
+* Added the ability to share an Ionic app with another user via email `ionic share developer@theirdomain.com`
+
 ### 1.3.15
 
 * Updated the `ionic link` command to work properly with the `--reset` option

From 84bfab4f47e025a03592a2af161bb755ef9bc37c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 19 Mar 2015 10:01:26 -0600
Subject: [PATCH 0508/1100] Closes #313 - adding the 'w' options to the boolean
 arguments for start so they dont give a value of the folder name

---
 lib/ionic/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a8579b2d47..26dbe014f8 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -5,7 +5,7 @@ var fs = require('fs'),
     path = require('path'),
     parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
-    argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
+    argv = require('optimist').boolean(['no-cordova', 'sass', 'list', 'w']).argv,
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),

From dd954dec8e15aa753ad836cc998ec2cb7ab8b162 Mon Sep 17 00:00:00 2001
From: Romain PIGNOLET <rpignolet@linagora.com>
Date: Fri, 20 Mar 2015 11:41:48 +0100
Subject: [PATCH 0509/1100] Resolves #315 - Add a no hook option for Cordova
 commands

---
 lib/ionic.js         | 11 ++++++++++-
 lib/ionic/cordova.js |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index dcedcf487d..38448adf48 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -111,6 +111,9 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
+    options: {
+      '--no-hook|-n': 'Do not add hook'
+    },
     module: './ionic/cordova'
   },
   {
@@ -127,6 +130,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
+      '--no-hook|-n': 'Do not add hook',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -146,6 +150,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
+      '--no-hook|-n': 'Do not add hook',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -159,6 +164,9 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
+    options: {
+      '--no-hook|-n': 'Do not add hook',
+    },
     module: './ionic/cordova'
   },
   {
@@ -172,7 +180,8 @@ var TASKS = [
     options: {
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
                                   'and subdirectories first for the plugin before\n' +
-                                  'looking it up in the registry.'
+                                  'looking it up in the registry.',
+      '--no-hook|-n': 'Do not add hook'
     },
     module: './ionic/cordova'
   },
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index ade9985d9a..ca9584b2b9 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -60,7 +60,12 @@ IonicTask.prototype.runCordova = function(cmdName) {
       cmdArgs.unshift('add');
     }
   }
-  this.addHooks();
+  var noHook = cmdArgs.some(function(cmdArg) {
+    return cmdArg === '--no-hook' || cmdArg === '-n';
+  });
+  if (!noHook) {
+    this.addHooks();
+  }
 
   cmdArgs.unshift(cmdName);
 

From 2b19daa90924e65c4835e27293e1f577e6cef73d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 20 Mar 2015 11:32:00 -0600
Subject: [PATCH 0510/1100] Altered the addIonicIcons method to return a
 promise. That way we can chain it in the cordova.js file - instead of having
 it get overrun by the cordova run command that will try to copy over
 resources that dont exist (they are still downloading)

---
 lib/ionic/cordova.js            |  82 ++++----------------------
 lib/ionic/resources/generate.js | 101 ++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 6bfc12430a..59a67419e2 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -33,7 +33,20 @@ IonicTask.prototype.run = function(ionic) {
     });
   }
 
+  var addDefaultResources = false;
+
+  if(argv._.indexOf('platform') != -1 && argv._.indexOf('add') != -1 ) {
+    addDefaultResources = true;
+  }
+
   q.then(function(){
+    if(addDefaultResources) {
+      return generate.addIonicIcons(argv._[2]);
+    } else {
+      return false;
+    }
+  })
+  .then(function() {
     self.runCordova(cmdName);
   })
 };
@@ -59,10 +72,6 @@ IonicTask.prototype.runCordova = function(cmdName) {
         }
       }
     }
-    
-    if(cmdArgs[0] == 'add') {
-      this.addIonicIcons(cmdArgs[1]);
-    }
 
     if(!hasCordovaCmd) {
       cmdArgs.unshift('add');
@@ -278,69 +287,4 @@ IonicTask.prototype.addHooks = function() {
 
 };
 
-IonicTask.prototype.addIonicIcons = function(platform) {
-
-  // console.log('generate:', generate)
-  // console.log('settings:', settings, '\n\n\n\n\n\n\n')
-
-  //If the user already has the resources folder set up, 
-  //we shouldnt need to do much here.
-  if(fs.existsSync(path.join('./', 'resources'))) {
-    console.log('Resources folder exists - no default resources shall be added'.red.bold);
-    return;
-  }
-
-  //First we check to see if platforms exist in config.xml
-  //If they do - let's not over write them.
-  //If they dont - we need to go through the settings and place them there
-  //then write config.xml file
-
-  console.log('Adding icons for platform:'.blue.bold, platform.green)
-
-  generate.getConfigData()
-  .then(function(data) {
-    if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
-      copyIconFilesIntoResources(platform)
-      addPlatformIcons(platform, data)
-    } else {
-      console.log('Platform exists. Doing nothing'.red.bold);
-    }
-
-  })
-  .catch(function(error) {
-    console.log('Error happened:', error)
-  })
-
-
-}
-
-function copyIconFilesIntoResources(platform) {
-  var unzipPath = path.join('resources');
-
-  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
-  // console.log('uzip to: ', unzipPath)
-  console.log('Downloading Default Ionic Resources'.yellow);
-  Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
-  .then(function() {
-    shelljs.config.silent = true
-    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
-    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
-    console.log('Done!')
-  })
-}
-
-function addPlatformIcons(platform, configData) {
-  var platElem = { '$': { name: platform }, icon: [] };
-  if(!configData.widget.platform) {
-    configData.widget.platform = [];
-  }
-  configData.widget.platform.push(platElem);
-  settings.ResPlatforms[platform].icon.images.forEach(function(image) {
-    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
-    platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
-  });
-
-  generate.writeConfigData(configData);
-}
-
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index d0bf379ef2..33bda0b65c 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     crc = require('crc'),
     resSettings = require('./settings.js'),
     Task = require('../task').Task,
+    shelljs = require('shelljs'),
     moduleSettings = require('../../../package.json'),
     IonicStats = require('../stats').IonicStats;
 
@@ -37,6 +38,12 @@ IonicResources.prototype.run = function() {
     return;
   }
 
+  if(argv.default) {
+    addIonicIcons('ios');
+    addIonicIcons('android');
+    return
+  }
+
   if (!fs.existsSync(settings.resourceDir)) {
     fs.mkdirSync(settings.resourceDir);
   }
@@ -734,8 +741,102 @@ function writeConfigData(configData) {
   }
 }
 
+function addIonicIcons(platform) {
+
+  if(!fs.existsSync(path.join('./', 'resources'))) {
+    copyIconFilesIntoResources(platform)
+  } else {
+    // console.log('Resources folder exists - no default resources shall be added'.red.bold);
+  }
+
+  console.log('Adding icons for platform:'.blue.bold, platform.green)
+
+  return getConfigData()
+  .then(function(data) {
+    if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
+      addPlatformIcons(platform, data)
+      addSplashScreenPreferences(data)
+      writeConfigData(data)
+    }
+  })
+  .catch(function(error) {
+    console.log('Error happened:', error)
+  })
+}
+
+function copyIconFilesIntoResources(platform) {
+  var unzipPath = path.join('resources');
+
+  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
+  // console.log('uzip to: ', unzipPath)
+  console.log('Downloading Default Ionic Resources'.yellow);
+  Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
+  .then(function() {
+    shelljs.config.silent = true
+    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
+    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
+    console.log('Done!')
+  })
+}
+
+function addPlatformIcons(platform, configData) {
+  var platElem = { '$': { name: platform }, icon: [], splash: [] };
+  if(!configData.widget.platform) {
+    configData.widget.platform = [];
+  }
+
+  configData.widget.platform.push(platElem);
+
+  resSettings.ResPlatforms[platform].icon.images.forEach(function(image) {
+    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
+    platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
+  });
+
+  resSettings.ResPlatforms[platform].splash.images.forEach(function(image) {
+    //resources/ios/splash/
+    var splashDir = ['resources/', platform, '/splash/', image.name].join('');
+    if(platform == 'android') {
+      platElem.splash.push({'$': { src: splashDir, density: image.density }})
+    } else {
+      platElem.splash.push({'$': { src: splashDir, height: image.height, width: image.width }})
+    }
+  })
+
+  // generate.writeConfigData(configData);
+}
+
+function addSplashScreenPreferences(configData) {
+  //Check for splash screen stuff
+  //<preference name="SplashScreen" value="screen"/>
+  //<preference name="SplashScreenDelay" value="3000"/>
+  var preferences = configData.widget.preference;
+
+  if(!configData.widget.preference) {
+    configData.widget.preference = []
+  }
+
+  var hasSplashScreen = false, hasSplashScreenDelay = false;
+
+  configData.widget.preference.forEach(function(pref) {
+    if(pref.$.name == 'SplashScreen') {
+      hasSplashScreen = true;
+    }
+    if(pref.$.name == 'SplashScreenDelay') {
+      hasSplashScreenDelay = true;
+    }
+  })
+
+  if(!hasSplashScreen) {
+    configData.widget.preference.push({'$': { name: 'SplashScreen', value: 'screen'}});
+  }
+  if(!hasSplashScreenDelay) {
+    configData.widget.preference.push({'$': { name: 'SplashScreenDelay', value: '3000'}});
+  }
+}
+
 module.exports = {
   IonicTask: IonicResources,
+  addIonicIcons: addIonicIcons,
   getConfigData: getConfigData,
   writeConfigData: writeConfigData
 }

From b360dd9081ae197993fb4c3ff241591ae346b9cf Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 20 Mar 2015 14:30:56 -0600
Subject: [PATCH 0511/1100] Moving some logging commands inward so the user
 only sees them if action is taken. Fixed the android icons to use density
 instead of height/width

---
 lib/ionic/resources/generate.js | 36 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 33bda0b65c..85e1832780 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -39,8 +39,10 @@ IonicResources.prototype.run = function() {
   }
 
   if(argv.default) {
-    addIonicIcons('ios');
-    addIonicIcons('android');
+    addIonicIcons('ios')
+    .then(function() {
+      addIonicIcons('android');    
+    })
     return
   }
 
@@ -743,17 +745,17 @@ function writeConfigData(configData) {
 
 function addIonicIcons(platform) {
 
-  if(!fs.existsSync(path.join('./', 'resources'))) {
-    copyIconFilesIntoResources(platform)
-  } else {
-    // console.log('Resources folder exists - no default resources shall be added'.red.bold);
-  }
+  // if(!fs.existsSync(path.join('./', 'resources'))) {
+  //   copyIconFilesIntoResources(platform)
+  // } else {
+  //   // console.log('Resources folder exists - no default resources shall be added'.red.bold);
+  // }
 
-  console.log('Adding icons for platform:'.blue.bold, platform.green)
-
-  return getConfigData()
+  return copyIconFilesIntoResources(platform)
+  .then(getConfigData)
   .then(function(data) {
     if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
+      console.log('Adding icons for platform:'.blue.bold, platform.green)
       addPlatformIcons(platform, data)
       addSplashScreenPreferences(data)
       writeConfigData(data)
@@ -767,15 +769,19 @@ function addIonicIcons(platform) {
 function copyIconFilesIntoResources(platform) {
   var unzipPath = path.join('resources');
 
+  if(fs.existsSync(path.join('./', 'resources'))) {
+    return Q();
+  }
+
   var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
   // console.log('uzip to: ', unzipPath)
   console.log('Downloading Default Ionic Resources'.yellow);
-  Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
+  return Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
   .then(function() {
     shelljs.config.silent = true
     shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
     shelljs.rm('-rf', 'resources/ionic-default-resources-master')
-    console.log('Done!')
+    console.log('Done adding default Ionic resources'.yellow)
   })
 }
 
@@ -789,7 +795,11 @@ function addPlatformIcons(platform, configData) {
 
   resSettings.ResPlatforms[platform].icon.images.forEach(function(image) {
     var iconDir = ['resources/', platform, '/icon/', image.name].join('');
-    platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
+    if(platform == 'android') {
+      platElem.icon.push({'$': { src: iconDir, density: image.density }})
+    } else {
+      platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
+    }
   });
 
   resSettings.ResPlatforms[platform].splash.images.forEach(function(image) {

From 1f11b559ffcfbce6ae6541d9b0207a368a3ffe48 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 23 Mar 2015 16:16:34 -0600
Subject: [PATCH 0512/1100] Adjusted the adding ionic icons to check and
 provide a force option to go ahead and download

---
 lib/ionic/cordova.js            |  5 +-
 lib/ionic/resources/generate.js | 90 ++++++++++++++++++++++++---------
 2 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 59a67419e2..950743c45f 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -41,7 +41,10 @@ IonicTask.prototype.run = function(ionic) {
 
   q.then(function(){
     if(addDefaultResources) {
-      return generate.addIonicIcons(argv._[2]);
+      return generate.copyIconFilesIntoResources()
+      .then(function() {
+        return generate.addIonicIcons(argv._[2]);
+      })
     } else {
       return false;
     }
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 85e1832780..518e1b9eed 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -39,9 +39,20 @@ IonicResources.prototype.run = function() {
   }
 
   if(argv.default) {
-    addIonicIcons('ios')
+    if(hasExistingResources() && !argv.force) {
+      console.log('The resources folder already exists. We will not overwrite your files unless you pass the --force argument.'.red.bold);
+      console.log('Running with the force flag will overwrite your resources directory and modify your config.xml file'.red.bold)
+      return;
+    }
+    copyIconFilesIntoResources(argv.force)
     .then(function() {
-      addIonicIcons('android');    
+      return addIonicIcons('ios')
+    })
+    .then(function() {
+      return addIonicIcons('android');
+    })
+    .catch(function(error) {
+      console.error('An error with adding default resources happened:', error);
     })
     return
   }
@@ -743,33 +754,62 @@ function writeConfigData(configData) {
   }
 }
 
-function addIonicIcons(platform) {
-
-  // if(!fs.existsSync(path.join('./', 'resources'))) {
-  //   copyIconFilesIntoResources(platform)
-  // } else {
-  //   // console.log('Resources folder exists - no default resources shall be added'.red.bold);
-  // }
-
-  return copyIconFilesIntoResources(platform)
-  .then(getConfigData)
-  .then(function(data) {
-    if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
-      console.log('Adding icons for platform:'.blue.bold, platform.green)
-      addPlatformIcons(platform, data)
-      addSplashScreenPreferences(data)
-      writeConfigData(data)
+function addIonicIcons(platform, forceAddResources) {
+
+  try {
+    var promise = null;
+
+    if(forceAddResources) {
+      console.log('forceAddResources')
+      promise = copyIconFilesIntoResources(forceAddResources);
+    } else {
+      promise = Q();
     }
-  })
-  .catch(function(error) {
-    console.log('Error happened:', error)
-  })
+
+    // console.log('addIonicIcons - forceAddResources:', forceAddResources)
+
+    // return copyIconFilesIntoResources(platform, forceAddResources)
+    return promise
+    .then(getConfigData)
+    .then(function(data) {
+      if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
+        console.log('Adding icons for platform:'.blue.bold, platform.green)
+        addPlatformIcons(platform, data)
+        addSplashScreenPreferences(data)
+        writeConfigData(data)
+      }
+    })
+    .catch(function(error) {
+      console.log('Error happened:', error)
+      throw error;
+    })
+  } catch(ex) {
+    Ionic.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
+  }
+}
+
+function hasExistingResources() {
+  //Check resources
+  // resources/icon.png
+  // resources/splash.png
+  // resources/ios/
+  // resources/android
+  var hasResources = fs.existsSync(path.join('./', 'resources')),
+      hasAndroidResources = fs.existsSync(path.join('./', 'resources', 'android')),
+      hasIosResources = fs.existsSync(path.join('./', 'resources', 'ios')),
+      hasIconResource = fs.existsSync(path.join('./', 'resources', 'icon.png')),
+      hasSplashResource = fs.existsSync(path.join('./', 'resources', 'splash.png'));
+
+  var hasAnyResources = hasResources || hasAndroidResources || hasIosResources || hasIconResource || hasSplashResource;
+
+  return hasAnyResources;
 }
 
-function copyIconFilesIntoResources(platform) {
+function copyIconFilesIntoResources(forceAddResources) {
   var unzipPath = path.join('resources');
 
-  if(fs.existsSync(path.join('./', 'resources'))) {
+  if(hasExistingResources() && !forceAddResources) {
+    // console.log('Not copying over default resources, the resources directory already exist. Please pass the --force argument to overwrite that folder'.red.bold);
     return Q();
   }
 
@@ -847,6 +887,8 @@ function addSplashScreenPreferences(configData) {
 module.exports = {
   IonicTask: IonicResources,
   addIonicIcons: addIonicIcons,
+  copyIconFilesIntoResources: copyIconFilesIntoResources,
   getConfigData: getConfigData,
+  hasExistingResources: hasExistingResources,
   writeConfigData: writeConfigData
 }

From 4acd6e6469fee721b815947358454ba6ffd92a57 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 23 Mar 2015 16:17:03 -0600
Subject: [PATCH 0513/1100] Adding in version lookup for ios-deploy

---
 lib/ionic/info.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 8a7fa5e619..7add882458 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -79,6 +79,15 @@ IonicTask.prototype.getIosSimInfo = function() {
   return version;
 }
 
+IonicTask.prototype.getIosDeployInfo = function() {
+  var result = shelljs.exec('ios-deploy --version', { silent: true });
+  if(result.code != 0) {
+    return 'Not installed';
+  }
+  var version = result.output.replace(/\n/g, ' ')
+  return version;
+}
+
 IonicTask.prototype.getIonicVersions = function(info) {
   var ionicCliVersion = require('../../package.json').version;
 
@@ -154,6 +163,7 @@ IonicTask.prototype.getOsEnvironment = function(info) {
       info.os = self.getMacInfo();
       info.xcode = self.getXcodeInfo();
       info.ios_sim = self.getIosSimInfo();
+      info.ios_deploy = self.getIosDeployInfo();
       break;
     case 'Windows_NT':
       info.os = self.getWindowsEnvironmentInfo();
@@ -221,6 +231,10 @@ IonicTask.prototype.printInfo = function(info) {
   if(info.ios_sim) {
     console.log('ios-sim version:', info.ios_sim);
   }
+  if(info.ios_deploy) {
+    console.log('ios-deploy version:', info.ios_deploy);
+  }
+  
   console.log('\n');
 }
 

From 400d70b5b9eed12c52ac1e346abec8965c341236 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 10:17:22 -0600
Subject: [PATCH 0514/1100] Updating changelog, bumping version

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9998474ef..eb69f6fd61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### 1.3.17
+
+* Added in default Ionic icons and splashscreens for your iOS and Android applications! Try them out `ionic resources --default`.
+* To note: if you have entries in your config.xml file for icons or splashscreens or files existing in your resources directory,
+* neither the settings nor the directory will not be overridden.
+* To force resource folder with the ionic icons, use `ionic resources --default --force`
+* Added in the ability to start an Ionic application from a Plnkr url - try it `ionic start http://embed.plnkr.co/dFvL8n/preview`
+* Fixed the no cordova option when using the shorthand `-w` - `ionic start -w folderX blank` should now work
+* Ionic info will now look up your version of ios-deploy - which is needed for ios application deployments - `ionic info`
+
+
 ### 1.3.16
 
 * Added the ability to share an Ionic app with another user via email `ionic share developer@theirdomain.com`
diff --git a/package.json b/package.json
index 31aea9cb36..3290982e85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 0ede8f7312f0f624495b7fa00d973a1d8a9448dd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 10:25:04 -0600
Subject: [PATCH 0515/1100] Updating readme

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index e6e23b5642..8a1df1a621 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,10 @@ __Codepen URL starters:__
 * Any Codepen url, ex: [http://codepen.io/ionic/pen/odqCz](http://codepen.io/ionic/pen/odqCz)
 * [Ionic Codepen Demos](http://codepen.io/ionic/public-list/)
 
+__Plunker URL starters:__
+
+* Any Plunker url, ex: [http://embed.plnkr.co/dFvL8n/preview](http://embed.plnkr.co/dFvL8n/preview)
+
 __Local directory starters:__
 
 * Relative or absolute path to a local directory
@@ -169,6 +173,18 @@ By default the `ionic resources` command will automatically figure out which pla
 $ ionic resources ios
 ```
 
+### Default Ionic Resources
+
+Ionic provides you some default icons and splash screens to give you a better idea of how to size your icons and splashscreen, as well as how to modify your config.xml file for your own icons.
+
+```bash
+$ ionic resources --default
+```
+
+If you already have a resources directory, the command above will not over write your files. If you wish to force an over write, use `ionic resources --default --force`.
+
+When starting a new app and adding a platform `ionic platform add ios` - the default icons and splashscreens will be downloaded and your config.xml will be modified to set up the default resources. This should help you identify your Ionic apps easier as well as help you get the file structure and configuration correct.
+
 
 ## Crosswalk for Android
 

From 1746d6e7bc89ff4cad326827967de7889cf825a7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 11:07:40 -0600
Subject: [PATCH 0516/1100] npm shrinkwrap

---
 npm-shrinkwrap.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b741482d0d..ddb13cd806 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1465,7 +1465,7 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "opbeat-ionic@1.1.3",
+      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {

From a0848472c2ce09a1a09a827f4be92b18042f2d0b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 14:12:07 -0600
Subject: [PATCH 0517/1100] Closes #328 - adding a default browser for the
 serve command with --defaultBrowser or -f to specify a default, the default
 will be saved to the users ionic.project file

---
 lib/ionic/serve.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index b236999e1e..9bdc3e6cc2 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -202,6 +202,16 @@ IonicTask.prototype.loadSettings = function(cb) {
   this.browser = argv.browser || argv.w || '';
   this.browserOption = argv.browserOption || argv.o || '';
 
+  //Check for default browser being specified
+  this.defaultBrowser = argv.defaultBrowser || argv.f || project.get('defaultBrowser');
+
+  if(this.defaultBrowser) {
+    project.set('defaultBrowser', this.defaultBrowser);
+    project.save();
+  }
+
+  this.browser = this.browser || this.defaultBrowser;
+
   this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
   this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
   this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;

From 5c5134f48599057e788f98e4664ec6cf03873e20 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 14:12:54 -0600
Subject: [PATCH 0518/1100] Updating changelog for default browsers

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb69f6fd61..8333576f1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### next-release
+
+* Added an option to `ionic serve` to specify a default browser for that Ionic project. `ionic serve --defaultBrowser safari`
+
 ### 1.3.17
 
 * Added in default Ionic icons and splashscreens for your iOS and Android applications! Try them out `ionic resources --default`.

From b2f189c55f4f21874b7ecc414934a9bc05828268 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 15:01:48 -0600
Subject: [PATCH 0519/1100] Changing color and message for no hooks added

---
 lib/ionic/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 3751067ae8..600d1252c2 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -86,10 +86,10 @@ IonicTask.prototype.runCordova = function(cmdName) {
   });
 
   if (!noHook) {
-    console.log('Adding in default Ionic hooks'.blue.bold)
+    console.log('Adding in default Ionic hooks'.yellow.bold)
     this.addHooks();
   } else {
-    console.log('Option passed to not install default Ionic hooks'.red)
+    console.log('Option passed to not install default Ionic hooks'.yellow.bold)
   }
 
   cmdArgs.unshift(cmdName);

From 72cfa62be90106b1f04873b58b138fcf328628d1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 15:04:46 -0600
Subject: [PATCH 0520/1100] Closes #315 and #319 - removes some plugin hooks.
 Also adds the option to not add other ionic cordova hooks when adding a
 platform

---
 CHANGELOG.md         | 4 ++++
 lib/ionic/cordova.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb69f6fd61..997cf33b62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### next-release
+
+* Added an option when adding platforms to not include the default Ionic cordova hooks - `ionic platform add ios --no-hook`
+
 ### 1.3.17
 
 * Added in default Ionic icons and splashscreens for your iOS and Android applications! Try them out `ionic resources --default`.
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 600d1252c2..4bfbffa6d3 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
-    argv = require('optimist').argv,
+    argv = require('optimist').boolean(['no-hook', 'n']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),

From 6cdc761260b08bde30ccf25db549f21ec58c79fd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 15:32:18 -0600
Subject: [PATCH 0521/1100] Adding in the method to remove only the hooks weve
 added to try and help cordova plugins via hooks. Added the
 deleteFolderRecursive method to utils - if we need it later Closes #252,
 #268, #304, #315, #319

---
 lib/ionic/cordova.js | 19 +++++++++++++++++++
 lib/ionic/utils.js   | 17 +++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 4bfbffa6d3..54a55638c9 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -88,6 +88,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
   if (!noHook) {
     console.log('Adding in default Ionic hooks'.yellow.bold)
     this.addHooks();
+    this.removeOldPluginHooks();
   } else {
     console.log('Option passed to not install default Ionic hooks'.yellow.bold)
   }
@@ -224,6 +225,24 @@ IonicTask.prototype.setupLiveReload = function() {
   return d.promise;
 };
 
+IonicTask.prototype.removeOldPluginHooks = function removeOldPluginHooks() {
+  var oldPluginHooks = [
+    'after_platform_add/010_install_plugins.js',
+    'after_plugin_add/010_register_plugin.js',
+    'after_plugin_rm/010_deregister_plugin.js'
+  ];
+
+  oldPluginHooks.forEach(function(hook) {
+    try {
+      var hookPath = path.join('.', 'hooks', hook);
+      console.log('trying to delete hookpath: ', hookPath)
+      fs.unlinkSync(hookPath);
+    } catch(ex) {
+      console.log('Error trying to delete old plugin hooks: ', ex)
+    }
+  })
+}
+
 IonicTask.prototype.addHooks = function() {
   // Add hooks which this Ionic project doesn't already have
   // note: hook scripts must be executable!
diff --git a/lib/ionic/utils.js b/lib/ionic/utils.js
index 2f581a155b..641d4ca5a2 100644
--- a/lib/ionic/utils.js
+++ b/lib/ionic/utils.js
@@ -20,8 +20,25 @@ var retrieveCsrfToken = function retrieveCsrfToken(jar) {
   return csrftoken;
 }
 
+var deleteFolderRecursive = function(removePath) {
+  var fs = require('fs'),
+      path = require('path')
+
+  if( fs.existsSync(removePath) ) {
+    fs.readdirSync(removePath).forEach(function(file,index){
+      var curPath = path.join(removePath, file);
+      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+        deleteFolderRecursive(curPath);
+      } else { // delete file
+        fs.unlinkSync(curPath);
+      }
+    });
+    fs.rmdirSync(removePath);
+  }
+};
 
 module.exports = {
+  deleteFolderRecursive: deleteFolderRecursive,
   retrieveCsrfToken: retrieveCsrfToken,
   transformCookies: transformCookies
 }

From d79a40cd3152b8d3ea1d101395fbf20906c39ad8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 24 Mar 2015 15:43:43 -0600
Subject: [PATCH 0522/1100] Updating changelog, removing console.log statements
 for removing old plugin hooks

---
 CHANGELOG.md         |  1 +
 lib/ionic/cordova.js | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 997cf33b62..f1dd28700a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### next-release
 
 * Added an option when adding platforms to not include the default Ionic cordova hooks - `ionic platform add ios --no-hook`
+* Ionic CLI now removes some of the older cordova hooks that try to manage plugins - this is now handled by cordova.
 
 ### 1.3.17
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 54a55638c9..9a1a96efd6 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -215,13 +215,6 @@ IonicTask.prototype.setupLiveReload = function() {
 
   })
 
-
-  // function(){
-  
-  // serveTask.start(self.ionic);
-
-
-
   return d.promise;
 };
 
@@ -235,11 +228,8 @@ IonicTask.prototype.removeOldPluginHooks = function removeOldPluginHooks() {
   oldPluginHooks.forEach(function(hook) {
     try {
       var hookPath = path.join('.', 'hooks', hook);
-      console.log('trying to delete hookpath: ', hookPath)
       fs.unlinkSync(hookPath);
-    } catch(ex) {
-      console.log('Error trying to delete old plugin hooks: ', ex)
-    }
+    } catch(ex) { }
   })
 }
 

From 2e6a64121f6ef5de33b3588d3ad8ab77d84de5ac Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 25 Mar 2015 10:47:52 -0600
Subject: [PATCH 0523/1100] Adding flags to args to not add default resources.
 Adding in switch statement to figure out what platform is passed incase its a
 local path

---
 lib/ionic/cordova.js            |  8 ++++++--
 lib/ionic/resources/generate.js | 11 ++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 9a1a96efd6..f4c6f2f10b 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
-    argv = require('optimist').boolean(['no-hook', 'n']).argv,
+    argv = require('optimist').boolean(['no-hook', 'n', 'r', 'no-resources']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),
@@ -22,6 +22,8 @@ IonicTask.prototype.run = function(ionic) {
 
   this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
+  this.addIcons = !(argv['no-resources'] || argv.r);
+
   if(this.isLiveReload) {
     q = self.setupLiveReload();
 
@@ -39,8 +41,10 @@ IonicTask.prototype.run = function(ionic) {
     addDefaultResources = true;
   }
 
+  // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
+
   q.then(function(){
-    if(addDefaultResources) {
+    if(addDefaultResources && self.addIcons) {
       return generate.copyIconFilesIntoResources()
       .then(function() {
         return generate.addIonicIcons(argv._[2]);
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 518e1b9eed..f0e1f34f24 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -756,6 +756,14 @@ function writeConfigData(configData) {
 
 function addIonicIcons(platform, forceAddResources) {
 
+  switch(platform) {
+    case 'android':
+    case 'ios':
+      break;
+    default:
+      platform = 'android';//most likely crosswalk `cordova platform add ./engine/cordova-android`
+  }
+
   try {
     var promise = null;
 
@@ -766,9 +774,6 @@ function addIonicIcons(platform, forceAddResources) {
       promise = Q();
     }
 
-    // console.log('addIonicIcons - forceAddResources:', forceAddResources)
-
-    // return copyIconFilesIntoResources(platform, forceAddResources)
     return promise
     .then(getConfigData)
     .then(function(data) {

From 7b39f2f04b7952a979cf987f401149bb9438167e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 25 Mar 2015 10:51:11 -0600
Subject: [PATCH 0524/1100] Updating help options text to be a little more
 verbose

---
 lib/ionic.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 38448adf48..0e3d486c07 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -112,7 +112,8 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--no-hook|-n': 'Do not add hook'
+      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
+      '--no-resources|-r': 'Do not add default Ionic icons and splash screen resources'
     },
     module: './ionic/cordova'
   },
@@ -130,7 +131,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--no-hook|-n': 'Do not add hook',
+      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -150,7 +151,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--no-hook|-n': 'Do not add hook',
+      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -165,7 +166,7 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--no-hook|-n': 'Do not add hook',
+      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
     },
     module: './ionic/cordova'
   },
@@ -181,7 +182,7 @@ var TASKS = [
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
                                   'and subdirectories first for the plugin before\n' +
                                   'looking it up in the registry.',
-      '--no-hook|-n': 'Do not add hook'
+      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova'
     },
     module: './ionic/cordova'
   },

From d648dedf34621af0fcc229fe94e5caf3e820ed9b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 25 Mar 2015 10:52:49 -0600
Subject: [PATCH 0525/1100] Closes #329 - properly checks for ionic platform
 adding - instead of a local path

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf1ba65259..787a667c52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 * Added an option when adding platforms to not include the default Ionic cordova hooks - `ionic platform add ios --no-hook`
 * Ionic CLI now removes some of the older cordova hooks that try to manage plugins - this is now handled by cordova.
 * Added an option to `ionic serve` to specify a default browser for that Ionic project. `ionic serve --defaultBrowser safari`
+* Added an argument to not add default Ionic icon and splash screen resources
+* Modified the cordova run command to check for the platform passed - this should resolve issues users are having with crosswalk and android.
 
 ### 1.3.17
 

From 9b9c0eb1ea70d932fda9c57fc2a7c505d9ceae12 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 25 Mar 2015 11:21:46 -0600
Subject: [PATCH 0526/1100] Bumping version and shrinkwrap, updating changelog

---
 CHANGELOG.md        | 4 ++--
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787a667c52..becb6053eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-### next-release
+### 1.3.18
 
+* Added an option to `ionic serve` to specify a default browser for that Ionic project. `ionic serve --defaultBrowser safari`
 * Added an option when adding platforms to not include the default Ionic cordova hooks - `ionic platform add ios --no-hook`
 * Ionic CLI now removes some of the older cordova hooks that try to manage plugins - this is now handled by cordova.
-* Added an option to `ionic serve` to specify a default browser for that Ionic project. `ionic serve --defaultBrowser safari`
 * Added an argument to not add default Ionic icon and splash screen resources
 * Modified the cordova run command to check for the platform passed - this should resolve issues users are having with crosswalk and android.
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ddb13cd806..1a156f9e75 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 3290982e85..92780c7c57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 43dca14bbf9b695781dff5e3f65e7dbc7f084497 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 26 Mar 2015 10:37:09 -0600
Subject: [PATCH 0527/1100] Closes #332 - changes the arguments for no-hooks
 and no-resources to not have hyphens to resolve issue

---
 lib/ionic.js         | 12 ++++++------
 lib/ionic/cordova.js |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0e3d486c07..3ef43994db 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -112,8 +112,8 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
-      '--no-resources|-r': 'Do not add default Ionic icons and splash screen resources'
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
+      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources'
     },
     module: './ionic/cordova'
   },
@@ -131,7 +131,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -151,7 +151,7 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -166,7 +166,7 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova',
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
     },
     module: './ionic/cordova'
   },
@@ -182,7 +182,7 @@ var TASKS = [
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
                                   'and subdirectories first for the plugin before\n' +
                                   'looking it up in the registry.',
-      '--no-hook|-n': 'Do not add default Ionic hooks for Cordova'
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova'
     },
     module: './ionic/cordova'
   },
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index f4c6f2f10b..1d1294b992 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
-    argv = require('optimist').boolean(['no-hook', 'n', 'r', 'no-resources']).argv,
+    argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),
@@ -22,7 +22,7 @@ IonicTask.prototype.run = function(ionic) {
 
   this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
-  this.addIcons = !(argv['no-resources'] || argv.r);
+  this.addIcons = !(argv.noresources || argv.r);
 
   if(this.isLiveReload) {
     q = self.setupLiveReload();
@@ -85,9 +85,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
     }
   }
 
-  var noHook = cmdArgs.some(function(cmdArg) {
-    return cmdArg === '--no-hook' || cmdArg === '-n';
-  });
+  var noHook = argv.nohooks || argv.n;
 
   if (!noHook) {
     console.log('Adding in default Ionic hooks'.yellow.bold)

From 4c200b8077bee558dbc7952335c3cbccbc726845 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 27 Mar 2015 15:02:52 -0600
Subject: [PATCH 0528/1100] Added the ionic state restore/save commands - saves
 the current state of your app in package.json in cordovaPlatforms and
 cordovaPlugins. Modifies the cordova statements to register to save them to
 package.json

---
 lib/ionic.js         |   9 +
 lib/ionic/cordova.js |   4 +-
 lib/ionic/state.js   | 465 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 477 insertions(+), 1 deletion(-)
 create mode 100644 lib/ionic/state.js

diff --git a/lib/ionic.js b/lib/ionic.js
index 0e3d486c07..d2bc73e05f 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -385,6 +385,15 @@ var TASKS = [
       '--reset|-r': 'This will reset the Ionic App ID'
     },
     module: './ionic/link'
+   },
+   {
+    title: 'state',
+    name: 'state',
+    summary: 'Saves or restores state of your Ionic Application',
+    args: {
+      '<COMMAND>': '[save|restore] - Saves or restores your Ionic applications state of platforms and plugins via the package.json file',
+    },
+    module: './ionic/state'
    }
 ];
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index f4c6f2f10b..4a92098e07 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -8,7 +8,8 @@ var Task = require('./task').Task,
     colors = require('colors'),
     shelljs = require('shelljs'),
     generate = require('./resources/generate'),
-    settings = require('./resources/settings');
+    settings = require('./resources/settings'),
+    State = require('./state');
 
 var IonicTask = function() {};
 
@@ -38,6 +39,7 @@ IonicTask.prototype.run = function(ionic) {
   var addDefaultResources = false;
 
   if(argv._.indexOf('platform') != -1 && argv._.indexOf('add') != -1 ) {
+    State.savePlatform(argv);
     addDefaultResources = true;
   }
 
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
new file mode 100644
index 0000000000..e63950eb86
--- /dev/null
+++ b/lib/ionic/state.js
@@ -0,0 +1,465 @@
+// "cordovaPlatforms": [
+//   "ios",
+//   {
+//     "android": {
+//       "id": "android",
+//       "locator": "https://github.com/apache/cordova-android.git"
+//     }
+//   }
+// ],
+// "cordovaPlugins": [
+//   "org.apache.cordova.device",
+//   "org.apache.cordova.console",
+//   "com.ionic.keyboard",
+//   "org.apache.cordova.splashscreen",
+//   {
+//     "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
+//     "id": "org.cordova.croswalk"
+//   },
+//   {
+//     "locator": "/path/to/cloned/phonegap-facebook-plugin",
+//     "id": "",
+//     "variables": {
+//         "APP_ID": "some_id",
+//         "APP_NAME": "some_name"
+//     }
+//   }
+// ]
+
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    Q = require('q'),
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats,
+    _ = require('underscore'),
+    IonicProject = require('./project'),
+    IonicInfo = require('./info').IonicTask;
+
+var State = module.exports
+
+shelljs.config.silent = true;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+State.saveState = function saveState() {
+  console.log('saveState')
+  
+  var packageJsonPath = path.resolve('.', 'package.json')
+  var packageJson = require(packageJsonPath)
+  try {
+    State.saveExistingPlatforms(packageJson)
+    State.saveExistingPlugins(packageJson)
+    State.savePackageJson(packageJson)
+  } catch(ex) {
+    console.log('There was an error saving your current Ionic setup'.red)
+    console.log('Error:', ex)
+  }
+}
+
+State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
+  var pp = path.resolve('.', 'platforms')
+  console.log(pp)
+
+  var platforms = fs.readdirSync(pp);
+
+  // console.log('h')
+  platforms.forEach(function(platform) {
+    console.log('Saving', platform, 'platform')
+    try {
+      var versionPath = path.resolve(pp, platform, 'cordova', 'version');
+      var version = State.getPlatformVersion(versionPath);
+      console.log('we had version', version)
+      var locator = platform;
+
+      //Check to see if its crosswalk
+      if(platform == 'android' && version.indexOf('-dev') != -1) {
+        console.log('crosswalk android')
+        //Look up path for engine/cordova-android path
+        var engineFiles = fs.readdirSync(path.resolve('engine'));
+        var enginePath = null;
+        engineFiles.forEach(function(engineDir) {
+          if(engineDir.indexOf('android') != -1) {
+            enginePath = engineDir;
+          }
+        })
+        locator = path.resolve('engine', enginePath);
+      }
+
+      console.log('locator', locator)
+
+      if(!packageJson.cordovaPlatforms) {
+        packageJson.cordovaPlatforms = [];
+      }
+
+      var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
+
+      console.log('platformExists:', platformExists)
+      if(!platformExists) {
+        packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+      }
+
+    } catch(ex) {
+      console.log('e', ex)
+    }
+  })
+  // console.log('platforms', platforms)
+}
+
+State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
+  var pluginDir = path.resolve('.', 'plugins')
+  console.log(pluginDir)
+
+  var plugins = fs.readdirSync(pluginDir);
+
+  //Lets try just relying on the fetch.json file
+  //this file lists all plugins with where they come from, etc
+  var fetchJson = require(path.resolve('plugins', 'fetch.json'));
+  
+  var configXmlPath = path.resolve('config.xml')
+  var cordovaPlugins = [];
+
+  // console.log('config xml path ', configXmlPath)
+  var configXmlData = State.getXmlData(configXmlPath)
+
+  console.log('config.xml data:', configXmlData)
+
+  if(fetchJson) {
+    // console.log('fetchJson', fetchJson)
+    //This will break with what we had before
+    var cordovaPlugins = [];
+    for (var pluginId in fetchJson) {
+      // cordovaPlugins.push();
+      // console.log('plugin:', pluginId)
+      var plugin = fetchJson[pluginId]
+      var pluginToAdd = {}
+
+      console.log('plugin info')
+      console.log(plugin)
+
+      var locator;
+
+      console.log('plugin.source.type', plugin.source.type)
+
+      if(plugin.source.type == 'registry') {
+        locator = pluginId
+      } else {
+        console.log('we have a local or git plugin', pluginId)
+        if(plugin.source.type == 'local') {
+          console.log('!!!  local')
+          locator = plugin.source.path
+        } else { //asume its git
+          console.log('!!!  git')
+          locator = plugin.source.url
+        }
+      }
+
+      var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml')
+
+      var pluginXml = State.getXmlData(pluginXmlPath)
+
+      // console.log('got pluginXml:', pluginXml)
+
+      var pluginName = pluginXml.plugin.name;
+
+      var preferences = pluginXml.plugin.preference;
+
+      var hasVariables = false,
+          variableList = [],
+          keyValueList = {};
+
+      if(preferences && preferences.length > 0) {
+        
+        hasVariables = true;
+
+        preferences.forEach(function(preference) {
+          variableList.push(preference.$.name);
+          // console.log('looking at preference: ', preference)
+        })
+      }
+
+      if(hasVariables) {
+        // console.log('we have avariables to look at:', variableList)
+        
+        var features = configXmlData.widget.feature;
+        console.log('features', features)
+        var feature;
+
+        features.forEach(function(potFeature) {
+          if(potFeature.$.name == pluginName) {
+            feature = potFeature
+          }
+        })
+
+        // console.log('feature found:', feature);
+        var featureParams = feature.param;
+
+        variableList.forEach(function(variable) {
+          // console.log('Looking up variable:', variable)
+          for(var i = 0, j = featureParams.length; i < j; i++) {
+            if(variable == featureParams[i].$.name) {
+              keyValueList[variable] = featureParams[i].$.value;
+            }
+          }
+        })
+
+        // console.log('We have the plugin parameters with values:', keyValueList)
+
+        var pluginObj = {id: pluginId, locator: locator, variables: keyValueList};
+        cordovaPlugins.push(pluginObj)
+
+      } else if (plugin.source.type == 'git') {
+        cordovaPlugins.push({locator: locator, id: pluginId});
+      } else {
+        cordovaPlugins.push(pluginId)
+      }
+
+    }//closes for loop for fetch.json
+
+    packageJson.cordovaPlugins = cordovaPlugins
+
+    // console.log('packageJson now:', packageJson)
+  }
+
+} //Closes saveExistingPlugins
+
+State.getXmlData = function getXmlData(xmlPath) {
+  var xml2js = require('xml2js');
+  var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
+  var xmlData;
+
+  var parseString = xml2js.parseString;
+  parseString(xmlString, function (err, jsonConfig) {
+    if(err) {
+      return self.fail('Error parsing xml file: ' + err);
+    }
+    try {
+      xmlData = jsonConfig;
+    } catch(e) {
+      return self.fail('Error parsing ' + xmlPath + ': ' + e);
+    }
+  });
+
+  return xmlData
+}
+
+State.getPlatformVersion = function getPlatformVersion(path) {
+  var result = shelljs.exec(['node', path].join(' '), { silent: true });
+  if(result.code != 0) {
+    return 'Not installed';
+  }
+  var version = result.output
+  console.log('Version for path:', path, version)
+  return version.replace(/\n/g, '');
+}
+
+State.savePlatform = function savePlatform(platformArgs) {
+  // console.log('platform args:'.green, platformArgs);
+  // { _: 
+  //    [ 'platform',
+  //      'add',
+  //      'https://github.com/apache/cordova-android.git' ],
+  //   'no-hook': false,
+  //   n: false,
+  //   r: false,
+  //   'no-resources': false,
+  //   save: true,
+  //   '$0': '/usr/local/bin/ionic' }
+
+  // Locator may be:
+  // Name:        ios, android
+  // Local path:  ./engine/cordova-android-c0.6.1
+  // Http url:    https://github.com/apache/cordova-android.git
+  var locator = platformArgs._[2];
+  var platform = 'ios';
+
+  var packageJsonPath = path.resolve('.', 'package.json')
+  var packageJson = require(packageJsonPath)
+
+  if(!packageJson.cordovaPlatforms) {
+    packageJson.cordovaPlatforms = [];
+  }
+
+
+  //Test to see if its just ios or android
+  if(locator === 'ios' || locator === 'android') {
+    platform = locator;
+  } else { //its path or url
+    platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
+  }
+
+  var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
+
+  // console.log('platformExists:', platformExists)
+  if(!platformExists) {
+    packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
+    // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+  } else {
+    platformExists.platform = platform
+    platformExists.locator = locator
+  }
+
+  State.savePackageJson(packageJson);
+
+}
+
+State.savePackageJson = function savePackageJson(packageJsonData) {
+  try {
+    var packageJsonPath = path.resolve('package.json');
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
+  } catch (e) {
+    console.log(('Error saving ' + packageJsonPath + ': ' + e).error.bold);
+  }
+}
+
+State.savePlugin = function savePlugin(pluginArgs) {
+
+}
+
+State.restoreState = function restoreState() {
+
+  console.log('Attempting to restore your Ionic application from package.json\n'.yellow.bold);
+
+  var packageJsonPath = path.resolve('.', 'package.json')
+  var packageJson = require(packageJsonPath)
+
+  //Restore plugins first - to avoid issues with platforms adding
+  //without variables
+  if(!packageJson.cordovaPlugins) {
+    packageJson.cordovaPlugins = []
+  }
+
+  console.log('Restoring Platforms\n'.blue.bold)
+
+  // console.log('processPlugin: defer:', defer)
+  
+  // State.processPlugin(0, packageJson, defer)
+  State.restorePlatforms(packageJson)
+  .then(function() {
+    console.log('\nRestore platforms is complete\n'.green.bold)
+    console.log('\rRestoring Plugins\n'.blue.bold)
+    return State.restorePlugins(packageJson)
+  })
+  .then(function() {
+    console.log('Restore plugins is complete\n'.green.bold)
+    console.log('Ionic state restore completed\n'.blue.bold)
+  })
+  .catch(function(ex) {
+    console.log('Ionic state restore failed\n'.red.bold)
+    console.log(ex)
+  })
+}
+
+State.restorePlugins = function restorePlugins(packageJson) {
+  var q = Q.defer();
+
+  State.processPlugin(0, packageJson, q);
+  // q.resolve();
+
+  return q.promise;
+}
+
+State.restorePlatforms = function restorePlatforms(packageJson) {
+  var q = Q.defer();
+
+  State.processPlatform(0, packageJson, q);
+
+  return q.promise;
+}
+
+State.processPlatform = function processPlatform(index, packageJson, promise) {
+  if(index >= packageJson.cordovaPlatforms.length) {
+    promise.resolve();
+    return
+  }
+
+  try {
+    // console.log('processing platform', index, packageJson)
+    var platform = packageJson.cordovaPlatforms[index];
+    var platformCommand;
+
+    if(typeof platform == 'string') {
+      platformCommand = ['cordova platform add ', platform].join('')
+    } else {
+      //Here, they have either a special version, or locator for
+      //local install or github install
+      platformCommand = 'cordova platform add ' + platform.locator;
+    }
+    // var platformCommand = State.createAddRemoveStatement(platform);
+    console.log(platformCommand);
+    exec(platformCommand, function(){
+        State.processPlatform(index + 1, packageJson, promise);
+    });
+  } catch(ex) {
+    console.log('An error happened processing the previous cordova plugins')
+    console.log('Error:', ex)
+    promise.reject(ex)
+  }
+}
+
+State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
+    // console.log('Creating add/remove statement', plugin)
+    try {
+      var pluginCmd = 'cordova plugin add ';
+      if(typeof plugin === 'string') {
+        pluginCmd += plugin;
+      } else {
+        pluginCmd += plugin.locator + ' ';
+        if(plugin.variables) {
+            Object.keys(plugin.variables).forEach(function(variable){
+                pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
+            });
+        }
+      }
+    } catch(ex) {
+      console.log('Failed to create add plugin statement:', ex)
+    }
+
+    // console.log('plugin cmd', pluginCmd)
+
+    return pluginCmd;
+}
+
+State.processPlugin = function processPlugin(index, packageJson, promise) {
+  if(index >= packageJson.cordovaPlugins.length) {
+    promise.resolve();
+    return
+  }
+  try {
+    // console.log('processing plugin', index, packageJson)
+    var plugin = packageJson.cordovaPlugins[index];
+    var pluginCommand = State.createAddRemoveStatement(plugin);
+    console.log(pluginCommand);
+    exec(pluginCommand, function(){
+        State.processPlugin(index + 1, packageJson, promise);
+    });
+  } catch(ex) {
+    console.log('An error happened processing the previous cordova plugins')
+    console.log('Error:', ex)
+    promise.reject(ex)
+  }
+}
+
+IonicTask.prototype.run = function run(ionic) {
+  var self = this;
+  this.ionic = ionic;
+
+  console.log('Args: ', argv._);
+
+  switch(argv._[1]) {
+    case 'save': 
+      State.saveState()
+      break;
+    case 'restore':
+      State.restoreState();
+      break;
+  }
+
+  IonicStats.t();
+
+};
+
+exports.IonicTask = IonicTask;

From 261aca8e2bc79af9514ac76d034de389cb0ca600 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 27 Mar 2015 15:04:19 -0600
Subject: [PATCH 0529/1100] Updating the latest versions of cordova android and
 cordova crosswalk browser. Adds the remove plugin style for the new ID for
 the plugin (changed), as well as default gradle.properties to be dropped in
 to support multi-architecture builds off the bat

---
 README.md                          |  9 ++++--
 lib/ionic/assets/gradle.properties |  8 +++++
 lib/ionic/browser.js               | 47 +++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 lib/ionic/assets/gradle.properties

diff --git a/README.md b/README.md
index 8a1df1a621..41e1327600 100644
--- a/README.md
+++ b/README.md
@@ -190,13 +190,18 @@ When starting a new app and adding a platform `ionic platform add ios` - the def
 
 In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
 
-Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `8.37.189.14` version of Crosswalk.
+Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `12.41.296.5` version of Crosswalk.
 
 If you'd like to specify a different version of Crosswalk, run `ionic browser list` to see which browsers are available and what versions. Then run `ionic browser add crosswalk@10.39.235.15`.
 
 All that is left is to run the project as normal - `ionic run android`.
 
-*NOTE: To start with, we are only supporting stable versions of Crosswalk. We plan to add the beta and canary versions as we continue adding to this feature set*
+If you'd like to build without Crosswalk for Android SDK 21 or later, do the following:
+
+```
+ionic browser revert android
+ionic build android --release -- --minSdkVersion 21
+```
 
 ## Advanced serve options
 
diff --git a/lib/ionic/assets/gradle.properties b/lib/ionic/assets/gradle.properties
new file mode 100644
index 0000000000..b98069121e
--- /dev/null
+++ b/lib/ionic/assets/gradle.properties
@@ -0,0 +1,8 @@
+cdvBuildMultipleApks=true
+# cdvCompileSdkVersion=14
+# cdvBuildToolsVersion=22
+# cdvVersionCode=14
+# cdvMinSdkVersion=14
+# cdvReleaseSigningPropertiesFile=/users/path
+# cdvDebugSigningPropertiesFile=/users/path
+# cdvBuildArch=x86
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 6e1ccc89ca..90cb956bbe 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -32,8 +32,8 @@ var fs = require('fs'),
 
 shelljs.config.silent = true;
 
-var crosswalkEngineVersion = 'c0.6.2',
-    cordovaAndroidVersion = 'c0.5.6',
+var crosswalkEngineVersion = 'c0.7.1',
+    cordovaAndroidVersion = 'c0.6.1',
     platforms = ['android', 'ios'];
 
 var crosswalkVersions = [
@@ -54,9 +54,8 @@ var crosswalkVersions = [
     publish_date: '2015-02-26 07:03'
   },
   {
-    version: '12.41.296.4',
-    publish_date: '2015-03-05 13:19',
-    beta: true
+    version: '12.41.296.5',
+    publish_date: '2015-03-05 13:19'
   },
   {
     version: '13.41.318.0',
@@ -65,7 +64,7 @@ var crosswalkVersions = [
   }
 ];
 
-var defaultCrosswalkVersion = crosswalkVersions[3].version;
+var defaultCrosswalkVersion = crosswalkVersions[4].version;
 
 var iosBrowsers = [
     {
@@ -301,6 +300,13 @@ IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
 
 }
 
+IonicTask.prototype.addGradleProperties = function addGradleProperties() {
+  var gradlePropertiesPath = path.resolve(__dirname, 'assets', 'gradle.properties');
+  var copyPath = path.join('.', 'platforms', 'android', 'gradle.properties');
+  console.log('copying:', gradlePropertiesPath, copyPath)
+  shelljs.cp(gradlePropertiesPath, copyPath)
+}
+
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
   var command = ['cordova plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
   var result = shelljs.exec(command);
@@ -310,19 +316,24 @@ IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
 IonicTask.prototype.removeCrosswalkEngines = function removeCrosswalkEngines() {
   shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk');
   shelljs.exec('cordova plugin rm org.crosswalk.engine');
+  shelljs.exec('cordova plugin rm cordova-plugin-crosswalk-webview');
+}
+
+IonicTask.prototype.addSplashScreenPlugin = function addSplashScreenPlugin() {
+  shelljs.exec('cordova plugin add org.apache.cordova.splashscreen')
 }
 
-IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
-  var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-  var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
-  var updateCommand = ['android update lib-project --path "', xwalkLibraryPath, '" --target "4"'].join('');
+// IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
+//   var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+//   var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
+//   var updateCommand = ['android update lib-project --path "', xwalkLibraryPath, '" --target "4"'].join('');
 
-  shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
+//   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
 
-  shelljs.exec(updateCommand, {silent: true});
+//   shelljs.exec(updateCommand, {silent: true});
 
-  shelljs.cd('../../');
-}
+//   shelljs.cd('../../');
+// }
 
 IonicTask.prototype.downloadFiles = function downloadFiles(version) {
   var q = Q.defer();
@@ -365,18 +376,20 @@ IonicTask.prototype.removeCrosswalk = function removeCrosswalk() {
 IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
   var self = this;
 
-  self.downloadFiles(version)
+  return self.downloadFiles(version)
   .then(function(data) {
     self.removeAndroidProject();
     self.removeCrosswalkEngines();
     self.addCordova40xProject();
     self.addCrosswalkPlugin();
-    self.updateAndroidProject();
+    self.addGradleProperties();
+    self.addSplashScreenPlugin();
+    // self.updateAndroidProject();
 
     console.log('\nIonic Browser Add completed for Crosswalk');
   })
   .catch(function(error){
-    console.log('\nAn error with adding Crosswalk browser occured')
+    console.error('\nAn error with adding Crosswalk browser occured', error)
     self.ionic.fail(error)
     // console.log(error)
   })

From ca20b1c1c229ca2ec4510c8cd0d5f195f39fe1b3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 27 Mar 2015 15:05:00 -0600
Subject: [PATCH 0530/1100] Adding in try/catch - invalid semver version
 scaning with '-dev' in them will break semver. Recovering gracefully

---
 lib/ionic/info.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 7add882458..bb526b419f 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -242,16 +242,21 @@ IonicTask.prototype.checkRuntime = function checkRuntime() {
   var info = this.gatherInfo();
   var validRuntime = true;
 
-  if(!semver.satisfies(info.node, requirements.node)) {
-    var updateMessage = ['Please update your Node runtime to version >=', requirements.node].join(' ');
-    console.log(updateMessage.red.bold);
-    validRuntime = false;
-  }
+  try {
 
-  if(!semver.satisfies(info.cordova, requirements.cordova)) {
-    var updateMessage = ['Please update your Cordova CLI to version >=', requirements.cordova, '`npm install -g cordova`'].join(' ')
-    console.log(updateMessage.red.bold);
-    validRuntime = false;
+    if(!semver.satisfies(info.node, requirements.node)) {
+      var updateMessage = ['Please update your Node runtime to version >=', requirements.node].join(' ');
+      console.log(updateMessage.red.bold);
+      validRuntime = false;
+    }
+
+    if(!semver.satisfies(info.cordova, requirements.cordova)) {
+      var updateMessage = ['Please update your Cordova CLI to version >=', requirements.cordova, '`npm install -g cordova`'].join(' ')
+      console.log(updateMessage.red.bold);
+      validRuntime = false;
+    }
+  } catch(ex) {
+    console.log('There was an error checking your runtime environment: ', ex)
   }
 
   return validRuntime;

From da6565adaf870ec485e67fc8e714ac413feeab29 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 28 Mar 2015 13:16:04 -0600
Subject: [PATCH 0531/1100] Adding in the docs command - for ionic docs list,
 or ionic docs ionicBackdrop

---
 lib/ionic.js                  |   9 ++
 lib/ionic/docs.js             | 176 ++++++++++++++++++++++++++++++++++
 lib/ionic/resources/docs.json | 141 +++++++++++++++++++++++++++
 package.json                  |   3 +-
 4 files changed, 328 insertions(+), 1 deletion(-)
 create mode 100644 lib/ionic/docs.js
 create mode 100644 lib/ionic/resources/docs.json

diff --git a/lib/ionic.js b/lib/ionic.js
index d2bc73e05f..713e2f3441 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -394,6 +394,15 @@ var TASKS = [
       '<COMMAND>': '[save|restore] - Saves or restores your Ionic applications state of platforms and plugins via the package.json file',
     },
     module: './ionic/state'
+   },
+   {
+    title: 'docs',
+    name: 'docs',
+    summary: 'Opens up the documentation for Ionic',
+    args: {
+      '<TOPIC>': 'the topic to view help documentation for'
+    },
+    module: './ionic/docs'
    }
 ];
 
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
new file mode 100644
index 0000000000..d65f582a75
--- /dev/null
+++ b/lib/ionic/docs.js
@@ -0,0 +1,176 @@
+// "cordovaPlatforms": [
+//   "ios",
+//   {
+//     "android": {
+//       "id": "android",
+//       "locator": "https://github.com/apache/cordova-android.git"
+//     }
+//   }
+// ],
+// "cordovaPlugins": [
+//   "org.apache.cordova.device",
+//   "org.apache.cordova.console",
+//   "com.ionic.keyboard",
+//   "org.apache.cordova.splashscreen",
+//   {
+//     "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
+//     "id": "org.cordova.croswalk"
+//   },
+//   {
+//     "locator": "/path/to/cloned/phonegap-facebook-plugin",
+//     "id": "",
+//     "variables": {
+//         "APP_ID": "some_id",
+//         "APP_NAME": "some_name"
+//     }
+//   }
+// ]
+
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    Q = require('q'),
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats,
+    _ = require('underscore'),
+    IonicProject = require('./project'),
+    IonicInfo = require('./info').IonicTask,
+    IonicDocs = require('./resources/docs.json');
+
+var Docs = module.exports
+
+shelljs.config.silent = true;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+Docs.showTopics = function showTopics() {
+
+}
+
+Docs.list = function list() {
+  try {
+    var Table = require('cli-table');
+    var docsList = IonicDocs.api;
+    // var i = 0;
+    console.log('Help Topics'.yellow)
+    for (doc in docsList) {
+      var table = new Table({ head: [doc] });
+      var count = 0;
+      var row = [];
+      docsList[doc].docs.forEach(function(docItem) {
+        if(count >= 7) {
+          table.push(row)
+          row = [];
+          count = 0;
+        }
+        row.push(docItem)
+        count++;
+      })
+      table.push(row)
+      console.log(table.toString());
+    }
+
+  } catch (ex) {
+    console.log('Error listing docs:', ex)
+  }
+  console.log('To open up a document, type "ionic docs <docname>" where the docname is listed above.'.blue.bold)
+}
+
+Docs.openDefault = function openDefault() {
+  var open = require('open');
+  var infoTask = require('./info').IonicTask;
+  var info = new infoTask();
+
+
+  var envInfo = info.gatherInfo();
+  var ionicVersion = envInfo.ionic;
+  var openUrl = ['http://ionicframework.com/docs/'];
+
+  console.log('Ionic version:', ionicVersion);
+  console.log('opening default')
+
+  if(ionicVersion) {
+    openUrl.push(ionicVersion, '/api')
+  }
+
+  open(openUrl.join(''));
+}
+
+Docs.lookUpCommand = function lookUpCommand(helpDoc) {
+  // console.log('Going thru doc commands', helpDoc)
+  //Go through all the different help topics
+  var docsList = IonicDocs.api;
+  helpDoc = helpDoc.replace(/-[a-z]/g, function(match) { return match[1].toUpperCase() })
+
+  // console.log('Help doc:', helpDoc)
+
+  var helpTopic;
+
+  for(doc in docsList) {
+    // console.log('Doc: ', doc)
+    // console.log('Entries for doc', docsList[doc].docs)
+    docsList[doc].docs.forEach(function(docItem) {
+      // console.log('Doc Item:', docItem)
+      if(docItem == helpDoc) {
+        // console.log('We found the help doc:', helpDoc)
+        helpTopic = doc;
+      }
+      if(docItem == '$' + helpDoc) {
+        helpDoc = '%24' + helpDoc;
+        helpTopic = doc
+      }
+    })
+  }
+
+  // console.log('we have helpTopic:', helpTopic)
+
+  if(helpTopic) {
+    // console.log('We have a help topic: ', helpTopic, helpDoc)
+    var openUrl = ['http://ionicframework.com/docs/api/', helpTopic, '/', helpDoc].join('')
+    console.log('Opening Ionic document:'.green.bold, openUrl.replace('%24', '$').green.bold)
+    var open = require('open');
+    open(openUrl);
+  }
+}
+
+IonicTask.prototype.run = function run(ionic) {
+  var self = this;
+  this.ionic = ionic;
+  // console.log('here')
+  // console.log('Args: ', argv._);
+
+  // console.log('IonicDocs:', IonicDocs)
+  var docCmd = argv._[1];
+  // console.log(docCmd)
+
+  if(docCmd == 'list') {
+    Docs.list();
+  } else if(docCmd == '' || typeof docCmd == 'undefined') {
+    console.log('openDefault')
+    Docs.openDefault();
+  } else {
+    // console.log('look up command')
+    //Look up what it was
+    Docs.lookUpCommand(docCmd);
+  }
+
+  // switch(argv._[1]) {
+  //   case 'list': 
+  //     Docs.list()
+  //     break;
+  //   case '':
+  //     Docs.restoreState();
+  //     break;
+  //   default:
+  //     Docs.openDefault();
+  //     break;
+  // }
+
+  IonicStats.t();
+
+};
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/resources/docs.json b/lib/ionic/resources/docs.json
new file mode 100644
index 0000000000..23b97c4ea3
--- /dev/null
+++ b/lib/ionic/resources/docs.json
@@ -0,0 +1,141 @@
+{
+  "versions": [
+    "1.0.0-beta.10",
+    "1.0.0-beta.11",
+    "1.0.0-beta.12",
+    "1.0.0-beta.13",
+    "1.0.0-beta.14"
+  ],
+  "api": {
+    "controller": {
+      "id": "controller",
+      "docs": [
+        "ionicModal",
+        "ionicPopover"
+      ]
+    },
+    "directive": {
+      "id": "directive",
+      "docs": [
+        "collectionRepeat",
+        "exposeAsideWhen",
+        "ionCheckbox",
+        "ionContent",
+        "ionDeleteButton",
+        "ionFooterBar",
+        "ionHeaderBar",
+        "ionInfiniteScroll",
+        "ionItem",
+        "ionList",
+        "ionNavBackButton",
+        "ionNavBar",
+        "ionNavButtons",
+        "ionNavTitle",
+        "ionNavView",
+        "ionOptionButton",
+        "ionPane",
+        "ionRadio",
+        "ionRefresher",
+        "ionReorderButton",
+        "ionScroll",
+        "ionSideMenu",
+        "ionSideMenuContent",
+        "ionSideMenus",
+        "ionSlide",
+        "ionSlideBox",
+        "ionSlidePager",
+        "ionTab",
+        "ionTabs",
+        "ionToggle",
+        "ionView",
+        "keyboardAttach",
+        "menuClose",
+        "menuToggle",
+        "navClear",
+        "navDirection",
+        "navTransition",
+        "onDrag",
+        "onDragDown",
+        "onDragLeft",
+        "onDragRight",
+        "onDragUp",
+        "onHold",
+        "onRelease",
+        "onSwipe",
+        "onSwipeDown",
+        "onSwipeLeft",
+        "onSwipeRight",
+        "onSwipeUp",
+        "onTap",
+        "onTouch"
+      ]
+    },
+    "ionic": {
+      "id": "ionic",
+      "docs": [
+        "controller",
+        "directive",
+        "service",
+        "utility"
+      ]
+    },
+    "module": {
+      "id": "module",
+      "docs": [
+        "ionic"
+      ]
+    },
+    "object": {
+      "id": "object",
+      "docs": [
+        "$ionicLoadingConfig"
+      ]
+    },
+    "page": {
+      "id": "page",
+      "docs": [
+        "keyboard",
+        "tap"
+      ]
+    },
+    "provider": {
+      "id": "provider",
+      "docs": [
+        "$ionicConfigProvider"
+      ]
+    },
+    "service": {
+      "id": "service",
+      "docs": [
+        "$ionicActionSheet",
+        "$ionicAnimation",
+        "$ionicBackdrop",
+        "$ionicBody",
+        "$ionicConfig",
+        "$ionicGesture",
+        "$ionicHistory",
+        "$ionicListDelegate",
+        "$ionicLoading",
+        "$ionicModal",
+        "$ionicNavBarDelegate",
+        "$ionicPlatform",
+        "$ionicPopover",
+        "$ionicPopup",
+        "$ionicPosition",
+        "$ionicScrollDelegate",
+        "$ionicSideMenuDelegate",
+        "$ionicSlideBoxDelegate",
+        "$ionicTabsDelegate",
+        "$ionicTemplateCache"
+      ]
+    },
+    "utility": {
+      "id": "utility",
+      "docs": [
+        "ionic.DomUtil",
+        "ionic.EventController",
+        "ionic.Platform"
+      ]
+    }
+  }
+}
diff --git a/package.json b/package.json
index 3290982e85..6368ecfa0b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.17",
+  "version": "1.3.18-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -53,6 +53,7 @@
   "dependencies": {
     "archiver": "0.5.1",
     "async": "^0.9.0",
+    "cli-table": "^0.3.1",
     "colors": "0.6.2",
     "connect": "3.1.1",
     "connect-livereload": "0.5.2",

From 7cbd0efe94fb902e89f4de1f3a2008fd853fbd40 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 30 Mar 2015 10:35:59 -0600
Subject: [PATCH 0532/1100] Adding cli tables. Listing docs. Including package
 version bump for beta, npm shrinkwrap for cli tables. Docs now opens doc in
 preferred browser

---
 lib/ionic/docs.js   | 56 ++++-----------------------------------------
 npm-shrinkwrap.json | 14 +++++++++++-
 package.json        |  2 +-
 3 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index d65f582a75..23a55194ff 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -1,31 +1,3 @@
-// "cordovaPlatforms": [
-//   "ios",
-//   {
-//     "android": {
-//       "id": "android",
-//       "locator": "https://github.com/apache/cordova-android.git"
-//     }
-//   }
-// ],
-// "cordovaPlugins": [
-//   "org.apache.cordova.device",
-//   "org.apache.cordova.console",
-//   "com.ionic.keyboard",
-//   "org.apache.cordova.splashscreen",
-//   {
-//     "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
-//     "id": "org.cordova.croswalk"
-//   },
-//   {
-//     "locator": "/path/to/cloned/phonegap-facebook-plugin",
-//     "id": "",
-//     "variables": {
-//         "APP_ID": "some_id",
-//         "APP_NAME": "some_name"
-//     }
-//   }
-// ]
-
 var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
@@ -36,7 +8,9 @@ var fs = require('fs'),
     _ = require('underscore'),
     IonicProject = require('./project'),
     IonicInfo = require('./info').IonicTask,
-    IonicDocs = require('./resources/docs.json');
+    IonicDocs = require('./resources/docs.json'),
+    COLUMN_LIMIT = 3;
+
 
 var Docs = module.exports
 
@@ -46,10 +20,6 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-Docs.showTopics = function showTopics() {
-
-}
-
 Docs.list = function list() {
   try {
     var Table = require('cli-table');
@@ -61,7 +31,7 @@ Docs.list = function list() {
       var count = 0;
       var row = [];
       docsList[doc].docs.forEach(function(docItem) {
-        if(count >= 7) {
+        if(count >= COLUMN_LIMIT) {
           table.push(row)
           row = [];
           count = 0;
@@ -76,7 +46,7 @@ Docs.list = function list() {
   } catch (ex) {
     console.log('Error listing docs:', ex)
   }
-  console.log('To open up a document, type "ionic docs <docname>" where the docname is listed above.'.blue.bold)
+  console.log('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold)
 }
 
 Docs.openDefault = function openDefault() {
@@ -139,12 +109,8 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
-  // console.log('here')
-  // console.log('Args: ', argv._);
 
-  // console.log('IonicDocs:', IonicDocs)
   var docCmd = argv._[1];
-  // console.log(docCmd)
 
   if(docCmd == 'list') {
     Docs.list();
@@ -157,18 +123,6 @@ IonicTask.prototype.run = function run(ionic) {
     Docs.lookUpCommand(docCmd);
   }
 
-  // switch(argv._[1]) {
-  //   case 'list': 
-  //     Docs.list()
-  //     break;
-  //   case '':
-  //     Docs.restoreState();
-  //     break;
-  //   default:
-  //     Docs.openDefault();
-  //     break;
-  // }
-
   IonicStats.t();
 
 };
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ddb13cd806..cf0a2ae144 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.17",
+  "version": "1.3.19-beta.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -233,6 +233,18 @@
       "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
     },
+    "cli-table": {
+      "version": "0.3.1",
+      "from": "cli-table@*",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "from": "colors@1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+        }
+      }
+    },
     "colors": {
       "version": "0.6.2",
       "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
diff --git a/package.json b/package.json
index 6368ecfa0b..61b25a6ede 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.18-beta.0",
+  "version": "1.3.19-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From edf79a551790cc5c4ee41b13cc8c5e0152d47626 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 30 Mar 2015 11:14:39 -0600
Subject: [PATCH 0533/1100] Adding in the hooks command to manage hooks. Added
 back in the old hooks, so users can add them and keep them if they want them.
 Removed the add/remove hooks calls from cordova commands

---
 .../after_platform_add/010_install_plugins.js |  29 ++++
 .../after_plugin_add/010_register_plugin.js   |  57 +++++++
 .../after_plugin_rm/010_deregister_plugin.js  |  27 ++++
 lib/ionic.js                                  |   9 ++
 lib/ionic/cordova.js                          |  98 +-----------
 lib/ionic/hooks.js                            | 139 ++++++++++++++++++
 6 files changed, 266 insertions(+), 93 deletions(-)
 create mode 100644 lib/hooks/after_platform_add/010_install_plugins.js
 create mode 100644 lib/hooks/after_plugin_add/010_register_plugin.js
 create mode 100644 lib/hooks/after_plugin_rm/010_deregister_plugin.js
 create mode 100644 lib/ionic/hooks.js

diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
new file mode 100644
index 0000000000..b23635c304
--- /dev/null
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+
+/**
+ * Install all plugins listed in package.json
+ * https://raw.githubusercontent.com/diegonetto/generator-ionic/master/templates/hooks/after_platform_add/install_plugins.js
+ */
+var exec = require('child_process').exec;
+var path = require('path');
+var sys = require('sys');
+
+var packageJSON = null;
+
+try {
+  packageJSON = require('../../package.json');
+} catch(ex) {
+  console.log('\nThere was an error fetching your package.json file.')
+  console.log('\nPlease ensure a valid package.json is in the root of this project\n')
+  return;
+}
+
+var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
+// var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+packageJSON.cordovaPlugins.forEach(function (plugin) {
+  exec('cordova plugin add ' + plugin, function (error, stdout, stderr) {
+    sys.puts(stdout);
+  });
+});
diff --git a/lib/hooks/after_plugin_add/010_register_plugin.js b/lib/hooks/after_plugin_add/010_register_plugin.js
new file mode 100644
index 0000000000..b0e9d35481
--- /dev/null
+++ b/lib/hooks/after_plugin_add/010_register_plugin.js
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+
+/**
+ * Push plugins to cordovaPlugins array after_plugin_add
+ */
+var fs = require('fs'),
+    packageJSON = require('../../package.json'),
+    path = require('path');
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+  var configString,
+      idRegEx,
+      id,
+      pluginXmlPath,
+      pluginToAdd;
+
+  if(plugin.indexOf('https') != -1 || plugin.indexOf('git') != -1) {
+    console.log('Installing plugin from url');
+  }
+
+  if(plugin.indexOf('/') != -1) {
+    try {
+      pluginXmlPath = path.resolve(plugin, 'plugin.xml');
+      console.log('got pluginXmlPath:', pluginXmlPath);
+      if (!fs.existsSync(pluginXmlPath)) {
+        var errorMessage = ['There was no plugin.xml file found for path: ', pluginXmlPath].join('');
+        return;
+      }
+
+      configString = fs.readFileSync(pluginXmlPath,{encoding: 'utf8'});
+      idRegEx = new RegExp('<plugin[^>]*id="(.*)"', 'i');
+      id = idRegEx.exec(configString)[1]
+      pluginToAdd = {id: id, locator: plugin};
+    } catch(ex) {
+      console.log('There was an error retrieving the plugin.xml filr from the 010_register_plugin.js hook', ex);
+    }
+  } else {
+    pluginToAdd = plugin;
+  }
+
+  if(typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) == -1) {
+    packageJSON.cordovaPlugins.push(pluginToAdd);
+  } else if (typeof pluginToAdd == 'object') {
+    var pluginExists = false;
+    packageJSON.cordovaPlugins.forEach(function(checkPlugin) {
+      if(typeof checkPlugin == 'object' && checkPlugin.id == pluginToAdd.id) {
+        pluginExists = true;
+      }
+    })
+    if(!pluginExists) {
+      packageJSON.cordovaPlugins.push(pluginToAdd);
+    }
+  }
+});
+
+fs.writeFileSync('package.json', JSON.stringify(packageJSON, null, 2));
diff --git a/lib/hooks/after_plugin_rm/010_deregister_plugin.js b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
new file mode 100644
index 0000000000..4f4c6b892e
--- /dev/null
+++ b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+/**
+ * Remove plugins from cordovaPlugins array after_plugin_rm
+ */
+var fs = require('fs');
+var packageJSON = require('../../package.json');
+
+packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
+
+process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+  var index = packageJSON.cordovaPlugins.indexOf(plugin);
+  if (index > -1) {
+    packageJSON.cordovaPlugins.splice(index, 1);
+  } else {
+    //If it didnt find a match, it may be listed as {id,locator}
+    for(var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i++) {
+      var packagePlugin = packageJSON.cordovaPlugins[i];
+      if(typeof packagePlugin == 'object' && packagePlugin.id == plugin) {
+        packageJSON.cordovaPlugins.splice(index, 1);
+        break;
+      }
+    }
+  }
+});
+
+fs.writeFile('package.json', JSON.stringify(packageJSON, null, 2));
diff --git a/lib/ionic.js b/lib/ionic.js
index 0e3d486c07..ba7368c0c2 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -385,6 +385,15 @@ var TASKS = [
       '--reset|-r': 'This will reset the Ionic App ID'
     },
     module: './ionic/link'
+   },
+   {
+    title: 'hooks',
+    name: 'hooks',
+    summary: 'Manage your Ionic Cordova hooks',
+    args: {
+      '[add|remove]': 'Add or remove default Ionic Cordova hooks'
+    },
+    module: './ionic/hooks'
    }
 ];
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index f4c6f2f10b..0ace2141bb 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -8,7 +8,8 @@ var Task = require('./task').Task,
     colors = require('colors'),
     shelljs = require('shelljs'),
     generate = require('./resources/generate'),
-    settings = require('./resources/settings');
+    settings = require('./resources/settings'),
+    Hooks = require('./hooks');
 
 var IonicTask = function() {};
 
@@ -91,8 +92,9 @@ IonicTask.prototype.runCordova = function(cmdName) {
 
   if (!noHook) {
     console.log('Adding in default Ionic hooks'.yellow.bold)
-    this.addHooks();
-    this.removeOldPluginHooks();
+    // this.addHooks();
+    Hooks.add();
+    // this.removeOldPluginHooks();
   } else {
     console.log('Option passed to not install default Ionic hooks'.yellow.bold)
   }
@@ -222,94 +224,4 @@ IonicTask.prototype.setupLiveReload = function() {
   return d.promise;
 };
 
-IonicTask.prototype.removeOldPluginHooks = function removeOldPluginHooks() {
-  var oldPluginHooks = [
-    'after_platform_add/010_install_plugins.js',
-    'after_plugin_add/010_register_plugin.js',
-    'after_plugin_rm/010_deregister_plugin.js'
-  ];
-
-  oldPluginHooks.forEach(function(hook) {
-    try {
-      var hookPath = path.join('.', 'hooks', hook);
-      fs.unlinkSync(hookPath);
-    } catch(ex) { }
-  })
-}
-
-IonicTask.prototype.addHooks = function() {
-  // Add hooks which this Ionic project doesn't already have
-  // note: hook scripts must be executable!
-
-  if( !fs.existsSync(path.join('www')) ) {
-    // don't both doing any of this if they aren't
-    // in the correct working directory, which would have `www`
-    return;
-  }
-
-  // loop through all the hook directories added to the ionic-cli
-  var cliHooksPath = path.join(__filename, '../../hooks');
-  fs.readdir(cliHooksPath, function(err, files){
-    if(err) return;
-    for(var x=0; x<files.length; x++) {
-      if(files[x].indexOf('.') > -1) continue;
-      addCliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
-    }
-  });
-
-  function addCliHookDirectory(cliHookPath, hookDirectoryName) {
-    fs.readdir(cliHookPath, function(err, files){
-      // loop through each of the scripts in the ionic-cli hook directory
-      if(err) return;
-      for(var x=0; x<files.length; x++) {
-        var hookFilename = files[x];
-        if(hookFilename.indexOf('.js') === -1) return;
-
-        // check if this hook script has already been added to this ionic project
-        var projectHookPath = path.join('hooks', hookDirectoryName, hookFilename);
-        addHookScript(cliHookPath, hookDirectoryName, hookFilename);
-      }
-    });
-  }
-
-  function addHookScript(cliHookPath, hookDirectoryName, hookFilename) {
-    // add the root hooks directory if the project doesn't have it
-    try {
-      var projectHookPath = path.join('hooks');
-      if( !fs.existsSync(projectHookPath) ) {
-        fs.mkdirSync(projectHookPath);
-      }
-
-      // add the hook directory (ie: after_prepare) if the project doesn't have it
-      projectHookPath = path.join(projectHookPath, hookDirectoryName);
-      if( !fs.existsSync(projectHookPath) ) {
-        fs.mkdirSync(projectHookPath);
-      }
-
-      var projectScript = path.join(projectHookPath, hookFilename);
-      if( !fs.existsSync(projectScript) ) {
-        // copy the hook script to the project
-        try {
-          var cliScript = path.join(cliHookPath, hookFilename);
-          fs.writeFileSync(projectScript, fs.readFileSync(cliScript));
-        } catch(e) {
-          console.log( ('addCliHookDirectory fs.createReadStream: ' + e).error );
-          return;
-        }
-      }
-
-      // make the script file executable
-      try {
-        fs.chmodSync(projectScript, '755');
-      } catch(e) {
-        console.log( ('addCliHookDirectory fs.chmodSync: ' + e).error );
-      }
-
-    } catch(e) {
-      console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);
-    }
-  }
-
-};
-
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
new file mode 100644
index 0000000000..85aec8f985
--- /dev/null
+++ b/lib/ionic/hooks.js
@@ -0,0 +1,139 @@
+var fs = require('fs'),
+    path = require('path'),
+    argv = require('optimist').argv,
+    Q = require('q'),
+    shelljs = require('shelljs'),
+    Task = require('./task').Task,
+    IonicStats = require('./stats').IonicStats,
+    _ = require('underscore'),
+    IonicProject = require('./project'),
+    IonicInfo = require('./info').IonicTask;
+
+
+var Hooks = module.exports
+
+shelljs.config.silent = true;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+Hooks.addCliHookDirectory = function addCliHookDirectory(cliHookPath, hookDirectoryName) {
+  fs.readdir(cliHookPath, function(err, files){
+    // loop through each of the scripts in the ionic-cli hook directory
+    if(err) return;
+    for(var x=0; x<files.length; x++) {
+      var hookFilename = files[x];
+      if(hookFilename.indexOf('.js') === -1) return;
+
+      // check if this hook script has already been added to this ionic project
+      var projectHookPath = path.join('hooks', hookDirectoryName, hookFilename);
+      Hooks.addHookScript(cliHookPath, hookDirectoryName, hookFilename);
+    }
+  });
+}
+
+Hooks.addHookScript = function addHookScript(cliHookPath, hookDirectoryName, hookFilename) {
+  // add the root hooks directory if the project doesn't have it
+  try {
+    var projectHookPath = path.join('hooks');
+    if( !fs.existsSync(projectHookPath) ) {
+      fs.mkdirSync(projectHookPath);
+    }
+
+    // add the hook directory (ie: after_prepare) if the project doesn't have it
+    projectHookPath = path.join(projectHookPath, hookDirectoryName);
+    if( !fs.existsSync(projectHookPath) ) {
+      fs.mkdirSync(projectHookPath);
+    }
+
+    var projectScript = path.join(projectHookPath, hookFilename);
+    if( !fs.existsSync(projectScript) ) {
+      // copy the hook script to the project
+      try {
+        var cliScript = path.join(cliHookPath, hookFilename);
+        fs.writeFileSync(projectScript, fs.readFileSync(cliScript));
+      } catch(e) {
+        console.log( ('addCliHookDirectory fs.createReadStream: ' + e).error );
+        return;
+      }
+    }
+
+    // make the script file executable
+    try {
+      fs.chmodSync(projectScript, '755');
+    } catch(e) {
+      console.log( ('addCliHookDirectory fs.chmodSync: ' + e).error );
+    }
+
+  } catch(e) {
+    console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);
+  }
+}
+
+Hooks.add = function add() {
+  console.log('Adding in default Ionic Cordova hooks'.blue.bold);
+  // Add hooks which this Ionic project doesn't already have
+  // note: hook scripts must be executable!
+
+  if( !fs.existsSync(path.join('www')) ) {
+    // don't both doing any of this if they aren't
+    // in the correct working directory, which would have `www`
+    return;
+  }
+
+  // loop through all the hook directories added to the ionic-cli
+  var cliHooksPath = path.join(__filename, '../../hooks');
+  fs.readdir(cliHooksPath, function(err, files){
+    if(err) return;
+    for(var x=0; x<files.length; x++) {
+      if(files[x].indexOf('.') > -1) continue;
+      Hooks.addCliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
+    }
+  });
+
+  console.log('Added default Ionic Cordova hooks'.green.bold)
+
+};
+
+Hooks.remove = function remove() {
+  console.log('Removing the Ionic Cordova plugin hooks'.blue.bold)
+  var oldPluginHooks = [
+    'after_platform_add/010_install_plugins.js',
+    'after_plugin_add/010_register_plugin.js',
+    'after_plugin_rm/010_deregister_plugin.js'
+  ];
+
+  oldPluginHooks.forEach(function(hook) {
+    try {
+      var hookPath = path.join('.', 'hooks', hook);
+      fs.unlinkSync(hookPath);
+    } catch(ex) { }
+  })
+
+  console.log('Removed the Ionic Cordova hooks'.green.bold);
+
+}
+
+IonicTask.prototype.run = function run(ionic) {
+  var self = this;
+  this.ionic = ionic;
+
+  var cmd = argv._[1];
+
+  switch(cmd) {
+    case 'add':
+      Hooks.add();
+      break;
+    case 'remove':
+      Hooks.remove(argv);
+      break;
+    default:
+      console.log('Please supply a command - either add or remove'.red.bold);
+  }
+
+  IonicStats.t();
+
+};
+
+exports.IonicTask = IonicTask;

From 758ab01b38df0d84a5c0021981e991aacc977050 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 30 Mar 2015 11:38:47 -0600
Subject: [PATCH 0534/1100] Adjusting the doc name to not show $, since it will
 be ignored in the command line.

---
 lib/ionic/docs.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 23a55194ff..7032ce0376 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -31,12 +31,13 @@ Docs.list = function list() {
       var count = 0;
       var row = [];
       docsList[doc].docs.forEach(function(docItem) {
+        var addDoc = docItem.replace('$', '')
         if(count >= COLUMN_LIMIT) {
           table.push(row)
           row = [];
           count = 0;
         }
-        row.push(docItem)
+        row.push(addDoc)
         count++;
       })
       table.push(row)
@@ -60,7 +61,7 @@ Docs.openDefault = function openDefault() {
   var openUrl = ['http://ionicframework.com/docs/'];
 
   console.log('Ionic version:', ionicVersion);
-  console.log('opening default')
+  // console.log('opening default')
 
   if(ionicVersion) {
     openUrl.push(ionicVersion, '/api')
@@ -111,14 +112,15 @@ IonicTask.prototype.run = function run(ionic) {
   this.ionic = ionic;
 
   var docCmd = argv._[1];
+  // console.log('docCmd', docCmd);
 
   if(docCmd == 'list') {
     Docs.list();
   } else if(docCmd == '' || typeof docCmd == 'undefined') {
-    console.log('openDefault')
+    // console.log('openDefault')
     Docs.openDefault();
   } else {
-    // console.log('look up command')
+    // console.log('look up command', docCmd)
     //Look up what it was
     Docs.lookUpCommand(docCmd);
   }

From e714dd68137025e04375403e70683ed6438699bd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 30 Mar 2015 11:44:05 -0600
Subject: [PATCH 0535/1100] latest beta version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 61b25a6ede..2b4452ecff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19-beta.1",
+  "version": "1.3.19-beta.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From b12c0dc1bd8969dbc929a65743ec85151c231bfb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 31 Mar 2015 11:15:12 -0600
Subject: [PATCH 0536/1100] Changes uncomplete - adding in savePlatform and
 savePlugin to save the cordovaPlugins and cordovaPlatforms into the
 package.json file - on plugin adding with variables, checks and makes sure
 that config is saved in config.xml as well.

---
 lib/ionic/cordova.js |  39 +++++-
 lib/ionic/start.js   |   6 +-
 lib/ionic/state.js   | 287 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 291 insertions(+), 41 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 4a92098e07..9a8c49a68d 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -37,12 +37,15 @@ IonicTask.prototype.run = function(ionic) {
   }
 
   var addDefaultResources = false;
+  var isPlatformCmd = argv._.indexOf('platform') != -1;
+  var isAddCmd = argv._.indexOf('add') != -1;
+  var isPluginCmd = argv._.indexOf('plugin') != -1;
+  var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
-  if(argv._.indexOf('platform') != -1 && argv._.indexOf('add') != -1 ) {
-    State.savePlatform(argv);
+
+  if(isPlatformCmd && isAddCmd) {
     addDefaultResources = true;
   }
-
   // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
 
   q.then(function(){
@@ -56,12 +59,26 @@ IonicTask.prototype.run = function(ionic) {
     }
   })
   .then(function() {
-    self.runCordova(cmdName);
+    return self.runCordova(cmdName);
   })
-};
-
+  .then(function() {
+    console.log('Now saving plugin/platform information')
+
+    if(isPlatformCmd && isAddCmd) {
+      addDefaultResources = true;
+      return State.savePlatform(argv);
+    } else if (isPlatformCmd && isRmCmd) {
+      State.removePlatform(argv);
+    } else if(isPluginCmd && isAddCmd) {
+      State.savePlugin(argv);
+    } else if(isPluginCmd && isRmCmd) {
+      State.removePlugin(argv);
+    }
+  })
+}
 
 IonicTask.prototype.runCordova = function(cmdName) {
+  var deferred = Q.defer();
   var self = this;
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
   var cmdArg, x, y;
@@ -129,6 +146,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
   }
 
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
+  console.log('running cordova ' + cleanArgs.join(' '))
 
   cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);
@@ -140,14 +158,21 @@ IonicTask.prototype.runCordova = function(cmdName) {
     }
   });
 
+  cordovaProcess.on('close', function(code) {
+    console.log('closing cordova process with code:', code)
+    deferred.resolve();
+  })
+
   if(self.isLiveReload) {
     cordovaProcess.on('exit', function(){
+      console.log('cordova process is exiting');
       setTimeout(function(){
         // set it back to the original src after a few seconds
         self.ionic.setConfigXml({
           resetContent: true,
           errorWhenNotFound: true
         });
+        // deferred.resolve();
       }, 5000);
     });
 
@@ -177,6 +202,8 @@ IonicTask.prototype.runCordova = function(cmdName) {
   }
 
   IonicStats.t();
+
+  return deferred.promise;
 };
 
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 26dbe014f8..0462a41a08 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -503,17 +503,17 @@ IonicTask.prototype.initCordova = function() {
 
     // add plugins
     for(var x=0; x<self.appSetup.plugins.length; x++) {
-      cmds.push('cordova plugin add ' + self.appSetup.plugins[x]);
+      cmds.push('ionic plugin add ' + self.appSetup.plugins[x]);
     }
 
     // platform add android with --android flag
     if(argv.android) {
-      cmds.push('cordova platform add android');
+      cmds.push('ionic platform add android');
     }
 
     // platform add ios with --android flag
     if(argv.ios) {
-      cmds.push('cordova platform add ios');
+      cmds.push('ionic platform add ios');
     }
 
     console.log('Initializing cordova project'.bold);
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index e63950eb86..70439922a1 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -45,11 +45,25 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
+State.getPackageJson = function getPackageJson() {
+  var packageJsonPath = path.resolve('.', 'package.json')
+  var packageJson = null;
+
+  try {
+    packageJson = require(packageJsonPath)
+  } catch(ex) {
+    console.log('There was an error opening your package.json file.')
+    console.log(ex);
+    Ionic.fail(ex);
+  }
+
+  return packageJson;
+}
+
 State.saveState = function saveState() {
   console.log('saveState')
   
-  var packageJsonPath = path.resolve('.', 'package.json')
-  var packageJson = require(packageJsonPath)
+  var packageJson = State.getPackageJson();
   try {
     State.saveExistingPlatforms(packageJson)
     State.saveExistingPlugins(packageJson)
@@ -64,7 +78,12 @@ State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
   var pp = path.resolve('.', 'platforms')
   console.log(pp)
 
-  var platforms = fs.readdirSync(pp);
+
+  var platforms = [];
+
+  try {
+    platforms = fs.readdirSync(pp);
+  } catch (ex) { }
 
   // console.log('h')
   platforms.forEach(function(platform) {
@@ -184,18 +203,17 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
       if(hasVariables) {
         // console.log('we have avariables to look at:', variableList)
         
-        var features = configXmlData.widget.feature;
-        console.log('features', features)
-        var feature;
-
-        features.forEach(function(potFeature) {
-          if(potFeature.$.name == pluginName) {
-            feature = potFeature
-          }
-        })
+        // var features = configXmlData.widget.feature;
+        // console.log('features', features)
+        var featureParams = State.getPluginParameters(configXmlData, pluginName);
+        // features.forEach(function(potFeature) {
+        //   if(potFeature.$.name == pluginName) {
+        //     feature = potFeature
+        //   }
+        // })
 
         // console.log('feature found:', feature);
-        var featureParams = feature.param;
+        // var featureParams = feature.param;
 
         variableList.forEach(function(variable) {
           // console.log('Looking up variable:', variable)
@@ -230,7 +248,7 @@ State.getXmlData = function getXmlData(xmlPath) {
   var xml2js = require('xml2js');
   var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
   var xmlData;
-
+// console.log('string:', xmlString)
   var parseString = xml2js.parseString;
   parseString(xmlString, function (err, jsonConfig) {
     if(err) {
@@ -257,24 +275,13 @@ State.getPlatformVersion = function getPlatformVersion(path) {
 }
 
 State.savePlatform = function savePlatform(platformArgs) {
-  // console.log('platform args:'.green, platformArgs);
-  // { _: 
-  //    [ 'platform',
-  //      'add',
-  //      'https://github.com/apache/cordova-android.git' ],
-  //   'no-hook': false,
-  //   n: false,
-  //   r: false,
-  //   'no-resources': false,
-  //   save: true,
-  //   '$0': '/usr/local/bin/ionic' }
-
   // Locator may be:
   // Name:        ios, android
   // Local path:  ./engine/cordova-android-c0.6.1
   // Http url:    https://github.com/apache/cordova-android.git
   var locator = platformArgs._[2];
   var platform = 'ios';
+  var requiresLocator = false;
 
   var packageJsonPath = path.resolve('.', 'package.json')
   var packageJson = require(packageJsonPath)
@@ -283,20 +290,22 @@ State.savePlatform = function savePlatform(platformArgs) {
     packageJson.cordovaPlatforms = [];
   }
 
-
   //Test to see if its just ios or android
   if(locator === 'ios' || locator === 'android') {
     platform = locator;
   } else { //its path or url
     platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
+    requiresLocator = true;
   }
 
   var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
 
   // console.log('platformExists:', platformExists)
-  if(!platformExists) {
+  if(!platformExists && requiresLocator) {
     packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
     // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+  } else if(!platformExists && !requiresLocator) {
+    packageJson.cordovaPlatforms.push(platform);
   } else {
     platformExists.platform = platform
     platformExists.locator = locator
@@ -315,10 +324,6 @@ State.savePackageJson = function savePackageJson(packageJsonData) {
   }
 }
 
-State.savePlugin = function savePlugin(pluginArgs) {
-
-}
-
 State.restoreState = function restoreState() {
 
   console.log('Attempting to restore your Ionic application from package.json\n'.yellow.bold);
@@ -443,6 +448,224 @@ State.processPlugin = function processPlugin(index, packageJson, promise) {
   }
 }
 
+State.removePlatform = function removePlatform(platformArgs) {
+  console.log('Args:', platformArgs);
+  //Expecting - ionic platform remove [ios|android]
+
+  //TODO - check if they pass multiple platforms
+  //ionic platform remove ios android
+  var platformToRemove = platformArgs._[2]
+  var packageJson = State.getPackageJson();
+  var cordovaPlatforms = packageJson.cordovaPlatforms ? packageJson.cordovaPlatforms : [];
+
+  console.log('Removing platform:', platformToRemove);
+
+  for (var i = 0, j = cordovaPlatforms.length; i < j; i++) {
+    var platformEntry = cordovaPlatforms[i];
+    if (typeof platformEntry == 'string') {
+      cordovaPlatforms.splice(i, 1);
+      break;
+    } else if (platformEntry.platform == platformToRemove) {
+      //Its object {platform: 'android', locator: './engine/cordova-android'}
+        cordovaPlatforms.splice(i, 1);
+        break;
+    }
+  }
+
+  console.log('After removing elements - ', cordovaPlatforms);
+
+  State.savePackageJson(packageJson);
+
+}
+
+State.getPluginParameters = function getPluginParameters(configXmlData, pluginName) {
+  if(!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
+    throw 'Invalid Config XML Data';
+  }
+
+  var features = configXmlData.widget.feature,
+      feature;
+
+  features.forEach(function(potFeature) {
+    if(potFeature.$.name == pluginName) {
+      feature = potFeature
+    }
+  })
+
+  if(feature && feature.param) {
+    return feature.param
+  }
+
+  return null;
+}
+
+State.savePlugin = function savePlugin(pluginArgs) {
+  console.log('SAveplugin:', pluginArgs);
+
+  //Expects - either simple ID for plugin registry
+  //or a local path, with or without variables
+  //ionic plugin add org.apache.cordova.splashscreen
+  //ionic plugin add ../phonegap-facebook-plugin --variable APP_ID="123456789" --variable APP_NAME="myApplication"
+
+  //With a local file locator, we can look at the plugin.xml as it exists
+  //If its a git resource locator, we'll have to look at fetch.json
+  //Idea: this is run after platform add/rm is done
+
+  var packageJson = State.getPackageJson();
+
+  if(!packageJson.cordovaPlugins) {
+    packageJson.cordovaPlugins = [];
+  }
+
+  var pluginLocator,
+      pluginId,
+      pluginInfo = {},
+      hasLocator = false;
+
+  pluginId = pluginArgs._[2] //grab the org.ionic.keyboard or ./engine/cordova-android
+
+  // console.log('Plugin id:', pluginId)
+
+  if (pluginId.indexOf('/') != -1) {
+    hasLocator = true;
+    //Its a locator, local file path or https://github.com repo
+    pluginLocator = pluginId;
+    pluginId = null;//We dont know ID yet.
+    var fetchJson = require(path.resolve('plugins', 'fetch.json'));
+
+    for (var lookupId in fetchJson) {
+      var lookupPlugin = fetchJson[lookupId]
+      // console.log('Weve got lookupPlugin:', lookupPlugin)
+      var isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
+      var hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;      
+
+      if(isNotRegistyPlugin && hasUrlOrPathOfLocator) {
+        pluginId = lookupId;
+        console.log('We found the plugin: ', pluginId)
+        break;
+      }
+    }
+
+    pluginInfo.id = pluginId;
+    pluginInfo.locator = pluginLocator;
+
+  } else { //closes if pluginId is file or url
+    pluginInfo.id = pluginId;//Save just the org.ionic.keyboard string
+  }
+
+  //Now weve got locator, pluginId
+  //Just gotta save the variables
+  if (pluginArgs.variable) {
+    pluginInfo.variables = {};
+    for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
+      //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
+      var splits = pluginArgs.variable[i].split('=');
+      pluginInfo.variables[splits[0]] = splits[1];
+    }
+  }
+
+
+  if (!hasLocator && !pluginInfo.variables) {
+    //This case - its com.ionic.keyboard and no variables
+    //Store it as just a string, otherwise, store the object
+    pluginInfo = pluginId;
+  }
+
+  //Check to see if platforms exist
+  //bug with cordova is, it doesnt add the entry into
+  //config.xml unless a platform has been added.
+  var configXmlPath = path.resolve('config.xml')
+  var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
+  
+  console.log('plugin path:', pluginXmlPath)
+
+  var pluginXmlData = State.getXmlData(pluginXmlPath);
+  // console.log('plugin data')
+  var configXmlData = State.getXmlData(configXmlPath);
+
+  console.log('xml data:', pluginXmlData)
+
+  var pluginName = pluginXmlData.plugin.name;
+
+  console.log('paths set name:', pluginName)
+
+
+  var params = State.getPluginParameters(configXmlData, pluginName);
+  if(!params) {
+    //We need to add them
+    console.log('There are no params, probably platforms werent added');
+
+    var feature = {'$': { name: pluginName}, param: [] }
+    if(!configXmlData.widget.feature) {
+      configXmlData.widget.feature = []
+    }
+    for(paramName in pluginInfo.variables) {
+      //Go thru vars and add to param
+      var param = { '$': { name: paramName, value: pluginInfo.variables[paramName]}}
+      console.log('param:', param)
+      feature.param.push(param);
+    }
+
+    configXmlData.widget.feature.push(feature)
+
+    //Now to save config.xml file
+    console.log('xml data:', configXmlData)
+    State.saveXmlFile(configXmlData, configXmlPath);
+  }
+  //Now we have as an array:
+  // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
+  // <param name="installPath" value="../phonegap-facebook-plugin"/>
+  // <param name="APP_ID" value="616451688482285"/>
+  // <param name="APP_NAME" value="hybrid-app"/>
+
+
+  // var features = configXmlData.widget.feature;
+  // console.log('features', features)
+  // var feature;
+
+  // features.forEach(function(potFeature) {
+  //   if(potFeature.$.name == pluginName) {
+  //     feature = potFeature
+  //   }
+  // })
+
+  // console.log('Plugin info to save: ', pluginInfo);
+
+  var existingPlugin = null;
+
+  //We need to check cordovaPlugins
+  //perhaps the ID already exists, or the 'id' in the object with locator exists.
+  for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
+    if(typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
+      existingPlugin = packageJson.cordovaPlugins[i];
+    } else if (packageJson.cordovaPlugins[i].id == pluginId) {
+      existingPlugin = packageJson.cordovaPlugins[i];
+    }
+  }
+
+  if(!existingPlugin) {
+    packageJson.cordovaPlugins.push(pluginInfo);
+  }
+
+  //By now we assume pluginId is set, and locator might be set.
+  State.savePackageJson(packageJson)
+}
+
+State.removePlugin = function removePlugin(pluginArgs) {
+
+}
+
+State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
+  try {
+    var xml2js = require('xml2js');
+    var xmlBuilder = new xml2js.Builder();
+    var configString = xmlBuilder.buildObject(xmlData);
+    fs.writeFileSync(xmlPath, configString);
+  } catch (ex) {
+    console.log('Could not save your xml file to path:', xmlPath);
+  }
+}
+
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;

From 1c8c4a59292c80a8bd67ec847fd3d91869aff7a2 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 31 Mar 2015 11:17:06 -0600
Subject: [PATCH 0537/1100] Including node file that is used in ionic-site to
 build up the docs

---
 lib/tasks/createDocsJson.js | 59 +++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 lib/tasks/createDocsJson.js

diff --git a/lib/tasks/createDocsJson.js b/lib/tasks/createDocsJson.js
new file mode 100644
index 0000000000..44dc396227
--- /dev/null
+++ b/lib/tasks/createDocsJson.js
@@ -0,0 +1,59 @@
+var fs = require('fs'),
+    path = require('path'),
+    cl = console.log;
+
+
+
+function crawlDocsCreateJson() {
+  
+  var docsJson = {
+    versions: [],
+    api: {}
+  }
+
+  var docsPath = path.resolve('docs');
+  var docsApiPath = path.join(docsPath, 'api');
+
+  var docsDirs = fs.readdirSync(docsPath);
+
+  docsDirs.forEach(function(doc) {
+    var isDocVersion = !isNaN(doc[0])
+    if(isDocVersion) {
+      docsJson.versions.push(doc)
+    }
+  })
+
+  var apiDocsDirs = fs.readdirSync(docsApiPath);
+
+  apiDocsDirs.forEach(function(docs) {
+    console.log('docs:', docs);
+    if(docs.indexOf('.md') != -1) {
+      return
+    }
+    docsJson.api[docs] = {id: docs, docs: []};
+
+    var apiDocPath = path.join(docsApiPath, docs)
+    console.log('apiDocPath:', apiDocPath)
+
+    var apiSubDocs = fs.readdirSync(apiDocPath)
+
+    apiSubDocs.forEach(function(subdoc) {
+      console.log('subdoc: ', subdoc)
+      docsJson.api[docs].docs.push(subdoc);
+    })
+  })
+
+  // cl('json:')
+  // cl(docsJson)
+
+  // cl(docsJson.api.controller.docs)
+  // docsJson.api.controller.docs.forEach(function(e) {
+  //   cl(e)
+  // })
+
+  cl(JSON.stringify(docsJson))
+
+}
+
+
+crawlDocsCreateJson();

From 0a9acb1c922ea69f134985306e64ee7b89ad33c2 Mon Sep 17 00:00:00 2001
From: Andrew <andrewtjoslin@gmail.com>
Date: Tue, 31 Mar 2015 14:57:39 -0600
Subject: [PATCH 0538/1100] feat(docs): make it suggest the closest result to
 user's input

---
 lib/ionic/docs.js | 158 +++++++++++++++++++++++++++++-----------------
 1 file changed, 101 insertions(+), 57 deletions(-)

diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 7032ce0376..df5d075d08 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -2,7 +2,7 @@ var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
     Q = require('q'),
-    shelljs = require('shelljs'),
+    prompt = require('prompt'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
@@ -12,100 +12,144 @@ var fs = require('fs'),
     COLUMN_LIMIT = 3;
 
 
-var Docs = module.exports
-
-shelljs.config.silent = true;
+var Docs = module.exports;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
+function sanitizeUrl(url) {
+  return url.replace(/\$/g, '%24');
+}
+
 Docs.list = function list() {
   try {
     var Table = require('cli-table');
     var docsList = IonicDocs.api;
     // var i = 0;
-    console.log('Help Topics'.yellow)
-    for (doc in docsList) {
-      var table = new Table({ head: [doc] });
+    console.log('Help Topics'.yellow);
+    _.each(docsList, function(doc) {
+      var table = new Table({ head: [doc.id] });
       var count = 0;
       var row = [];
-      docsList[doc].docs.forEach(function(docItem) {
-        var addDoc = docItem.replace('$', '')
+      _.each(doc.docs, function(docItem) {
+        var addDoc = docItem.replace('$', '');
         if(count >= COLUMN_LIMIT) {
-          table.push(row)
+          table.push(row);
           row = [];
           count = 0;
         }
-        row.push(addDoc)
+        row.push(addDoc);
         count++;
-      })
-      table.push(row)
+      });
+      table.push(row);
       console.log(table.toString());
-    }
+    });
 
   } catch (ex) {
-    console.log('Error listing docs:', ex)
+    console.log('Error listing docs:', ex);
   }
-  console.log('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold)
-}
+  console.log('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold);
+};
 
 Docs.openDefault = function openDefault() {
-  var open = require('open');
   var infoTask = require('./info').IonicTask;
   var info = new infoTask();
 
-
   var envInfo = info.gatherInfo();
   var ionicVersion = envInfo.ionic;
-  var openUrl = ['http://ionicframework.com/docs/'];
-
-  console.log('Ionic version:', ionicVersion);
-  // console.log('opening default')
 
-  if(ionicVersion) {
-    openUrl.push(ionicVersion, '/api')
+  var url = 'http://ionicframework.com/docs/';
+  if (ionicVersion) {
+    url += ionicVersion + '/api';
+    console.log('Ionic version:', ionicVersion);
   }
-
-  open(openUrl.join(''));
-}
+  return require('open')(sanitizeUrl(url));
+};
 
 Docs.lookUpCommand = function lookUpCommand(helpDoc) {
   // console.log('Going thru doc commands', helpDoc)
   //Go through all the different help topics
   var docsList = IonicDocs.api;
-  helpDoc = helpDoc.replace(/-[a-z]/g, function(match) { return match[1].toUpperCase() })
-
-  // console.log('Help doc:', helpDoc)
-
-  var helpTopic;
-
-  for(doc in docsList) {
-    // console.log('Doc: ', doc)
-    // console.log('Entries for doc', docsList[doc].docs)
-    docsList[doc].docs.forEach(function(docItem) {
-      // console.log('Doc Item:', docItem)
-      if(docItem == helpDoc) {
-        // console.log('We found the help doc:', helpDoc)
-        helpTopic = doc;
+  helpDoc = helpDoc.replace(/-[a-zA-Z]/g, function(match) { 
+    return match[1].toUpperCase(); 
+  });
+
+  var docs = _.map(docsList, function(doc) {
+    return _.map(doc.docs, function(docItem) {
+      return {
+        topic: doc.id,
+        doc: docItem
+      };
+    });
+  });
+  docs = _.flatten(docs);
+
+  var match = _.find(docs, { doc: helpDoc }) || _.find(docs, { doc: '$' + helpDoc});
+  if (match) {
+    return openDoc(match.topic, match.doc);
+  
+  } else if (helpDoc.length >= 3) {
+
+    var lowerHelp = helpDoc.toLowerCase();
+    var matches = docs
+      .filter(function(item) {
+        var lowerDoc = item.doc.toLowerCase();
+        return lowerDoc.indexOf(lowerHelp) > -1 ||
+          lowerHelp.indexOf(lowerDoc) > -1;
+      })
+      .sort(function(a,b) {
+        return a.doc.length < b.doc.length ? -1 : 1;
+      })
+      .slice(0,3);
+
+    if (matches.length === 0) return console.log('No matching docs found for "' + helpDoc.cyan + '".');
+
+    prompt.message = 'Did you mean ';
+    if (matches.length > 1) {
+      prompt.message += matches.map(function(item, i) {
+        var str = '';
+        if (i > 0) {
+          if (i === matches.length - 1)  {
+            str = ' or ';
+          } else {
+            str = ', ';
+          }
+        }
+        str += '(' + (i + 1 + '').cyan + ') ' + item.doc;
+        return str;
+      }).join('');
+    } else {
+      prompt.message += matches[0].doc;
+    }
+    prompt.message += '?';
+    prompt.start();
+    prompt.get({
+      name: 'choice',
+      default: matches.length === 1 ? 'yes' : '1',
+    }, function(err, result) {
+      var num;
+      if (matches.length == 1) {
+        if (result.choice.match(/^y/i, result.choice.trim())) {
+          num = 1;
+        }
+      } else {
+        num = parseInt(result.choice.trim());
       }
-      if(docItem == '$' + helpDoc) {
-        helpDoc = '%24' + helpDoc;
-        helpTopic = doc
+      if (!isNaN(num) && num > 0 && num <= matches.length) {
+        num--; // chioce (1-based) to index (0-based)
+        return openDoc(matches[num].topic, matches[num].doc);
       }
-    })
-  }
+    });
 
-  // console.log('we have helpTopic:', helpTopic)
+  }
 
-  if(helpTopic) {
-    // console.log('We have a help topic: ', helpTopic, helpDoc)
-    var openUrl = ['http://ionicframework.com/docs/api/', helpTopic, '/', helpDoc].join('')
-    console.log('Opening Ionic document:'.green.bold, openUrl.replace('%24', '$').green.bold)
-    var open = require('open');
-    open(openUrl);
+  function openDoc(topic, doc) {
+    var url = sanitizeUrl('http://ionicframework.com/docs/api/' + topic + '/' + doc);
+    console.log('Opening Ionic document:'.green.bold, url.green.bold);
+    return require('open')(url);
   }
-}
+};
 
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
@@ -114,9 +158,9 @@ IonicTask.prototype.run = function run(ionic) {
   var docCmd = argv._[1];
   // console.log('docCmd', docCmd);
 
-  if(docCmd == 'list') {
+  if(docCmd == 'ls') {
     Docs.list();
-  } else if(docCmd == '' || typeof docCmd == 'undefined') {
+  } else if (!docCmd) {
     // console.log('openDefault')
     Docs.openDefault();
   } else {

From 212389ff415b9be28e200c1135fe028e555c6eed Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 31 Mar 2015 18:34:22 -0600
Subject: [PATCH 0539/1100] Adding in some refactoring. Some code
 styling/linting fixes. Also added the clear and reset commands, to get around
 cordova errors if they pop up.

---
 lib/ionic/state.js | 424 +++++++++++++++++++++++++--------------------
 1 file changed, 238 insertions(+), 186 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 70439922a1..ad0b99e180 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -27,152 +27,182 @@
 // ]
 
 var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    Q = require('q'),
-    shelljs = require('shelljs'),
-    Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
-    _ = require('underscore'),
-    IonicProject = require('./project'),
-    IonicInfo = require('./info').IonicTask;
-
-var State = module.exports
+  path = require('path'),
+  argv = require('optimist').argv,
+  Q = require('q'),
+  shelljs = require('shelljs'),
+  Task = require('./task').Task,
+  IonicStats = require('./stats').IonicStats,
+  _ = require('underscore'),
+  IonicProject = require('./project'),
+  IonicInfo = require('./info').IonicTask;
+
+var State = module.exports;
 
 shelljs.config.silent = true;
 
-var IonicTask = function() {};
+var IonicTask = function(){};
 
 IonicTask.prototype = new Task();
 
 State.getPackageJson = function getPackageJson() {
-  var packageJsonPath = path.resolve('.', 'package.json')
+  var packageJsonPath = path.resolve('.', 'package.json');
   var packageJson = null;
 
   try {
-    packageJson = require(packageJsonPath)
-  } catch(ex) {
-    console.log('There was an error opening your package.json file.')
+    packageJson = require(packageJsonPath);
+    if(!packageJson.cordovaPlugins) {
+      packageJson.cordovaPlugins = [];
+    }
+    if(!packageJson.cordovaPlatforms) {
+      packageJson.cordovaPlatforms = [];
+    }
+  } catch (ex) {
+    console.log('There was an error opening your package.json file.');
     console.log(ex);
     Ionic.fail(ex);
   }
 
   return packageJson;
+};
+
+State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo) {
+  var existingPlugin = null;
+
+  if (typeof pluginInfo === 'undefined') {
+    pluginInfo = pluginId;
+  }
+
+  //We need to check cordovaPlugins
+  //perhaps the ID already exists, or the 'id' in the object with locator exists.
+  for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
+    if(typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
+      existingPlugin = packageJson.cordovaPlugins[i];
+    } else if (packageJson.cordovaPlugins[i].id == pluginId) {
+      existingPlugin = packageJson.cordovaPlugins[i];
+    }
+  }
+
+  if (!existingPlugin) {
+    packageJson.cordovaPlugins.push(pluginInfo);
+  }
 }
 
 State.saveState = function saveState() {
-  console.log('saveState')
-  
+  console.log('saveState');
+
   var packageJson = State.getPackageJson();
   try {
-    State.saveExistingPlatforms(packageJson)
-    State.saveExistingPlugins(packageJson)
-    State.savePackageJson(packageJson)
-  } catch(ex) {
-    console.log('There was an error saving your current Ionic setup'.red)
-    console.log('Error:', ex)
+    State.saveExistingPlatforms(packageJson);
+    State.saveExistingPlugins(packageJson);
+    State.savePackageJson(packageJson);
+  } catch (ex) {
+    console.log('There was an error saving your current Ionic setup'.red);
+    console.log('Error:', ex);
   }
-}
+};
 
-State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
-  var pp = path.resolve('.', 'platforms')
-  console.log(pp)
+State.doit = function doit(platform) {
 
+}
 
-  var platforms = [];
+State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
+  var pp = path.resolve('.', 'platforms'),
+    platforms = [];
 
   try {
     platforms = fs.readdirSync(pp);
-  } catch (ex) { }
+  } catch (ex) {
+    return;
+  }
 
   // console.log('h')
-  platforms.forEach(function(platform) {
-    console.log('Saving', platform, 'platform')
+  platforms.forEach(function (platform) {
+    console.log('Saving', platform, 'platform');
     try {
       var versionPath = path.resolve(pp, platform, 'cordova', 'version');
       var version = State.getPlatformVersion(versionPath);
-      console.log('we had version', version)
+      console.log('we had version', version);
       var locator = platform;
 
       //Check to see if its crosswalk
-      if(platform == 'android' && version.indexOf('-dev') != -1) {
-        console.log('crosswalk android')
+      if (platform === 'android' && version.indexOf('-dev') !== -1) {
+        console.log('crosswalk android');
         //Look up path for engine/cordova-android path
         var engineFiles = fs.readdirSync(path.resolve('engine'));
         var enginePath = null;
         engineFiles.forEach(function(engineDir) {
-          if(engineDir.indexOf('android') != -1) {
+          if (engineDir.indexOf('android') !== -1) {
             enginePath = engineDir;
           }
-        })
+        });
         locator = path.resolve('engine', enginePath);
       }
 
-      console.log('locator', locator)
+      console.log('locator', locator);
 
-      if(!packageJson.cordovaPlatforms) {
+      if (!packageJson.cordovaPlatforms) {
         packageJson.cordovaPlatforms = [];
       }
 
       var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
 
-      console.log('platformExists:', platformExists)
-      if(!platformExists) {
+      console.log('platformExists:', platformExists);
+      if (!platformExists) {
         packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
       }
 
-    } catch(ex) {
-      console.log('e', ex)
+    } catch (ex) {
+      console.log('e', ex);
     }
-  })
-  // console.log('platforms', platforms)
-}
+  });
+};
 
 State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
-  var pluginDir = path.resolve('.', 'plugins')
-  console.log(pluginDir)
+  var pluginDir = path.resolve('.', 'plugins');
+  console.log(pluginDir);
 
   var plugins = fs.readdirSync(pluginDir);
+  var pluginId;
 
   //Lets try just relying on the fetch.json file
   //this file lists all plugins with where they come from, etc
   var fetchJson = require(path.resolve('plugins', 'fetch.json'));
-  
-  var configXmlPath = path.resolve('config.xml')
+  var configXmlPath = path.resolve('config.xml');
+  var plugin,
+    pluginToAdd,
+    locator;
   var cordovaPlugins = [];
 
   // console.log('config xml path ', configXmlPath)
-  var configXmlData = State.getXmlData(configXmlPath)
+  var configXmlData = State.getXmlData(configXmlPath);
 
-  console.log('config.xml data:', configXmlData)
+  console.log('config.xml data:', configXmlData);
 
-  if(fetchJson) {
+  if (fetchJson) {
     // console.log('fetchJson', fetchJson)
     //This will break with what we had before
-    var cordovaPlugins = [];
-    for (var pluginId in fetchJson) {
+    for (pluginId in fetchJson) {
       // cordovaPlugins.push();
       // console.log('plugin:', pluginId)
-      var plugin = fetchJson[pluginId]
-      var pluginToAdd = {}
+      plugin = fetchJson[pluginId];
+      pluginToAdd = {};
 
-      console.log('plugin info')
-      console.log(plugin)
+      console.log('plugin info');
+      console.log(plugin);
 
-      var locator;
+      console.log('plugin.source.type', plugin.source.type);
 
-      console.log('plugin.source.type', plugin.source.type)
-
-      if(plugin.source.type == 'registry') {
-        locator = pluginId
+      if (plugin.source.type === 'registry') {
+        locator = pluginId;
       } else {
-        console.log('we have a local or git plugin', pluginId)
-        if(plugin.source.type == 'local') {
-          console.log('!!!  local')
-          locator = plugin.source.path
+        console.log('we have a local or git plugin', pluginId);
+        if (plugin.source.type === 'local') {
+          console.log('!!!  local');
+          locator = plugin.source.path;
         } else { //asume its git
-          console.log('!!!  git')
-          locator = plugin.source.url
+          console.log('!!!  git');
+          locator = plugin.source.url;
         }
       }
 
@@ -183,6 +213,7 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
       // console.log('got pluginXml:', pluginXml)
 
       var pluginName = pluginXml.plugin.name;
+      var featureParams;
 
       var preferences = pluginXml.plugin.preference;
 
@@ -190,7 +221,7 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
           variableList = [],
           keyValueList = {};
 
-      if(preferences && preferences.length > 0) {
+      if (preferences && preferences.length > 0) {
         
         hasVariables = true;
 
@@ -200,12 +231,12 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
         })
       }
 
-      if(hasVariables) {
+      if (hasVariables) {
         // console.log('we have avariables to look at:', variableList)
         
         // var features = configXmlData.widget.feature;
         // console.log('features', features)
-        var featureParams = State.getPluginParameters(configXmlData, pluginName);
+        featureParams = State.getPluginParameters(configXmlData, pluginName);
         // features.forEach(function(potFeature) {
         //   if(potFeature.$.name == pluginName) {
         //     feature = potFeature
@@ -248,7 +279,6 @@ State.getXmlData = function getXmlData(xmlPath) {
   var xml2js = require('xml2js');
   var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
   var xmlData;
-// console.log('string:', xmlString)
   var parseString = xml2js.parseString;
   parseString(xmlString, function (err, jsonConfig) {
     if(err) {
@@ -342,7 +372,7 @@ State.restoreState = function restoreState() {
   // console.log('processPlugin: defer:', defer)
   
   // State.processPlugin(0, packageJson, defer)
-  State.restorePlatforms(packageJson)
+  return State.restorePlatforms(packageJson)
   .then(function() {
     console.log('\nRestore platforms is complete\n'.green.bold)
     console.log('\rRestoring Plugins\n'.blue.bold)
@@ -499,8 +529,18 @@ State.getPluginParameters = function getPluginParameters(configXmlData, pluginNa
   return null;
 }
 
+//
+/**
+* Used after `ionic plugin add <id|locator>` to save the plugin
+* to package.json and config.xml.
+* @pluginArgs  {Object} contains the command line args passed
+* from the ionic command.
+* { _: [ 'plugin', 'add', '../phonegap-facebook-plugin' ],
+  variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ],
+  '$0': '/usr/local/bin/ionic' }
+*/
 State.savePlugin = function savePlugin(pluginArgs) {
-  console.log('SAveplugin:', pluginArgs);
+  console.log('Saveplugin:', pluginArgs);
 
   //Expects - either simple ID for plugin registry
   //or a local path, with or without variables
@@ -511,159 +551,165 @@ State.savePlugin = function savePlugin(pluginArgs) {
   //If its a git resource locator, we'll have to look at fetch.json
   //Idea: this is run after platform add/rm is done
 
-  var packageJson = State.getPackageJson();
-
-  if(!packageJson.cordovaPlugins) {
-    packageJson.cordovaPlugins = [];
-  }
-
-  var pluginLocator,
+  var packageJson = State.getPackageJson(),
       pluginId,
       pluginInfo = {},
-      hasLocator = false;
+      plugin;
 
   pluginId = pluginArgs._[2] //grab the org.ionic.keyboard or ./engine/cordova-android
 
   // console.log('Plugin id:', pluginId)
+  // State.saveRemotePlugin()
 
-  if (pluginId.indexOf('/') != -1) {
-    hasLocator = true;
-    //Its a locator, local file path or https://github.com repo
-    pluginLocator = pluginId;
-    pluginId = null;//We dont know ID yet.
-    var fetchJson = require(path.resolve('plugins', 'fetch.json'));
-
-    for (var lookupId in fetchJson) {
-      var lookupPlugin = fetchJson[lookupId]
-      // console.log('Weve got lookupPlugin:', lookupPlugin)
-      var isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
-      var hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;      
-
-      if(isNotRegistyPlugin && hasUrlOrPathOfLocator) {
-        pluginId = lookupId;
-        console.log('We found the plugin: ', pluginId)
-        break;
-      }
-    }
+  if (pluginId.indexOf('/') === -1) { //its just an id
+    console.log('short circuit!')
+    State.addOrUpdatePluginToPackageJson(packageJson, pluginId);
+    return State.savePackageJson(packageJson);
+  }
+
+  //By here, we know its not a registry plugin (git/local)
+  //Its a locator, local file path or https://github.com repo
+  pluginInfo.locator = pluginId;
+  pluginInfo.id = pluginId = State.getPluginFromFetchJsonByLocator(pluginInfo.locator);
 
-    pluginInfo.id = pluginId;
-    pluginInfo.locator = pluginLocator;
+  // console.log('going on to variables now')
 
-  } else { //closes if pluginId is file or url
-    pluginInfo.id = pluginId;//Save just the org.ionic.keyboard string
+  //If there are no variables, we just add to package, then save
+  if (!pluginArgs.variable) {
+    // console.log('no args, saving plugin info:', pluginInfo);
+    State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
+    return State.savePackageJson(packageJson);
   }
 
-  //Now weve got locator, pluginId
-  //Just gotta save the variables
-  if (pluginArgs.variable) {
-    pluginInfo.variables = {};
-    for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
-      //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
-      var splits = pluginArgs.variable[i].split('=');
-      pluginInfo.variables[splits[0]] = splits[1];
-    }
+  //Check and save for variables
+
+  pluginInfo.variables = {};
+  for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
+    //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
+    var splits = pluginArgs.variable[i].split('=');
+    pluginInfo.variables[splits[0]] = splits[1];
   }
 
+  console.log('Plugin info variables:', pluginInfo.variables);
 
-  if (!hasLocator && !pluginInfo.variables) {
-    //This case - its com.ionic.keyboard and no variables
-    //Store it as just a string, otherwise, store the object
-    pluginInfo = pluginId;
+  // State.checkAndSaveConfigXml(pluginId);
+  // console.log('Saved config.xml');
+  // console.log('Plugin info to save: ', pluginInfo);
+  State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
+
+  console.log('Save plugin to package.json completed');
+
+  //By now we assume pluginId is set, and locator might be set.
+  return State.savePackageJson(packageJson);
+}
+
+State.removePlugin = function removePlugin(pluginArgs) {
+
+}
+
+State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
+  try {
+    var xml2js = require('xml2js');
+    var xmlBuilder = new xml2js.Builder();
+    var configString = xmlBuilder.buildObject(xmlData);
+    fs.writeFileSync(xmlPath, configString);
+  } catch (ex) {
+    console.log('Could not save your xml file to path:', xmlPath);
   }
+}
+
+State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator(pluginLocator) {
+  var fetchJson = require(path.resolve('plugins', 'fetch.json')),
+    lookupId,
+    lookupPlugin,
+    isNotRegistyPlugin,
+    hasUrlOrPathOfLocator,
+    pluginId;
+
+    console.log('Going through fetch.json for this locator:', pluginLocator)
+
+  for (lookupId in fetchJson) {
+    lookupPlugin = fetchJson[lookupId];
+    // console.log('Weve got lookupPlugin:', lookupPlugin)
+    isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
+    hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;      
+
+    if (isNotRegistyPlugin && hasUrlOrPathOfLocator) {
+      pluginId = lookupId;
+      console.log('We found the plugin: ', pluginId);
+      break;
+    }
+  }
+
+  return pluginId;
+}
+
+State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
+  //Now we have as an array:
+  // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
+  // <param name="installPath" value="../phonegap-facebook-plugin"/>
+  // <param name="APP_ID" value="616451688482285"/>
+  // <param name="APP_NAME" value="hybrid-app"/>
 
   //Check to see if platforms exist
   //bug with cordova is, it doesnt add the entry into
   //config.xml unless a platform has been added.
-  var configXmlPath = path.resolve('config.xml')
+  console.log('checkAndSaveConfigXml:', pluginId);
+  var configXmlPath = path.resolve('config.xml');
   var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
-  
-  console.log('plugin path:', pluginXmlPath)
 
   var pluginXmlData = State.getXmlData(pluginXmlPath);
-  // console.log('plugin data')
   var configXmlData = State.getXmlData(configXmlPath);
 
-  console.log('xml data:', pluginXmlData)
-
-  var pluginName = pluginXmlData.plugin.name;
+  // console.log('xml data:', pluginXmlData);
 
-  console.log('paths set name:', pluginName)
+  var pluginName = pluginXmlData.plugin.name[0],
+      feature,
+      param,
+      paramName;
 
+  console.log('paths set name:', pluginName);
 
   var params = State.getPluginParameters(configXmlData, pluginName);
-  if(!params) {
+  if (!params) {
     //We need to add them
     console.log('There are no params, probably platforms werent added');
 
-    var feature = {'$': { name: pluginName}, param: [] }
-    if(!configXmlData.widget.feature) {
-      configXmlData.widget.feature = []
+    feature = {'$': { name: pluginName }, param: [] };
+
+    if (!configXmlData.widget.feature) {
+      configXmlData.widget.feature = [];
     }
-    for(paramName in pluginInfo.variables) {
+
+    for (paramName in pluginInfo.variables) {
       //Go thru vars and add to param
-      var param = { '$': { name: paramName, value: pluginInfo.variables[paramName]}}
-      console.log('param:', param)
+      param = { '$': { name: paramName, value: pluginInfo.variables[paramName] } };
+      console.log('param:', param);
       feature.param.push(param);
     }
 
-    configXmlData.widget.feature.push(feature)
+    configXmlData.widget.feature.push(feature);
 
     //Now to save config.xml file
-    console.log('xml data:', configXmlData)
+    // console.log('xml data:', configXmlData);
     State.saveXmlFile(configXmlData, configXmlPath);
   }
-  //Now we have as an array:
-  // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
-  // <param name="installPath" value="../phonegap-facebook-plugin"/>
-  // <param name="APP_ID" value="616451688482285"/>
-  // <param name="APP_NAME" value="hybrid-app"/>
-
-
-  // var features = configXmlData.widget.feature;
-  // console.log('features', features)
-  // var feature;
-
-  // features.forEach(function(potFeature) {
-  //   if(potFeature.$.name == pluginName) {
-  //     feature = potFeature
-  //   }
-  // })
-
-  // console.log('Plugin info to save: ', pluginInfo);
-
-  var existingPlugin = null;
-
-  //We need to check cordovaPlugins
-  //perhaps the ID already exists, or the 'id' in the object with locator exists.
-  for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
-    if(typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
-      existingPlugin = packageJson.cordovaPlugins[i];
-    } else if (packageJson.cordovaPlugins[i].id == pluginId) {
-      existingPlugin = packageJson.cordovaPlugins[i];
-    }
-  }
-
-  if(!existingPlugin) {
-    packageJson.cordovaPlugins.push(pluginInfo);
-  }
-
-  //By now we assume pluginId is set, and locator might be set.
-  State.savePackageJson(packageJson)
 }
 
-State.removePlugin = function removePlugin(pluginArgs) {
-
+State.resetState = function resetState() {
+  shelljs.rm('-rf', ['platforms', 'plugins']);
+  console.log('Removed platforms and plugins'.blue.bold);
+  State.restoreState()
+  .then(function() {
+    console.log('Ionic reset state complete'.green.bold);  
+  })
 }
 
-State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
-  try {
-    var xml2js = require('xml2js');
-    var xmlBuilder = new xml2js.Builder();
-    var configString = xmlBuilder.buildObject(xmlData);
-    fs.writeFileSync(xmlPath, configString);
-  } catch (ex) {
-    console.log('Could not save your xml file to path:', xmlPath);
-  }
+State.clearState = function clearState() {
+  shelljs.rm('-rf', ['platforms', 'plugins']);
+  var packageJson = State.getPackageJson();
+  packageJson.cordovaPlatforms = packageJson.cordovaPlugins = [];
+  State.savePackageJson(packageJson);
 }
 
 IonicTask.prototype.run = function run(ionic) {
@@ -674,11 +720,17 @@ IonicTask.prototype.run = function run(ionic) {
 
   switch(argv._[1]) {
     case 'save': 
-      State.saveState()
+      State.saveState();
       break;
     case 'restore':
       State.restoreState();
       break;
+    case 'reset': 
+      State.resetState();
+      break;
+    case 'clear':
+      State.clearState();
+      break;
   }
 
   IonicStats.t();

From d0d046a7d04cab2ffded247b3655c6862d631135 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 00:42:56 -0600
Subject: [PATCH 0540/1100] Updating calls for ionic state to be cleaner for
 platform reuse

---
 lib/ionic/state.js | 131 ++++++++++++++++++++++++++++-----------------
 1 file changed, 83 insertions(+), 48 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index ad0b99e180..91a58b5209 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -67,7 +67,7 @@ State.getPackageJson = function getPackageJson() {
 };
 
 State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo) {
-  var existingPlugin = null;
+  var existingPlugin;
 
   if (typeof pluginInfo === 'undefined') {
     pluginInfo = pluginId;
@@ -76,7 +76,7 @@ State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(p
   //We need to check cordovaPlugins
   //perhaps the ID already exists, or the 'id' in the object with locator exists.
   for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
-    if(typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
+    if (typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
       existingPlugin = packageJson.cordovaPlugins[i];
     } else if (packageJson.cordovaPlugins[i].id == pluginId) {
       existingPlugin = packageJson.cordovaPlugins[i];
@@ -86,7 +86,7 @@ State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(p
   if (!existingPlugin) {
     packageJson.cordovaPlugins.push(pluginInfo);
   }
-}
+};
 
 State.saveState = function saveState() {
   console.log('saveState');
@@ -102,10 +102,6 @@ State.saveState = function saveState() {
   }
 };
 
-State.doit = function doit(platform) {
-
-}
-
 State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
   var pp = path.resolve('.', 'platforms'),
     platforms = [];
@@ -304,6 +300,39 @@ State.getPlatformVersion = function getPlatformVersion(path) {
   return version.replace(/\n/g, '');
 }
 
+State.addOrUpdatePlatformToPackageJson = function addOrUpdatePlatformToPackageJson(packageJson, platformId, platformInfo) {
+  // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platformId});
+  var existingPlatform;
+  console.log('addOrUpdatePlatformToPackageJson')
+
+  if (typeof platformInfo === 'undefined') {
+    platformInfo = platformId;
+  }
+
+  for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
+    if (typeof packageJson.cordovaPlatforms[i] == 'string' && packageJson.cordovaPlatforms[i] == platformId) {
+      existingPlatform = packageJson.cordovaPlatforms[i];
+    } else if (packageJson.cordovaPlatforms[i].id == platformId) {
+      existingPlatform = packageJson.cordovaPlatforms[i];
+      existingPlatform.locator = platformInfo.locator;
+    }
+  }
+
+  if (!existingPlatform) {
+    packageJson.cordovaPlatforms.push(platformInfo);
+  }
+  // console.log('platformExists:', platformExists)
+  // if (!platformExists && requiresLocator) {
+  //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
+  //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+  // } else if (!platformExists && !requiresLocator) {
+  //   packageJson.cordovaPlatforms.push(platform);
+  // } else {
+  //   platformExists.platform = platform
+  //   platformExists.locator = locator
+  // }
+}
+
 State.savePlatform = function savePlatform(platformArgs) {
   // Locator may be:
   // Name:        ios, android
@@ -311,35 +340,46 @@ State.savePlatform = function savePlatform(platformArgs) {
   // Http url:    https://github.com/apache/cordova-android.git
   var locator = platformArgs._[2];
   var platform = 'ios';
-  var requiresLocator = false;
 
-  var packageJsonPath = path.resolve('.', 'package.json')
-  var packageJson = require(packageJsonPath)
+  // var packageJsonPath = path.resolve('.', 'package.json')
+  // var packageJson = require(packageJsonPath)
+
+  // if(!packageJson.cordovaPlatforms) {
+  //   packageJson.cordovaPlatforms = [];
+  // }
+
+  var packageJson = State.getPackageJson();
 
-  if(!packageJson.cordovaPlatforms) {
-    packageJson.cordovaPlatforms = [];
-  }
 
   //Test to see if its just ios or android
-  if(locator === 'ios' || locator === 'android') {
+  if (locator === 'ios' || locator === 'android') {
     platform = locator;
-  } else { //its path or url
-    platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
-    requiresLocator = true;
+    State.addOrUpdatePlatformToPackageJson(packageJson, platform);
+    return State.savePackageJson(packageJson);
   }
 
-  var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
 
-  // console.log('platformExists:', platformExists)
-  if(!platformExists && requiresLocator) {
-    packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
-    // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-  } else if(!platformExists && !requiresLocator) {
-    packageJson.cordovaPlatforms.push(platform);
-  } else {
-    platformExists.platform = platform
-    platformExists.locator = locator
-  }
+  platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
+
+  var platformInfo = {
+    platform: platform,
+    locator: locator
+  };
+
+  State.addOrUpdatePlatformToPackageJson(packageJson, platform, platformInfo);
+
+  // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
+
+  // // console.log('platformExists:', platformExists)
+  // if(!platformExists && requiresLocator) {
+  //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
+  //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+  // } else if(!platformExists && !requiresLocator) {
+  //   packageJson.cordovaPlatforms.push(platform);
+  // } else {
+  //   platformExists.platform = platform
+  //   platformExists.locator = locator
+  // }
 
   State.savePackageJson(packageJson);
 
@@ -449,7 +489,7 @@ State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
             });
         }
       }
-    } catch(ex) {
+    } catch (ex) {
       console.log('Failed to create add plugin statement:', ex)
     }
 
@@ -459,7 +499,7 @@ State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
 }
 
 State.processPlugin = function processPlugin(index, packageJson, promise) {
-  if(index >= packageJson.cordovaPlugins.length) {
+  if (index >= packageJson.cordovaPlugins.length) {
     promise.resolve();
     return
   }
@@ -468,10 +508,10 @@ State.processPlugin = function processPlugin(index, packageJson, promise) {
     var plugin = packageJson.cordovaPlugins[index];
     var pluginCommand = State.createAddRemoveStatement(plugin);
     console.log(pluginCommand);
-    exec(pluginCommand, function(){
+    exec(pluginCommand, function() {
         State.processPlugin(index + 1, packageJson, promise);
     });
-  } catch(ex) {
+  } catch (ex) {
     console.log('An error happened processing the previous cordova plugins')
     console.log('Error:', ex)
     promise.reject(ex)
@@ -484,32 +524,27 @@ State.removePlatform = function removePlatform(platformArgs) {
 
   //TODO - check if they pass multiple platforms
   //ionic platform remove ios android
-  var platformToRemove = platformArgs._[2]
-  var packageJson = State.getPackageJson();
-  var cordovaPlatforms = packageJson.cordovaPlatforms ? packageJson.cordovaPlatforms : [];
-
-  console.log('Removing platform:', platformToRemove);
-
-  for (var i = 0, j = cordovaPlatforms.length; i < j; i++) {
-    var platformEntry = cordovaPlatforms[i];
-    if (typeof platformEntry == 'string') {
-      cordovaPlatforms.splice(i, 1);
+  var platformToRemove = platformArgs._[2],
+    packageJson = State.getPackageJson(),
+    platformEntry;
+
+  for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
+    platformEntry = packageJson.cordovaPlatforms[i];
+    if (typeof platformEntry === 'string' && platformEntry == platformToRemove) {
+      packageJson.cordovaPlatforms.splice(i, 1);
       break;
     } else if (platformEntry.platform == platformToRemove) {
       //Its object {platform: 'android', locator: './engine/cordova-android'}
-        cordovaPlatforms.splice(i, 1);
+        packageJson.cordovaPlatforms.splice(i, 1);
         break;
     }
   }
 
-  console.log('After removing elements - ', cordovaPlatforms);
-
   State.savePackageJson(packageJson);
-
-}
+};
 
 State.getPluginParameters = function getPluginParameters(configXmlData, pluginName) {
-  if(!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
+  if (!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
     throw 'Invalid Config XML Data';
   }
 

From 4a183e09c72636a45b33a4133e30259e5b193c29 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 00:43:16 -0600
Subject: [PATCH 0541/1100] Changing the cordova platform and cordova plugin
 calls to be ionic instead

---
 lib/ionic/browser.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 6e1ccc89ca..aee9c09b50 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -9,9 +9,9 @@
 //Download the release for cordova-crosswalk-engine
 //Download the release for cordova-android with crosswalk
 //Ensure Android API 19 is installed
-//Run cordova platform rm android
-//Run cordova platform add ./engine/cordova-android-crosswalk
-//Run cordova plugin add ./engine/cordova-crosswalk-engine
+//Run ionic platform rm android
+//Run ionic platform add ./engine/cordova-android-crosswalk
+//Run ionic plugin add ./engine/cordova-crosswalk-engine
 //Run android update project on android file
 //Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
@@ -282,7 +282,7 @@ IonicTask.prototype.setPermissionsForFolder = function setPermissionsForFolder(f
 }
 
 IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
-  var command = 'cordova platform remove android';
+  var command = 'ionic platform remove android';
   var result = shelljs.exec(command);
   console.log('\nRemoved old Cordova Android platform')
 }
@@ -302,14 +302,15 @@ IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
 }
 
 IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
-  var command = ['cordova plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+  var command = ['ionic plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
+  console.log('add crosswalk plugin', command)
   var result = shelljs.exec(command);
   console.log('\nAdded Crosswalk Webview Engine')
 }
 
 IonicTask.prototype.removeCrosswalkEngines = function removeCrosswalkEngines() {
-  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk');
-  shelljs.exec('cordova plugin rm org.crosswalk.engine');
+  shelljs.exec('ionic plugin rm org.apache.cordova.engine.crosswalk');
+  shelljs.exec('ionic plugin rm org.crosswalk.engine');
 }
 
 IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
@@ -356,10 +357,10 @@ IonicTask.prototype.downloadFiles = function downloadFiles(version) {
 }
 
 IonicTask.prototype.removeCrosswalk = function removeCrosswalk() {
-  shelljs.exec('cordova plugin rm org.apache.cordova.engine.crosswalk')
-  shelljs.exec('cordova plugin rm org.crosswalk.engine')
-  shelljs.exec('cordova platform rm android')
-  shelljs.exec('cordova platform add android')
+  shelljs.exec('ionic plugin rm org.apache.cordova.engine.crosswalk')
+  shelljs.exec('ionic plugin rm org.crosswalk.engine')
+  shelljs.exec('ionic platform rm android')
+  shelljs.exec('ionic platform add android')
 }
 
 IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
@@ -412,8 +413,8 @@ IonicTask.prototype.revertBrowser = function revertBrowser() {
 
   console.log('Reverting', platform, 'browser');
 
-  var rmCommand = ['cordova platform rm', platform].join(' ');
-  var addCommand = ['cordova platform add', platform].join(' ');
+  var rmCommand = ['ionic platform rm', platform].join(' ');
+  var addCommand = ['ionic platform add', platform].join(' ');
 
   shelljs.exec(rmCommand)
 

From fec5d1234a6e78e86b3f495f6856b0c13bc624ab Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 00:56:07 -0600
Subject: [PATCH 0542/1100] Code cleanup from linting/jscs rules. Fixed
 platform rm from cordovaPlatforms

---
 lib/ionic/state.js | 94 ++++++++++++----------------------------------
 1 file changed, 25 insertions(+), 69 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 91a58b5209..b1e41fa6b1 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -89,13 +89,15 @@ State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(p
 };
 
 State.saveState = function saveState() {
-  console.log('saveState');
-
+  console.log('Saving your Ionic app state of platforms and plugins'.blue.bold);
   var packageJson = State.getPackageJson();
   try {
     State.saveExistingPlatforms(packageJson);
+    console.log('Saved platform'.green);
     State.saveExistingPlugins(packageJson);
+    console.log('Saved plugins'.green);
     State.savePackageJson(packageJson);
+    console.log('Saved package.json'.green);
   } catch (ex) {
     console.log('There was an error saving your current Ionic setup'.red);
     console.log('Error:', ex);
@@ -113,17 +115,15 @@ State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
   }
 
   // console.log('h')
-  platforms.forEach(function (platform) {
-    console.log('Saving', platform, 'platform');
+  platforms.forEach(function(platform) {
+    // console.log('Saving', platform, 'platform');
     try {
       var versionPath = path.resolve(pp, platform, 'cordova', 'version');
       var version = State.getPlatformVersion(versionPath);
-      console.log('we had version', version);
       var locator = platform;
 
       //Check to see if its crosswalk
       if (platform === 'android' && version.indexOf('-dev') !== -1) {
-        console.log('crosswalk android');
         //Look up path for engine/cordova-android path
         var engineFiles = fs.readdirSync(path.resolve('engine'));
         var enginePath = null;
@@ -135,28 +135,21 @@ State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
         locator = path.resolve('engine', enginePath);
       }
 
-      console.log('locator', locator);
-
-      if (!packageJson.cordovaPlatforms) {
-        packageJson.cordovaPlatforms = [];
-      }
-
       var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
 
-      console.log('platformExists:', platformExists);
       if (!platformExists) {
         packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
       }
 
     } catch (ex) {
-      console.log('e', ex);
+      console.log('There was an error trying to save your existing state', ex);
     }
   });
 };
 
 State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
   var pluginDir = path.resolve('.', 'plugins');
-  console.log(pluginDir);
+  // console.log(pluginDir);
 
   var plugins = fs.readdirSync(pluginDir);
   var pluginId;
@@ -173,8 +166,6 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
   // console.log('config xml path ', configXmlPath)
   var configXmlData = State.getXmlData(configXmlPath);
 
-  console.log('config.xml data:', configXmlData);
-
   if (fetchJson) {
     // console.log('fetchJson', fetchJson)
     //This will break with what we had before
@@ -184,20 +175,14 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
       plugin = fetchJson[pluginId];
       pluginToAdd = {};
 
-      console.log('plugin info');
-      console.log(plugin);
-
-      console.log('plugin.source.type', plugin.source.type);
+      // console.log('plugin.source.type', plugin.source.type);
 
       if (plugin.source.type === 'registry') {
         locator = pluginId;
       } else {
-        console.log('we have a local or git plugin', pluginId);
         if (plugin.source.type === 'local') {
-          console.log('!!!  local');
           locator = plugin.source.path;
         } else { //asume its git
-          console.log('!!!  git');
           locator = plugin.source.url;
         }
       }
@@ -206,8 +191,6 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
 
       var pluginXml = State.getXmlData(pluginXmlPath)
 
-      // console.log('got pluginXml:', pluginXml)
-
       var pluginName = pluginXml.plugin.name;
       var featureParams;
 
@@ -218,7 +201,6 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
           keyValueList = {};
 
       if (preferences && preferences.length > 0) {
-        
         hasVariables = true;
 
         preferences.forEach(function(preference) {
@@ -229,7 +211,6 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
 
       if (hasVariables) {
         // console.log('we have avariables to look at:', variableList)
-        
         // var features = configXmlData.widget.feature;
         // console.log('features', features)
         featureParams = State.getPluginParameters(configXmlData, pluginName);
@@ -244,8 +225,8 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
 
         variableList.forEach(function(variable) {
           // console.log('Looking up variable:', variable)
-          for(var i = 0, j = featureParams.length; i < j; i++) {
-            if(variable == featureParams[i].$.name) {
+          for (var i = 0, j = featureParams.length; i < j; i++) {
+            if (variable == featureParams[i].$.name) {
               keyValueList[variable] = featureParams[i].$.value;
             }
           }
@@ -265,8 +246,6 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
     }//closes for loop for fetch.json
 
     packageJson.cordovaPlugins = cordovaPlugins
-
-    // console.log('packageJson now:', packageJson)
   }
 
 } //Closes saveExistingPlugins
@@ -277,12 +256,12 @@ State.getXmlData = function getXmlData(xmlPath) {
   var xmlData;
   var parseString = xml2js.parseString;
   parseString(xmlString, function (err, jsonConfig) {
-    if(err) {
+    if (err) {
       return self.fail('Error parsing xml file: ' + err);
     }
     try {
       xmlData = jsonConfig;
-    } catch(e) {
+    } catch (e) {
       return self.fail('Error parsing ' + xmlPath + ': ' + e);
     }
   });
@@ -292,11 +271,11 @@ State.getXmlData = function getXmlData(xmlPath) {
 
 State.getPlatformVersion = function getPlatformVersion(path) {
   var result = shelljs.exec(['node', path].join(' '), { silent: true });
-  if(result.code != 0) {
+  if (result.code != 0) {
     return 'Not installed';
   }
   var version = result.output
-  console.log('Version for path:', path, version)
+  // console.log('Version for path:', path, version)
   return version.replace(/\n/g, '');
 }
 
@@ -340,17 +319,8 @@ State.savePlatform = function savePlatform(platformArgs) {
   // Http url:    https://github.com/apache/cordova-android.git
   var locator = platformArgs._[2];
   var platform = 'ios';
-
-  // var packageJsonPath = path.resolve('.', 'package.json')
-  // var packageJson = require(packageJsonPath)
-
-  // if(!packageJson.cordovaPlatforms) {
-  //   packageJson.cordovaPlatforms = [];
-  // }
-
   var packageJson = State.getPackageJson();
 
-
   //Test to see if its just ios or android
   if (locator === 'ios' || locator === 'android') {
     platform = locator;
@@ -368,19 +338,6 @@ State.savePlatform = function savePlatform(platformArgs) {
 
   State.addOrUpdatePlatformToPackageJson(packageJson, platform, platformInfo);
 
-  // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
-
-  // // console.log('platformExists:', platformExists)
-  // if(!platformExists && requiresLocator) {
-  //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
-  //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-  // } else if(!platformExists && !requiresLocator) {
-  //   packageJson.cordovaPlatforms.push(platform);
-  // } else {
-  //   platformExists.platform = platform
-  //   platformExists.locator = locator
-  // }
-
   State.savePackageJson(packageJson);
 
 }
@@ -403,15 +360,12 @@ State.restoreState = function restoreState() {
 
   //Restore plugins first - to avoid issues with platforms adding
   //without variables
-  if(!packageJson.cordovaPlugins) {
+  if (!packageJson.cordovaPlugins) {
     packageJson.cordovaPlugins = []
   }
 
   console.log('Restoring Platforms\n'.blue.bold)
 
-  // console.log('processPlugin: defer:', defer)
-  
-  // State.processPlugin(0, packageJson, defer)
   return State.restorePlatforms(packageJson)
   .then(function() {
     console.log('\nRestore platforms is complete\n'.green.bold)
@@ -446,7 +400,7 @@ State.restorePlatforms = function restorePlatforms(packageJson) {
 }
 
 State.processPlatform = function processPlatform(index, packageJson, promise) {
-  if(index >= packageJson.cordovaPlatforms.length) {
+  if (index >= packageJson.cordovaPlatforms.length) {
     promise.resolve();
     return
   }
@@ -456,7 +410,7 @@ State.processPlatform = function processPlatform(index, packageJson, promise) {
     var platform = packageJson.cordovaPlatforms[index];
     var platformCommand;
 
-    if(typeof platform == 'string') {
+    if (typeof platform == 'string') {
       platformCommand = ['cordova platform add ', platform].join('')
     } else {
       //Here, they have either a special version, or locator for
@@ -468,7 +422,7 @@ State.processPlatform = function processPlatform(index, packageJson, promise) {
     exec(platformCommand, function(){
         State.processPlatform(index + 1, packageJson, promise);
     });
-  } catch(ex) {
+  } catch (ex) {
     console.log('An error happened processing the previous cordova plugins')
     console.log('Error:', ex)
     promise.reject(ex)
@@ -479,11 +433,11 @@ State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
     // console.log('Creating add/remove statement', plugin)
     try {
       var pluginCmd = 'cordova plugin add ';
-      if(typeof plugin === 'string') {
+      if (typeof plugin === 'string') {
         pluginCmd += plugin;
       } else {
         pluginCmd += plugin.locator + ' ';
-        if(plugin.variables) {
+        if (plugin.variables) {
             Object.keys(plugin.variables).forEach(function(variable){
                 pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
             });
@@ -519,7 +473,7 @@ State.processPlugin = function processPlugin(index, packageJson, promise) {
 }
 
 State.removePlatform = function removePlatform(platformArgs) {
-  console.log('Args:', platformArgs);
+  // console.log('Args:', platformArgs);
   //Expecting - ionic platform remove [ios|android]
 
   //TODO - check if they pass multiple platforms
@@ -741,17 +695,19 @@ State.resetState = function resetState() {
 }
 
 State.clearState = function clearState() {
+  console.log('Clearing out your Ionic app of platforms, plugins, and package.json entries'.blue.bold);
   shelljs.rm('-rf', ['platforms', 'plugins']);
   var packageJson = State.getPackageJson();
   packageJson.cordovaPlatforms = packageJson.cordovaPlugins = [];
   State.savePackageJson(packageJson);
+  console.log('Ionic app state cleared'.green.bold);
 }
 
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
 
-  console.log('Args: ', argv._);
+  // console.log('Args: ', argv._);
 
   switch(argv._[1]) {
     case 'save': 

From 8b7b10094e8da3587788bfd578029efd8b678932 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 09:57:11 -0600
Subject: [PATCH 0543/1100] Style rule updates

---
 lib/ionic/state.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index b1e41fa6b1..0d5f4d01c7 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -41,7 +41,7 @@ var State = module.exports;
 
 shelljs.config.silent = true;
 
-var IonicTask = function(){};
+var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
@@ -51,10 +51,10 @@ State.getPackageJson = function getPackageJson() {
 
   try {
     packageJson = require(packageJsonPath);
-    if(!packageJson.cordovaPlugins) {
+    if (!packageJson.cordovaPlugins) {
       packageJson.cordovaPlugins = [];
     }
-    if(!packageJson.cordovaPlatforms) {
+    if (!packageJson.cordovaPlatforms) {
       packageJson.cordovaPlatforms = [];
     }
   } catch (ex) {
@@ -255,7 +255,7 @@ State.getXmlData = function getXmlData(xmlPath) {
   var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
   var xmlData;
   var parseString = xml2js.parseString;
-  parseString(xmlString, function (err, jsonConfig) {
+  parseString(xmlString, function(err, jsonConfig) {
     if (err) {
       return self.fail('Error parsing xml file: ' + err);
     }
@@ -419,7 +419,7 @@ State.processPlatform = function processPlatform(index, packageJson, promise) {
     }
     // var platformCommand = State.createAddRemoveStatement(platform);
     console.log(platformCommand);
-    exec(platformCommand, function(){
+    exec(platformCommand, function() {
         State.processPlatform(index + 1, packageJson, promise);
     });
   } catch (ex) {
@@ -438,7 +438,7 @@ State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
       } else {
         pluginCmd += plugin.locator + ' ';
         if (plugin.variables) {
-            Object.keys(plugin.variables).forEach(function(variable){
+            Object.keys(plugin.variables).forEach(function(variable) {
                 pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
             });
         }
@@ -506,12 +506,12 @@ State.getPluginParameters = function getPluginParameters(configXmlData, pluginNa
       feature;
 
   features.forEach(function(potFeature) {
-    if(potFeature.$.name == pluginName) {
+    if (potFeature.$.name == pluginName) {
       feature = potFeature
     }
   })
 
-  if(feature && feature.param) {
+  if (feature && feature.param) {
     return feature.param
   }
 
@@ -621,7 +621,7 @@ State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator
     lookupPlugin = fetchJson[lookupId];
     // console.log('Weve got lookupPlugin:', lookupPlugin)
     isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
-    hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;      
+    hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;
 
     if (isNotRegistyPlugin && hasUrlOrPathOfLocator) {
       pluginId = lookupId;
@@ -690,7 +690,7 @@ State.resetState = function resetState() {
   console.log('Removed platforms and plugins'.blue.bold);
   State.restoreState()
   .then(function() {
-    console.log('Ionic reset state complete'.green.bold);  
+    console.log('Ionic reset state complete'.green.bold);
   })
 }
 
@@ -709,14 +709,14 @@ IonicTask.prototype.run = function run(ionic) {
 
   // console.log('Args: ', argv._);
 
-  switch(argv._[1]) {
-    case 'save': 
+  switch (argv._[1]) {
+    case 'save':
       State.saveState();
       break;
     case 'restore':
       State.restoreState();
       break;
-    case 'reset': 
+    case 'reset':
       State.resetState();
       break;
     case 'clear':

From d8ffa727a12275b59b512fd53e20a7668ca216f0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 15:37:49 -0600
Subject: [PATCH 0544/1100] Updating log messages, checking for fetch.json, and
 reporting errors correctly

---
 lib/ionic/state.js | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index cc1bf77bb4..9c416c6860 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -156,7 +156,15 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
 
   //Lets try just relying on the fetch.json file
   //this file lists all plugins with where they come from, etc
-  var fetchJson = require(path.resolve('plugins', 'fetch.json'));
+  var fetchJson;
+
+  try {
+    fetchJson = require(path.resolve('plugins', 'fetch.json'));
+  } catch (ex) {
+    // Ionic.fail('There is not a fetch.json file available in your plugins folder.');
+    // return;
+  }
+
   var configXmlPath = path.resolve('config.xml');
   var plugin,
     pluginToAdd,
@@ -246,6 +254,9 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
     }//closes for loop for fetch.json
 
     packageJson.cordovaPlugins = cordovaPlugins
+  } else {
+    console.log('There was no fetch.json file available to restore plugin information from.'.red.bold);
+    console.log('Restoring plugins from scanning the plugins folder is still being worked on.'.red.bold);
   }
 
 } //Closes saveExistingPlugins
@@ -528,7 +539,7 @@ State.getPluginParameters = function getPluginParameters(configXmlData, pluginNa
   '$0': '/usr/local/bin/ionic' }
 */
 State.savePlugin = function savePlugin(pluginArgs) {
-  console.log('Saveplugin:', pluginArgs);
+  // console.log('Saveplugin:', pluginArgs);
 
   //Expects - either simple ID for plugin registry
   //or a local path, with or without variables
@@ -702,9 +713,28 @@ State.clearState = function clearState() {
 }
 
 IonicTask.prototype.run = function run(ionic) {
-  var self = this;
+  var self = this,
+      project,
+      stats,
+      projectPath;
+
   this.ionic = ionic;
 
+  try {
+    projectPath = path.resolve('ionic.project');
+    stats = fs.statSync(projectPath);
+  } catch (ex) {
+    this.ionic.fail('You cannot run any state commands on a project that is not an Ionic project.\nTry adding an ionic.project file or running ionic start to get an application to save or restore');
+    return;
+  }
+
+  try {
+    project = IonicProject.load();
+  } catch (ex) {
+    this.ionic.fail(ex.message);
+    return;
+  }
+
   // console.log('Args: ', argv._);
 
   switch (argv._[1]) {

From f7e6bb9c254707a93aa7b71fb03ad8bff536ce48 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 15:54:47 -0600
Subject: [PATCH 0545/1100] On restore command, ignoring DS_Store files or any
 other files that arent directories

---
 lib/ionic/state.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 9c416c6860..7ad3770ad5 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -106,7 +106,9 @@ State.saveState = function saveState() {
 
 State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
   var pp = path.resolve('.', 'platforms'),
-    platforms = [];
+    platforms = [],
+    platformPath,
+    platformStats;
 
   try {
     platforms = fs.readdirSync(pp);
@@ -116,7 +118,12 @@ State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
 
   // console.log('h')
   platforms.forEach(function(platform) {
-    // console.log('Saving', platform, 'platform');
+    platformPath = path.resolve('platforms', platform);
+    platformStats = fs.statSync(platformPath);
+    if (!platformStats.isDirectory()) {
+      return
+    }
+
     try {
       var versionPath = path.resolve(pp, platform, 'cordova', 'version');
       var version = State.getPlatformVersion(versionPath);

From 12ad8a205dced4d4d90b577358257ff3fd542270 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 18:00:53 -0600
Subject: [PATCH 0546/1100] Updating state to give better output about commands
 to use if none are passed.

---
 lib/ionic/state.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 7ad3770ad5..6bd08dda0c 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -252,7 +252,7 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
         var pluginObj = {id: pluginId, locator: locator, variables: keyValueList};
         cordovaPlugins.push(pluginObj)
 
-      } else if (plugin.source.type == 'git') {
+      } else if (plugin.source.type === 'git' || plugin.source.type === 'local') {
         cordovaPlugins.push({locator: locator, id: pluginId});
       } else {
         cordovaPlugins.push(pluginId)
@@ -757,6 +757,8 @@ IonicTask.prototype.run = function run(ionic) {
     case 'clear':
       State.clearState();
       break;
+    default:
+      console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);
   }
 
   IonicStats.t();

From fbd14b9ca859ba9a9de2668c9f8ee347c4cb8752 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Apr 2015 18:01:13 -0600
Subject: [PATCH 0547/1100] Updating cli help for docs and state. Giving better
 information about the state command.

---
 lib/ionic.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index efc35e10d1..2254abe89e 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -399,9 +399,17 @@ var TASKS = [
   {
     title: 'state',
     name: 'state',
-    summary: 'Saves or restores state of your Ionic Application',
+    summary: 'Saves or restores state of your Ionic Application using the package.json file',
     args: {
-      '<COMMAND>': '[save|restore] - Saves or restores your Ionic applications state of platforms and plugins via the package.json file',
+      '<COMMAND>': '[ save | restore | clear | reset ]'
+    },
+    options: {
+      'save': 'Save the platforms and plugins into package.json',
+      'restore': 'Restore the platforms and plugins from package.json',
+      'clear': 'Clear the package.json of cordovaPlugins and cordovaPlatforms, as well as clear out the platforms and plugins folders',
+      'reset': 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
+      '--plugins': 'Only do operations with plugins',
+      '--platforms': 'Only do operations with platforms'
     },
     module: './ionic/state'
    },
@@ -410,7 +418,7 @@ var TASKS = [
     name: 'docs',
     summary: 'Opens up the documentation for Ionic',
     args: {
-      '<TOPIC>': 'the topic to view help documentation for'
+      '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
     },
     module: './ionic/docs'
    }

From 4cbb7e954004e5e7c151991249f57feddc0d58cd Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 2 Apr 2015 10:32:28 -0600
Subject: [PATCH 0548/1100] Fixing an issue where it doesnt check for the local
 paths of plugins when adding or saving from existing

---
 lib/ionic/state.js | 59 +++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 6bd08dda0c..9c58bdfc98 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -84,6 +84,7 @@ State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(p
   }
 
   if (!existingPlugin) {
+    console.log('Adding since there was no existingPlugin')
     packageJson.cordovaPlugins.push(pluginInfo);
   }
 };
@@ -181,14 +182,37 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
   // console.log('config xml path ', configXmlPath)
   var configXmlData = State.getXmlData(configXmlPath);
 
+  var pluginPath,
+      pluginPathStats,
+      pluginXmlPath,
+      pluginXml,
+      pluginName,
+      featureParams,
+      preferences,
+      hasVariables = false,
+      variableList = [],
+      keyValueList = {};
+
+
   if (fetchJson) {
     // console.log('fetchJson', fetchJson)
     //This will break with what we had before
     for (pluginId in fetchJson) {
       // cordovaPlugins.push();
-      // console.log('plugin:', pluginId)
       plugin = fetchJson[pluginId];
       pluginToAdd = {};
+      try {
+        pluginPath = path.resolve('plugins', pluginId);
+        pluginPathStats = fs.statSync(pluginPath);
+      } catch (ex) {
+        console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
+        continue;
+      }
+
+      if (!pluginPathStats.isDirectory()) {
+        console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
+        continue;
+      }
 
       // console.log('plugin.source.type', plugin.source.type);
 
@@ -202,18 +226,12 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
         }
       }
 
-      var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml')
-
-      var pluginXml = State.getXmlData(pluginXmlPath)
+      pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
+      pluginXml = State.getXmlData(pluginXmlPath)
 
-      var pluginName = pluginXml.plugin.name;
-      var featureParams;
+      pluginName = pluginXml.plugin.name;
 
-      var preferences = pluginXml.plugin.preference;
-
-      var hasVariables = false,
-          variableList = [],
-          keyValueList = {};
+      preferences = pluginXml.plugin.preference;
 
       if (preferences && preferences.length > 0) {
         hasVariables = true;
@@ -224,6 +242,10 @@ State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
         })
       }
 
+      hasVariables = false;
+      variableList = [];
+      keyValueList = {};
+
       if (hasVariables) {
         // console.log('we have avariables to look at:', variableList)
         // var features = configXmlData.widget.feature;
@@ -581,7 +603,6 @@ State.savePlugin = function savePlugin(pluginArgs) {
 
   //If there are no variables, we just add to package, then save
   if (!pluginArgs.variable) {
-    // console.log('no args, saving plugin info:', pluginInfo);
     State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
     return State.savePackageJson(packageJson);
   }
@@ -595,8 +616,6 @@ State.savePlugin = function savePlugin(pluginArgs) {
     pluginInfo.variables[splits[0]] = splits[1];
   }
 
-  console.log('Plugin info variables:', pluginInfo.variables);
-
   // State.checkAndSaveConfigXml(pluginId);
   // console.log('Saved config.xml');
   // console.log('Plugin info to save: ', pluginInfo);
@@ -631,17 +650,14 @@ State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator
     hasUrlOrPathOfLocator,
     pluginId;
 
-    console.log('Going through fetch.json for this locator:', pluginLocator)
-
   for (lookupId in fetchJson) {
     lookupPlugin = fetchJson[lookupId];
-    // console.log('Weve got lookupPlugin:', lookupPlugin)
     isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
     hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;
+    hasPathWithLeadingDot = lookupPlugin.source && lookupPlugin.source.replace('./', '') == pluginLocator
 
-    if (isNotRegistyPlugin && hasUrlOrPathOfLocator) {
+    if ((isNotRegistyPlugin && hasUrlOrPathOfLocator) || (isNotRegistyPlugin && hasPathWithLeadingDot)) {
       pluginId = lookupId;
-      console.log('We found the plugin: ', pluginId);
       break;
     }
   }
@@ -659,7 +675,6 @@ State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
   //Check to see if platforms exist
   //bug with cordova is, it doesnt add the entry into
   //config.xml unless a platform has been added.
-  console.log('checkAndSaveConfigXml:', pluginId);
   var configXmlPath = path.resolve('config.xml');
   var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
 
@@ -673,13 +688,9 @@ State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
       param,
       paramName;
 
-  console.log('paths set name:', pluginName);
-
   var params = State.getPluginParameters(configXmlData, pluginName);
   if (!params) {
     //We need to add them
-    console.log('There are no params, probably platforms werent added');
-
     feature = {'$': { name: pluginName }, param: [] };
 
     if (!configXmlData.widget.feature) {

From a9b6af9f42bac998fdc30633d60e96445c8c0c81 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 2 Apr 2015 11:22:23 -0600
Subject: [PATCH 0549/1100] Adding in the nosave option for cordova
 platform/plugin commands, as well as updating cli help

---
 lib/ionic.js         | 7 +++----
 lib/ionic/cordova.js | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 2254abe89e..ca645b2b05 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -112,8 +112,8 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
-      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources'
+      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources',
+      '--nosave|-e': 'Do not save the platform to the package.json file'
     },
     module: './ionic/cordova'
   },
@@ -131,7 +131,6 @@ var TASKS = [
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
       '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
       '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
       '--debug|--release': '',
       '--device|--emulator|--target=FOO': ''
     },
@@ -182,7 +181,7 @@ var TASKS = [
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
                                   'and subdirectories first for the plugin before\n' +
                                   'looking it up in the registry.',
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova'
+      '--nosave|-e': 'Do not save the plugin to the package.json file'
     },
     module: './ionic/cordova'
   },
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 3e52ffbd87..8fd4420f4a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
-    argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources']).argv,
+    argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),
@@ -64,7 +64,7 @@ IonicTask.prototype.run = function(ionic) {
   })
   .then(function(runCode) {
     //We dont want to do anything if the cordova command failed
-    if(runCode !== 0) {
+    if(runCode !== 0 || argv.nosave) {
       return
     }
     if (isPlatformCmd && isAddCmd) {

From 4fbb038e21ec12b590dccfdc5a38f4cf3251c38f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 2 Apr 2015 11:22:39 -0600
Subject: [PATCH 0550/1100] Updating changelog and readme for hooks, docs, and
 state commands

---
 CHANGELOG.md |  2 +-
 README.md    | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca475c8fff..d1814ef62f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### next-release
+### 1.3.19
 
 * Added in the `ionic docs` command to assist you in getting Ionic docs opened faster from the CLI! View all with `ionic docs ls`, or type in your desired docs `ionic docs collectionRepeat`. Ionic docs will be opened for the version of Ionic that you are using in your project (ex RC0, RC1, etc).
 * Added in the `ionic state` command to help organize your Cordova platforms and plugins by storing the information in the package.json file. Try out `ionic state save` and `ionic state restore`.
diff --git a/README.md b/README.md
index 41e1327600..0c47460c2f 100644
--- a/README.md
+++ b/README.md
@@ -419,3 +419,91 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 # Set your Ionic Project App ID
 
 Use the `ionic link <appId>` command to set your Ionic App ID to continue working with the same app with the Ionic platform across development enviroments.
+
+# Ionic Docs
+
+To get Ionic documentation from the Ionic CLI, try using the `ionic docs` command. The command will look up your currently used Ionic version and open the docs specific for that version. Ex: RC0, RC1, etc.
+
+To view all docs, `ionic docs ls`.
+
+To get help with a doc you may not remember, just type the name close enough: `ionic docs list` and you will be prompted for suggestions that may match.
+
+
+# Ionic Hooks
+
+Ionic provides some default hooks for you to use in your Cordova application. In versions prior to 1.3.18, these hooks were automatically installed via the `ionic platform` command. 
+
+In 1.3.18, the hooks were automatically removed due to some errors users were having with Crosswalk and other plugins with variables. 
+
+If you were a user who would still like to use those hooks, you can re-install these hooks with the `ionic hooks add` command.
+
+If you would like to remove these hooks yourself, use `ionic hooks remove` to get rid of them.
+
+
+# Ionic State
+
+Ionic now provides a command to help you manage the state of your Ionic application. Previously Cordova hooks were used to save platforms and plugins to your `package.json` file.
+
+Now when using `ionic platform add`, `ionic platform rm`, `ionic plugin add`, or `ionic plugin rm`, the state command will automatically be used to save the platform or plugin state to the `package.json` file.
+
+If you would like to avoid saving plugins or platforms to the `package.json` file - pass in the `--nosave` option. (`ionic plugin add org.apache.cordova.file --nosave`).
+
+Your package.json file might look something like the following:
+
+```json
+"cordovaPlatforms": [
+  "ios",
+  {
+    "android": {
+      "id": "android",
+      "locator": "https://github.com/apache/cordova-android.git"
+    }
+  }
+],
+"cordovaPlugins": [
+  "org.apache.cordova.device",
+  "org.apache.cordova.console",
+  "com.ionic.keyboard",
+  "org.apache.cordova.splashscreen",
+  {
+    "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
+    "id": "org.cordova.croswalk"
+  },
+  {
+    "locator": "/path/to/cloned/phonegap-facebook-plugin",
+    "id": "",
+    "variables": {
+        "APP_ID": "some_id",
+        "APP_NAME": "some_name"
+    }
+  }
+]
+```
+
+## ionic state save
+
+The `ionic state save` command does some lookup in your platforms and plugins to save the current state of your cordova application. 
+
+First it looks in your platforms folder to see which platforms are installed, and saves the name and version in your `package.json` file under the `cordovaPlatforms` attribute.
+
+Second it looks at your plugins `fetch.json` file to save the plugins installed both from the Cordova registry, locally installed plugins, as well as remote plugins from github or a remote HTTP url.
+
+## ionic state restore
+
+The `ionic state restore` command looks at the `cordovaPlugins` and `cordovaPlatforms` attributes in your `package.json` file to restore your application with those platforms and plugins.
+
+In the package.json file, `cordovaPlugins` will be stored as just their `ID` if they are installed from the Cordova registry. However, if they are local or remote, they will be stored as an object with those properties. Also to note, variables are stored for plugins with variables like the Facebook connect plugin.
+
+The `cordovaPlatforms` follow the same convention of either an `ID` for the platform name, if they are local or remote, they will be stored as an object with those properties.
+
+If you'd like, you can populate the `cordovaPlugins` and `cordovaPlatforms` by hand, then use the `ionic state restore` command to get your app ready to go.
+
+## ionic state clear
+
+The `ionic state clear` method will clear out your platforms and plugins directories, as well as removing the `cordovaPlugins` and `cordovaPlaforms` attributes in your `package.json` file.
+
+## ionic state reset
+
+The `ionic state reset` method will first remove your platforms and plugins folders. Then it will look at your `package.json` file to re-install the platforms and plugins as specified there.
+
+This command can be helpful for you to reinstall your plugins and platforms to get a fresh start.

From d2884d957053c6b54caea06a7b20cdf3853cd009 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 2 Apr 2015 11:51:38 -0600
Subject: [PATCH 0551/1100] Version bumps

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 894ececfc9..4253b9780e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19-beta.2",
+  "version": "1.3.19",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 2b4452ecff..db79df75c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19-beta.2",
+  "version": "1.3.19",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 67d318aa25fc5c8740be62fdec90f553b401960f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 6 Apr 2015 23:21:53 -0600
Subject: [PATCH 0552/1100] Moving code over to the app lib

---
 lib/ionic/serve.js | 176 +++++++++++++--------------------------------
 1 file changed, 50 insertions(+), 126 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 9bdc3e6cc2..8da6a1abb9 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -16,6 +16,8 @@ var fs = require('fs'),
     url = require('url'),
     xml2js = require('xml2js'),
     IonicStats = require('./stats').IonicStats,
+    ionicCliLib = require('ionic-cli-lib'),
+    Serve = ionicCliLib.serve,
     shelljs = require('shelljs'),
     ports = require('./ports');
 
@@ -33,120 +35,57 @@ IonicTask.prototype.run = function(ionic) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
-  this.loadSettings();
+  var options = Serve.loadSettings(argv);
+  options.address = '0.0.0.0';
+  //TODO: Look up address stuffs
 
-  this.getAddress()
+  return Serve.start(options)
   .then(function() {
-    return self.checkPorts(true, self.port, self.address);
-  })
-  .then(function() {
-    if(self.runLivereload) {
-      return self.checkPorts(false, self.liveReloadPort, self.address);
-    }
-  })
-  .then(function() {
-    if(self.isAddressCmd) {
-      console.log( self.address );
-      process.exit();
-    }
-
-    self.start(ionic)
-
-    // self.printCommandTips();
-    // console.log('listenForServerCommands')
-    // self.listenForServerCommands();
-
-    if(ionic.hasFailed) return;
-
-    ionic.latestVersion.promise.then(function(){
-      ionic.printVersionWarning();
-    });
+    return Serve.showFinishedServeMessage(options);
   })
+  // .then(function() {
+  //   return Serve.showFinishedServeMessage();
+  // })
   .catch(function(error) {
-
+    console.log('There was an error serving your Ionic application:', error);
+    throw error;
   })
+  // return;
+  // this.loadSettings();
+
+  // this.getAddress()
+  // .then(function() {
+  //   return self.checkPorts(true, self.port, self.address);
+  // })
+  // .then(function() {
+  //   if(self.runLivereload) {
+  //     return self.checkPorts(false, self.liveReloadPort, self.address);
+  //   }
+  // })
+  // .then(function() {
+  //   if(self.isAddressCmd) {
+  //     console.log( self.address );
+  //     process.exit();
+  //   }
+
+  //   self.start(ionic)
+
+  //   // self.printCommandTips();
+  //   // console.log('listenForServerCommands')
+  //   // self.listenForServerCommands();
+
+  //   if(ionic.hasFailed) return;
+
+  //   ionic.latestVersion.promise.then(function(){
+  //     ionic.printVersionWarning();
+  //   });
+  // })
+  // .catch(function(error) {
+
+  // })
 
 };
 
-IonicTask.prototype.listenForServerCommands = function listenForServerCommands() {
-  var self = this;
-  var readline = require('readline');
-
-  process.on("SIGINT", function(){
-    process.exit();
-  });
-
-  var rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: false
-  });
-
-  if(process.platform === "win32") {
-    rl.on("SIGINT", function (){
-      process.emit("SIGINT");
-    });
-  }
-
-  rl.setPrompt('ionic $ ');
-  rl.prompt();
-  rl.on('line', function(entry) {
-
-    if(entry === null) return;
-    // console.log('entry', entry)
-    var input = (entry + '').trim();
-
-    if (input === 'quit' || input === 'q') rl.close();
-
-    if (input === null) return;
-    input = (input + '').trim();
-
-    // console.log('input received:', input)
-
-    if(input == 'restart' || input == 'r') {
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input.indexOf('goto ') === 0 || input.indexOf('g ') === 0) {
-      var url = input.replace('goto ', '').replace('g ', '');
-      self._goToUrl(url);
-
-    } else if(input == 'consolelogs' || input == 'c') {
-      self.printConsoleLogs = !self.printConsoleLogs;
-      console.log('Console log output: '.green + (self.printConsoleLogs ? 'enabled' : 'disabled'));
-      self._goToUrl('/?restart=' + Math.floor((Math.random() * 899999) + 100000));
-
-    } else if(input == 'serverlogs' || input == 's') {
-      self.printServerLogs = !self.printServerLogs;
-      console.log('Server log output: '.green + (self.printServerLogs ? 'enabled' : 'disabled'));
-
-    } else if(input.match(/^go\([+\-]?[0-9]{1,9}\)$/)) {
-      self._goToHistory(input);
-
-    } else if(input == 'help' || input == 'h') {
-      self.printCommandTips();
-
-    } else if(input == 'quit' || input == 'q') {
-      if(self.childProcess) {
-        self.childProcess.kill('SIGTERM');
-      }
-      process.exit();
-
-    } else if(input == 'clear' || input == 'clr') {
-      process.stdout.write("\u001b[2J\u001b[0;0H");
-
-    } else {
-      console.log('\nInvalid ionic server command'.error.bold);
-      self.printCommandTips();
-    }
-
-    // console.log('input: ', input);
-    rl.prompt();
-  }).on('close', function() {
-    process.exit(0);
-  });
-
-}
-
 //isIonicServer = true when serving www directory, false when live reload
 IonicTask.prototype.checkPorts = function(isIonicServer, testPort, testHost) {
   var q = Q.defer();
@@ -242,24 +181,9 @@ IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
   return true;
 }
 
-IonicTask.prototype.showFinishedServeMessage = function() {
-  if(this.launchLab || this.launchBrowser) {
-    var open = require('open');
-    var openUrl = this.launchLab ? [this.host(this.port), IONIC_LAB_URL] : [this.host(this.port)];
-    if(this.browserOption) {
-      openUrl.push(this.browserOption)
-    }
-
-    try {
-      open(openUrl.join(''), this.browser);
-    } catch (ex) {
-      console.log('Error opening the browser - ', ex)
-    }
-  }
-
-  this.printCommandTips();
-  this.listenForServerCommands();
-
+IonicTask.prototype.showFinishedServeMessage = function(options) {
+  Serve.printCommandTips(options);
+  Serve.listenForServerCommands(options);
 }
 
 IonicTask.prototype.start = function(ionic) {
@@ -444,9 +368,9 @@ IonicTask.prototype.start = function(ionic) {
     // Listen
     app.use(server);
     try {
-      app.listen(this.port, this.address);
+      app.listen(options.port, options.address);
     }catch(ex) {
-      self.ionic.fail('Failed to start the Ionic server: ', ex.message)
+      Utils.fail('Failed to start the Ionic server: ', ex.message);
     }
 
     console.log('Running dev server:'.green.bold, this.devServer);

From aaa12794cae4e5881965f9bec42d5b9d8095a52d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 7 Apr 2015 08:26:13 -0600
Subject: [PATCH 0553/1100] Switching serve command to be broken out to lib,
 cli calls that lib

---
 lib/ionic/serve.js | 487 ---------------------------------------------
 1 file changed, 487 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 8da6a1abb9..c8b099943b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -181,489 +181,6 @@ IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
   return true;
 }
 
-IonicTask.prototype.showFinishedServeMessage = function(options) {
-  Serve.printCommandTips(options);
-  Serve.listenForServerCommands(options);
-}
-
-IonicTask.prototype.start = function(ionic) {
-  try {
-    var self = this;
-    var app = connect();
-    var childProcess = null;
-
-    if (!fs.existsSync( path.resolve(this.documentRoot) )) {
-      if (this.createDocumentRoot) {
-        fs.mkdirSync(this.documentRoot);
-      } else {
-        return ionic.fail('"' + this.documentRoot + '" directory cannot be found. Please make sure the working directory is an Ionic project.');
-      }
-    }
-
-    // gulpStartupTasks should be an array of tasks set in the project config
-    // watchSass is for backwards compatible sass: true project config
-    if((this.gulpStartupTasks && this.gulpStartupTasks.length) || this.watchSass) {
-      var tasks = this.gulpStartupTasks || ['sass','watch'];
-
-      if(!self.gulpInstalledGlobally()) {
-        var message = ['You have specified Gulp start up tasks in your ionic.project file.'.red, '\n', 'However, you do not have Gulp installed globally. Please run '.red, '`npm install -g gulp`'.green].join('');
-        return ionic.fail(message)
-      }
-
-      console.log('Gulp startup tasks:'.green.bold, tasks);
-      self.childProcess = require('cross-spawn').spawn('gulp', tasks, { stdio: 'inherit' });
-    }
-
-    if(this.runLivereload) {
-
-      vfs.watch(self.watchPatterns, {},function(f) {
-        self._changed(f.path);
-      });
-
-      self.liveReloadServer = self.host(self.liveReloadPort);
-
-      var lrServer = tinylr();
-      try {
-        lrServer.listen(self.liveReloadPort, function(err) {
-          if(err) {
-            return ionic.fail('Unable to start live reload server:', err);
-          } else {
-            console.log('Running live reload server:'.green.bold, self.liveReloadServer );
-            console.log('Watching :'.green.bold, self.watchPatterns);
-            self.showFinishedServeMessage();
-          }
-        });
-      } catch(ex) {
-        self.ionic.fail('Live Reload failed to start, error: ', ex.message)
-      }
-
-      app.use(require('connect-livereload')({
-        port: this.liveReloadPort
-      }));
-    }
-
-    if(this.useProxy) {
-
-      for(var x=0; x<this.proxies.length; x++) {
-        var proxy = this.proxies[x];
-
-        var opts = url.parse(proxy.proxyUrl);
-        if(proxy.proxyNoAgent)
-            opts.agent = false;
-
-        app.use(proxy.path, proxyMiddleware(opts));
-        console.log('Proxy added:'.green.bold, proxy.path + " => " + url.format(proxy.proxyUrl));
-      }
-    }
-
-    this.devServer = this.host(this.port);
-
-    // Serve up the www folder by default
-    var serve = serveStatic(this.documentRoot);
-
-    // Create static server
-    var server = http.createServer(function(req, res){
-      var done = finalhandler(req, res);
-
-      var urlParsed = url.parse(req.url, true);
-      var platformOverride = urlParsed.query && urlParsed.query.ionicplatform;
-
-      var platformUrl = getPlatformUrl(req);
-      if(platformUrl) {
-        var platformWWW = getPlatformWWW(req);
-
-        if(self.isPlatformServe) {
-          fs.readFile( path.resolve(path.join(platformWWW, platformUrl)), function (err, buf) {
-            res.setHeader('Content-Type', 'application/javascript');
-            if (err) {
-              res.end('// mocked cordova.js response to prevent 404 errors during development');
-              if(req.url == '/cordova.js') {
-                self.serverLog(req, '(mocked)');
-              } else {
-                self.serverLog(req, '(Error ' + platformWWW + ')');
-              }
-            } else {
-              self.serverLog(req, '(' + platformWWW + ')');
-              res.end(buf);
-            }
-          });
-        } else {
-          self.serverLog(req, '(mocked)');
-          res.setHeader('Content-Type', 'application/javascript');
-          res.end('// mocked cordova.js response to prevent 404 errors during development');
-        }
-        return;
-      }
-
-      if(self.printConsoleLogs && req.url === '/__ionic-cli/console') {
-        self.consoleLog(req);
-        res.end('');
-        return;
-      }
-
-      if(req.url === IONIC_LAB_URL) {
-        // Serve the lab page with the given object with template data
-        var labServeFn = function(context) {
-          fs.readFile(path.resolve(path.join(__dirname, 'assets/preview.html')), function(err, buf) {
-            var html;
-            if(err) {
-              res.end('404');
-            } else {
-              html = buf.toString('utf8');
-              html = html.replace('//INSERT_JSON_HERE', 'var BOOTSTRAP = ' + JSON.stringify(context || {}));
-            }
-            res.setHeader('Content-Type', 'text/html');
-            res.end(html);
-          });
-        };
-
-        // If the config.xml file exists, let's parse it for some nice features like
-        // showing the name of the app in the title
-        if(fs.existsSync('config.xml')) {
-          fs.readFile(path.resolve('config.xml'), function(err, buf) {
-            var xml = buf.toString('utf8');
-            xml2js.parseString(xml, function (err, result) {
-              labServeFn({
-                appName: result.widget.name[0]
-              });
-            });
-          });
-        } else {
-          labServeFn();
-        }
-
-        return;
-      }
-
-      if(req.url.split('?')[0] === '/') {
-        fs.readFile( path.resolve(self.contentSrc), 'utf8', function (err, buf) {
-          res.setHeader('Content-Type', 'text/html');
-          if (err) {
-            self.serverLog(req, 'ERROR!');
-            res.end(err.toString());
-          } else {
-            self.serverLog(req, '(' + self.contentSrc + ')');
-
-            var html = injectGoToScript( buf.toString('utf8') );
-
-            if(self.printConsoleLogs) {
-              html = injectConsoleLogScript(html);
-            }
-
-            if(platformOverride) {
-              html = injectPlatformScript( html, platformOverride );
-            }
-
-            res.end(html);
-          }
-        });
-        return;
-      }
-
-      // root www directory file
-      self.serverLog(req);
-      serve(req, res, done);
-    });
-
-    // Listen
-    app.use(server);
-    try {
-      app.listen(options.port, options.address);
-    }catch(ex) {
-      Utils.fail('Failed to start the Ionic server: ', ex.message);
-    }
-
-    console.log('Running dev server:'.green.bold, this.devServer);
-
-    if(!self.runLivereload) {
-      self.showFinishedServeMessage();
-    }
-
-
-  } catch(e) {
-    var msg;
-    if(e && (e + '').indexOf('EMFILE') > -1) {
-      msg = (e + '\n').error.bold +
-            'The watch process has exceed the default number of files to keep open.\n'.error.bold +
-            'You can change the default with the following command:\n\n'.error.bold +
-            '  ulimit -n 1000\n\n' +
-            'In the command above, it\'s setting the default to watch a max of 1000 files.\n\n'.error.bold;
-
-    } else {
-      msg = ('server start error: ' + e.stack).error.bold;
-    }
-    console.log(msg);
-    process.exit(1);
-  }
-};
-
-
-IonicTask.prototype.serverLog = function(req, msg) {
-  if(this.printServerLogs) {
-    var log = 'serve  '.yellow;
-
-    log += (req.url.length > 60 ? req.url.substr(0, 57) + '...' : req.url).yellow;
-
-    if(msg) {
-      log += '  ' + msg.yellow;
-    }
-
-    var ua = (req.headers && req.headers['user-agent'] || '');
-    if(ua.indexOf('Android') > 0) {
-      log += '  Android'.small;
-    } else if(ua.indexOf('iPhone') > -1 || ua.indexOf('iPad') > -1 || ua.indexOf('iPod') > -1) {
-      log += '  iOS'.small;
-    } else if(ua.indexOf('Windows Phone') > -1) {
-      log += '  Windows Phone'.small;
-    }
-
-    console.log(log);
-  }
-};
-
-
-IonicTask.prototype.consoleLog = function(req) {
-  var body = '';
-
-  req.on('data', function (data) {
-    if(data) body += data;
-  });
-
-  req.on('end', function () {
-    if(!body) return;
-
-    try {
-      var log = JSON.parse(body);
-
-      var msg = log.index + '  ';
-      while(msg.length < 5) {
-        msg += ' ';
-      }
-
-      msg += ' ' + (log.ts + '').substr(7) + '   ';
-
-      msg += log.method;
-      while(msg.length < 24) {
-        msg += ' ';
-      }
-
-      var msgIndent = '';
-      while(msgIndent.length < msg.length) {
-        msgIndent += ' ';
-      }
-
-      if(log.method == 'dir' || log.method == 'table') {
-        var isFirstLine = true;
-
-        log.args.forEach(function(argObj){
-
-          for(objKey in argObj) {
-            if(isFirstLine) {
-              isFirstLine = false;
-            } else {
-              msg += '\n' + msgIndent;
-            }
-            msg += objKey + ': ';
-            try {
-              msg += ( JSON.stringify(argObj[objKey], null, 1) ).replace(/\n/g, '');
-            } catch(e) {
-              msg += argObj[objKey];
-            }
-          }
-
-        });
-
-      } else if(log.args.length) {
-        if(log.args.length === 2 && log.args[0] === '%o' && log.args[1] == '[object Object]') return;
-        msg += log.args.join(', ');
-      }
-
-      if(log.method == 'error' || log.method == 'exception') msg = msg.red;
-      else if(log.method == 'warn') msg = msg.yellow;
-      else if(log.method == 'info') msg = msg.green;
-      else if(log.method == 'debug') msg = msg.blue;
-
-      console.log(msg);
-    }catch(e){}
-  });
-};
-
-
-function getPlatformUrl(req) {
-  if(req.url == '/cordova.js' || req.url == '/cordova_plugins.js' || req.url.indexOf('/plugins/') === 0) {
-    return req.url;
-  }
-}
-
-
-function getPlatformWWW(req) {
-  var platformPath = 'www';
-
-  if(req && req.headers && req.headers['user-agent']) {
-    var ua = req.headers['user-agent'].toLowerCase();
-    if(ua.indexOf('iphone') > -1 || ua.indexOf('ipad') > -1 || ua.indexOf('ipod') > -1) {
-      platformPath = path.join('platforms', 'ios', 'www');
-
-    } else if(ua.indexOf('android') > -1) {
-      platformPath = path.join('platforms', 'android', 'assets', 'www');
-    }
-  }
-
-  return platformPath;
-}
-
-
-function injectConsoleLogScript(html) {
-  try{
-    var findTags = html.match(/<html(?=[\s>])(.*?)>|<head>|<meta charset(.*?)>/gi);
-    var insertAfter = findTags[ findTags.length - 1 ];
-
-    return html.replace(insertAfter, insertAfter + '\n\
-    <script>\n\
-      // Injected Ionic CLI Console Logger\n\
-      (function() {\n\
-        var methods = "assert clear count debug dir dirxml error exception group groupCollapsed groupEnd info log markTimeline profile profileEnd table time timeEnd timeStamp trace warn".split(" ");\n\
-        var console = (window.console=window.console || {});\n\
-        var logCount = 0;\n\
-        window.onerror = function(msg, url, line) {\n\
-          if(msg && url) console.error(msg, url, (line ? "Line: " + line : ""));\n\
-        };\n\
-        function sendConsoleLog(method, args) {\n\
-          try {\n\
-            var xhr = new XMLHttpRequest();\n\
-            xhr.open("POST", "/__ionic-cli/console", true);\n\
-            xhr.send(JSON.stringify({ index: logCount, method: method, ts: Date.now(), args: args }));\n\
-            logCount++;\n\
-          } catch(e){}\n\
-        }\n\
-        for(var x=0; x<methods.length; x++) {\n\
-          (function(m){\n\
-            var orgConsole = console[m];\n\
-            console[m] = function() {\n\
-              try {\n\
-                sendConsoleLog(m, Array.prototype.slice.call(arguments));\n\
-                if(orgConsole) orgConsole.apply(console, arguments);\n\
-              } catch(e){}\n\
-            };\n\
-          })(methods[x]);\n\
-        }\n\
-      }());\n\
-    </script>');
-  }catch(e){}
-
-  return html;
-}
-
-
-function injectGoToScript(html) {
-  try{
-    var findTags = html.match(/<html(?=[\s>])(.*?)>|<head>|<meta charset(.*?)>/gi);
-    var insertAfter = findTags[ findTags.length - 1 ];
-
-    return html.replace(insertAfter, insertAfter + '\n\
-    <script>\n\
-      // Injected Ionic Go To URL Live Reload Plugin\n\
-      window.LiveReloadPlugin_IonicGoToUrl = (function() {\n\
-        var GOTO_KEY = "__ionic_goto_url__";\n\
-        var HISTORY_GO_KEY = "__ionic_history_go__";\n\
-        var GoToUrlPlugin = function(window, host) {\n\
-          this.window = window;\n\
-          this.host = host;\n\
-        }\n\
-        GoToUrlPlugin.identifier = "__ionic_goto_url__";\n\
-        GoToUrlPlugin.version = "1.0";\n\
-        GoToUrlPlugin.prototype.reload = function(path) {\n\
-          try {\n\
-            if(path) {\n\
-              if(path.indexOf(GOTO_KEY) === 0) {\n\
-                this.window.document.location = path.replace(GOTO_KEY, "");\n\
-                return true;\n\
-              }\n\
-              if(path.indexOf(HISTORY_GO_KEY) === 0) {\n\
-                this.window.document.history.go( parseInt(path.replace(HISTORY_GO_KEY, ""), 10));\n\
-                return true;\n\
-              }\n\
-            }\n\
-          } catch(e) {\n\
-            console.log(e);\n\
-          }\n\
-          return false;\n\
-        };\n\
-        return GoToUrlPlugin;\n\
-      })();\n\
-    </script>');
-  }catch(e){}
-
-  return html;
-}
-
-/**
- * Inject the platform override for choosing Android or iOS during
- * development.
- */
-function injectPlatformScript(html, platformOverride) {
-  try {
-    var findTags = html.toLowerCase().indexOf('</body>');
-    if(findTags < 0) { return html; }
-
-    return html.slice(0, findTags) + '\n' +
-    '<script>\n' +
-      'ionic && ionic.Platform && ionic.Platform.setPlatform("' + platformOverride + '");\n' +
-    '</script>\n' +
-    html.slice(findTags);
-  } catch(e) {}
-
-  return html;
-}
-
-IonicTask.prototype._changed = function(filePath) {
-  // Cleanup the path a bit
-  var pwd = process.cwd();
-  filePath = filePath.replace(pwd + '/', '');
-
-  if( filePath.indexOf('.css') > 0 ) {
-    console.log( ('CSS changed:  ' + filePath).green );
-  } else if( filePath.indexOf('.js') > 0 ) {
-    console.log( ('JS changed:   ' + filePath).green );
-  } else if( filePath.indexOf('.html') > 0 ) {
-    console.log( ('HTML changed: ' + filePath).green );
-  } else {
-    console.log( ('File changed: ' + filePath).green );
-  }
-
-  this._postToLiveReload( [filePath] );
-};
-
-
-IonicTask.prototype._goToUrl = function(url) {
-  console.log( ('Loading: ' + url).green );
-  this._postToLiveReload( ['__ionic_goto_url__' + url] );
-};
-
-
-IonicTask.prototype._goToHistory = function(goHistory) {
-  goHistory = goHistory.replace('go(', '').replace(')', '');
-  console.log( ('History Go: ' + goHistory).green );
-  this._postToLiveReload( ['__ionic_history_go__' + goHistory] );
-};
-
-
-IonicTask.prototype._postToLiveReload = function(files) {
-  var postUrl = [this.liveReloadServer, '/changed'].join('')
-  request.post(postUrl, {
-    path: '/changed',
-    method: 'POST',
-    body: JSON.stringify({
-      files: files
-    })
-  }, function(err, res, body) {
-    if(err) {
-      console.log('Unable to update live reload:', err);
-    }
-  });
-
-}
-
 
 IonicTask.prototype.getAddress = function(cb) {
   var q = Q.defer();
@@ -808,8 +325,4 @@ IonicTask.prototype.getAddress = function(cb) {
   return q.promise;
 };
 
-IonicTask.prototype.host = function(port) {
-  return 'http://' + this.address + ':' + port;
-};
-
 exports.IonicTask = IonicTask;

From 8f68cf7f468d414a58e7645e03f65d5b0eb404ca Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 7 Apr 2015 08:35:43 -0600
Subject: [PATCH 0554/1100] Changing name to ionic-app-lib

---
 lib/ionic.js       | 2 +-
 lib/ionic/serve.js | 2 +-
 lib/ionic/start.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ce9262c0d7..113c9dbe47 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -22,7 +22,7 @@ var argv = require('optimist').argv,
     Multibar = require('./ionic/multibar'),
     ionitron = require('./ionic/ionitron');
 
-var ionicCliLib = require('ionic-cli-lib');
+var ionicCliLib = require('ionic-app-lib');
 
 ionicCliLib.events.on('log', console.log)
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index c8b099943b..8987bf715e 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -16,7 +16,7 @@ var fs = require('fs'),
     url = require('url'),
     xml2js = require('xml2js'),
     IonicStats = require('./stats').IonicStats,
-    ionicCliLib = require('ionic-cli-lib'),
+    ionicCliLib = require('ionic-app-lib'),
     Serve = ionicCliLib.serve,
     shelljs = require('shelljs'),
     ports = require('./ports');
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index f6c7112cff..4e2790e19c 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -16,7 +16,7 @@ var fs = require('fs'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats,
-    cliLib = require('ionic-cli-lib');
+    cliLib = require('ionic-app-lib');
 
 var Start = cliLib.start;
 

From c2a9333bb314d91dbe7f550cf0301536696981e0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 7 Apr 2015 15:27:37 -0600
Subject: [PATCH 0555/1100] Adding listening in on server and console logs from
 CLI

---
 lib/ionic/serve.js | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 8987bf715e..47a5583827 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -19,6 +19,7 @@ var fs = require('fs'),
     ionicCliLib = require('ionic-app-lib'),
     Serve = ionicCliLib.serve,
     shelljs = require('shelljs'),
+    events = ionicCliLib.events,
     ports = require('./ports');
 
 var DEFAULT_HTTP_PORT = 8100;
@@ -37,15 +38,18 @@ IonicTask.prototype.run = function(ionic) {
 
   var options = Serve.loadSettings(argv);
   options.address = '0.0.0.0';
+  options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
   //TODO: Look up address stuffs
 
   return Serve.start(options)
   .then(function() {
     return Serve.showFinishedServeMessage(options);
   })
-  // .then(function() {
-  //   return Serve.showFinishedServeMessage();
-  // })
+  .then(function() {
+    // return Serve.listenToServeLogs(options);
+    events.on('serverlog', console.log);
+    events.on('consolelog', console.log);
+  })
   .catch(function(error) {
     console.log('There was an error serving your Ionic application:', error);
     throw error;
@@ -161,27 +165,6 @@ IonicTask.prototype.loadSettings = function(cb) {
 
 };
 
-
-IonicTask.prototype.printCommandTips = function(ionic) {
-  console.log('Ionic server commands, enter:'.green.bold);
-  console.log('  restart' + ' or '.green + 'r' + ' to restart the client app from the root'.green);
-  console.log('  goto' + ' or '.green + 'g' + ' and a url to have the app navigate to the given url'.green);
-  console.log('  consolelogs' + ' or '.green + 'c' + ' to enable/disable console log output'.green);
-  console.log('  serverlogs' + ' or '.green + 's' + ' to enable/disable server log output'.green);
-  console.log('  quit' + ' or '.green + 'q' + ' to shutdown the server and exit'.green);
-  console.log('');
-};
-
-IonicTask.prototype.gulpInstalledGlobally = function gulpInstalledGlobally() {
-  var result = shelljs.exec('gulp -v', { silent: true });
-
-  if(result.code != 0) {
-    return false;
-  }
-  return true;
-}
-
-
 IonicTask.prototype.getAddress = function(cb) {
   var q = Q.defer();
   try {

From 71436e4f1b93c5479701c0124ec4f89b0e8d32bb Mon Sep 17 00:00:00 2001
From: Matt Ezell <ezell.matt@gmail.com>
Date: Tue, 7 Apr 2015 17:48:57 -0500
Subject: [PATCH 0556/1100] Remove cordova-plugin-crosswalk-webview from
 plugins on removal of Crosswalk via 'browser revert android'

Removing 'cordova-plugin-crosswalk-webview' from plugins when running 'ionic browser revert android' as plugin is crosswalk resource and so should no longer remain after reverting to Android browser - presence of this plugin caused failure of subsequent attempts to run 'ionic platform add android' after removal of Android platform from project.
---
 lib/ionic/browser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index db6477c70f..9a8c2c733a 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -370,6 +370,7 @@ IonicTask.prototype.downloadFiles = function downloadFiles(version) {
 IonicTask.prototype.removeCrosswalk = function removeCrosswalk() {
   shelljs.exec('ionic plugin rm org.apache.cordova.engine.crosswalk')
   shelljs.exec('ionic plugin rm org.crosswalk.engine')
+  shelljs.exec('ionic plugin rm cordova-plugin-crosswalk-webview')
   shelljs.exec('ionic platform rm android')
   shelljs.exec('ionic platform add android')
 }

From da243767ae885701fdab855cccad313f64027169 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 8 Apr 2015 13:53:46 -0600
Subject: [PATCH 0557/1100] Refactoring the info command out to ionic app lib

---
 lib/ionic.js      |  15 +--
 lib/ionic/docs.js |   5 +-
 lib/ionic/info.js | 269 +++-------------------------------------------
 3 files changed, 23 insertions(+), 266 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 113c9dbe47..924eddde89 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -17,19 +17,21 @@ var argv = require('optimist').argv,
     colors = require('colors'),
     Q = require('q'),
     settings = require('../package.json'),
-    IonicInfo = require('./ionic/info').IonicTask;
+    ionicAppLib = require('ionic-app-lib'),
+    Info = ionicAppLib.info,
     shelljs = require('shelljs/global'),
     Multibar = require('./ionic/multibar'),
     ionitron = require('./ionic/ionitron');
 
 var ionicCliLib = require('ionic-app-lib');
 
-ionicCliLib.events.on('log', console.log)
+ionicCliLib.events.on('log', console.log);
+//Subscribe to verbose
+ionicCliLib.events.on('verbose', console.log);
 
 var reportExtras = function reportExtras() {
-  var ionicInfo = new IonicInfo();
   var commandLineInfo = process.argv;
-  var info = ionicInfo.gatherInfo();
+  var info = Info.gatherInfo();
   info.command = commandLineInfo;
   return info;
 }
@@ -654,9 +656,8 @@ Ionic = {
       process.stderr.write(msg.error.bold);
       process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
       
-      var infoChecker = new IonicInfo();
-      var info = infoChecker.gatherInfo();
-      infoChecker.printInfo(info);
+      var info = Info.gatherInfo();
+      Info.printInfo(info);
     }
     if(taskHelp) {
       for(var i = 0; i < TASKS.length; i++) {
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index df5d075d08..1d81846805 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -53,10 +53,9 @@ Docs.list = function list() {
 };
 
 Docs.openDefault = function openDefault() {
-  var infoTask = require('./info').IonicTask;
-  var info = new infoTask();
+  var Info = require('ionic-app-lib').info;
 
-  var envInfo = info.gatherInfo();
+  var envInfo = Info.gatherInfo();
   var ionicVersion = envInfo.ionic;
 
   var url = 'http://ionicframework.com/docs/';
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index bb526b419f..8d63911b18 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -1,275 +1,32 @@
 var fs = require('fs'),
     path = require('path'),
-    shelljs = require('shelljs'),
-    os = require('os'),
     argv = require('optimist').argv,
-    IonicProject = require('./project'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
-    semver = require('semver');
-
-var requirements = {
-  node: '>=0.10.33',
-  cordova: '>=4.2.0'
-}
+    ionicAppLib = require('ionic-app-lib'),
+    Info = ionicAppLib.info,
+    IonicStats = require('./stats').IonicStats;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-// http://en.wikipedia.org/wiki/Darwin_%28operating_system%29#Release_history
-IonicTask.prototype.getMacInfo = function() {
-  //Need to get:
-  //Look up for what version (Yosemite, Mavericks, Mountain Lion)
-  //What version of Xcode
-  var macVersion = 'Yosemite';
-  switch(os.release()) {
-    case '14.0.0':
-      macVersion = 'Yosemite';
-      break;
-    case '13.0.0':
-    case '13.1.0':
-    case '13.2.0':
-    case '13.3.0':
-    case '13.4.0':
-      macVersion = 'Mavericks';
-      break;
-    case '12.0.0':
-    case '12.5.0':
-      macVersion = 'Mountain Lion';
-      break;
-    case '11.4.2':
-      macVersion = 'Lion';
-      break;
-    case '10.8':
-      macVersion = 'Snow Leopard';
-      break;
-  }
-
-  return 'Mac OS X ' + macVersion;
-  // console.log('Mac OS X', macVersion);
-}
-
-IonicTask.prototype.getCordovaInfo = function(info) {
-  var command = 'cordova -v';
-  var result = shelljs.exec(command, { silent: true });
-  if(result.code != 0) {
-    info.cordova = 'Not installed';
-    return;
-  }
-
-  info.cordova = result.output.replace('\n', '');
-}
-
-IonicTask.prototype.getXcodeInfo = function() {
-  var result = shelljs.exec('/usr/bin/xcodebuild -version', { silent: true });
-  if(result.code != 0) {
-    return 'Not installed';
-  }
-  var version = result.output.replace(/\n/g, ' ')
-  return version;
-}
-
-IonicTask.prototype.getIosSimInfo = function() {
-  var result = shelljs.exec('ios-sim --version', { silent: true });
-  if(result.code != 0) {
-    return 'Not installed';
-  }
-  var version = result.output.replace(/\n/g, ' ')
-  return version;
-}
-
-IonicTask.prototype.getIosDeployInfo = function() {
-  var result = shelljs.exec('ios-deploy --version', { silent: true });
-  if(result.code != 0) {
-    return 'Not installed';
-  }
-  var version = result.output.replace(/\n/g, ' ')
-  return version;
-}
-
-IonicTask.prototype.getIonicVersions = function(info) {
-  var ionicCliVersion = require('../../package.json').version;
-
-  info.ionic_cli = ionicCliVersion;
+IonicTask.prototype.run = function(ionic) {
+  this.ionic = ionic;
 
   try {
-    var ionicVersionFile = require(path.resolve('www/lib/ionic/version.json'));
-    var ionicVersion = ionicVersionFile.version;
-
-    info.ionic = ionicVersion;
-  } catch (ex) {}
-
-}
-
-// Windows XP  5.1.2600
-// Windows Server 2003 5.2.3790
-// Windows Vista
-// Windows Server 2008 6.0.6000
-// Windows Vista, SP2  6.0.6002
-// Windows 7
-// Windows Server 2008 R2  6.1.7600
-// Windows 7 SP1
-// Windows Server 2008 R2 SP1  6.1.7601
-// Windows 8
-// Windows Server 2012 6.2.9200
-// Windows 8.1
-// Windows Server 2012 R2  6.3.9600
-// Windows 10 Technical Preview  6.4.9841
-
-IonicTask.prototype.getWindowsEnvironmentInfo = function() {
-  // Windows version reference
-  // http://en.wikipedia.org/wiki/Ver_%28command%29
-  var version = os.release();
-  var windowsVersion = null;
-  switch(version) {
-    case '5.1.2600':
-      windowsVersion = 'Windows XP';
-      break;
-    case '6.0.6000':
-      windowsVersion = 'Windows Vista';
-      break;
-    case '6.0.6002':
-      windowsVersion = 'Windows Vista SP2';
-      break;
-    case '6.1.7600':
-      windowsVersion = 'Windows 7';
-      break;
-    case '6.1.7601':
-      windowsVersion = 'Windows 7 SP1';
-      break;
-    case '6.2.9200':
-      windowsVersion = 'Windows 8';
-      break;
-    case '6.3.9600':
-      windowsVersion = 'Windows 8.1';
-      break;
-  }
-
-  return windowsVersion;
-}
-
-IonicTask.prototype.getLinuxEnvironmentInfo = function() {
-  var result = shelljs.exec('lsb_release -id', { silent: true });
-  return result.output.replace(/\n/g, ' ')
-}
 
-//http://stackoverflow.com/questions/6551006/get-my-os-from-the-node-js-shell
-IonicTask.prototype.getOsEnvironment = function(info) {
-  var self = this;
+    var info = Info.gatherInfo();
+    
+    Info.getIonicVersion(info, process.cwd());
+    Info.getIonicCliVersion(info, path.join(__dirname, '../../'));
 
-  switch(os.type()) {
-    case 'Darwin':
-      info.os = self.getMacInfo();
-      info.xcode = self.getXcodeInfo();
-      info.ios_sim = self.getIosSimInfo();
-      info.ios_deploy = self.getIosDeployInfo();
-      break;
-    case 'Windows_NT':
-      info.os = self.getWindowsEnvironmentInfo();
-      break;
-    case 'Linux':
-      info.os = self.getLinuxEnvironmentInfo();
-      break;
-  }
-}
-
-IonicTask.prototype.getNodeVersion = function(info) {
-  var command = 'node -v';
-  var result = shelljs.exec(command, { silent: true } );
-  info.node = result.output.replace('\n','');
-}
-
-IonicTask.prototype.gatherInfo = function() {
-  var self = this;
-  var info = {};
-  //For macs we want:
-  //Mac version, xcode version (if installed)
-
-  //For windows
-  //Windows version
-
-  //For all
-  // Android SDK info
-  // Cordova CLI info
-  // Ionic CLI version
-  // Ionic version
-
-  // var info = {
-  //   cordova: 'CLI v3.5.0',
-  //   os: 'Mac OSX Yosemite',
-  //   xcode: 'Xcode 6.1.1',
-  //   ionic: '1.0.0-beta.13',
-  //   ionic_cli: '1.3.0'
-  // };
-
-  self.getIonicVersions(info);
-
-  self.getNodeVersion(info);
-
-  self.getOsEnvironment(info);
-
-  self.getCordovaInfo(info);
-
-  // self.printJavaInformation();
-  return info;
-}
-
-IonicTask.prototype.printInfo = function(info) {
-  console.log('\nYour system information:\n');
-  console.log('OS:', info.os);
-  console.log('Node Version:', info.node);
-  console.log('Cordova CLI:', info.cordova);
-  if (info.ionic) {
-    console.log('Ionic Version:', info.ionic);
-  }
-  console.log('Ionic CLI Version:', info.ionic_cli);
-  if(info.xcode) {
-    console.log('Xcode version:', info.xcode);
-  }
-
-  if(info.ios_sim) {
-    console.log('ios-sim version:', info.ios_sim);
-  }
-  if(info.ios_deploy) {
-    console.log('ios-deploy version:', info.ios_deploy);
-  }
-  
-  console.log('\n');
-}
-
-IonicTask.prototype.checkRuntime = function checkRuntime() {
-  var info = this.gatherInfo();
-  var validRuntime = true;
-
-  try {
+    Info.printInfo(info);
 
-    if(!semver.satisfies(info.node, requirements.node)) {
-      var updateMessage = ['Please update your Node runtime to version >=', requirements.node].join(' ');
-      console.log(updateMessage.red.bold);
-      validRuntime = false;
-    }
-
-    if(!semver.satisfies(info.cordova, requirements.cordova)) {
-      var updateMessage = ['Please update your Cordova CLI to version >=', requirements.cordova, '`npm install -g cordova`'].join(' ')
-      console.log(updateMessage.red.bold);
-      validRuntime = false;
-    }
-  } catch(ex) {
-    console.log('There was an error checking your runtime environment: ', ex)
+    Info.checkRuntime();
+  } catch (ex) {
+    this.ionic.fail('There was an error retrieving your environment information:', ex);
   }
 
-  return validRuntime;
-}
-
-IonicTask.prototype.run = function(ionic) {
-
-  var info = this.gatherInfo();
-  this.ionic = ionic;
-  this.printInfo(info);
-
-  this.checkRuntime();
-
   IonicStats.t();
 }
 

From 18066d9a910823c4836a4ffdfafdfdc1ac4baeac Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 14 Apr 2015 09:33:48 -0600
Subject: [PATCH 0558/1100] Updating changes for lib extraction on browser -
 not complete. Needs to get checked for app directory changing from shelljs.

---
 lib/ionic/browser.js | 596 ++-----------------------------------------
 1 file changed, 16 insertions(+), 580 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index db6477c70f..974bf8b4dd 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -15,587 +15,20 @@
 //Run android update project on android file
 //Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    Q = require('q'),
-    shelljs = require('shelljs'),
+var argv = require('optimist').argv,
     Task = require('./task').Task,
-    proxyMiddleware = require('proxy-middleware'),
-    unzip = require('unzip'),
-    Ionic = require('../ionic').Ionic,
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
-    IonicInfo = require('./info').IonicTask;
-
-shelljs.config.silent = true;
-
-var crosswalkEngineVersion = 'c0.7.1',
-    cordovaAndroidVersion = 'c0.6.1',
-    platforms = ['android', 'ios'];
-
-var crosswalkVersions = [
-  {
-    version: '8.37.189.14',
-    publish_date: '2014-10-10 03:26'
-  },
-  {
-    version: '9.38.208.10',
-    publish_date: '2014-11-25 11:45'
-  },
-  {
-    version: '10.39.235.15',
-    publish_date: '2014-12-31 13:16'
-  },
-  {
-    version: '11.40.277.7',
-    publish_date: '2015-02-26 07:03'
-  },
-  {
-    version: '12.41.296.5',
-    publish_date: '2015-03-05 13:19'
-  },
-  {
-    version: '13.41.318.0',
-    publish_date: '2015-03-11 09:22',
-    canary: true
-  }
-];
-
-var defaultCrosswalkVersion = crosswalkVersions[4].version;
-
-var iosBrowsers = [
-    {
-      platform: 'iOS',
-      name: 'WKWebView',
-      available: false,
-      command: 'ionic browser add wkwebview'
-    },
-    {
-      platform: 'iOS',
-      name: 'UIWebView',
-      available: false,
-      command: 'ionic browser revert ios'
-    }
-  ],
-  androidBrowsers = [
-    {
-      platform: 'Android',
-      name: 'Crosswalk',
-      available: true,
-      command: 'ionic browser add crosswalk',
-      versions: crosswalkVersions
-    },
-    {
-      platform: 'Android',
-      name: 'Browser (default)',
-      available: true,
-      command: 'ionic browser revert android'
-    },
-    {
-      platform: 'Android',
-      name: 'GeckoView',
-      available: false,
-      command: 'ionic browser add geckoview'
-    }
-  ];
-
-var IonicTask = function() {};
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.getCordovaCrosswalkEngine = function getCordovaCrosswalkEngine() {
-  var q = Q.defer();
-
-  if(!fs.existsSync(path.join(process.cwd(), 'engine'))) {
-    shelljs.mkdir(path.join(process.cwd(), 'engine'));
-  }
-
-  var cordovaCrosswalkFolderName = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-
-  if(fs.existsSync(path.join(process.cwd(), 'engine', cordovaCrosswalkFolderName))) {
-    q.resolve();
-    return q.promise;
-  }
-
-  var downloadUrl = ['https://github.com/driftyco/cordova-crosswalk-engine/archive/', crosswalkEngineVersion, '.zip'].join('');
-
-  var tempZipFilePath = path.join(process.cwd(), 'engine', 'cordova-crosswalk-engine.zip');
-  var zipOutPath = path.join(process.cwd(), 'engine');
-
-  Ionic.fetchArchive(zipOutPath, downloadUrl)
-  .then(function(data) {
-    q.resolve();
-  }, function(error) {
-    console.log('Failed to download cordova-crosswalk-engine - ', error);
-    q.reject();
-  })
-
-  return q.promise;
-}
-
-// IonicTask.prototype.getAndroidRuntimes = function getAndroidRuntimes() {
-//   var command = 'echo "y" | android update sdk --no-ui --all --filter 10';
-//   console.log('\nFetching Android SDK API 19.1.0')
-//   // var result = shelljs.exec(command, { silent: true } );
-
-//   // if(result.code != 0) {
-//   //   var errorMessage = 'Had an error fetching the Android SDK required for Crosswalk.';
-//   //   this.ionic.fail(errorMessage);
-//   //   throw new Error(errorMessage);
-//   // }
-// }
-
-IonicTask.prototype.copyInCrosswalkLibrariesToCrosswalkEngine = function copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version) {
-  var copyMessage = ['\nCopying over Crosswalk Webview (', architecture, ') to the Crosswalk Engine\n'].join('');
-  console.log(copyMessage)
-  var xwalkFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
-  var fileName = fs.readdirSync(xwalkFilePath);
-  var cordovaCrosswalkFolder = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-  var copySource = path.join(xwalkFilePath, fileName[0], '*');
-
-  var copyDestination = path.join(process.cwd(), 'engine', cordovaCrosswalkFolder, 'libs', 'xwalk_core_library', '/');
-
-  // console.log('copying - ', copySource, copyDestination)
-
-  shelljs.cp('-R', copySource, copyDestination);
-  var copyCompleteMessage = ['Finished copying Crosswalk Webview (', architecture, ') to the Crosswalk Engine'].join('');
-  console.log(copyCompleteMessage)
-
-}
-
-IonicTask.prototype.downloadCrosswalkWebview = function downloadCrosswalkWebview(architecture, version, releaseStatus) {
-  var q = Q.defer();
-  var self = this;
-
-  var downloadUrl = 'https://download.01.org/crosswalk/releases/crosswalk/android/' + releaseStatus + '/' +
-    version + '/' + architecture + '/crosswalk-webview-' + version + '-' + architecture + '.zip';
-
-  var tempZipFilePath = path.join(process.cwd(), 'engine', 'xwalk-webviews', architecture);
-
-  if (!fs.existsSync(path.join(process.cwd(), 'engine', 'xwalk-webviews'))) {
-    shelljs.mkdir(path.join(process.cwd(), 'engine', 'xwalk-webviews'));
-  }
-
-  var xwalkPath = ['crosswalk-webview-', version, '-', architecture].join('');
-  var xwalkArchPath = path.join(tempZipFilePath, xwalkPath)
-
-  if(fs.existsSync(xwalkArchPath)) {
-    //We've already downloaded it. Copy it over!
-    self.copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version)
-    q.resolve()
-    return;
-  }
-
-  Ionic.fetchArchive(tempZipFilePath, downloadUrl)
-  .then(function(data) {
-    self.copyInCrosswalkLibrariesToCrosswalkEngine(architecture, version)
-    q.resolve(data);
-  }, function(error) {
-    console.log('Crosswalk webviews failed to download - ')
-    q.reject(error);
-  })
-
-  return q.promise;
-}
-
-IonicTask.prototype.getCrosswalkWebviews = function getCrosswalkWebviews(version) {
-  // var version = version ? version : '8.37.189.14';
-
-  var xwalkVersion = _.findWhere(crosswalkVersions, { version: version });
-
-  // console.log('xwalk', xwalkVersion)
-
-  if(!xwalkVersion) {
-    console.log('\nYou must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
-    // q.reject('You must specify a valid version from crosswalk. Run `ionic browser list` to see versions')
-    throw new Error('Invalid version of Crosswalk specified');
-  }
-
-  var releaseStatus = 'stable';
-
-  if(xwalkVersion.beta) {
-    releaseStatus = 'beta';
-  } else if(xwalkVersion.canary) {
-    releaseStatus = 'canary';
-  }
-
-  var armPromise = this.downloadCrosswalkWebview('arm', version, releaseStatus);
-  var x86Promise = this.downloadCrosswalkWebview('x86', version, releaseStatus);
-
-  return Q.all([armPromise, x86Promise]);
-}
-
-IonicTask.prototype.downloadCordova40x = function downloadCordova40x() {
-  var q = Q.defer();
-  var self = this;
-
-  var crosswalkEngineUnzipName = ['cordova-android-', cordovaAndroidVersion].join('');
-  var downloadUrl = ['https://github.com/driftyco/cordova-android/archive/', cordovaAndroidVersion, '.zip'].join('');
-
-  var tempZipFilePath = path.join(process.cwd(), 'engine');
-  var cordovaAndroid4Path = path.join(tempZipFilePath, crosswalkEngineUnzipName, 'bin');
-  var android4BinPath = path.join(cordovaAndroid4Path, 'templates', 'cordova');
-
-  if(fs.existsSync(path.join(tempZipFilePath, crosswalkEngineUnzipName))) {
-
-    self.setPermissionsForFolder(cordovaAndroid4Path);
-    self.setPermissionsForFolder(android4BinPath);
-
-    q.resolve();
-    return;
-  }
-
-  Ionic.fetchArchive(tempZipFilePath, downloadUrl)
-  .then(function(data) {
-    console.log('\nFinished downloading cordova-android v4.0.x');
-    //Need to make certain files executable
-    self.setPermissionsForFolder(cordovaAndroid4Path)
-    self.setPermissionsForFolder(android4BinPath)
-    console.log('\nAltered permissions for Android Paths')
-    q.resolve();
-  }, function(error) {
-    console.log('Failed to download cordova-android v4.0.x ', error);
-    q.reject();
-  })
-
-  return q.promise;
-}
-
-IonicTask.prototype.setPermissionsForFolder = function setPermissionsForFolder(folderName) {
-  var self = this;
-
-  fs.readdir(folderName, function(err, files){
-    if(err) return;
-    for(var x=0; x<files.length; x++) {
-      var file = path.join(folderName, files[x]);
-      try {
-        fs.chmodSync(file, '755');
-      }catch (ex) {
-        self.ionic.fail(['Error setting file permissions for file', file, ex].join(' '))
-      }
-    }
-  });
-}
-
-IonicTask.prototype.removeAndroidProject = function removeAndroidProject() {
-  var command = 'ionic platform remove android';
-  var result = shelljs.exec(command);
-  console.log('\nRemoved old Cordova Android platform')
-}
-
-IonicTask.prototype.addCordova40xProject = function addCordova40xProject() {
-  var command =  ['ionic platform add ./engine/cordova-android-', cordovaAndroidVersion, '/'].join('');
-  var result = shelljs.exec(command);
-
-  if(result.code != 0) {
-    var errorMessage = ['There was an error adding the Cordova Android library', result.output].join('\n');
-    this.ionic.fail(errorMessage);
-    throw new Error(errorMessage);
-  } else {
-    console.log('\nAdded Cordova Android 4.0')
-  }
-
-}
-
-IonicTask.prototype.addGradleProperties = function addGradleProperties() {
-  var gradlePropertiesPath = path.resolve(__dirname, 'assets', 'gradle.properties');
-  var copyPath = path.join('.', 'platforms', 'android', 'gradle.properties');
-  console.log('\nCopying default gradle.properties file')
-  shelljs.cp(gradlePropertiesPath, copyPath)
-}
-
-IonicTask.prototype.addCrosswalkPlugin = function addCrosswalkPlugin() {
-  var command = ['ionic plugin add ./engine/cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-  console.log('add crosswalk plugin', command)
-  var result = shelljs.exec(command);
-  console.log('\nAdded Crosswalk Webview Engine')
-}
-
-IonicTask.prototype.removeCrosswalkEngines = function removeCrosswalkEngines() {
-  shelljs.exec('ionic plugin rm org.apache.cordova.engine.crosswalk');
-  shelljs.exec('ionic plugin rm org.crosswalk.engine');
-  shelljs.exec('ionic plugin rm cordova-plugin-crosswalk-webview');
-}
-
-IonicTask.prototype.addSplashScreenPlugin = function addSplashScreenPlugin() {
-  shelljs.exec('ionic plugin add org.apache.cordova.splashscreen');
-}
-
-// IonicTask.prototype.updateAndroidProject = function updateAndroidProject() {
-//   var crosswalkEnginePath = ['cordova-crosswalk-engine-', crosswalkEngineVersion].join('');
-//   var xwalkLibraryPath = path.join(process.cwd(), 'engine', crosswalkEnginePath, 'libs', 'xwalk_core_library');
-//   var updateCommand = ['android update lib-project --path "', xwalkLibraryPath, '" --target "4"'].join('');
-
-//   shelljs.cd(path.join(process.cwd(), 'platforms', 'android'));
-
-//   shelljs.exec(updateCommand, {silent: true});
-
-//   shelljs.cd('../../');
-// }
-
-IonicTask.prototype.downloadFiles = function downloadFiles(version) {
-  var q = Q.defer();
-
-  var self = this;
-  this.getCordovaCrosswalkEngine()
-  .then(function(data) {
-    console.log('\nDownloaded cordova-crosswalk-engine');
-    return self.downloadCordova40x();
-  })
-  .then(function(data) {
-    console.log('\nDownloaded Cordova Android for Crosswalk');
-    return self.getCrosswalkWebviews(version);
-  })
-  // .then(function(data) {
-  //   console.log('\nDownloaded Crosswalk webviews');
-  //   return self.getAndroidRuntimes();
-  // })
-  .then(function(data) {
-    console.log('\nDownloaded Crosswalk webviews');
-    q.resolve();
-  }, function(error) {
-    q.reject();
-  })
-  .catch(function(error){
-    console.log('There was an error finishing the browser command - ', error);
-    q.reject(error);
-  })
-
-  return q.promise;
-}
-
-IonicTask.prototype.removeCrosswalk = function removeCrosswalk() {
-  shelljs.exec('ionic plugin rm org.apache.cordova.engine.crosswalk')
-  shelljs.exec('ionic plugin rm org.crosswalk.engine')
-  shelljs.exec('ionic platform rm android')
-  shelljs.exec('ionic platform add android')
-}
-
-IonicTask.prototype.installCrosswalk = function installCrosswalk(version) {
-  var self = this;
-
-  return self.downloadFiles(version)
-  .then(function(data) {
-    self.removeAndroidProject();
-    self.removeCrosswalkEngines();
-    self.addCordova40xProject();
-    self.addCrosswalkPlugin();
-    self.addGradleProperties();
-    self.addSplashScreenPlugin();
-    // self.updateAndroidProject();
-
-    console.log('\nIonic Browser Add completed for Crosswalk');
-  })
-  .catch(function(error){
-    console.error('\nAn error with adding Crosswalk browser occured', error)
-    self.ionic.fail(error)
-    // console.log(error)
-  })
-}
-
-IonicTask.prototype.clean = function clean() {
-  console.log('Cleaning up Ionic browser artifacts'.green)
-  shelljs.rm('-rf', './engine');
-  console.log('Cleaned'.yellow)
-}
-
-IonicTask.prototype.upgradeCrosswalk = function upgradeCrosswalk() {
-  console.log('Updating your Ionic project with the latest build of Crosswalk'.green)
-  this.clean();
-  this.installCrosswalk(defaultCrosswalkVersion);
-  
-}
-
-IonicTask.prototype.revertBrowser = function revertBrowser() {
-  var self = this;
-
-  var platform = argv._[2];
-
-  if (!platform) {
-    console.log('You did not specify a platform to revert the browser');
-    return
-  }
-
-  if(platforms.indexOf(platform) == -1) {
-    console.log('You did not specify a valid platform.');
-    return
-  }
-
-  console.log('Reverting', platform, 'browser');
-
-  var rmCommand = ['ionic platform rm', platform].join(' ');
-  var addCommand = ['ionic platform add', platform].join(' ');
-
-  shelljs.exec(rmCommand)
-
-  if(platform == 'android') {
-    self.removeCrosswalk();
-  }
-
-  shelljs.exec(addCommand)
-
-  console.log('Reverted', platform, 'browser');
-}
-
-IonicTask.prototype.saveBrowserInstallation = function saveBrowserInstallation(platform, browser, version) {
-  var project = IonicProject.load();
-  var browsers = project.get('browsers') || [];
-  var platformExists = false, platformIndex = 0;
-  var browserEntry = { platform: platform, browser: browser, version: version };
-
-  for( ; platformIndex < browsers.length; platformIndex++) {
-    var platformBrowser = browsers[platformIndex];
-    if(platformBrowser.platform == platform) {
-      platformExists = true;
-      break;
-    }
-  }
-
-  if(platformExists) {
-    browsers[platformIndex] = browserEntry;
-  } else {
-    browsers.push(browserEntry)
-  }
-
-  project.set('browsers', browsers);
-  project.save();
-}
-
-IonicTask.prototype.addBrowser = function addBrowser() {
-  var self = this;
-
-  //Check which browser they wish to install
-  var browserToInstall = 'crosswalk',
-      platform = 'android',
-      browserVersion = null
-      validBrowserSpecified = false;
-  if (argv._[2]) {
-    browserToInstall = argv._[2];
-  } else {
-    console.log('No browser specified. Nothing to do here.'.red.bold)
-    return;
-  }
-
-  if(browserToInstall.indexOf('@') !== -1) {
-    //Browser version specified. Find version number.
-    var browserVersionAttempt = argv._[2].split('@');
-    browserToInstall = browserVersionAttempt[0];
-    browserVersion = browserVersionAttempt[1];
-  } else {
-    browserVersion = defaultCrosswalkVersion;
-  }
-
-  switch(browserToInstall) {
-    case 'crosswalk':
-      console.log('Adding', browserToInstall, 'browser')
-      self.installCrosswalk(browserVersion);
-      validBrowserSpecified = true;
-      break;
-    case 'default':
-      console.log('Adding', browserToInstall, 'browser')
-      self.installDefaultBrowser();
-      validBrowserSpecified = true;
-      break;
-    default:
-      console.log('No accepted browser was specified.'.red.bold)
-      validBrowserSpecified = false;
-      break;
-  }
-
-  if(validBrowserSpecified) {
-    self.saveBrowserInstallation(platform, browserToInstall, browserVersion);
-  }
-}
-
-IonicTask.prototype.removeBrowser = function removeBrowser() {
-  var browser = 'crosswalk';
-
-  if (argv._[2]) {
-    browser = argv._[2];
-    console.log('Removing', browser, 'browser')
-  } else {
-    console.log('You did not specify a browser to remove.'.red)
-    return;
-  }
-
-  switch (browser) {
-    case 'crosswalk':
-      this.removeCrosswalk();
-      break;
-    case 'default':
-      this.removeDefault();
-      break;
-  }
-
-}
-
-var printBrowsers = function printBrowsers(browsers) {
-  for(var x = 0, y = browsers.length; x < y; x++) {
-    var browser = browsers[x];
-    var avail = browser.available ? 'Yes' : 'No';
-    var installCommand = browser.command ? browser.command : '';
-
-    if(browser.available) {
-      console.log('\nAvailable'.green.bold, '-', browser.name.green, '-', installCommand)
-      if(browser.versions) {
-        for(version in browser.versions) {
-          var ver = browser.versions[version];
-
-          var betaCanaryMessage = null;
-
-          if(ver.beta) {
-            betaCanaryMessage = '(beta)\t'
-          } else if (ver.canary) {
-            betaCanaryMessage = '(canary)'
-          } else {
-            betaCanaryMessage = '\t';
-          }
-
-          // console.log('betacanary', betaCanaryMessage)
-          // console.log('beta canary msg', betaCanaryMessage)
-          console.log(betaCanaryMessage, 'Version'.blue, ver.version.yellow, 'Published'.cyan, new Date(ver.publish_date))
-        }
-      }
-    } else {
-      console.log('Not Available Yet'.red.bold, '-', browser.name.green)
-    }
-  }
-}
-
-IonicTask.prototype.listBrowsers = function listBrowsers() {
-  console.log('iOS - Browsers Listing:\n')
-
-  printBrowsers(iosBrowsers);
-
-  console.log('\n\nAndroid - Browsers Listing:\n')
-
-  printBrowsers(androidBrowsers);
-}
-
-IonicTask.prototype.listInstalledBrowsers = function listInstalledBrowsers() {
-  var project = IonicProject.load();
-
-  var browsers = project.get('browsers');
-
-  console.log('\nInstalled browsers:\n'.green)
-
-  for(browserIndex in browsers) {
-    var browser = browsers[browserIndex]
-    console.log('For', browser.platform, '-', browser.browser, browser.version)
-  }
-
-  console.log('\n')
-}
+    IonicAppLib = require('ionic-app-lib'),
+    Info = IonicAppLib.info,
+    Browser = IonicAppLib.browser;
 
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
 
-  var infoChecker = new IonicInfo();
-  if(!infoChecker.checkRuntime()) {
+  if(!Info.checkRuntime()) {
     console.log('\nPlease update your runtime environment before running the browser command');
     return
   }
@@ -620,37 +53,40 @@ IonicTask.prototype.run = function run(ionic) {
     return this.ionic.fail('You did not supply a valid command', 'browser');
   }
 
+  var appDirectory = process.cwd();
+  var platform = argv._[2],
+      browserToInstall = argv._[2];
 
   switch(cmdArg) {
     case 'add':
-      this.addBrowser();
+      Browser.addBrowser(appDirectory, browserToInstall);
       break;
     case 'clean':
-      this.clean();
+      Browser.clean(appDirectory);
       break;
     case 'remove':
     case 'rm':
-      this.removeBrowser();
+      Browser.removeBrowser(appDirectory);
       break;
     case 'revert':
-      this.revertBrowser();
+      Browser.revertBrowser(appDirectory, platform);
       break;
     case 'list':
     case 'ls':
-      this.listBrowsers();
+      Browser.listBrowsers(appDirectory);
       break;
     case 'upgrade':
-      this.upgradeCrosswalk();
+      Browser.upgradeCrosswalk(appDirectory);
       break;
     case 'update':
     case 'up':
-      this.addBrowser();
+      Browser.addBrowser(appDirectory);
       break;
     case 'check':
       console.log('Checking for engine');
       break;
     case 'versions':
-      this.listInstalledBrowsers();
+      Browser.listInstalledBrowsers(appDirectory);
   }
 
   IonicStats.t();

From 3233dc98fca334409b02127f6d0d6507946c14ce Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 14 Apr 2015 09:34:09 -0600
Subject: [PATCH 0559/1100] Updating to run cordova commands as normal.

---
 lib/ionic/cordova.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 8fd4420f4a..385ee36bb9 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -9,6 +9,8 @@ var Task = require('./task').Task,
     shelljs = require('shelljs'),
     generate = require('./resources/generate'),
     settings = require('./resources/settings'),
+    ionicAppLib = require('ionic-app-lib'),
+    Cordova = ionicAppLib.cordova,
     Hooks = require('./hooks'),
     State = require('./state');
 
@@ -24,6 +26,10 @@ IonicTask.prototype.run = function(ionic) {
 
   this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
+  // Cordova.addPlatform(path.resolve('.'));
+  // return;
+
+
   this.addIcons = !(argv.noresources || argv.r);
 
   if(this.isLiveReload) {

From 745aa8c5223e086a67525eb128ced8094a226ad0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 14 Apr 2015 09:34:29 -0600
Subject: [PATCH 0560/1100] Updating appname and directory to be passed to
 Start.startApp

---
 lib/ionic/start.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 4e2790e19c..7d4f22e720 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -54,6 +54,8 @@ IonicTask.prototype.run = function(ionic) {
     return
   }
 
+  //      0     1
+  //ionic start facebooker
   // Grab the app's relative directory name
   this.appDirectory = argv._[1];
 
@@ -106,6 +108,8 @@ IonicTask.prototype.run = function(ionic) {
         rm('-rf', self.targetPath);
         // self.startApp();
         var options = {
+          appDirectory: self.appDirectory,
+          appName: self.appName,
           targetPath: self.targetPath,
           template: self.template,
           packageName: self.packageName,
@@ -131,6 +135,8 @@ IonicTask.prototype.run = function(ionic) {
     // console.log('Making options for start app from lib')
 
     var options = {
+      appDirectory: self.appDirectory,
+      appName: self.appName,
       targetPath: self.targetPath,
       template: self.template,
       packageName: self.packageName,

From a8ddcc3e5770c3c983c1ae832938e22879993268 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 14 Apr 2015 09:34:38 -0600
Subject: [PATCH 0561/1100] Bumping version to beta

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db79df75c4..1cbaaa62bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19",
+  "version": "1.4.0-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 97e872a9110370721806b99c3364a6e43a145c64 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 14 Apr 2015 11:52:07 -0600
Subject: [PATCH 0562/1100] Refactoring start - moving most the commands to the
 start command in ionic lib

---
 lib/ionic/start.js | 936 ++-------------------------------------------
 1 file changed, 26 insertions(+), 910 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 7d4f22e720..ab94c218c2 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,17 +1,10 @@
 var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
-    parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
     argv = require('optimist').boolean(['no-cordova', 'sass', 'list', 'w']).argv,
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
     open = require('open'),
-    xml2js = require('xml2js'),
-    IonicProject = require('./project'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task;
@@ -21,929 +14,52 @@ var fs = require('fs'),
 var Start = cliLib.start;
 
 var IonicTask = function() {};
-
-// The URL for the cordova wrapper project
-IonicTask.WRAPPER_REPO_NAME = 'ionic-app-base';
-
-IonicTask.DEFAULT_APP = {
-  "plugins": [
-    "org.apache.cordova.device",
-    "org.apache.cordova.console",
-    "com.ionic.keyboard"
-  ],
-  "sass": false
-};
-
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
-  this.ionic = ionic;
-  var self = this;
+IonicTask.prototype.run = function run(ionic) {
 
-  if(argv.list || argv.l) {
+  if (argv.list || argv.l) {
     new IonicTemplates().run(ionic);
     return;
   }
 
-  if(argv._.length < 2) {
+  if (argv._.length < 2) {
     return this.ionic.fail('Invalid command', 'start');
   }
 
-  if(argv._[1] == '.') {
+  if (argv._[1] == '.') {
     console.log('Please name your Ionic project something meaningful other than \'.\''.red);
     return
   }
 
-  //      0     1
-  //ionic start facebooker
-  // Grab the app's relative directory name
-  this.appDirectory = argv._[1];
-
-  // Grab the name of the app from -a or  --app. Defaults to appDirectory if none provided
-  this.appName = argv.appname || argv['app-name'] || argv.a;
-  if(!this.appName) {
-    var appNameSplit = this.appDirectory.split('/');
-    appNameSplit = appNameSplit[ appNameSplit.length -1 ].split('\\');
-    this.appName = appNameSplit[ appNameSplit.length -1 ];
-  }
-
-  // get a packge name, like com.ionic.myapp
-  this.packageName = argv.id || argv.i;
-  this.isCordovaProject = (argv.cordova !== false && !argv.w);
-
-  // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
-  this.template = (argv.template || argv.t || argv._[2] || 'tabs');
-
-  // figure out the full path
-  this.targetPath = path.resolve(this.appDirectory);
-
-  console.log('Creating Ionic app in folder', this.targetPath, 'based on', this.template.bold, 'project');
-
-  // Make sure to create this
-  if( fs.existsSync(this.targetPath) ) {
-    // prompt for log
-    console.log('\nThe directory'.error.bold, this.targetPath, 'already exists.'.error.bold);
-    console.log('Would you like to overwrite the directory with this new project?');
-
-    var promptProperties = {
-      areYouSure: {
-        name: 'areYouSure',
-        description: '(yes/no):'.yellow.bold,
-        required: true
-      }
-    };
-
-    prompt.override = argv;
-    prompt.message = '';
-    prompt.delimiter = '';
-    prompt.start();
-
-    prompt.get({properties: promptProperties}, function (err, promptResult) {
-      if(err) {
-        return console.log(err);
-      }
-
-      var areYouSure = promptResult.areYouSure.toLowerCase().trim();
-      if(areYouSure == 'yes' || areYouSure == 'y') {
-        rm('-rf', self.targetPath);
-        // self.startApp();
-        var options = {
-          appDirectory: self.appDirectory,
-          appName: self.appName,
-          targetPath: self.targetPath,
-          template: self.template,
-          packageName: self.packageName,
-          isCordovaProject: self.isCordovaProject,
-          setupSass: (argv.sass || this.appSetup.sass)
-        }
-          // result.targetPath = options.targetPath || null;
-          // result.template = options.template || 'blank';
-          // result.packageName = options.packageName || null;
-          // result.appName = options.appName || '';
-          // result.isCordovaProject = options.isCordovaProject || true;
-          // result.setupSass = options.setupSass || true;
-        Start.startApp(options)
-        .then(function(data) {
-          self.finalize();
-        })
-      }
-    });
-
-  } else {
-    // create the app directory
-    fs.mkdirSync(this.targetPath);
-    // console.log('Making options for start app from lib')
-
-    var options = {
-      appDirectory: self.appDirectory,
-      appName: self.appName,
-      targetPath: self.targetPath,
-      template: self.template,
-      packageName: self.packageName,
-      isCordovaProject: self.isCordovaProject,
-      setupSass: argv.sass
-    }
-    // console.log('Starting app from lib')
-
-    Start.startApp(options)
-    .then(function(data) {
-      self.finalize();
-    })
-    .catch(function(err) {
-      console.log('Error!', err.stack)
-    })
-  }
-
-};
-
-
-IonicTask.prototype.startApp = function() {
-  var self = this;
-
-  self.fetchWrapper()
-    .then(function(){
-      return self.fetchSeed();
-    })
-    .then(function(){
-      return self.loadAppSetup();
-    })
-    .then(function(){
-      return self.initCordova();
-    })
-    .then(function(){
-      return self.setupSass();
-    })
-    .then(function(){
-      return self.finalize();
-    })
-    .catch(function(err) {
-      console.error('Error: Unable to initalize app:', err);
-      return self.ionic.fail('');
-    });
-};
-
-
-IonicTask.prototype.fetchWrapper = function() {
-  var q = Q.defer();
-  var self = this;
-
-  var repoUrl = 'https://github.com/driftyco/' + IonicTask.WRAPPER_REPO_NAME + '/archive/master.zip';
-
-  Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
-    var repoFolderName = IonicTask.WRAPPER_REPO_NAME + '-master';
-    cp('-R', self.targetPath + '/' + repoFolderName + '/.', self.targetPath);
-    rm('-rf', self.targetPath + '/' + repoFolderName + '/');
-    cd(self.targetPath);
-
-    if(!self.isCordovaProject) {
-      // remove any cordova files/directories if they only want the www
-      var cordovaFiles = ['hooks/', 'platforms/', 'plugins/', 'config.xml'];
-      for(var x=0; x<cordovaFiles.length; x++) {
-        rm('-rf', self.targetPath + '/' + cordovaFiles[x]);
-      }
-    }
-
-    q.resolve(self.targetPath);
-  }, function(err) {
-    q.reject(err);
-  }).catch(function(err) {
-    return self.ionic.fail('Error: Unable to fetch wrapper repo: ' + err);
-  });
-
-  return q.promise;
-};
-
-
-IonicTask.prototype.fetchSeed = function() {
-
-  // Codepen: http://codepen.io/ionic/pen/GpCst
-  if( /\/\/codepen.io\//i.test(this.template) ) {
-    this.seedType = 'codepen';
-    return this.fetchCodepen();
-  }
-
-  if(/plnkr.co\//i.test(this.template)) {
-    this.seedType = 'plnkr';
-    return this.fetchPlnkr();
-  }
-
-  if( /creator:/i.test(this.template) ) {
-    this.seedType = 'creator';
-    return this.fetchCreatorApp();
-  }
-
-  // Github URL: http://github.com/myrepo/
-  if( /\/\/github.com\//i.test(this.template) ) {
-    this.seedType = 'github';
-    return this.fetchGithubStarter(this.template);
-  }
-
-  // Local Directory: /User/starterapp
-  if( (this.template.indexOf('/') > -1 || this.template.indexOf('\\') > -1) && (this.template.indexOf('http://') === -1 && this.template.indexOf('https://') === -1)) {
-    console.log('local', this.template);
-    this.seedType = 'local';
-    return this.fetchLocalStarter();
-  }
-
-  // Ionic Github Repo
-  this.seedType = 'ionic-starter';
-  return this.fetchIonicStarter();
-};
-
-
-IonicTask.prototype.loadAppSetup = function() {
-  var q = Q.defer();
-  this.appSetup = IonicTask.DEFAULT_APP;
-
-  var appJsonPath = path.join(this.targetPath, 'www', 'app.json');
-
-  if(fs.existsSync(appJsonPath)) {
-    try {
-      this.appSetup = JSON.parse( fs.readFileSync(appJsonPath) );
-      rm('-rf', appJsonPath);
-    } catch(e) {
-      console.log( 'app.json error:', e);
-    }
-  }
-  q.resolve();
-  return q;
-};
-
-
-IonicTask.prototype.fetchCreatorApp = function() {
-  var self = this;
-  var appId = this.template.split(':')[1];
-  var downloadUrl = Ionic.IONIC_DASH + path.join('/api/v1/creator', appId, 'download/html');
-  var wwwPath = path.join(this.targetPath, 'www');
-
-  console.log('\nDownloading Creator Prototype:'.bold, downloadUrl);
-
-  var q = Q.defer();
-
-  var proxy = process.env.PROXY || null;
-
-  request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-    if(!err && res && res.statusCode === 200) {
-      //html = self.convertTemplates(html);
-
-      fs.writeFileSync(path.join(wwwPath, 'index.html'), html, 'utf8');
-    } else {
-      console.log('Unable to fetch', err, res.statusCode);
-      q.reject(res);
-    }
-    q.resolve();
-  });
-  return Q.all([q]);
-};
-
-IonicTask.prototype.fetchCodepen = function() {
-  var self = this;
-  var codepenUrl = this.template.split('?')[0].split('#')[0];
-  var wwwPath = path.join(this.targetPath, 'www');
-
-  //Given any of these urls:
-  // http://codepen.io/ionic/pen/QwamEW
-  // http://codepen.io/ionic/live/QwamEW
-  // http://codepen.io/ionic/details/QwamEW/
-  // http://codepen.io/ionic/full/QwamEW/
-
-  // we want to parse out and get the /pen/ID link if its not already a /pen link
-  if (codepenUrl.indexOf('/pen') == -1) {
-    if(codepenUrl[codepenUrl.length - 1] == '/') {
-      codepenUrl = codepenUrl.substr(0, codepenUrl.length - 1);
-    }
-    var codePenSplit = codepenUrl.split('/')
-    var codePenId = codePenSplit[codePenSplit.length - 1];
-    var codePenOrg = codePenSplit[3];
-    codepenUrl = ['http://codepen.io/', codePenOrg, '/pen/', codePenId].join('')
-  }
-
-  console.log('\nDownloading Codepen:'.bold, codepenUrl);
-
-  var qHTML = Q.defer();
-  var qCSS = Q.defer();
-  var qJS = Q.defer();
-
-  var proxy = process.env.PROXY || process.env.http_proxy || null;
-
-  request({ url: codepenUrl + '.html', proxy: proxy }, function(err, res, html) {
-    if(!err && res && res.statusCode === 200) {
-      html = html || '';
-
-      if(html.indexOf('<!DOCTYPE html>') < 0) {
-        html = '<!DOCTYPE html>\n' + html;
-      }
-
-      var resources = '    <link href="css/style.css" rel="stylesheet">\n' +
-                      '    <script src="js/app.js"></script>\n';
-
-      if(self.isCordovaProject) {
-        resources += '    <script src="cordova.js"></script>\n';
-      }
-
-      resources += '  </head>';
-
-      html = html.replace(/<\/head>/i, '\n' + resources);
-
-      html = self.convertTemplates(html);
-
-      fs.writeFileSync(path.join(wwwPath, 'index.html'), html, 'utf8');
-    }
-    qHTML.resolve();
-  });
-
-  request({ url: codepenUrl + '.css', proxy: proxy }, function(err, res, css) {
-    if(!err && res && res.statusCode === 200) {
-      css = css || '';
-
-      var cssPath = path.join(wwwPath, 'css');
-      if(!fs.existsSync(cssPath)) {
-        fs.mkdirSync(cssPath);
-      }
-      css = css.replace("cursor: url('http://ionicframework.com/img/finger.png'), auto;", '');
-      fs.writeFileSync(path.join(cssPath, 'style.css'), css, 'utf8');
-    }
-    qCSS.resolve();
-  });
-
-  request({ url: codepenUrl + '.js', proxy: proxy }, function(err, res, js) {
-    if(!err && res && res.statusCode === 200) {
-      js = js || '';
-
-      var jsPath = path.join(wwwPath, 'js');
-      if(!fs.existsSync(jsPath)) {
-        fs.mkdirSync(jsPath);
-      }
-      fs.writeFileSync(path.join(jsPath, 'app.js'), js, 'utf8');
-    }
-    qJS.resolve();
-  });
-
-  return Q.all([qHTML.promise, qCSS.promise, qJS.promise]);
-};
-
-
-IonicTask.prototype.convertTemplates = function(html) {
-  var templates = [];
-  var self = this;
-
-  try {
-    var scripts = html.match(/<script [\s\S]*?<\/script>/gi);
-    scripts.forEach(function(scriptElement){
-      if(scriptElement.indexOf('text/ng-template') > -1) {
-
-        var lines = scriptElement.split('\n');
-        for(var x=0; x<lines.length; x++) {
-          try {
-            if(lines[x].substr(0, 6) === '      ') {
-              lines[x] = lines[x].substr(6);
-            }
-          } catch(lE){}
-        }
-        var data = lines.join('\n');
-
-        var id = data.match(/ id=["|'](.*?)["|']/i)[0];
-        id = id.replace(/'/g, '"').split('"')[1];
-
-        data = data.replace(/<script [\s\S]*?>/gi, '');
-        data = data.replace(/<\/script>/gi, '');
-        data = data.trim();
-
-        templates.push({
-          path: id,
-          scriptElement: scriptElement,
-          html: data
-        });
-
-      }
-    });
-  }catch(e){}
-
-  try {
-
-    templates.forEach(function(tmpl){
-
-      var tmpPath = path.join(self.targetPath, 'www', path.dirname(tmpl.path));
-      if(!fs.existsSync(tmpPath)) {
-        fs.mkdirSync(tmpPath);
-      }
-
-      tmpPath = path.join(self.targetPath, 'www', tmpl.path);
-      fs.writeFileSync(tmpPath, tmpl.html, 'utf8');
-
-      html = html.replace( tmpl.scriptElement, '' );
-      html = html.replace( /    \n    \n/g, '' );
-    });
-
-  }catch(e){}
-
-  return html;
-};
-
-
-IonicTask.prototype.fetchLocalStarter = function() {
-  var self = this;
-  var q = Q.defer();
-
-  try {
-    cd('..');
-
-    var localStarterPath = path.resolve(this.template);
-
-    if( !fs.existsSync(localStarterPath) ) {
-      self.ionic.fail('Unable to find local starter template: ' + localStarterPath);
-      q.reject();
-      return q.promise;
-    }
-
-    console.log('\nCopying files to www from:'.bold, localStarterPath);
-
-    // Move the content of this repo into the www folder
-    cp('-Rf', path.join(localStarterPath, '*'), path.join(self.targetPath, 'www'));
-
-    q.resolve();
-  } catch(e) {
-    q.reject(e);
-  }
-
-  cd(self.targetPath);
-
-  return q.promise;
-};
-
-
-IonicTask.prototype.fetchIonicStarter = function() {
-
-  // Get the starter project repo name:
-  var repoName = 'ionic-starter-' + this.template;
-
-  // Get the URL for the starter project repo:
-  var repoUrl = 'https://github.com/driftyco/' + repoName;
-
-  return this.fetchGithubStarter(repoUrl);
-};
-
-
-IonicTask.prototype.fetchGithubStarter = function(repoUrl) {
-  var self = this;
-  var q = Q.defer();
-
-  // https://github.com/driftyco/ionic-starter-tabs/
-  var urlParse = parseUrl(repoUrl);
-  var pathSplit = urlParse.pathname.replace(/\//g, ' ').trim().split(' ');
-  if(!urlParse.hostname || urlParse.hostname.toLowerCase() !== 'github.com' || pathSplit.length !== 2) {
-    console.log( ('Invalid Github URL: ' + repoUrl).error );
-    console.log( ('Example of a valid URL: https://github.com/driftyco/ionic-starter-tabs/').error );
-    self.ionic.fail('');
-    q.reject();
-    return q.promise;
-  }
-  var repoName = pathSplit[1];
-  var repoFolderName = repoName + '-master';
-
-  // ensure there's an ending /
-  if(repoUrl.substr(repoUrl.length -1) !== '/') {
-    repoUrl += '/';
-  }
-  repoUrl += 'archive/master.zip';
-
-  Ionic.fetchArchive(self.targetPath, repoUrl).then(function() {
-
-    try {
-      // Move the content of this repo into the www folder
-      cp('-Rf', self.targetPath + '/' + repoFolderName + '/.', 'www');
-
-      // Clean up start template folder
-      rm('-rf', self.targetPath + '/' + repoFolderName + '/');
-
-      q.resolve();
-
-    } catch(e) {
-      q.reject(e);
-    }
-
-  }).catch(function(err) {
-    console.error('More info available at: \nhttp://ionicframework.com/getting-started/\nhttps://github.com/driftyco/ionic-cli');
-    return self.ionic.fail('');
-  });
-
-  return q.promise;
-};
-
-
-IonicTask.prototype.initCordova = function() {
-  var self = this;
-  var q = Q.defer();
-
-  if(this.isCordovaProject) {
-    // update the config.xml file from cmd line args
-    this.updateConfigXml();
-
-    if(this.ionic.hasFailed) return;
-
-    var cmds = [];
-
-    // add plugins
-    for(var x=0; x<self.appSetup.plugins.length; x++) {
-      cmds.push('ionic plugin add ' + self.appSetup.plugins[x]);
-    }
-
-    // platform add android with --android flag
-    if(argv.android) {
-      cmds.push('ionic platform add android');
-    }
-
-    // platform add ios with --android flag
-    if(argv.ios) {
-      cmds.push('ionic platform add ios');
-    }
-
-    console.log('Initializing cordova project'.bold);
-    exec(cmds.join(' && '),
-         function(err, stdout, stderr) {
-            if(err) {
-              self.ionic.fail('Unable to add plugins. Perhaps your version of Cordova is too old. ' +
-                              'Try updating (npm install -g cordova), removing this project folder, and trying again.');
-              q.reject(stderr);
-            } else {
-              q.resolve(stdout);
-            }
-    });
+  var promptPromise,
+      options = Utils.preprocessCliOptions(argv);
 
+  if (fs.existsSync(options.targetPath)) {
+    promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
-    q.resolve();
-  }
-
-  return q.promise;
-};
-
-
-IonicTask.prototype.updateConfigXml = function() {
-  var self = this;
-  console.log('\nUpdate config.xml'.bold);
-
-  try {
-    var configXmlPath = self.targetPath + '/config.xml';
-    var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
-
-    var parseString = xml2js.parseString;
-    parseString(configString, function (err, jsonConfig) {
-      if(err) {
-        return self.ionic.fail('Error parsing config.xml: ' + err);
-      }
-
-      if(!self.packageName) {
-        var packageName = self.appDirectory + (self.appDirectory !== 'tmp' ? Math.round((Math.random() * 899999) + 100000) : '');
-        self.packageName = 'com.ionicframework.' + packageName.replace(/\./g, '');
-      }
-
-      jsonConfig.widget.$.id = self.packageName.replace(/ /g, '').replace(/-/g, '').replace(/_/g, '').toLowerCase().trim();
-      jsonConfig.widget.name = [ self.appName ];
-
-      var xmlBuilder = new xml2js.Builder();
-      configString = xmlBuilder.buildObject(jsonConfig);
-
-      fs.writeFile(configXmlPath, configString, function(err) {
-        if(err) {
-          return self.ionic.fail('Error saving config.xml file: ' + err);
-        }
-      });
-    });
-
-  } catch(e) {
-    return self.ionic.fail('Error updating config.xml file: ' + e);
-  }
-};
-
-
-IonicTask.prototype.setupSass = function() {
-  this.hasSass = false;
-
-  if(argv.sass || this.appSetup.sass) {
-    // auto setup sass if they set the option
-    console.log('setup sass'.green.bold);
-    var IonicSetupTask = require('./setup').IonicTask
-    var setupTask = new IonicSetupTask();
-    this.hasSass = true;
-    return setupTask.sassSetup(this.ionic);
-  }
-
-  // didn't ask to setup sass, so resolve it
-  var q = Q.defer();
-  q.resolve();
-  return q.promise;
-};
-
-
-IonicTask.prototype.updateLibFiles = function() {
-  var libPath = argv.lib || argv.l || 'lib/ionic';
-
-  // create a symlink if the path exists locally
-  var libSymlinkPath = path.resolve(libPath);
-  if( fs.existsSync(libSymlinkPath) ) {
-    // rename the existing lib/ionic directory before creating symlink
-    var wwwIonicCssPath = path.resolve('www/lib/ionic/css');
-    if( fs.existsSync(wwwIonicCssPath) ) {
-      mv( wwwIonicCssPath, path.resolve('www/lib/ionic/css_local') );
-    }
-
-    var wwwIonicJsPath = path.resolve('www/lib/ionic/js');
-    if( fs.existsSync(wwwIonicJsPath) ) {
-      mv( wwwIonicJsPath, path.resolve('www/lib/ionic/js_local') );
-    }
-
-    var wwwIonicFontsPath = path.resolve('www/lib/ionic/fonts');
-    if( fs.existsSync(wwwIonicFontsPath) ) {
-      mv( wwwIonicFontsPath, path.resolve('www/lib/ionic/fonts_local') );
-    }
-
-    var libCssSymlinkPath = path.join(libSymlinkPath, 'css');
-    console.log('Create www/lib/ionic/css symlink to ' + libCssSymlinkPath);
-    fs.symlinkSync(libCssSymlinkPath, wwwIonicCssPath);
-
-    var libJsSymlinkPath = path.join(libSymlinkPath, 'js');
-    console.log('Create www/lib/ionic/js symlink to ' + libJsSymlinkPath);
-    fs.symlinkSync(libJsSymlinkPath, wwwIonicJsPath);
-
-    var libFontsSymlinkPath = path.join(libSymlinkPath, 'fonts');
-    console.log('Create www/lib/ionic/fonts symlink to ' + libFontsSymlinkPath);
-    fs.symlinkSync(libFontsSymlinkPath, wwwIonicFontsPath);
-
-    libPath = 'lib/ionic';
-  }
-
-  if(libPath == 'lib/ionic' && (this.seedType == 'ionic-starter' || /ionic-starter/i.test(this.template))) {
-    // don't bother if its still is the default which comes with the starters
-    return;
-  }
-
-  // path did not exist locally, so manually switch out the path in the html
-  var libFiles = 'ionic.css ionic.min.css ionic.js ionic.min.js ionic.bundle.js ionic.bundle.min.js ionic-angular.js ionic-angular.min.js'.split(' ');
-
-  function isLibFile(tag) {
-    if(tag) {
-      tag = tag.toLowerCase();
-      for(var x=0; x<libFiles.length; x++) {
-        if( tag.indexOf(libFiles[x]) > -1 ) {
-          return true;
-        }
-      }
-    }
-  }
-
-  function changeLibPath(originalUrl) {
-    var splt = originalUrl.split('/');
-    var newUrl = [ libPath ];
-    var filename = splt[ splt.length - 1 ];
-
-    if(filename.indexOf('.css') > -1) {
-      newUrl.push('css');
-    } else if(filename.indexOf('.js') > -1) {
-      newUrl.push('js');
-    }
-
-    newUrl.push(filename);
-
-    return newUrl.join('/');
-  }
-
-  function replaceResource(html, originalTag) {
-    originalTag = originalTag.replace(/'/g, '"');
-    var splt = originalTag.split('"');
-    var newTagArray = [];
-
-    for(var x=0; x<splt.length; x++) {
-      if( isLibFile(splt[x]) ) {
-        newTagArray.push( changeLibPath(splt[x]) );
-      } else {
-        newTagArray.push( splt[x] );
-      }
-    }
-
-    var newTag = newTagArray.join('"');
-
-    return html.replace(originalTag, newTag);
-  }
-
-  function getLibTags(html) {
-    var resourceTags = [];
-    var libTags = [];
-
-    try{
-      resourceTags = resourceTags.concat( html.match(/<script (.*?)>/gi) );
-    }catch(e){}
-
-    try{
-      resourceTags = resourceTags.concat( html.match(/<link (.*?)>/gi) );
-    }catch(e){}
-
-    for(var x=0; x<resourceTags.length; x++) {
-      if( isLibFile(resourceTags[x]) ) {
-        libTags.push(resourceTags[x]);
-      }
-    }
-
-    return libTags;
-  }
-
-  try {
-    console.log('Replacing Ionic lib references with ' + libPath);
-    var indexPath = path.join(this.targetPath, 'www', 'index.html');
-    var html = fs.readFileSync(indexPath, 'utf8');
-
-    var libTags = getLibTags(html);
-
-    for(var x=0; x<libTags.length; x++) {
-      var originalTag = libTags[x];
-
-      html = replaceResource(html, originalTag);
-    }
-
-    fs.writeFileSync(indexPath, html, 'utf8');
-
-  } catch(e) {
-    this.ionic.fail('Error updating lib files: ' + e);
-  }
-};
-
-IonicTask.prototype.promptLogin = function() {
-  var ionicConfig = new IonicStore('ionic.config');
-
-  if(ionicConfig) {
-    // Check if we already asked
-    var didPrompt = ionicConfig.get('accountPrompt');
-    if(didPrompt == 'y') {
-      /*
-      console.log('\n' + 'New!'.green.bold + ' Create an ionic.io account and try the View App!\n' + Ionic.IONIC_DASH + '/signup');
-      */
-      return;
-    }
-    ionicConfig.set('accountPrompt', 'y');
-    ionicConfig.save();
-  }
-
-  console.log('\nCreate an ionic.io account to use the Ionic View app and other features?');
-
-
-  var promptProperties = {
-    shouldCreate: {
-      name: 'shouldCreate',
-      description: '(Y/n):'.yellow.bold,
-    }
-  };
-
-  prompt.override = argv;
-  prompt.message = '';
-  prompt.delimiter = '';
-  prompt.start();
-
-  prompt.get({properties: promptProperties}, function (err, promptResult) {
-    if(err) {
-      return console.log(err);
-    }
-
-    var areYouSure = promptResult.shouldCreate.toLowerCase().trim();
-    if(areYouSure.toLowerCase() != 'n') {
-      // If they want to, let's open a thing
-      open(Ionic.IONIC_DASH + '/signup');
-    }
-  });
-};
-
-IonicTask.prototype.finalize = function() {
-  var self = this;
-
-  this.updateLibFiles();
-
-  try {
-    var packageFilePath = path.resolve('package.json');
-    var packageData = require(packageFilePath);
-    packageData.name = encodeURIComponent( this.appName.toLowerCase().replace(/\s+/g, '-') );
-    packageData.description = this.appName + ': An Ionic project';
-    fs.writeFileSync(packageFilePath, JSON.stringify(packageData, null, 2), 'utf8');
-  } catch(e) {}
-
-  try {
-    // create the ionic.project file and
-    // set the app name
-    var project = IonicProject.create();
-    project.set('name', this.appName);
-    project.save(this.targetPath);
-  } catch(e) {}
-
-  try {
-    // update the app name in the bower.json file
-    var ionicBower = require('./bower').IonicBower;
-    ionicBower.setAppName(this.appName);
-  } catch(e) {}
-
-  try {
-    // remove the README file in the root because it
-    // doesn't make sense because its the README for the repo
-    // and not helper text while developing an app
-    fs.unlinkSync(this.targetPath + '/README.md');
-  } catch(e) {}
-
-  try {
-    // remove the README file in the www root because it
-    // doesn't make sense because its the README for the repo
-    // and not helper text while developing an app
-    fs.unlinkSync(this.targetPath + '/www/README.md');
-  } catch(e) {}
-
-  this.printQuickHelp();
-
-  this.ionic.printNewsUpdates(true).then(function() {
-    self.promptLogin();
-  });
-
-  IonicStats.t();
-
-};
-
-
-IonicTask.prototype.printQuickHelp = function() {
-  console.log('\nYour Ionic project is ready to go!'.green.bold, 'Some quick tips:');
-
-  console.log('\n * cd into your project:', ('$ cd ' + this.appDirectory).bold);
-
-  if(!this.hasSass) {
-    console.log('\n * Setup this project to use Sass:', 'ionic setup sass'.bold);
-  }
-
-  console.log('\n * Develop in the browser with live reload:', 'ionic serve'.bold);
-
-  if(this.isCordovaProject) {
-    console.log('\n * Add a platform (ios or Android):', 'ionic platform add ios [android]'.bold);
-    console.log('   Note: iOS development requires OS X currently'.small);
-    console.log('   See the Android Platform Guide for full Android installation instructions:'.small);
-    console.log('   https://cordova.apache.org/docs/en/edge/guide_platforms_android_index.md.html'.small);
-    console.log('\n * Build your app:', 'ionic build <PLATFORM>'.bold);
-    console.log('\n * Simulate your app:', 'ionic emulate <PLATFORM>'.bold);
-    console.log('\n * Run your app on a device:', 'ionic run <PLATFORM>'.bold);
-    console.log('\n * Package an app using Ionic package service:', 'ionic package <MODE> <PLATFORM>'.bold);
-  }
-  console.log('\nFor more help use', 'ionic --help'.bold, 'or visit the Ionic docs:', 'http://ionicframework.com/docs\n'.bold);
-};
-
-IonicTask.prototype.fetchPlnkr = function fetchPlnkr() {
-  var self = this;
-  var q = Q.defer();
-
-  var plnkrUrl = this.template.split('?')[0].split('#')[0];
-
-  var plnkrId = null;
-
-  //Given any of these urls - we need to extract the ID
-  //http://embed.plnkr.co/dFvL8n/preview
-  //http://run.plnkr.co/plunks/dFvL8n/#/tabs/friends
-  //http://api.plnkr.co/plunks/dFvL8n
-
-  // http://embed.plnkr.co/BZrnKPlCJt93orQp58H3/preview
-
-  //To download, we want http://api.plnkr.co/plunks/dFvL8n.zip
-
-  if (plnkrUrl[plnkrUrl.length - 1] == '/') {
-    plnkrUrl = plnkrUrl.substr(0, plnkrUrl.length -1);
+    promptPromise = Q(true);
   }
 
-  var plnkrSplit = plnkrUrl.split('/');
-
-  // api link - need zip on end.
-  if (plnkrUrl.indexOf('embed.plnkr.co') != -1) {
-    plnkrId = plnkrSplit[3];
-  } else if (plnkrUrl.indexOf('run.plnkr.co') != -1 || plnkrUrl.indexOf('api.plnkr.co') != -1) {
-    plnkrId = plnkrSplit[plnkrSplit.length - 1];
-
-    if(plnkrId.indexOf('.zip') != -1) {
-      plnkrId = plnkrId.replace('.zip', '')
+  promptPromise
+  .then(function(promptToContinue) {
+    if (!promptToContinue) {
+      return
     }
-  }
-
-  plnkrUrl = ['http://api.plnkr.co/plunks/', plnkrId, '.zip'].join('');
-
-  console.log('\nDownloading Plnkr url:', plnkrUrl)
-
-  var extractPath = path.join(self.targetPath, 'plnkr');
-
-  Ionic.fetchArchive(extractPath, plnkrUrl)
+    return Start.startApp(options);
+  })
   .then(function() {
-    // console.log('Done downloading')
-    try {
-      // Move the content of this repo into the www folder
-      var copyDir = [extractPath, '/*'].join('');
-      cp('-Rf', copyDir, 'www');
-      // Clean up start template folder
-      rm('-rf', extractPath + '/');
-      q.resolve();
-
-    } catch(e) {
-      q.reject(e);
-    }
+    return Start.printQuickHelp(options);
   })
-
-  return q.promise;
-}
-
+  .then(function() {
+    ionic.printNewsUpdates(true);
+    return Start.promptLogin(options);
+  })
+  .then(function(requestLogin) {
+  })
+  .catch(function(error) {
+    console.log('Run had an error:', error);
+  });
+};
 
 exports.IonicTask = IonicTask;

From 5af427f28c33fb8b526fd98f51e70b1c3ad3dc67 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 15 Apr 2015 00:03:31 -0600
Subject: [PATCH 0563/1100] Refactored out commands to the lib

---
 lib/ionic/browser.js | 120 +++++++++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 974bf8b4dd..d1fd542cde 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -24,72 +24,80 @@ var argv = require('optimist').argv,
     Info = IonicAppLib.info,
     Browser = IonicAppLib.browser;
 
+var IonicTask = function() {};
+IonicTask.prototype = new Task();
+
 IonicTask.prototype.run = function run(ionic) {
-  var self = this;
-  this.ionic = ionic;
+  try {
+    var self = this;
+    this.ionic = ionic;
 
-  if(!Info.checkRuntime()) {
-    console.log('\nPlease update your runtime environment before running the browser command');
-    return
-  }
+    if(!Info.checkRuntime()) {
+      console.log('\nPlease update your runtime environment before running the browser command');
+      return
+    }
 
-  if(argv._.length < 2) {
-    return this.ionic.fail('Invalid command usage', 'browser');
-  }
+    if(argv._.length < 2) {
+      return this.ionic.fail('Invalid command usage', 'browser');
+    }
 
-  var cmdArg, x, y, hasValidCmd = false;
+    var cmdArg, x, y, hasValidCmd = false;
 
-  cmdArg = argv._[1]
+    cmdArg = argv._[1]
 
-  var validCommands = 'add remove rm list ls revert versions clean upgrade'.split(' ');
-  for(y=0; y<validCommands.length; y++) {
-    if(cmdArg == validCommands[y]) {
-      hasValidCmd = true;
-      break;
+    var validCommands = 'add remove rm list ls revert versions clean upgrade'.split(' ');
+    for(y=0; y<validCommands.length; y++) {
+      if(cmdArg == validCommands[y]) {
+        hasValidCmd = true;
+        break;
+      }
     }
-  }
 
-  if(!hasValidCmd) {
-    return this.ionic.fail('You did not supply a valid command', 'browser');
-  }
+    if(!hasValidCmd) {
+      return this.ionic.fail('You did not supply a valid command', 'browser');
+    }
 
-  var appDirectory = process.cwd();
-  var platform = argv._[2],
-      browserToInstall = argv._[2];
-
-  switch(cmdArg) {
-    case 'add':
-      Browser.addBrowser(appDirectory, browserToInstall);
-      break;
-    case 'clean':
-      Browser.clean(appDirectory);
-      break;
-    case 'remove':
-    case 'rm':
-      Browser.removeBrowser(appDirectory);
-      break;
-    case 'revert':
-      Browser.revertBrowser(appDirectory, platform);
-      break;
-    case 'list':
-    case 'ls':
-      Browser.listBrowsers(appDirectory);
-      break;
-    case 'upgrade':
-      Browser.upgradeCrosswalk(appDirectory);
-      break;
-    case 'update':
-    case 'up':
-      Browser.addBrowser(appDirectory);
-      break;
-    case 'check':
-      console.log('Checking for engine');
-      break;
-    case 'versions':
-      Browser.listInstalledBrowsers(appDirectory);
-  }
+    var appDirectory = process.cwd();
+    var platform = argv._[2],
+        browserToInstall = argv._[2];
+
+    switch(cmdArg) {
+      case 'add':
+        Browser.addBrowser(appDirectory, browserToInstall);
+        break;
+      case 'clean':
+        Browser.clean(appDirectory);
+        break;
+      case 'remove':
+      case 'rm':
+        Browser.removeBrowser(appDirectory);
+        break;
+      case 'revert':
+        Browser.revertBrowser(appDirectory, platform);
+        break;
+      case 'list':
+      case 'ls':
+        Browser.listBrowsers(appDirectory);
+        break;
+      case 'upgrade':
+        Browser.upgradeCrosswalk(appDirectory);
+        break;
+      case 'update':
+      case 'up':
+        Browser.addBrowser(appDirectory);
+        break;
+      case 'check':
+        console.log('Checking for engine');
+        break;
+      case 'versions':
+        Browser.listInstalledBrowsers(appDirectory);
+    }
 
-  IonicStats.t();
+    IonicStats.t();
+  } catch (ex) {
+    console.log(ex.stack);
+    console.log('Exception:', ex);
+  }
 
 };
 

From 8979b34c953729b7f8c4afd56cf17fd7ede52dc3 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Thu, 16 Apr 2015 13:26:13 -0500
Subject: [PATCH 0564/1100] fix(upload): add cachebuster to asset urls before
 upload

---
 lib/ionic/upload.js | 57 +++++++++++++++++++++++++++++++++++++++++++--
 package.json        |  1 +
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 79b51b37b3..5312ca9e3f 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,5 +1,6 @@
 var fs = require('fs'),
     path = require('path'),
+    cheerio = require('cheerio'),
     parseUrl = require('url').parse,
     archiver = require('archiver'),
     argv = require('optimist').argv,
@@ -34,6 +35,21 @@ IonicTask.prototype.run = function(ionic, callback) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
+
+    var documentRoot = project.get('documentRoot') || 'www';
+
+    if (!fs.existsSync(path.resolve(documentRoot))) {
+      return ionic.fail(documentRoot + ' directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'upload');
+    }
+
+    var indexPath = path.join(documentRoot, 'index.html');
+
+    if (!fs.existsSync(path.resolve(indexPath))) {
+      return ionic.fail(indexPath + ' cannot be found. Make sure index.html is in your project root.', 'upload');
+    }
+
+    addCachebusters(indexPath);
+
     var TEMP_FILENAME = 'www.zip';
 
     IonicStats.t();
@@ -44,7 +60,7 @@ IonicTask.prototype.run = function(ionic, callback) {
     archive.pipe(zip);
 
     archive.bulk([
-      { expand: true, cwd: 'www/', src: ['**'] }
+      { expand: true, cwd: documentRoot, src: ['**'] }
     ]);
 
     archive.finalize(function(err, bytes) {
@@ -52,8 +68,9 @@ IonicTask.prototype.run = function(ionic, callback) {
         return ionic.fail("Error uploading: " + err);
       }
     });
-
     zip.on('close', function() {
+      removeCachebusters(indexPath);
+
       console.log('\nUploading app...'.bold.green);
 
       var csrftoken = '';
@@ -151,4 +168,40 @@ IonicTask.prototype.setNote = function(note) {
   this.note = note
 };
 
+// If your Webview's strange, and its cache is no good? Who you gonna call?
+//
+// Cachebusters!
+function addCachebusters(indexPath) {
+  var randomString = Math.floor(Math.random() * 100000);
+  var indexHtml = fs.readFileSync(indexPath, 'utf8');
+  var $ = cheerio.load(indexHtml);
+  $('script').each(function(i, el){
+    el.attribs.src += ";ionicCachebuster=" + randomString;
+  });
+  $('link').each(function(i, el){
+    el.attribs.href += ";ionicCachebuster=" + randomString;
+  });
+  try {
+    fs.writeFileSync(indexPath, $.html());
+  } catch(e) {
+    console.error("Unable to append cachebusters to index.html asset urls. Err: " + err);
+  }
+}
+
+function removeCachebusters(indexPath) {
+  var indexHtml = fs.readFileSync(indexPath, 'utf8');
+  var $ = cheerio.load(indexHtml);
+  $('script').each(function(i, el){
+    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf(";ionicCache"));
+  });
+  $('link').each(function(i, el){
+    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf(";ionicCache"));
+  });
+  try {
+    fs.writeFileSync(indexPath, $.html());
+  } catch(e) {
+    console.error("Unable to remove cachebusters from index.html asset urls. Err: " + err);
+  }
+}
+
 exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index db79df75c4..46b0d7edce 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
   "dependencies": {
     "archiver": "0.5.1",
     "async": "^0.9.0",
+    "cheerio": "^0.19.0",
     "cli-table": "^0.3.1",
     "colors": "0.6.2",
     "connect": "3.1.1",

From fb3acfcd5beae2f935d63f6abd97b0ea30d82760 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 16 Apr 2015 15:17:00 -0500
Subject: [PATCH 0565/1100] feat(start): Start with a specific io app id

---
 lib/ionic/start.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0462a41a08..a7a99aafee 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -65,6 +65,7 @@ IonicTask.prototype.run = function(ionic) {
 
   // get a packge name, like com.ionic.myapp
   this.packageName = argv.id || argv.i;
+  this.ionicAppId = argv['io-app-id'];
   this.isCordovaProject = (argv.cordova !== false && !argv.w);
 
   // start project template can come from cmd line args -t, --template, or the 3rd arg, and defaults to tabs
@@ -785,6 +786,9 @@ IonicTask.prototype.finalize = function() {
     // create the ionic.project file and
     // set the app name
     var project = IonicProject.create();
+    if(this.ionicAppId) {
+      project.set('app_id', this.ionicAppId);
+    }
     project.set('name', this.appName);
     project.save(this.targetPath);
   } catch(e) {}

From a5420db2771d5490aee40cc8140ae9d6f85a860e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 16 Apr 2015 15:17:15 -0500
Subject: [PATCH 0566/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db79df75c4..0fa6ecb362 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ad15cc6f96fb227bda66f6d6d3c80fc8627c7664 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 16 Apr 2015 15:18:42 -0500
Subject: [PATCH 0567/1100] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 0c47460c2f..fafa54fc5d 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ __Command-line flags/options:__
     [--no-cordova|-w]  ....  Do not create an app targeted for Cordova
     [--sass|-s] ...........  Setup the project to use Sass CSS precompiling
     [--list|-l]  ..........  List starter templates available
+    
+    [--io-app-id] .........  The Ionic.io app ID to use
 
 ## Adding a platform target
 

From 8e44165fe67fd60d8d95d644d58ffe96a1b92d77 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 10:57:20 -0600
Subject: [PATCH 0568/1100] Adding in the verbose option

---
 lib/ionic.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 924eddde89..0f389b6ea4 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -27,7 +27,6 @@ var ionicCliLib = require('ionic-app-lib');
 
 ionicCliLib.events.on('log', console.log);
 //Subscribe to verbose
-ionicCliLib.events.on('verbose', console.log);
 
 var reportExtras = function reportExtras() {
   var commandLineInfo = process.argv;
@@ -623,6 +622,10 @@ Ionic = {
       return ionitron.print();
     }
 
+    if (argv.verbose) {
+      ionicCliLib.events.on('verbose', console.log);
+    }
+
     if( (argv.version || argv.v) && !argv._.length) {
       return this.version();
     }

From ca1a7f286bb15e2c13f043f566c449c8ffd297af Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 11:36:22 -0600
Subject: [PATCH 0569/1100] Got the start command to check for previous
 overwrite, does not proceed if no is selected

---
 lib/ionic/start.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index ab94c218c2..0170596abf 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -33,7 +33,8 @@ IonicTask.prototype.run = function run(ionic) {
   }
 
   var promptPromise,
-      options = Utils.preprocessCliOptions(argv);
+      options = Utils.preprocessCliOptions(argv),
+      startingApp = true;
 
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
@@ -44,22 +45,23 @@ IonicTask.prototype.run = function run(ionic) {
   promptPromise
   .then(function(promptToContinue) {
     if (!promptToContinue) {
+      startingApp = false;
       return
     }
     return Start.startApp(options);
   })
   .then(function() {
-    return Start.printQuickHelp(options);
-  })
-  .then(function() {
-    ionic.printNewsUpdates(true);
-    return Start.promptLogin(options);
-  })
-  .then(function(requestLogin) {
+    if (startingApp) {
+      Start.printQuickHelp(options);
+      ionic.printNewsUpdates(true);
+      return Start.promptLogin(options);
+    }
   })
   .catch(function(error) {
     console.log('Run had an error:', error);
   });
+
+  IonicStats.t();
 };
 
 exports.IonicTask = IonicTask;

From f1ef41b8ae7f93f464ac23ed78b5eca0aa26aea1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 11:36:35 -0600
Subject: [PATCH 0570/1100] Removing cordova exec message

---
 lib/ionic/cordova.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 385ee36bb9..ec8e334b70 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -157,7 +157,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
   }
 
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
-  console.log('running cordova ' + cleanArgs.join(' '))
+  // console.log('running cordova ' + cleanArgs.join(' '))
 
   cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);

From 3a071fc51d62033da38722426073942d7d89260b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 16:03:40 -0600
Subject: [PATCH 0571/1100] Updating hooks commands, adding in permissions to
 call ionic app lib hooks

---
 lib/ionic.js       |   2 +-
 lib/ionic/hooks.js | 130 +++++++--------------------------------------
 2 files changed, 21 insertions(+), 111 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index 0f389b6ea4..e632ed27ad 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -396,7 +396,7 @@ var TASKS = [
     name: 'hooks',
     summary: 'Manage your Ionic Cordova hooks',
     args: {
-      '[add|remove]': 'Add or remove default Ionic Cordova hooks'
+      '[add|remove|permissions|perm]': 'Add, remove, or modify permissions on the default Ionic Cordova hooks'
     },
     module: './ionic/hooks'
   },
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 85aec8f985..4907a3e13c 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -7,10 +7,9 @@ var fs = require('fs'),
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
-    IonicInfo = require('./info').IonicTask;
-
-
-var Hooks = module.exports
+    IonicInfo = require('./info').IonicTask
+    IonicAppLib = require('ionic-app-lib'),
+    Hooks = IonicAppLib.hooks;
 
 shelljs.config.silent = true;
 
@@ -18,118 +17,29 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-Hooks.addCliHookDirectory = function addCliHookDirectory(cliHookPath, hookDirectoryName) {
-  fs.readdir(cliHookPath, function(err, files){
-    // loop through each of the scripts in the ionic-cli hook directory
-    if(err) return;
-    for(var x=0; x<files.length; x++) {
-      var hookFilename = files[x];
-      if(hookFilename.indexOf('.js') === -1) return;
-
-      // check if this hook script has already been added to this ionic project
-      var projectHookPath = path.join('hooks', hookDirectoryName, hookFilename);
-      Hooks.addHookScript(cliHookPath, hookDirectoryName, hookFilename);
-    }
-  });
-}
-
-Hooks.addHookScript = function addHookScript(cliHookPath, hookDirectoryName, hookFilename) {
-  // add the root hooks directory if the project doesn't have it
-  try {
-    var projectHookPath = path.join('hooks');
-    if( !fs.existsSync(projectHookPath) ) {
-      fs.mkdirSync(projectHookPath);
-    }
-
-    // add the hook directory (ie: after_prepare) if the project doesn't have it
-    projectHookPath = path.join(projectHookPath, hookDirectoryName);
-    if( !fs.existsSync(projectHookPath) ) {
-      fs.mkdirSync(projectHookPath);
-    }
-
-    var projectScript = path.join(projectHookPath, hookFilename);
-    if( !fs.existsSync(projectScript) ) {
-      // copy the hook script to the project
-      try {
-        var cliScript = path.join(cliHookPath, hookFilename);
-        fs.writeFileSync(projectScript, fs.readFileSync(cliScript));
-      } catch(e) {
-        console.log( ('addCliHookDirectory fs.createReadStream: ' + e).error );
-        return;
-      }
-    }
-
-    // make the script file executable
-    try {
-      fs.chmodSync(projectScript, '755');
-    } catch(e) {
-      console.log( ('addCliHookDirectory fs.chmodSync: ' + e).error );
-    }
-
-  } catch(e) {
-    console.log('Error adding hook script ' + hookDirectoryName + '/' + hookFilename + ', ' + e);
-  }
-}
-
-Hooks.add = function add() {
-  console.log('Adding in default Ionic Cordova hooks'.blue.bold);
-  // Add hooks which this Ionic project doesn't already have
-  // note: hook scripts must be executable!
-
-  if( !fs.existsSync(path.join('www')) ) {
-    // don't both doing any of this if they aren't
-    // in the correct working directory, which would have `www`
-    return;
-  }
-
-  // loop through all the hook directories added to the ionic-cli
-  var cliHooksPath = path.join(__filename, '../../hooks');
-  fs.readdir(cliHooksPath, function(err, files){
-    if(err) return;
-    for(var x=0; x<files.length; x++) {
-      if(files[x].indexOf('.') > -1) continue;
-      Hooks.addCliHookDirectory( path.join(cliHooksPath, files[x]), files[x] );
-    }
-  });
-
-  console.log('Added default Ionic Cordova hooks'.green.bold)
-
-};
-
-Hooks.remove = function remove() {
-  console.log('Removing the Ionic Cordova plugin hooks'.blue.bold)
-  var oldPluginHooks = [
-    'after_platform_add/010_install_plugins.js',
-    'after_plugin_add/010_register_plugin.js',
-    'after_plugin_rm/010_deregister_plugin.js'
-  ];
-
-  oldPluginHooks.forEach(function(hook) {
-    try {
-      var hookPath = path.join('.', 'hooks', hook);
-      fs.unlinkSync(hookPath);
-    } catch(ex) { }
-  })
-
-  console.log('Removed the Ionic Cordova hooks'.green.bold);
-
-}
-
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
   this.ionic = ionic;
 
   var cmd = argv._[1];
+  try {
 
-  switch(cmd) {
-    case 'add':
-      Hooks.add();
-      break;
-    case 'remove':
-      Hooks.remove(argv);
-      break;
-    default:
-      console.log('Please supply a command - either add or remove'.red.bold);
+    switch(cmd) {
+      case 'add':
+        Hooks.add(process.cwd());
+        break;
+      case 'remove':
+        Hooks.remove(process.cwd());
+        break;
+      case 'perm':
+      case 'permissions':
+        Hooks.setHooksPermission(process.cwd());
+        break;
+      default:
+        console.log('Please supply a command - either add or remove'.red.bold);
+    }
+  } catch (ex) {
+    console.log('error:', ex, ex.stack);
   }
 
   IonicStats.t();

From 7a909cdef5d407fc994213bf9f2a1f135b107624 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 16:04:05 -0600
Subject: [PATCH 0572/1100] Now have livereload running on device.

---
 lib/ionic/cordova.js | 110 +++++++++++++++++++++++++++++++++----------
 1 file changed, 86 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index ec8e334b70..3b098f6133 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -10,7 +10,9 @@ var Task = require('./task').Task,
     generate = require('./resources/generate'),
     settings = require('./resources/settings'),
     ionicAppLib = require('ionic-app-lib'),
+    ConfigXml = ionicAppLib.configXml,
     Cordova = ionicAppLib.cordova,
+    Serve = ionicAppLib.serve,
     Hooks = require('./hooks'),
     State = require('./state');
 
@@ -175,10 +177,9 @@ IonicTask.prototype.runCordova = function(cmdName) {
 
   if(self.isLiveReload) {
     cordovaProcess.on('exit', function(){
-      console.log('cordova process is exiting');
       setTimeout(function(){
         // set it back to the original src after a few seconds
-        self.ionic.setConfigXml({
+        ConfigXml.setConfigXml({
           resetContent: true,
           errorWhenNotFound: true
         });
@@ -222,43 +223,104 @@ IonicTask.prototype.setupLiveReload = function() {
 
   console.log('Setup Live Reload'.green.bold);
 
-  var self = this;
-  var serve = new require('./serve');
-  var serveTask = new serve.IonicTask();
-  serveTask.ionic = this.ionic;
-  serveTask.isPlatformServe = true;
+  var options = Serve.loadSettings(argv);
+  // options.address = '0.0.0.0';
+  options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
+  options.runLivereload = true;
+  options.launchBrowser = false;
+  options.launchLab = false;
+  options.isPlatformServe = true;
+
+
+  //TODO: Look up address stuffs
+
+
+  // First ask user for the IP selection
+  // Check ports not used
+  // Set up config.xml src url
+  // run the cordova command
+
+  var promise;
 
-  serveTask.loadSettings();
+  if (argv.allIps) {
+    promise = Q();
+    console.log('Defaulting address to 0.0.0.0');
+    options.address = '0.0.0.0';
+  } else {
+    promise = Serve.getAddress(options);
+  }
 
-  serveTask.getAddress()
+  return promise
   .then(function() {
-    return serveTask.checkPorts(true, serveTask.port, serveTask.address);
+    options.devServer = Serve.host(options.address, options.port);
+    return Serve.checkPorts(true, options.port, options.address, options);
   })
   .then(function() {
-    if(serveTask.runLivereload) {
-      return serveTask.checkPorts(false, serveTask.liveReloadPort, serveTask.address);
+    if(options.runLivereload) {
+      return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
     }
   })
   .then(function() {
-
-    serveTask.runLivereload = true;
-    serveTask.launchBrowser = false;
-    serveTask.launchLab = false;
-    serveTask.start(self.ionic);
-
-    if(self.ionic.hasFailed) return;
-
-    self.ionic.setConfigXml({
-      devServer: serveTask.devServer
+    ConfigXml.setConfigXml({
+      devServer: Serve.host(options.address, options.port)
     }).then(function(){
       d.resolve();
     });
+    return Serve.start(options);
   })
   .catch(function(error) {
-
+    console.log('There was an error serving your Ionic application for run', error);
+    console.log(error.stack);
+    throw error;
   })
 
-  return d.promise;
+  // .then(function() {
+    // return Serve.showFinishedServeMessage(options);
+  // })
+  // .then(function() {
+    // return Serve.listenToServeLogs(options);
+    // events.on('serverlog', console.log);
+    // events.on('consolelog', console.log);
+  // })
+
+
+  // var self = this;
+  // var serve = new require('./serve');
+  // var serveTask = new serve.IonicTask();
+  // serveTask.ionic = this.ionic;
+  // serveTask.isPlatformServe = true;
+
+  // serveTask.loadSettings();
+
+  // serveTask.getAddress()
+  // .then(function() {
+  //   return serveTask.checkPorts(true, serveTask.port, serveTask.address);
+  // })
+  // .then(function() {
+  //   if(serveTask.runLivereload) {
+  //     return serveTask.checkPorts(false, serveTask.liveReloadPort, serveTask.address);
+  //   }
+  // })
+  // .then(function() {
+
+  //   serveTask.runLivereload = true;
+  //   serveTask.launchBrowser = false;
+  //   serveTask.launchLab = false;
+  //   serveTask.start(self.ionic);
+
+  //   if(self.ionic.hasFailed) return;
+
+  //   self.ionic.setConfigXml({
+  //     devServer: serveTask.devServer
+  //   }).then(function(){
+  //     d.resolve();
+  //   });
+  // })
+  // .catch(function(error) {
+
+  // })
+
+  // return d.promise;
 };
 
 exports.IonicTask = IonicTask;

From 95eb92ea0d4fcd4a239d4c1c4960d4da873187c4 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 16:04:39 -0600
Subject: [PATCH 0573/1100] Adding in option to serve at all addresses,
 0.0.0.0, checking ports, and then starting the servers

---
 lib/ionic/serve.js | 53 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 47a5583827..64d01325cd 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -37,23 +37,48 @@ IonicTask.prototype.run = function(ionic) {
   this.liveReloadPort = argv._[2];
 
   var options = Serve.loadSettings(argv);
-  options.address = '0.0.0.0';
   options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
   //TODO: Look up address stuffs
 
-  return Serve.start(options)
-  .then(function() {
-    return Serve.showFinishedServeMessage(options);
-  })
-  .then(function() {
-    // return Serve.listenToServeLogs(options);
-    events.on('serverlog', console.log);
-    events.on('consolelog', console.log);
-  })
-  .catch(function(error) {
-    console.log('There was an error serving your Ionic application:', error);
-    throw error;
-  })
+  var promise;
+
+  try {
+    if (argv.allIps) {
+      options.address = '0.0.0.0';
+      promise = Q();
+    } else {
+      promise = Serve.getAddress(options);
+    }
+
+    return promise
+    .then(function() {
+      return Serve.checkPorts(true, options.port, options.address, options);
+    })
+    .then(function() {
+      if(options.runLivereload) {
+        return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
+      }
+    })
+    .then(function() {
+      return Serve.start(options);
+    })
+    .then(function() {
+      return Serve.showFinishedServeMessage(options);
+    })
+    .then(function() {
+      // return Serve.listenToServeLogs(options);
+      events.on('serverlog', console.log);
+      events.on('consolelog', console.log);
+    })
+    .catch(function(error) {
+      console.log('There was an error serving your Ionic application:', error);
+      throw error;
+    })
+  } catch (ex) {
+    Utils.fail('Error with serve- ' + ex);
+    console.log(ex.stack);
+  }
+
   // return;
   // this.loadSettings();
 

From b0586c2d7662dc673231e27126a66753e7875b12 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 16:05:03 -0600
Subject: [PATCH 0574/1100] Updating the templates command - no longer fires
 off an error from the invalid starter templates reference.

---
 lib/ionic/templates.js | 14 ++++++--------
 package.json           |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 369b63030c..5172aa387f 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -56,22 +56,20 @@ IonicTask.prototype.list = function list(templates) {
     var outStr = []
     console.log(shortName.green, dots, template.description);
   })
-}
+};
 
 IonicTask.prototype.run = function(ionic) {
   var self = this;
 
   self.fetchStarterTemplates()
   .then(function(starterTemplates) {
-    self.list(starterTemplates.items);
-  })
-
-  var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
-  console.log('Ionic Starter templates'.green);
-  this.list(templates);
+    var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
+    console.log('Ionic Starter templates'.green);
+    self.list(templates);
+  });
 
   IonicStats.t();
 
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index 1cbaaa62bf..02c2770542 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
+    "ionic-app-lib": "0.0.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From f266ff8fdf01fac3e4045ca2ab35ef7a4059693d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 17:17:23 -0600
Subject: [PATCH 0575/1100] Including hooks permissions for any platform add
 commands

---
 lib/ionic/cordova.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 3b098f6133..a6a65c8a24 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -51,6 +51,9 @@ IonicTask.prototype.run = function(ionic) {
   var isPluginCmd = argv._.indexOf('plugin') != -1;
   var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
+  if (isAddCmd) {
+    Hooks.setHooksPermission(process.cwd());
+  }
 
   if(isPlatformCmd && isAddCmd) {
     addDefaultResources = true;

From 05648e31fc49720191b0b50833bf2597731e571a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 18:09:43 -0600
Subject: [PATCH 0576/1100] Adding flag for all ips to be served

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 64d01325cd..8fa0c8aa28 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -43,7 +43,7 @@ IonicTask.prototype.run = function(ionic) {
   var promise;
 
   try {
-    if (argv.allIps) {
+    if (argv.all) {
       options.address = '0.0.0.0';
       promise = Q();
     } else {

From ce2d6762817dea2bf3867bbc729552e0cc1538b0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 18:09:56 -0600
Subject: [PATCH 0577/1100] Adding flag for serve to have all addresses

---
 lib/ionic/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 8fa0c8aa28..ec52f1e274 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -43,7 +43,7 @@ IonicTask.prototype.run = function(ionic) {
   var promise;
 
   try {
-    if (argv.all) {
+    if (argv.all || argv.a) {
       options.address = '0.0.0.0';
       promise = Q();
     } else {

From fa6b71666ec785c78efe2b050d822ee6ca145e8b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 17 Apr 2015 18:10:08 -0600
Subject: [PATCH 0578/1100] Updating readme for all ip flag

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0c47460c2f..0b19855b10 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ __Command-line flags/options for `run` and `emulate`:__
     [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
     [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
     [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
+    [--all|-a] ..............  Specify to run on all addresses, 0.0.0.0, so you can view externally
     [--browser|-w] ..........  Specifies the browser to use (safari, firefox, chrome)
     [--browseroption|-o] ....  Specifies a path to open to (/#/tab/dash)
     [--debug|--release]

From f2283a0672504b26667bc4d2016d869f96e4c28b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 12:40:16 -0600
Subject: [PATCH 0579/1100] defaulting permissions to every cordova command

---
 CHANGELOG.md         |    9 +
 lib/ionic/cordova.js |    4 +-
 npm-shrinkwrap.json  | 2190 +++++++++++++++++++++++++++++++++++++++++-
 package.json         |    4 +-
 4 files changed, 2199 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1814ef62f..a17802a2a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### 1.4.0
+
+* Extracting core logic for the CLI into ionic-app-lib
+* Certain commands have been moved to the ionic-app-lib - notably: start, serve, hooks, info, browser, and some of cordova.
+* Ionic serve now allows all IP addresses so you can access the server outside of your machine - use `ionic serve --all` or `ionic serve --address 0.0.0.0` to serve to all addresses.
+* Ionic hooks have had some issues with permissions - those are now added in when an app is started. Also there is the `ionic hooks permissions` command to grant those hooks execute permissions.
+* Updating Crosswalk to have version canary version 14.42.334.0.
+* Crosswalk now contains the cordova whitelist by default.
+
 ### 1.3.19
 
 * Added in the `ionic docs` command to assist you in getting Ionic docs opened faster from the CLI! View all with `ionic docs ls`, or type in your desired docs `ionic docs collectionRepeat`. Ionic docs will be opened for the version of Ionic that you are using in your project (ex RC0, RC1, etc).
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index a6a65c8a24..5119a16486 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -51,9 +51,7 @@ IonicTask.prototype.run = function(ionic) {
   var isPluginCmd = argv._.indexOf('plugin') != -1;
   var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
-  if (isAddCmd) {
-    Hooks.setHooksPermission(process.cwd());
-  }
+  Hooks.setHooksPermission(process.cwd());
 
   if(isPlatformCmd && isAddCmd) {
     addDefaultResources = true;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4253b9780e..edab2561b0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.19",
+  "version": "1.4.0-beta.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -235,12 +235,12 @@
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "cli-table@*",
+      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "colors@1.0.3",
+          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
@@ -906,6 +906,2190 @@
         }
       }
     },
+    "ionic-app-lib": {
+      "version": "0.0.3",
+      "from": "ionic-app-lib@*",
+      "dependencies": {
+        "cordova-lib": {
+          "version": "4.3.0",
+          "from": "cordova-lib@>=4.3.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-4.3.0.tgz",
+          "dependencies": {
+            "bplist-parser": {
+              "version": "0.0.6",
+              "from": "bplist-parser@0.0.6",
+              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
+            },
+            "cordova-js": {
+              "version": "3.8.0",
+              "from": "cordova-js@3.8.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-3.8.0.tgz",
+              "dependencies": {
+                "browserify": {
+                  "version": "7.1.0",
+                  "from": "browserify@7.1.0",
+                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz",
+                  "dependencies": {
+                    "JSONStream": {
+                      "version": "0.8.4",
+                      "from": "JSONStream@>=0.8.3 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+                      "dependencies": {
+                        "jsonparse": {
+                          "version": "0.0.5",
+                          "from": "jsonparse@0.0.5",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                        }
+                      }
+                    },
+                    "assert": {
+                      "version": "1.1.2",
+                      "from": "assert@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz"
+                    },
+                    "browser-pack": {
+                      "version": "3.2.0",
+                      "from": "browser-pack@>=3.2.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.3.0",
+                          "from": "combine-source-map@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "inline-source-map": {
+                              "version": "0.3.1",
+                              "from": "inline-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.3.0",
+                                  "from": "source-map@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "0.1.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "convert-source-map": {
+                              "version": "0.3.5",
+                              "from": "convert-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.1.43",
+                              "from": "source-map@>=0.1.31 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "0.1.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "through2": {
+                          "version": "0.5.1",
+                          "from": "through2@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
+                        }
+                      }
+                    },
+                    "browser-resolve": {
+                      "version": "1.8.2",
+                      "from": "browser-resolve@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz",
+                      "dependencies": {
+                        "resolve": {
+                          "version": "1.1.6",
+                          "from": "resolve@1.1.6",
+                          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                        }
+                      }
+                    },
+                    "browserify-zlib": {
+                      "version": "0.1.4",
+                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                      "dependencies": {
+                        "pako": {
+                          "version": "0.2.6",
+                          "from": "pako@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.6.tgz"
+                        }
+                      }
+                    },
+                    "buffer": {
+                      "version": "3.1.2",
+                      "from": "buffer@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.1.2.tgz",
+                      "dependencies": {
+                        "base64-js": {
+                          "version": "0.0.8",
+                          "from": "base64-js@0.0.8",
+                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                        },
+                        "ieee754": {
+                          "version": "1.1.4",
+                          "from": "ieee754@>=1.1.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz"
+                        },
+                        "is-array": {
+                          "version": "1.0.1",
+                          "from": "is-array@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@>=0.0.3 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    },
+                    "commondir": {
+                      "version": "0.0.1",
+                      "from": "commondir@0.0.1",
+                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+                    },
+                    "concat-stream": {
+                      "version": "1.4.8",
+                      "from": "concat-stream@>=1.4.1 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.8.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.9 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "console-browserify": {
+                      "version": "1.1.0",
+                      "from": "console-browserify@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                      "dependencies": {
+                        "date-now": {
+                          "version": "0.1.4",
+                          "from": "date-now@>=0.1.4 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                        }
+                      }
+                    },
+                    "constants-browserify": {
+                      "version": "0.0.1",
+                      "from": "constants-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                    },
+                    "crypto-browserify": {
+                      "version": "3.9.14",
+                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz",
+                      "dependencies": {
+                        "browserify-aes": {
+                          "version": "1.0.0",
+                          "from": "browserify-aes@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz"
+                        },
+                        "browserify-sign": {
+                          "version": "3.0.1",
+                          "from": "browserify-sign@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.1.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "1.3.0",
+                              "from": "bn.js@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "2.0.0",
+                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "1.0.1",
+                              "from": "elliptic@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.2",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "parse-asn1": {
+                              "version": "3.0.0",
+                              "from": "parse-asn1@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "1.0.4",
+                                  "from": "asn1.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "pbkdf2-compat": {
+                                  "version": "3.0.2",
+                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-ecdh": {
+                          "version": "2.0.0",
+                          "from": "create-ecdh@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "1.3.0",
+                              "from": "bn.js@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "1.0.1",
+                              "from": "elliptic@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.2",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-hash": {
+                          "version": "1.1.1",
+                          "from": "create-hash@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz",
+                          "dependencies": {
+                            "ripemd160": {
+                              "version": "1.0.0",
+                              "from": "ripemd160@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz"
+                            },
+                            "sha.js": {
+                              "version": "2.4.0",
+                              "from": "sha.js@>=2.3.6 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.0.tgz"
+                            }
+                          }
+                        },
+                        "create-hmac": {
+                          "version": "1.1.3",
+                          "from": "create-hmac@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"
+                        },
+                        "diffie-hellman": {
+                          "version": "3.0.1",
+                          "from": "diffie-hellman@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "1.3.0",
+                              "from": "bn.js@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                            },
+                            "miller-rabin": {
+                              "version": "1.1.5",
+                              "from": "miller-rabin@>=1.1.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "pbkdf2": {
+                          "version": "3.0.4",
+                          "from": "pbkdf2@>=3.0.3 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
+                        },
+                        "public-encrypt": {
+                          "version": "2.0.0",
+                          "from": "public-encrypt@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "1.3.0",
+                              "from": "bn.js@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "2.0.0",
+                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                            },
+                            "parse-asn1": {
+                              "version": "3.0.0",
+                              "from": "parse-asn1@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "1.0.4",
+                                  "from": "asn1.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "pbkdf2-compat": {
+                                  "version": "3.0.2",
+                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "randombytes": {
+                          "version": "2.0.1",
+                          "from": "randombytes@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
+                        }
+                      }
+                    },
+                    "deep-equal": {
+                      "version": "0.2.2",
+                      "from": "deep-equal@>=0.2.1 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                    },
+                    "defined": {
+                      "version": "0.0.0",
+                      "from": "defined@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                    },
+                    "deps-sort": {
+                      "version": "1.3.5",
+                      "from": "deps-sort@>=1.3.5 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "0.2.0",
+                          "from": "minimist@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+                        },
+                        "through2": {
+                          "version": "0.5.1",
+                          "from": "through2@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
+                        }
+                      }
+                    },
+                    "domain-browser": {
+                      "version": "1.1.4",
+                      "from": "domain-browser@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                    },
+                    "duplexer2": {
+                      "version": "0.0.2",
+                      "from": "duplexer2@>=0.0.2 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.9 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "events": {
+                      "version": "1.0.2",
+                      "from": "events@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
+                    },
+                    "http-browserify": {
+                      "version": "1.7.0",
+                      "from": "http-browserify@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                      "dependencies": {
+                        "Base64": {
+                          "version": "0.2.1",
+                          "from": "Base64@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                        }
+                      }
+                    },
+                    "https-browserify": {
+                      "version": "0.0.0",
+                      "from": "https-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "insert-module-globals": {
+                      "version": "6.2.1",
+                      "from": "insert-module-globals@>=6.1.0 <7.0.0",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.1.tgz",
+                      "dependencies": {
+                        "JSONStream": {
+                          "version": "0.7.4",
+                          "from": "JSONStream@>=0.7.1 <0.8.0",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                          "dependencies": {
+                            "jsonparse": {
+                              "version": "0.0.5",
+                              "from": "jsonparse@0.0.5",
+                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                            }
+                          }
+                        },
+                        "combine-source-map": {
+                          "version": "0.3.0",
+                          "from": "combine-source-map@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "inline-source-map": {
+                              "version": "0.3.1",
+                              "from": "inline-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.3.0",
+                                  "from": "source-map@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "0.1.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "convert-source-map": {
+                              "version": "0.3.5",
+                              "from": "convert-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.1.43",
+                              "from": "source-map@>=0.1.31 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "0.1.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lexical-scope": {
+                          "version": "1.1.0",
+                          "from": "lexical-scope@>=1.1.0 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz",
+                          "dependencies": {
+                            "astw": {
+                              "version": "1.1.0",
+                              "from": "astw@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/astw/-/astw-1.1.0.tgz",
+                              "dependencies": {
+                                "esprima-fb": {
+                                  "version": "3001.1.0-dev-harmony-fb",
+                                  "from": "esprima-fb@3001.1.0-dev-harmony-fb",
+                                  "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "process": {
+                          "version": "0.6.0",
+                          "from": "process@>=0.6.0 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz"
+                        }
+                      }
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "labeled-stream-splicer": {
+                      "version": "1.0.2",
+                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+                      "dependencies": {
+                        "stream-splicer": {
+                          "version": "1.3.1",
+                          "from": "stream-splicer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.1.13",
+                              "from": "readable-stream@>=1.1.13-1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "readable-wrap": {
+                              "version": "1.0.0",
+                              "from": "readable-wrap@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                            },
+                            "indexof": {
+                              "version": "0.0.1",
+                              "from": "indexof@0.0.1",
+                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "module-deps": {
+                      "version": "3.7.6",
+                      "from": "module-deps@>=3.6.3 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.6.tgz",
+                      "dependencies": {
+                        "JSONStream": {
+                          "version": "0.7.4",
+                          "from": "JSONStream@>=0.7.1 <0.8.0",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+                          "dependencies": {
+                            "jsonparse": {
+                              "version": "0.0.5",
+                              "from": "jsonparse@0.0.5",
+                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                            }
+                          }
+                        },
+                        "detective": {
+                          "version": "4.0.0",
+                          "from": "detective@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.0.tgz",
+                          "dependencies": {
+                            "acorn": {
+                              "version": "0.9.0",
+                              "from": "acorn@>=0.9.0 <0.10.0",
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"
+                            },
+                            "escodegen": {
+                              "version": "1.6.1",
+                              "from": "escodegen@>=1.4.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz",
+                              "dependencies": {
+                                "estraverse": {
+                                  "version": "1.9.3",
+                                  "from": "estraverse@>=1.9.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
+                                },
+                                "esutils": {
+                                  "version": "1.1.6",
+                                  "from": "esutils@>=1.1.6 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+                                },
+                                "esprima": {
+                                  "version": "1.2.5",
+                                  "from": "esprima@>=1.2.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
+                                },
+                                "optionator": {
+                                  "version": "0.5.0",
+                                  "from": "optionator@>=0.5.0 <0.6.0",
+                                  "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+                                  "dependencies": {
+                                    "prelude-ls": {
+                                      "version": "1.1.1",
+                                      "from": "prelude-ls@>=1.1.1 <1.2.0",
+                                      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"
+                                    },
+                                    "deep-is": {
+                                      "version": "0.1.3",
+                                      "from": "deep-is@>=0.1.2 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
+                                    },
+                                    "wordwrap": {
+                                      "version": "0.0.2",
+                                      "from": "wordwrap@>=0.0.2 <0.1.0",
+                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                                    },
+                                    "type-check": {
+                                      "version": "0.3.1",
+                                      "from": "type-check@>=0.3.1 <0.4.0",
+                                      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"
+                                    },
+                                    "levn": {
+                                      "version": "0.2.5",
+                                      "from": "levn@>=0.2.5 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
+                                    },
+                                    "fast-levenshtein": {
+                                      "version": "1.0.6",
+                                      "from": "fast-levenshtein@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"
+                                    }
+                                  }
+                                },
+                                "source-map": {
+                                  "version": "0.1.43",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "0.1.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "minimist": {
+                          "version": "0.2.0",
+                          "from": "minimist@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+                        },
+                        "parents": {
+                          "version": "1.0.1",
+                          "from": "parents@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                          "dependencies": {
+                            "path-platform": {
+                              "version": "0.11.15",
+                              "from": "path-platform@>=0.11.15 <0.12.0",
+                              "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+                            }
+                          }
+                        },
+                        "resolve": {
+                          "version": "1.1.6",
+                          "from": "resolve@>=1.1.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                        },
+                        "stream-combiner2": {
+                          "version": "1.0.2",
+                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                          "dependencies": {
+                            "through2": {
+                              "version": "0.5.1",
+                              "from": "through2@>=0.5.1 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                              "dependencies": {
+                                "xtend": {
+                                  "version": "3.0.0",
+                                  "from": "xtend@>=3.0.0 <3.1.0",
+                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "subarg": {
+                          "version": "0.0.1",
+                          "from": "subarg@0.0.1",
+                          "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.10",
+                              "from": "minimist@>=0.0.7 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                            }
+                          }
+                        },
+                        "through2": {
+                          "version": "0.4.2",
+                          "from": "through2@>=0.4.1 <0.5.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+                          "dependencies": {
+                            "xtend": {
+                              "version": "2.1.2",
+                              "from": "xtend@>=2.1.1 <2.2.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+                              "dependencies": {
+                                "object-keys": {
+                                  "version": "0.4.0",
+                                  "from": "object-keys@>=0.4.0 <0.5.0",
+                                  "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.0",
+                          "from": "xtend@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                        }
+                      }
+                    },
+                    "os-browserify": {
+                      "version": "0.1.2",
+                      "from": "os-browserify@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                    },
+                    "parents": {
+                      "version": "0.0.3",
+                      "from": "parents@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.3.tgz",
+                      "dependencies": {
+                        "path-platform": {
+                          "version": "0.0.1",
+                          "from": "path-platform@>=0.0.1 <0.0.2",
+                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-browserify": {
+                      "version": "0.0.0",
+                      "from": "path-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                    },
+                    "process": {
+                      "version": "0.8.0",
+                      "from": "process@>=0.8.0 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.8.0.tgz"
+                    },
+                    "punycode": {
+                      "version": "1.2.4",
+                      "from": "punycode@>=1.2.3 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
+                    },
+                    "querystring-es3": {
+                      "version": "0.2.1",
+                      "from": "querystring-es3@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                    },
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.33-1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "resolve": {
+                      "version": "0.7.4",
+                      "from": "resolve@>=0.7.1 <0.8.0",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+                    },
+                    "shallow-copy": {
+                      "version": "0.0.1",
+                      "from": "shallow-copy@0.0.1",
+                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+                    },
+                    "shasum": {
+                      "version": "1.0.1",
+                      "from": "shasum@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz",
+                      "dependencies": {
+                        "json-stable-stringify": {
+                          "version": "0.0.1",
+                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "from": "jsonify@>=0.0.0 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+                            }
+                          }
+                        },
+                        "sha.js": {
+                          "version": "2.3.6",
+                          "from": "sha.js@>=2.3.0 <2.4.0",
+                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz"
+                        }
+                      }
+                    },
+                    "shell-quote": {
+                      "version": "0.0.1",
+                      "from": "shell-quote@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
+                    },
+                    "stream-browserify": {
+                      "version": "1.0.0",
+                      "from": "stream-browserify@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "subarg": {
+                      "version": "1.0.0",
+                      "from": "subarg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "1.1.1",
+                          "from": "minimist@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                        }
+                      }
+                    },
+                    "syntax-error": {
+                      "version": "1.1.2",
+                      "from": "syntax-error@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz",
+                      "dependencies": {
+                        "acorn": {
+                          "version": "0.9.0",
+                          "from": "acorn@>=0.9.0 <0.10.0",
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz"
+                        }
+                      }
+                    },
+                    "through2": {
+                      "version": "1.1.1",
+                      "from": "through2@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13-1 <1.2.0-0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.0",
+                          "from": "xtend@>=4.0.0 <4.1.0-0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                        }
+                      }
+                    },
+                    "timers-browserify": {
+                      "version": "1.4.0",
+                      "from": "timers-browserify@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz",
+                      "dependencies": {
+                        "process": {
+                          "version": "0.10.1",
+                          "from": "process@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz"
+                        }
+                      }
+                    },
+                    "tty-browserify": {
+                      "version": "0.0.0",
+                      "from": "tty-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                    },
+                    "umd": {
+                      "version": "2.1.0",
+                      "from": "umd@>=2.1.0 <2.2.0",
+                      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
+                      "dependencies": {
+                        "rfile": {
+                          "version": "1.0.0",
+                          "from": "rfile@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
+                          "dependencies": {
+                            "callsite": {
+                              "version": "1.0.0",
+                              "from": "callsite@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+                            },
+                            "resolve": {
+                              "version": "0.3.1",
+                              "from": "resolve@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"
+                            }
+                          }
+                        },
+                        "ruglify": {
+                          "version": "1.0.0",
+                          "from": "ruglify@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
+                          "dependencies": {
+                            "uglify-js": {
+                              "version": "2.2.5",
+                              "from": "uglify-js@>=2.2.0 <2.3.0",
+                              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.1.43",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "0.1.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "optimist": {
+                                  "version": "0.3.7",
+                                  "from": "optimist@>=0.3.5 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+                                  "dependencies": {
+                                    "wordwrap": {
+                                      "version": "0.0.2",
+                                      "from": "wordwrap@>=0.0.2 <0.1.0",
+                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "url": {
+                      "version": "0.10.3",
+                      "from": "url@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                      "dependencies": {
+                        "punycode": {
+                          "version": "1.3.2",
+                          "from": "punycode@1.3.2",
+                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                        },
+                        "querystring": {
+                          "version": "0.2.0",
+                          "from": "querystring@0.2.0",
+                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                        }
+                      }
+                    },
+                    "util": {
+                      "version": "0.10.3",
+                      "from": "util@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+                    },
+                    "vm-browserify": {
+                      "version": "0.0.4",
+                      "from": "vm-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                      "dependencies": {
+                        "indexof": {
+                          "version": "0.0.1",
+                          "from": "indexof@0.0.1",
+                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "xtend": {
+                      "version": "3.0.0",
+                      "from": "xtend@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.4",
+                  "from": "through@2.3.4",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+                },
+                "uglify-js": {
+                  "version": "2.4.20",
+                  "from": "uglify-js@>=2.4.15 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10",
+                      "from": "async@>=0.2.6 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.1.34",
+                      "from": "source-map@0.1.34",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "0.1.0",
+                          "from": "amdefine@>=0.0.4",
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "yargs": {
+                      "version": "3.5.4",
+                      "from": "yargs@>=3.5.4 <3.6.0",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.0.2",
+                          "from": "camelcase@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                        },
+                        "decamelize": {
+                          "version": "1.0.0",
+                          "from": "decamelize@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                        },
+                        "window-size": {
+                          "version": "0.1.0",
+                          "from": "window-size@0.1.0",
+                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "wordwrap@0.0.2",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "d8": {
+              "version": "0.4.4",
+              "from": "d8@0.4.4",
+              "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+              "dependencies": {
+                "m8": {
+                  "version": "0.4.4",
+                  "from": "m8@>=0.4.3",
+                  "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                }
+              }
+            },
+            "dep-graph": {
+              "version": "1.1.0",
+              "from": "dep-graph@1.1.0",
+              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.2.1",
+                  "from": "underscore@1.2.1",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
+                }
+              }
+            },
+            "elementtree": {
+              "version": "0.1.5",
+              "from": "elementtree@0.1.5",
+              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz",
+              "dependencies": {
+                "sax": {
+                  "version": "0.3.5",
+                  "from": "sax@0.3.5",
+                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
+                }
+              }
+            },
+            "glob": {
+              "version": "4.0.6",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.6",
+                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.6.1",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.0",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "init-package-json": {
+              "version": "1.4.1",
+              "from": "init-package-json@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.4.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.5",
+                  "from": "glob@>=5.0.3 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.5.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.4",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.0",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.1",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.0.0",
+                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.0.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.2",
+                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                    },
+                    "semver": {
+                      "version": "4.3.3",
+                      "from": "semver@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
+                    }
+                  }
+                },
+                "promzard": {
+                  "version": "0.3.0",
+                  "from": "promzard@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                },
+                "read": {
+                  "version": "1.0.5",
+                  "from": "read@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.4",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.0",
+                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.0.tgz",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.0",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.0.0",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.2",
+                          "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "3.0.6",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.0.1",
+                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.0.1.tgz",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            },
+            "npm": {
+              "version": "1.3.4",
+              "from": "npm@1.3.4",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-1.3.4.tgz",
+              "dependencies": {
+                "semver": {
+                  "version": "2.0.8",
+                  "from": "semver@latest"
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@latest"
+                },
+                "slide": {
+                  "version": "1.1.4",
+                  "from": "slide@latest"
+                },
+                "abbrev": {
+                  "version": "1.0.4",
+                  "from": "abbrev@latest"
+                },
+                "graceful-fs": {
+                  "version": "2.0.0",
+                  "from": "graceful-fs@2"
+                },
+                "minimatch": {
+                  "version": "0.2.12",
+                  "from": "minimatch@latest",
+                  "dependencies": {
+                    "sigmund": {
+                      "version": "1.0.0",
+                      "from": "sigmund@~1.0.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "2.1.1",
+                  "from": "nopt@latest"
+                },
+                "rimraf": {
+                  "version": "2.2.0",
+                  "from": "rimraf@2.2"
+                },
+                "request": {
+                  "version": "2.21.0",
+                  "from": "request@latest",
+                  "dependencies": {
+                    "qs": {
+                      "version": "0.6.5",
+                      "from": "qs@~0.6.0"
+                    },
+                    "json-stringify-safe": {
+                      "version": "4.0.0",
+                      "from": "json-stringify-safe@~4.0.0"
+                    },
+                    "forever-agent": {
+                      "version": "0.5.0",
+                      "from": "forever-agent@~0.5.0"
+                    },
+                    "tunnel-agent": {
+                      "version": "0.3.0",
+                      "from": "tunnel-agent@~0.3.0"
+                    },
+                    "http-signature": {
+                      "version": "0.9.11",
+                      "from": "http-signature@~0.9.11",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "0.1.2",
+                          "from": "assert-plus@0.1.2"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11"
+                        },
+                        "ctype": {
+                          "version": "0.5.2",
+                          "from": "ctype@0.5.2"
+                        }
+                      }
+                    },
+                    "hawk": {
+                      "version": "0.13.1",
+                      "from": "hawk@~0.13.0",
+                      "dependencies": {
+                        "hoek": {
+                          "version": "0.8.5",
+                          "from": "hoek@0.8.x"
+                        },
+                        "boom": {
+                          "version": "0.4.2",
+                          "from": "boom@0.4.x",
+                          "dependencies": {
+                            "hoek": {
+                              "version": "0.9.1",
+                              "from": "hoek@0.9.x",
+                              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                            }
+                          }
+                        },
+                        "cryptiles": {
+                          "version": "0.2.1",
+                          "from": "cryptiles@0.2.x"
+                        },
+                        "sntp": {
+                          "version": "0.2.4",
+                          "from": "sntp@0.2.x",
+                          "dependencies": {
+                            "hoek": {
+                              "version": "0.9.1",
+                              "from": "hoek@0.9.x",
+                              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "aws-sign": {
+                      "version": "0.3.0",
+                      "from": "aws-sign@~0.3.0"
+                    },
+                    "oauth-sign": {
+                      "version": "0.3.0",
+                      "from": "oauth-sign@~0.3.0"
+                    },
+                    "cookie-jar": {
+                      "version": "0.3.0",
+                      "from": "cookie-jar@~0.3.0"
+                    },
+                    "node-uuid": {
+                      "version": "1.4.0",
+                      "from": "node-uuid@~1.4.0"
+                    },
+                    "mime": {
+                      "version": "1.2.9",
+                      "from": "mime@~1.2.9"
+                    },
+                    "form-data": {
+                      "version": "0.0.8",
+                      "from": "form-data@0.0.8",
+                      "dependencies": {
+                        "combined-stream": {
+                          "version": "0.0.4",
+                          "from": "combined-stream@~0.0.4",
+                          "dependencies": {
+                            "delayed-stream": {
+                              "version": "0.0.5",
+                              "from": "delayed-stream@0.0.5"
+                            }
+                          }
+                        },
+                        "async": {
+                          "version": "0.2.9",
+                          "from": "async@~0.2.7"
+                        }
+                      }
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.0.5",
+                  "from": "which@1"
+                },
+                "tar": {
+                  "version": "0.1.17",
+                  "from": "tar@0.1.17",
+                  "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"
+                },
+                "fstream": {
+                  "version": "0.1.23",
+                  "from": "fstream@latest"
+                },
+                "block-stream": {
+                  "version": "0.0.6",
+                  "from": "block-stream@*"
+                },
+                "inherits": {
+                  "version": "1.0.0",
+                  "from": "git://github.com/isaacs/inherits"
+                },
+                "mkdirp": {
+                  "version": "0.3.5",
+                  "from": "mkdirp@0.3.5",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+                },
+                "read": {
+                  "version": "1.0.4",
+                  "from": "read@~1.0.3",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.3",
+                      "from": "mute-stream@~0.0.2"
+                    }
+                  }
+                },
+                "lru-cache": {
+                  "version": "2.3.0",
+                  "from": "lru-cache@latest"
+                },
+                "node-gyp": {
+                  "version": "0.10.6",
+                  "from": "node-gyp@latest"
+                },
+                "fstream-npm": {
+                  "version": "0.1.4",
+                  "from": "fstream-npm@latest",
+                  "dependencies": {
+                    "fstream-ignore": {
+                      "version": "0.0.6",
+                      "from": "fstream-ignore@~0.0.5"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.3",
+                  "from": "../uid-number"
+                },
+                "archy": {
+                  "version": "0.0.2",
+                  "from": "archy@0.0.2"
+                },
+                "chownr": {
+                  "version": "0.0.1",
+                  "from": "../chownr"
+                },
+                "npmlog": {
+                  "version": "0.0.4",
+                  "from": "npmlog@latest"
+                },
+                "ansi": {
+                  "version": "0.1.2",
+                  "from": "ansi@~0.1.2"
+                },
+                "npm-registry-client": {
+                  "version": "0.2.27",
+                  "from": "npm-registry-client@latest",
+                  "dependencies": {
+                    "couch-login": {
+                      "version": "0.1.17",
+                      "from": "couch-login@~0.1.15"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "1.1.0",
+                  "from": "read-package-json@1",
+                  "dependencies": {
+                    "normalize-package-data": {
+                      "version": "0.2.0",
+                      "from": "normalize-package-data@~0.2",
+                      "dependencies": {
+                        "github-url-from-git": {
+                          "version": "1.1.1",
+                          "from": "github-url-from-git@~1.1.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "read-installed": {
+                  "version": "0.2.2",
+                  "from": "read-installed@latest"
+                },
+                "glob": {
+                  "version": "3.2.3",
+                  "from": "glob@latest",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.0",
+                      "from": "inherits@2"
+                    }
+                  }
+                },
+                "init-package-json": {
+                  "version": "0.0.10",
+                  "from": "init-package-json@latest",
+                  "dependencies": {
+                    "promzard": {
+                      "version": "0.2.0",
+                      "from": "promzard@~0.2.0"
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.0.3",
+                  "from": "osenv@latest"
+                },
+                "lockfile": {
+                  "version": "0.4.0",
+                  "from": "lockfile@latest"
+                },
+                "retry": {
+                  "version": "0.6.0",
+                  "from": "retry"
+                },
+                "once": {
+                  "version": "1.1.1",
+                  "from": "once"
+                },
+                "npmconf": {
+                  "version": "0.1.1",
+                  "from": "npmconf@latest",
+                  "dependencies": {
+                    "config-chain": {
+                      "version": "1.1.7",
+                      "from": "config-chain@~1.1.1",
+                      "dependencies": {
+                        "proto-list": {
+                          "version": "1.2.2",
+                          "from": "proto-list@~1.2.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "opener": {
+                  "version": "1.3.0",
+                  "from": "opener@latest"
+                },
+                "chmodr": {
+                  "version": "0.1.0",
+                  "from": "chmodr@latest"
+                },
+                "cmd-shim": {
+                  "version": "1.1.0",
+                  "from": "cmd-shim@"
+                },
+                "sha": {
+                  "version": "1.0.1",
+                  "from": "sha@~1.0.1"
+                },
+                "editor": {
+                  "version": "0.0.4",
+                  "from": "editor@"
+                },
+                "child-process-close": {
+                  "version": "0.1.1",
+                  "from": "child-process-close@",
+                  "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
+                },
+                "npm-user-validate": {
+                  "version": "0.0.3",
+                  "from": "npm-user-validate@0.0.3",
+                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
+                },
+                "normalize-package-data": {
+                  "version": "2.0.0",
+                  "from": "normalize-package-data@*",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.2",
+                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "npmconf": {
+              "version": "0.1.16",
+              "from": "npmconf@0.1.16",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.8",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.3",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "once": {
+                  "version": "1.3.1",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.3.5",
+                  "from": "mkdirp@>=0.3.3 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+                },
+                "osenv": {
+                  "version": "0.0.3",
+                  "from": "osenv@0.0.3",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"
+                },
+                "nopt": {
+                  "version": "2.2.1",
+                  "from": "nopt@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.5",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                    }
+                  }
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.1.0",
+              "from": "osenv@0.1.0",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
+            },
+            "plist": {
+              "version": "1.1.0",
+              "from": "plist@1.1.0",
+              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.6",
+                  "from": "base64-js@0.0.6",
+                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
+                },
+                "xmlbuilder": {
+                  "version": "2.2.1",
+                  "from": "xmlbuilder@2.2.1",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
+                  "dependencies": {
+                    "lodash-node": {
+                      "version": "2.4.1",
+                      "from": "lodash-node@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+                    }
+                  }
+                },
+                "xmldom": {
+                  "version": "0.1.19",
+                  "from": "xmldom@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
+                },
+                "util-deprecate": {
+                  "version": "1.0.0",
+                  "from": "util-deprecate@1.0.0",
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
+                }
+              }
+            },
+            "properties-parser": {
+              "version": "0.2.3",
+              "from": "properties-parser@0.2.3",
+              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
+            },
+            "rc": {
+              "version": "0.5.2",
+              "from": "rc@0.5.2",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "minimist@>=0.0.7 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                },
+                "deep-extend": {
+                  "version": "0.2.11",
+                  "from": "deep-extend@>=0.2.5 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                },
+                "strip-json-comments": {
+                  "version": "0.1.3",
+                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                }
+              }
+            },
+            "request": {
+              "version": "2.47.0",
+              "from": "request@2.47.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "bl@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.26 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.6.0",
+                  "from": "caseless@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "from": "forever-agent@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.0",
+                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "mime-types@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.3",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                },
+                "qs": {
+                  "version": "2.3.3",
+                  "from": "qs@>=2.3.1 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.0",
+                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                },
+                "tough-cookie": {
+                  "version": "0.12.1",
+                  "from": "tough-cookie@>=0.12.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "punycode@>=0.2.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    }
+                  }
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "from": "http-signature@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "asn1@0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "ctype@0.5.3",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.4.0",
+                  "from": "oauth-sign@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "from": "hawk@1.1.1",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1",
+                      "from": "hoek@>=0.9.0 <0.10.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "boom": {
+                      "version": "0.4.2",
+                      "from": "boom@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "from": "cryptiles@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "from": "sntp@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "aws-sign2@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.4",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@>=0.0.5 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "semver": {
+              "version": "2.0.11",
+              "from": "semver@2.0.11",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"
+            },
+            "shelljs": {
+              "version": "0.3.0",
+              "from": "shelljs@0.3.0",
+              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+            },
+            "tar": {
+              "version": "1.0.2",
+              "from": "tar@1.0.2",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+              "dependencies": {
+                "block-stream": {
+                  "version": "0.0.7",
+                  "from": "block-stream@*",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                },
+                "fstream": {
+                  "version": "1.0.4",
+                  "from": "fstream@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.6",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                    },
+                    "mkdirp": {
+                      "version": "0.5.0",
+                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        }
+                      }
+                    },
+                    "rimraf": {
+                      "version": "2.3.2",
+                      "from": "rimraf@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+                      "dependencies": {
+                        "glob": {
+                          "version": "4.5.3",
+                          "from": "glob@>=4.4.2 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                          "dependencies": {
+                            "inflight": {
+                              "version": "1.0.4",
+                              "from": "inflight@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "minimatch": {
+                              "version": "2.0.4",
+                              "from": "minimatch@>=2.0.1 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                              "dependencies": {
+                                "brace-expansion": {
+                                  "version": "1.1.0",
+                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                                  "dependencies": {
+                                    "balanced-match": {
+                                      "version": "0.2.0",
+                                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                    },
+                                    "concat-map": {
+                                      "version": "0.0.1",
+                                      "from": "concat-map@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "once": {
+                              "version": "1.3.1",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "from": "through2@0.6.3",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "unorm": {
+              "version": "1.3.3",
+              "from": "unorm@1.3.3",
+              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
+            },
+            "valid-identifier": {
+              "version": "0.0.1",
+              "from": "valid-identifier@0.0.1",
+              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
+            },
+            "xcode": {
+              "version": "0.6.7",
+              "from": "xcode@0.6.7",
+              "resolved": "https://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz",
+              "dependencies": {
+                "pegjs": {
+                  "version": "0.6.2",
+                  "from": "pegjs@0.6.2",
+                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.3.3",
+                  "from": "node-uuid@1.3.3",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "ncp": {
       "version": "0.4.2",
       "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
diff --git a/package.json b/package.json
index 02c2770542..7fbab372ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.0",
+  "version": "1.4.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -63,7 +63,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.1",
+    "ionic-app-lib": "0.0.3",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From ff35c83a128e2eb21dcfc8e65141fb807de7b573 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 13:01:16 -0600
Subject: [PATCH 0580/1100] Version bump, getting the correct version of hooks
 to use

---
 lib/ionic/cordova.js | 117 ++++++++++++++++++++++---------------------
 npm-shrinkwrap.json  |   2 +-
 package.json         |   2 +-
 3 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5119a16486..9bcc1277b5 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -13,7 +13,7 @@ var Task = require('./task').Task,
     ConfigXml = ionicAppLib.configXml,
     Cordova = ionicAppLib.cordova,
     Serve = ionicAppLib.serve,
-    Hooks = require('./hooks'),
+    Hooks = ionicAppLib.hooks,
     State = require('./state');
 
 var IonicTask = function() {};
@@ -26,71 +26,76 @@ IonicTask.prototype.run = function(ionic) {
   var cmdName = process.argv[2].toLowerCase();
   var q;
 
-  this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
+  try {
+    this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
-  // Cordova.addPlatform(path.resolve('.'));
-  // return;
+    // Cordova.addPlatform(path.resolve('.'));
+    // return;
 
 
-  this.addIcons = !(argv.noresources || argv.r);
+    this.addIcons = !(argv.noresources || argv.r);
 
-  if(this.isLiveReload) {
-    q = self.setupLiveReload();
+    if(this.isLiveReload) {
+      q = self.setupLiveReload();
 
-  } else {
-    // ensure the content node was set back to its original
-    q = self.ionic.setConfigXml({
-      resetContent: true,
-      errorWhenNotFound: false
-    });
-  }
+    } else {
+      // ensure the content node was set back to its original
+      q = self.ionic.setConfigXml({
+        resetContent: true,
+        errorWhenNotFound: false
+      });
+    }
 
-  var addDefaultResources = false;
-  var isPlatformCmd = argv._.indexOf('platform') != -1;
-  var isAddCmd = argv._.indexOf('add') != -1;
-  var isPluginCmd = argv._.indexOf('plugin') != -1;
-  var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
+    var addDefaultResources = false;
+    var isPlatformCmd = argv._.indexOf('platform') != -1;
+    var isAddCmd = argv._.indexOf('add') != -1;
+    var isPluginCmd = argv._.indexOf('plugin') != -1;
+    var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
-  Hooks.setHooksPermission(process.cwd());
+    Hooks.setHooksPermission(process.cwd());
 
-  if(isPlatformCmd && isAddCmd) {
-    addDefaultResources = true;
-  }
-  // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
-
-  q.then(function(){
-    if(addDefaultResources && self.addIcons) {
-      return generate.copyIconFilesIntoResources()
-      .then(function() {
-        return generate.addIonicIcons(argv._[2]);
-      })
-    } else {
-      return false;
-    }
-  })
-  .then(function() {
-    return self.runCordova(cmdName);
-  })
-  .then(function(runCode) {
-    //We dont want to do anything if the cordova command failed
-    if(runCode !== 0 || argv.nosave) {
-      return
-    }
-    if (isPlatformCmd && isAddCmd) {
+    if(isPlatformCmd && isAddCmd) {
       addDefaultResources = true;
-      console.log('Saving platform to package.json file'.blue)
-      return State.savePlatform(argv);
-    } else if (isPlatformCmd && isRmCmd) {
-      console.log('Removing platform from package.json file'.blue)
-      return State.removePlatform(argv);
-    } else if (isPluginCmd && isAddCmd) {
-      console.log('Saving plugin to package.json file'.blue)
-      return State.savePlugin(argv);
-    } else if (isPluginCmd && isRmCmd) {
-      console.log('Removing plugin from package.json file'.blue)
-      return State.removePlugin(argv);
     }
-  })
+    // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
+
+    q.then(function(){
+      if(addDefaultResources && self.addIcons) {
+        return generate.copyIconFilesIntoResources()
+        .then(function() {
+          return generate.addIonicIcons(argv._[2]);
+        })
+      } else {
+        return false;
+      }
+    })
+    .then(function() {
+      return self.runCordova(cmdName);
+    })
+    .then(function(runCode) {
+      //We dont want to do anything if the cordova command failed
+      if(runCode !== 0 || argv.nosave) {
+        return
+      }
+      if (isPlatformCmd && isAddCmd) {
+        addDefaultResources = true;
+        console.log('Saving platform to package.json file'.blue)
+        return State.savePlatform(argv);
+      } else if (isPlatformCmd && isRmCmd) {
+        console.log('Removing platform from package.json file'.blue)
+        return State.removePlatform(argv);
+      } else if (isPluginCmd && isAddCmd) {
+        console.log('Saving plugin to package.json file'.blue)
+        return State.savePlugin(argv);
+      } else if (isPluginCmd && isRmCmd) {
+        console.log('Removing plugin from package.json file'.blue)
+        return State.removePlugin(argv);
+      }
+    });
+  } catch (ex) {
+    console.log('An error occurred running a Cordova command:', ex);
+    console.log(ex.stack);
+  }
 }
 
 IonicTask.prototype.runCordova = function(cmdName) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index edab2561b0..00d5456639 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.1",
+  "version": "1.4.0-beta.2",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 7fbab372ee..c0b53b2d09 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.1",
+  "version": "1.4.0-beta.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 9f863b51fd06706100ab6afc7bb88662c26df4e4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Thu, 16 Apr 2015 13:26:13 -0500
Subject: [PATCH 0581/1100] fix(upload): add cachebuster to asset urls before
 upload

---
 lib/ionic/upload.js | 57 +++++++++++++++++++++++++++++++++++++++++++--
 package.json        |  1 +
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 79b51b37b3..5312ca9e3f 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,5 +1,6 @@
 var fs = require('fs'),
     path = require('path'),
+    cheerio = require('cheerio'),
     parseUrl = require('url').parse,
     archiver = require('archiver'),
     argv = require('optimist').argv,
@@ -34,6 +35,21 @@ IonicTask.prototype.run = function(ionic, callback) {
 
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
+
+    var documentRoot = project.get('documentRoot') || 'www';
+
+    if (!fs.existsSync(path.resolve(documentRoot))) {
+      return ionic.fail(documentRoot + ' directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'upload');
+    }
+
+    var indexPath = path.join(documentRoot, 'index.html');
+
+    if (!fs.existsSync(path.resolve(indexPath))) {
+      return ionic.fail(indexPath + ' cannot be found. Make sure index.html is in your project root.', 'upload');
+    }
+
+    addCachebusters(indexPath);
+
     var TEMP_FILENAME = 'www.zip';
 
     IonicStats.t();
@@ -44,7 +60,7 @@ IonicTask.prototype.run = function(ionic, callback) {
     archive.pipe(zip);
 
     archive.bulk([
-      { expand: true, cwd: 'www/', src: ['**'] }
+      { expand: true, cwd: documentRoot, src: ['**'] }
     ]);
 
     archive.finalize(function(err, bytes) {
@@ -52,8 +68,9 @@ IonicTask.prototype.run = function(ionic, callback) {
         return ionic.fail("Error uploading: " + err);
       }
     });
-
     zip.on('close', function() {
+      removeCachebusters(indexPath);
+
       console.log('\nUploading app...'.bold.green);
 
       var csrftoken = '';
@@ -151,4 +168,40 @@ IonicTask.prototype.setNote = function(note) {
   this.note = note
 };
 
+// If your Webview's strange, and its cache is no good? Who you gonna call?
+//
+// Cachebusters!
+function addCachebusters(indexPath) {
+  var randomString = Math.floor(Math.random() * 100000);
+  var indexHtml = fs.readFileSync(indexPath, 'utf8');
+  var $ = cheerio.load(indexHtml);
+  $('script').each(function(i, el){
+    el.attribs.src += ";ionicCachebuster=" + randomString;
+  });
+  $('link').each(function(i, el){
+    el.attribs.href += ";ionicCachebuster=" + randomString;
+  });
+  try {
+    fs.writeFileSync(indexPath, $.html());
+  } catch(e) {
+    console.error("Unable to append cachebusters to index.html asset urls. Err: " + err);
+  }
+}
+
+function removeCachebusters(indexPath) {
+  var indexHtml = fs.readFileSync(indexPath, 'utf8');
+  var $ = cheerio.load(indexHtml);
+  $('script').each(function(i, el){
+    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf(";ionicCache"));
+  });
+  $('link').each(function(i, el){
+    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf(";ionicCache"));
+  });
+  try {
+    fs.writeFileSync(indexPath, $.html());
+  } catch(e) {
+    console.error("Unable to remove cachebusters from index.html asset urls. Err: " + err);
+  }
+}
+
 exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index 0fa6ecb362..a520a71021 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
   "dependencies": {
     "archiver": "0.5.1",
     "async": "^0.9.0",
+    "cheerio": "^0.19.0",
     "cli-table": "^0.3.1",
     "colors": "0.6.2",
     "connect": "3.1.1",

From 5642bc371ee8fd887998c7b3db90e20bfdedd8e3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 14:54:51 -0600
Subject: [PATCH 0582/1100] Changelog updates. Serve added a ;

---
 CHANGELOG.md       | 5 +++--
 lib/ionic/serve.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17802a2a0..71e764f001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ### 1.4.0
 
-* Extracting core logic for the CLI into ionic-app-lib
-* Certain commands have been moved to the ionic-app-lib - notably: start, serve, hooks, info, browser, and some of cordova.
+* Extracting core logic for the CLI into ionic-app-lib.
+* Certain commands have been moved to the ionic-app-lib - notably: start, serve, hooks, info, browser, and some of cordova commands.
 * Ionic serve now allows all IP addresses so you can access the server outside of your machine - use `ionic serve --all` or `ionic serve --address 0.0.0.0` to serve to all addresses.
 * Ionic hooks have had some issues with permissions - those are now added in when an app is started. Also there is the `ionic hooks permissions` command to grant those hooks execute permissions.
+* When starting an application on a Mac, the iOS platform will be automatically added.
 * Updating Crosswalk to have version canary version 14.42.334.0.
 * Crosswalk now contains the cordova whitelist by default.
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index ec52f1e274..854edb1c42 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -73,7 +73,7 @@ IonicTask.prototype.run = function(ionic) {
     .catch(function(error) {
       console.log('There was an error serving your Ionic application:', error);
       throw error;
-    })
+    });
   } catch (ex) {
     Utils.fail('Error with serve- ' + ex);
     console.log(ex.stack);

From d700922057c812255cd0ee1ffc7155d653a7b197 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 15:35:50 -0600
Subject: [PATCH 0583/1100] Adding help flag to release the io-app-id

---
 lib/ionic.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index e632ed27ad..5f9f5ba515 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -82,7 +82,8 @@ var TASKS = [
       '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
       '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
       '--sass|-s': 'Setup the project to use Sass CSS precompiling',
-      '--list|-l': 'List starter templates available'
+      '--list|-l': 'List starter templates available',
+      '--io-app-id': 'The Ionic.io app ID to use'
     },
     module: './ionic/start'
   },

From 1bf5cb99d692228919a3b2aba7891cdbe0b1413e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 15:36:29 -0600
Subject: [PATCH 0584/1100] Version bump and shrinkwrap

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 2ec9d4b557..822275cef1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0-beta.3",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 30f935069c..dcc4bd3aa6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From db6bcfb0638aa41bf43560251f6ed048c9603046 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 16:32:19 -0600
Subject: [PATCH 0585/1100] Adding in documentation for the all flags for all
 ip addressesgs

---
 lib/ionic.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 5f9f5ba515..34cdbb4a43 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -103,6 +103,7 @@ var TASKS = [
       '--nolivereload|-d': 'Do not start live reload',
       '--noproxy|-x': 'Do not add proxies',
       '--address': 'Use specific address or return with failure',
+      '--all|-a': 'Have the server listen on all addresses (0.0.0.0)',
       '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
       '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
       '--lab|-l': 'Test your apps on multiple screen sizes and platform types'

From 1ad905a791fde1f1735bb7bdb3110b98f7b9ac48 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 16:32:52 -0600
Subject: [PATCH 0586/1100] Fixing the serve address to use all (0.0.0.0), a
 specific address, or to chose one

---
 lib/ionic/serve.js | 258 +--------------------------------------------
 1 file changed, 5 insertions(+), 253 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 854edb1c42..32b6e00e67 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -46,12 +46,17 @@ IonicTask.prototype.run = function(ionic) {
     if (argv.all || argv.a) {
       options.address = '0.0.0.0';
       promise = Q();
+    } else if (argv.address) {
+      options.address = argv.address;
+      promise = Q();
     } else {
       promise = Serve.getAddress(options);
     }
 
+
     return promise
     .then(function() {
+      // console.log('options.address', options.address);
       return Serve.checkPorts(true, options.port, options.address, options);
     })
     .then(function() {
@@ -78,259 +83,6 @@ IonicTask.prototype.run = function(ionic) {
     Utils.fail('Error with serve- ' + ex);
     console.log(ex.stack);
   }
-
-  // return;
-  // this.loadSettings();
-
-  // this.getAddress()
-  // .then(function() {
-  //   return self.checkPorts(true, self.port, self.address);
-  // })
-  // .then(function() {
-  //   if(self.runLivereload) {
-  //     return self.checkPorts(false, self.liveReloadPort, self.address);
-  //   }
-  // })
-  // .then(function() {
-  //   if(self.isAddressCmd) {
-  //     console.log( self.address );
-  //     process.exit();
-  //   }
-
-  //   self.start(ionic)
-
-  //   // self.printCommandTips();
-  //   // console.log('listenForServerCommands')
-  //   // self.listenForServerCommands();
-
-  //   if(ionic.hasFailed) return;
-
-  //   ionic.latestVersion.promise.then(function(){
-  //     ionic.printVersionWarning();
-  //   });
-  // })
-  // .catch(function(error) {
-
-  // })
-
-};
-
-//isIonicServer = true when serving www directory, false when live reload
-IonicTask.prototype.checkPorts = function(isIonicServer, testPort, testHost) {
-  var q = Q.defer();
-
-  var self = this,
-      message = [];
-
-  if(isIonicServer) {
-    testHost = this.address == 'localhost' ? null : this.address;
-  } else {
-    testHost = null;
-  }
-
-  ports.getPort({port: testPort, host: testHost},
-    function(err, port) {
-    if(port != testPort) {
-      message = ['The port ', testPort, ' was taken on the host ', self.address, ' - using port ', port, ' instead'].join('');
-      console.log(message.yellow.bold);
-      if(isIonicServer) {
-        self.port = port;
-      } else {
-        self.liveReloadPort = port;
-      }
-    }
-    q.resolve();
-  });
-
-  return q.promise;
-}
-
-
-IonicTask.prototype.loadSettings = function(cb) {
-  var project = null;
-
-  try {
-    project = IonicProject.load();
-  } catch (ex) {
-    this.ionic.fail(ex.message);
-    return
-  }
-  var self = this;
-
-  this.port = this.port || argv.port || argv.p || DEFAULT_HTTP_PORT;
-  this.liveReloadPort = this.liveReloadPort || argv.livereloadport || argv.r || argv['livereload-port'] || argv.i || DEFAULT_LIVE_RELOAD_PORT;
-  this.launchBrowser = !argv.nobrowser && !argv.b;
-  this.launchLab = this.launchBrowser && (argv.lab || argv.l);
-  this.runLivereload = !(argv.nolivereload || argv.d);
-  this.useProxy = !argv.noproxy && !argv.x;
-  this.proxies = project.get('proxies') || [];
-  this.watchSass = project.get('sass') === true && !argv.nosass && !argv.n;
-  this.gulpStartupTasks = project.get('gulpStartupTasks');
-  
-  this.browser = argv.browser || argv.w || '';
-  this.browserOption = argv.browserOption || argv.o || '';
-
-  //Check for default browser being specified
-  this.defaultBrowser = argv.defaultBrowser || argv.f || project.get('defaultBrowser');
-
-  if(this.defaultBrowser) {
-    project.set('defaultBrowser', this.defaultBrowser);
-    project.save();
-  }
-
-  this.browser = this.browser || this.defaultBrowser;
-
-  this.watchPatterns = project.get('watchPatterns') || ['www/**/*', '!www/lib/**/*'];
-  this.printConsoleLogs = argv.consolelogs || argv['console-logs'] || argv.c;
-  this.printServerLogs = argv.serverlogs || argv['server-logs'] || argv.s;
-  this.isAddressCmd = argv._[0].toLowerCase() == 'address';
-  this.documentRoot = project.get('documentRoot') || 'www';
-  this.createDocumentRoot = project.get('createDocumentRoot') || null;
-  this.contentSrc = path.join(this.documentRoot, this.ionic.getContentSrc());
-
-};
-
-IonicTask.prototype.getAddress = function(cb) {
-  var q = Q.defer();
-  try {
-    var self = this;
-    var addresses = [];
-    var os = require('os');
-    var ifaces = os.networkInterfaces();
-    var ionicConfig = require('./config').load();
-
-    var addressConfigKey = (self.isPlatformServe ? 'platformServeAddress' : 'ionicServeAddress');
-    var tryAddress;
-
-    if(self.isAddressCmd) {
-      // reset any address configs
-      ionicConfig.set('ionicServeAddress', null);
-      ionicConfig.set('platformServeAddress', null);
-    } else {
-      if(!argv.address)
-        tryAddress = ionicConfig.get(addressConfigKey);
-      else
-        tryAddress = argv.address;
-    }
-
-    if(ifaces){
-      for (var dev in ifaces) {
-        if(!dev) continue;
-        ifaces[dev].forEach(function(details){
-          if (details && details.family == 'IPv4' && !details.internal && details.address) {
-            addresses.push({
-              address: details.address,
-              dev: dev
-            });
-          }
-        });
-      }
-    }
-
-    if(tryAddress) {
-      if(tryAddress == 'localhost') {
-        self.address = tryAddress;
-        // cb();
-        q.resolve();
-        return q.promise;
-      }
-      for(var x=0; x<addresses.length; x++) {
-        // double check if this address is still available
-        if(addresses[x].address == tryAddress)
-        {
-          self.address = addresses[x].address;
-          // cb();
-          q.resolve();
-          return q.promise;
-        }
-      }
-      if (argv.address) {
-        self.ionic.fail('Address ' + argv.address + ' not available.');
-        return q.promise;
-      }
-    }
-
-    if(addresses.length > 0) {
-      
-      if(!self.isPlatformServe) {
-        addresses.push({
-          address: 'localhost'
-        });
-      }
-
-      if(addresses.length === 1) {
-        self.address = addresses[0].address;
-        // cb();
-        q.resolve();
-        return q.promise;
-      } 
-
-      console.log('\nMultiple addresses available.'.error.bold);
-      console.log('Please select which address to use by entering its number from the list below:'.error.bold);
-      if(self.isPlatformServe) {
-        console.log('Note that the emulator/device must be able to access the given IP address'.small);
-      }
-
-      for(var x=0; x<addresses.length; x++) {
-        console.log( (' ' + (x+1) + ') ' + addresses[x].address + ( addresses[x].dev ? ' (' + addresses[x].dev + ')' : '' )).yellow );
-      }
-
-      console.log('Std in before prompt')
-      // console.log(process.stdin)
-
-      var prompt = require('prompt');
-      var promptProperties = {
-        selection: {
-          name: 'selection',
-          description: 'Address Selection: '.yellow.bold,
-          required: true
-        }
-      };
-
-      prompt.override = argv;
-      prompt.message = '';
-      prompt.delimiter = '';
-      prompt.start();
-
-      prompt.get({properties: promptProperties}, function (err, promptResult) {
-        if(err) {
-          return console.log(err);
-        }
-
-        var selection = promptResult.selection;
-        for(var x=0; x<addresses.length; x++) {
-          if(selection == (x + 1) || selection == addresses[x].address || selection == addresses[x].dev) {
-            self.address = addresses[x].address;
-            if(!self.isAddressCmd) {
-              console.log('Selected address: '.green.bold + self.address);
-            }
-            ionicConfig.set(addressConfigKey, self.address);
-            // cb();
-            prompt.resume();
-            q.resolve();
-            return q.promise;
-          }
-        }
-
-        self.ionic.fail('Invalid address selection');
-      });
-
-    } else if(self.isPlatformServe) {
-      // no addresses found
-      self.ionic.fail('Unable to find an IPv4 address for run/emulate live reload.\nIs WiFi disabled or LAN disconnected?');
-
-    } else {
-      // no address found, but doesn't matter if it doesn't need an ip address and localhost will do
-      self.address = 'localhost';
-      // cb();
-      q.resolve();
-    }
-
-  } catch(e) {
-    self.ionic.fail('Error getting IPv4 address: ' + e);
-  }
-
-  return q.promise;
 };
 
 exports.IonicTask = IonicTask;

From e1d4ed5fc05c8b78cf1322b970aab4752ca8bf2f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 20 Apr 2015 16:33:20 -0600
Subject: [PATCH 0587/1100] Version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dcc4bd3aa6..4ae96c12e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.3",
+  "version": "1.4.0-beta.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d79f617789edb1efd143c5c6fc5d0e41c60c570e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 22 Apr 2015 11:00:38 -0600
Subject: [PATCH 0588/1100] Adding no save option for browser

---
 lib/ionic.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/ionic.js b/lib/ionic.js
index 34cdbb4a43..d16e602a6d 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -315,6 +315,9 @@ var TASKS = [
       '<command>': '"add remove rm versions upgrade list ls revert"',
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
+    options: {
+      '--nosave|-n': 'Do not save the platforms and plugins to the package.json file'
+    },
     module: './ionic/browser'
   },
   {

From f144c85774d20f6622b1caea1f03dc6e219a2f04 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 22 Apr 2015 11:00:59 -0600
Subject: [PATCH 0589/1100] Adding in dont save option to the addBrowser
 command

---
 lib/ionic/browser.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index d1fd542cde..6cda40b723 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -61,9 +61,11 @@ IonicTask.prototype.run = function run(ionic) {
     var platform = argv._[2],
         browserToInstall = argv._[2];
 
+    var dontSavePlatformsPlugins = !(argv.nosave || argv.n);
+
     switch(cmdArg) {
       case 'add':
-        Browser.addBrowser(appDirectory, browserToInstall);
+        Browser.addBrowser(appDirectory, browserToInstall, dontSavePlatformsPlugins);
         break;
       case 'clean':
         Browser.clean(appDirectory);

From 9c453dd2401826812450e853f6da3afbca0b8b5c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 22 Apr 2015 11:01:40 -0600
Subject: [PATCH 0590/1100] Adding in the ionic app lib state commands to
 cordova. Removed some comments

---
 lib/ionic/cordova.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 9bcc1277b5..1e4ae7822d 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -14,7 +14,8 @@ var Task = require('./task').Task,
     Cordova = ionicAppLib.cordova,
     Serve = ionicAppLib.serve,
     Hooks = ionicAppLib.hooks,
-    State = require('./state');
+    State = ionicAppLib.state;
+    // State = require('./state');
 
 var IonicTask = function() {};
 
@@ -29,10 +30,6 @@ IonicTask.prototype.run = function(ionic) {
   try {
     this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
 
-    // Cordova.addPlatform(path.resolve('.'));
-    // return;
-
-
     this.addIcons = !(argv.noresources || argv.r);
 
     if(this.isLiveReload) {
@@ -77,19 +74,20 @@ IonicTask.prototype.run = function(ionic) {
       if(runCode !== 0 || argv.nosave) {
         return
       }
+      var argumentName = argv._[2];
       if (isPlatformCmd && isAddCmd) {
         addDefaultResources = true;
         console.log('Saving platform to package.json file'.blue)
-        return State.savePlatform(argv);
+        return State.savePlatform(process.cwd(), argumentName);
       } else if (isPlatformCmd && isRmCmd) {
         console.log('Removing platform from package.json file'.blue)
-        return State.removePlatform(argv);
+        return State.removePlatform(process.cwd(), argumentName);
       } else if (isPluginCmd && isAddCmd) {
         console.log('Saving plugin to package.json file'.blue)
-        return State.savePlugin(argv);
+        return State.savePlugin(process.cwd(), argumentName);
       } else if (isPluginCmd && isRmCmd) {
         console.log('Removing plugin from package.json file'.blue)
-        return State.removePlugin(argv);
+        return State.removePlugin(process.cwd(), argumentName);
       }
     });
   } catch (ex) {

From 8fe2a796216be09aa8beeb2c8a768b1023548f1d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 22 Apr 2015 11:03:41 -0600
Subject: [PATCH 0591/1100] Version bumps

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4ae96c12e6..cf86dee66e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.4",
+  "version": "1.4.0-beta.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -64,7 +64,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.4",
+    "ionic-app-lib": "0.0.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 871768927bf468618d74ba91ac352a60c1952bd3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 22 Apr 2015 11:18:29 -0600
Subject: [PATCH 0592/1100] Version bump for shrinkwrap

---
 npm-shrinkwrap.json | 833 ++++++++++++++++++++++----------------------
 package.json        |   2 +-
 2 files changed, 420 insertions(+), 415 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 822275cef1..7a8cd3618a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,101 +1,101 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.3",
+  "version": "1.4.0-beta.6",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
+      "from": "archiver@0.5.1",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,32 +104,32 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "from": "glob@>=3.2.9 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0",
-                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                      "version": "2.6.1",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,50 +187,50 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                  "version": "2.6.1",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "async": {
       "version": "0.9.0",
-      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
+      "from": "async@>=0.9.0 <0.10.0",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
     },
     "cheerio": {
@@ -352,351 +352,351 @@
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "from": "cli-table@>=0.3.1 <0.4.0",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "from": "colors@1.0.3",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "from": "escape-html@1.0.1",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
+      "from": "connect-livereload@0.5.2",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+      "from": "crc@3.2.1",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.5.0",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+          "version": "2.6.1",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
-          "version": "2.3.6",
-          "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+          "version": "2.3.7",
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
+          "from": "map-stream@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+          "from": "pause-stream@0.0.11",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "from": "archy@>=0.0.2 <0.0.3",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.4",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
+              "from": "beeper@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "from": "chalk@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+                  "from": "ansi-styles@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "from": "has-ansi@>=1.0.3 <2.0.0",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                      "from": "get-stdin@*",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "from": "strip-ansi@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
-                  "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz"
+                  "version": "1.3.1",
+                  "from": "supports-color@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "from": "meow@*",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.2",
-                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "from": "repeating@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             }
                           }
@@ -709,111 +709,116 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.3.2",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
+              "version": "3.5.0",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
-                  "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
+                  "version": "3.0.1",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.4",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz"
+                  "version": "3.0.6",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.6.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
+                "lodash.isnative": {
+                  "version": "3.0.2",
+                  "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
+                },
                 "lodash.keys": {
-                  "version": "3.0.4",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
+                  "version": "3.0.6",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.6.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
+                      "version": "3.0.1",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz"
                     },
                     "lodash.isarray": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
-                    },
-                    "lodash.isnative": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
+                      "version": "3.0.2",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz"
                     }
                   }
                 },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+                },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -824,66 +829,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+              "from": "object-assign@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
-              "version": "0.6.3",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "version": "0.6.5",
+              "from": "through2@>=0.6.1 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.26 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -892,42 +897,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@>=0.12.0 <0.13.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "version": "2.6.1",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -936,51 +941,51 @@
                 },
                 "lodash": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "from": "resolve@>=0.7.0 <0.8.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "from": "minimist@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -989,34 +994,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
+          "from": "semver@>=3.0.1 <4.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -1024,8 +1029,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.4",
-      "from": "ionic-app-lib@0.0.4",
+      "version": "0.0.6",
+      "from": "ionic-app-lib@0.0.6",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1144,9 +1149,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.1.2",
+                      "version": "3.2.0",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.1.2.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.0.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1703,7 +1708,7 @@
                                 },
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -1993,7 +1998,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2173,7 +2178,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2342,7 +2347,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -2745,7 +2750,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2935,9 +2940,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                 },
                 "tough-cookie": {
-                  "version": "0.12.1",
+                  "version": "0.13.0",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz",
                   "dependencies": {
                     "punycode": {
                       "version": "1.3.2",
@@ -3132,7 +3137,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3164,7 +3169,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -3209,12 +3214,12 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "from": "ncp@0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -3778,22 +3783,22 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
       "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
-          "version": "2.0.1",
-          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
+          "version": "2.0.2",
+          "from": "after-all@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "from": "once@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -3802,22 +3807,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "from": "stackman@>=0.2.2 <0.3.0",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+              "from": "stackback@0.0.2",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -3831,130 +3836,130 @@
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
+      "from": "progress@1.1.7",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+          "from": "read@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
-              "version": "0.3.2",
-              "from": "https://registry.npmjs.org/i/-/i-0.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
+              "version": "0.3.3",
+              "from": "i@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.2",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "version": "4.5.3",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -3963,12 +3968,12 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -3981,37 +3986,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -4020,47 +4025,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -4069,28 +4074,28 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "from": "caseless@>=0.8.0 <0.9.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.9",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
+              "version": "2.0.10",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.7.0",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
+                  "version": "1.8.0",
+                  "from": "mime-db@>=1.8.0 <1.9.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                 }
               }
             }
@@ -4098,113 +4103,113 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "from": "mime-types@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "from": "qs@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "0.12.1",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+          "version": "0.13.0",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+              "from": "punycode@>=0.2.0",
               "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+              "from": "ctype@0.5.3",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+          "from": "stringstream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -4212,131 +4217,131 @@
       }
     },
     "semver": {
-      "version": "4.3.1",
-      "from": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz"
+      "version": "4.3.3",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
-              "version": "2.1.2",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
+              "version": "2.1.3",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "from": "ms@0.7.0",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
+              "version": "1.0.1",
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -4345,88 +4350,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "from": "underscore@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.6",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.2",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "version": "4.5.3",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4435,12 +4440,12 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4453,85 +4458,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -4540,44 +4545,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
-              "version": "4.5.2",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+              "version": "4.5.3",
+              "from": "glob@>=4.4.2 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "from": "inflight@>=1.0.4 <2.0.0",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -4586,22 +4591,22 @@
             },
             "minimatch": {
               "version": "2.0.4",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "from": "minimatch@>=2.0.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "from": "concat-map@0.0.1",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -4610,78 +4615,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "from": "glob2base@>=0.0.12 <0.0.13",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                  "from": "find-index@>=0.1.1 <0.2.0",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
-                      "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "version": "2.6.1",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -4694,95 +4699,95 @@
         },
         "graceful-fs": {
           "version": "3.0.6",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
+          "from": "graceful-fs@>=3.0.2 <3.1.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "lodash": {
           "version": "2.4.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
-          "version": "0.6.3",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "from": "clone@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -4791,22 +4796,22 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.6.2",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+          "from": "xmlbuilder@>=1.0.0",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.5.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
+              "from": "lodash@>=3.5.0 <3.6.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
             }
           }
diff --git a/package.json b/package.json
index cf86dee66e..b9fdc2cc3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.5",
+  "version": "1.4.0-beta.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 7fe5302c7ca001839b7fc2ab2eecd3b3ab1715cf Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 23 Apr 2015 10:53:20 -0600
Subject: [PATCH 0593/1100] Adding fail to occur from utils.fail instead of
 just logging the error

---
 lib/ionic/start.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index fd0c449000..67a5104ba2 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,9 +9,9 @@ var fs = require('fs'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task;
     IonicStats = require('./stats').IonicStats,
-    cliLib = require('ionic-app-lib');
-
-var Start = cliLib.start;
+    cliLib = require('ionic-app-lib'),
+    Start = cliLib.start,
+    Utils = cliLib.utils;
 
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
@@ -47,7 +47,8 @@ IonicTask.prototype.run = function run(ionic) {
   .then(function(promptToContinue) {
     if (!promptToContinue) {
       startingApp = false;
-      return
+      console.log('\nIonic start cancelled by user.\n'.red.bold);
+      return;
     }
     return Start.startApp(options);
   })
@@ -59,7 +60,9 @@ IonicTask.prototype.run = function run(ionic) {
     }
   })
   .catch(function(error) {
-    console.log('Run had an error:', error);
+    Utils.fail(error);
+    // console.log('', error);
+    // console.log(error.stack);
   });
 
   IonicStats.t();

From 480641f78817e7d5a05fa9f338e5291f48ceaf71 Mon Sep 17 00:00:00 2001
From: Joel Weirauch <joel@drifty.com>
Date: Thu, 23 Apr 2015 14:09:57 -0500
Subject: [PATCH 0594/1100] Refactor upload to go direct to S3

---
 lib/ionic/upload.js | 49 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5312ca9e3f..b6dcf1b6e6 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,6 +1,7 @@
 var fs = require('fs'),
     path = require('path'),
     cheerio = require('cheerio'),
+    request = require('request'),
     parseUrl = require('url').parse,
     archiver = require('archiver'),
     argv = require('optimist').argv,
@@ -81,9 +82,9 @@ IonicTask.prototype.run = function(ionic, callback) {
       form.append('name', project.get('name'));
       form.append('note', self.note);
       form.append('csrfmiddlewaretoken', csrftoken);
-      form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
+      //form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
 
-      var url = ionic.IONIC_DASH + ionic.IONIC_API + 'app/upload/' + project.get('app_id');
+      var url = ionic.IONIC_DASH + ionic.IONIC_API + 'app/direct-upload/' + project.get('app_id');
       var params = parseUrl(url);
 
       form.submit({
@@ -97,8 +98,6 @@ IonicTask.prototype.run = function(ionic, callback) {
           }).join("; ")
         })
       }, function(err, response) {
-
-        rm('-f', TEMP_FILENAME);
         if (err) {
           console.log('There was an error trying to upload your app.'.red.bold);
           var errorMessage;
@@ -119,7 +118,6 @@ IonicTask.prototype.run = function(ionic, callback) {
         });
 
         response.on('end', function() {
-
           if ( response.statusCode == 401 ) {
             return ionic.fail('Session expired (401). Please log in and run this command again.');
           } else if ( response.statusCode == 403 ) {
@@ -147,8 +145,45 @@ IonicTask.prototype.run = function(ionic, callback) {
             // Success
             project.set('app_id', d.app_id);
             project.save();
-            console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
-            console.log(('Share your beautiful app with someone:\n\n$ ionic share EMAIL\n').bold);
+
+            // Now we actually do the upload with the signed URL the dash returned
+            request({
+              method: 'PUT',
+              preambleCRLF: true,
+              postambleCRLF: true,
+              uri: d.signed_request,
+              headers: {
+                'x-amz-acl': 'private',
+                'content-type': 'application/zip'
+              },
+              body: fs.readFileSync(path.resolve(TEMP_FILENAME))
+            },
+            function(error, response, body) {
+              rm('-f', TEMP_FILENAME);
+
+              if (error) {
+                return console.log('Upload Failed:', error);
+              } else {
+                // The final step is to signal the dash that the file was successfully uploaded
+                request({
+                  method: 'GET',
+                  uri: ionic.IONIC_DASH + ionic.IONIC_API + 'app/direct-upload/' + project.get('app_id'),
+                  headers: {
+                    cookie: jar.map(function(c) {
+                      return c.key + "=" + encodeURIComponent(c.value);
+                    }).join("; ")
+                  }
+                },
+                function(error, response, body) {
+                  if (error || response.statusCode != 200) {
+                    console.log("Upload Failed:", error || "Server Error: " + response.statusCode);
+                  } else {
+                    console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
+                    console.log(('Share your beautiful app with someone:\n\n$ ionic share EMAIL\n').bold);
+                  }
+                });
+              }
+            });
           } 
 
           if ( callback ) {

From 8103bc2e751ef7ce02c1aaa0fa9e624df8f1909d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 23 Apr 2015 16:29:04 -0600
Subject: [PATCH 0595/1100] Pulling out the CLI tasks into their own module.
 Adding CLI as its own module instead of the old ionic.js file, now its cli.js
 which can be used as a module, where you just call its run method with args
 already parsed out for ease of testing

---
 bin/ionic             |  16 +-
 lib/cli.js            | 451 ++++++++++++++++++++++++++++++++++++++++++
 lib/ionic/config.js   |   4 +-
 lib/ionic/help.js     |  12 +-
 lib/tasks/cliTasks.js | 378 +++++++++++++++++++++++++++++++++++
 spec/cli.spec.js      |  83 ++++++++
 6 files changed, 934 insertions(+), 10 deletions(-)
 create mode 100644 lib/cli.js
 create mode 100644 lib/tasks/cliTasks.js
 create mode 100644 spec/cli.spec.js

diff --git a/bin/ionic b/bin/ionic
index 3b444affe9..21db978e28 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -1,10 +1,22 @@
 #!/usr/bin/env node
 
 
+// 'use strict';
+
+// process.title = 'ionic';
+
+// var Ionic = require('../lib/ionic').Ionic;
+
+// Ionic.run();
+
+/////////////////////
+//What I want to see
+/////////////////////
 'use strict';
 
 process.title = 'ionic';
 
-var Ionic = require('../lib/ionic').Ionic;
+var argv = require('optimist').argv, 
+    IonicCli = require('../lib/cli');
 
-Ionic.run();
+IonicCli.run(argv);
diff --git a/lib/cli.js b/lib/cli.js
new file mode 100644
index 0000000000..4260e61632
--- /dev/null
+++ b/lib/cli.js
@@ -0,0 +1,451 @@
+var Cli = module.exports,
+    colors = require('colors'),
+    IonicAppLib = require('ionic-app-lib'),
+    ConfigXml = IonicAppLib.configXml,
+    IonicOpbeat = IonicAppLib.opbeat,
+    Info = IonicAppLib.info,
+    Ionitron = require('./ionic/ionitron'),
+    path = require('path'),
+    settings = require('../package.json'),
+    Tasks = require('./tasks/cliTasks'),
+    Utils = IonicAppLib.utils,
+    Q = require('q');
+
+Cli.Tasks = TASKS = Tasks;
+
+Cli.IONIC_DASH = 'https://apps.ionic.io';
+//Cli.IONIC_DASH: 'http://localhost:8000',
+Cli.IONIC_API = '/api/v1/';
+Cli.PRIVATE_PATH = '.ionic';
+
+Cli.run = function run(argv) {
+
+  try {    
+    IonicAppLib.events.on('log', console.log);
+
+    Cli.attachErrorHandling();
+
+    Cli.checkLatestVersion();
+
+    process.on('exit', function(){
+      Cli.printVersionWarning();
+    });
+
+    if(argv.ionitron) {
+      return Ionitron.print();
+    }
+
+    if (argv.verbose) {
+      IonicAppLib.events.on('verbose', console.log);
+    }
+
+    if( (argv.version || argv.v) && !argv._.length) {
+      return Cli.version();
+    }
+
+    if(argv.help || argv.h) {
+      return Cli.printHelpLines();
+    }
+
+    if(argv['stats-opt-out']) {
+      var IonicStore = require('./ionic/store').IonicStore;
+      var ionicConfig = new IonicStore('ionic.config');
+      ionicConfig.set('statsOptOut', true);
+      ionicConfig.save();
+      console.log('Successful stats opt-out');
+      return;
+    }
+
+    var taskSetting = Cli.tryBuildingTask(argv);
+    if(!taskSetting) {
+      return Cli.printAvailableTasks();
+    }
+    // var taskModule = require(taskSetting.module).IonicTask;
+    var taskModule = Cli.lookupTask(taskSetting.module);
+
+    var taskInstance = new taskModule();
+    taskInstance.run(Cli);
+  } catch (ex) {
+    Utils.fail(ex);
+  }
+};
+
+Cli.lookupTask = function lookupTask(module) {
+  try {
+    console.log(module);
+    var taskModule = require(module).IonicTask;
+    return taskModule;
+  } catch (ex) {
+    throw ex;
+  }
+};
+
+Cli.printVersionWarning = function printVersionWarning() {
+  if (Cli.npmVersion && Cli.npmVersion != settings.version.trim()) {
+    process.stdout.write('\n------------------------------------\n'.red);
+    process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
+    process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
+    process.stdout.write( (' * Latest version: ' + Cli.npmVersion + '\n').yellow );
+    process.stdout.write( (' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow );
+    process.stdout.write( ' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow );
+    process.stdout.write('------------------------------------\n\n'.red);
+    Cli.npmVersion = null;
+  }
+};
+
+Cli.checkLatestVersion = function checkLatestVersion() {
+  Cli.latestVersion = Q.defer();
+
+  try {
+    if (settings.version.indexOf('beta') > -1) {
+      // don't bother checking if its a beta
+      Cli.latestVersion.resolve();
+      return;
+    }
+
+    // stay silent if it errors
+    var IonicStore = require('./ionic/store').IonicStore;
+    var ionicConfig = new IonicStore('ionic.config');
+    var versionCheck = ionicConfig.get('versionCheck');
+    if (versionCheck && ((versionCheck + 86400000) > Date.now() )) {
+      // we've recently checked for the latest version, so don't bother again
+      Cli.latestVersion.resolve();
+      return;
+    }
+
+    var proxy = process.env.PROXY || process.env.http_proxy || null;
+    var request = require('request');
+    request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
+      try {
+        Cli.npmVersion = JSON.parse(body).version;
+        ionicConfig.set('versionCheck', Date.now());
+        ionicConfig.save();
+      } catch(e) {}
+      Cli.latestVersion.resolve();
+    });
+  } catch (e) {
+    Cli.latestVersion.resolve();
+  }
+
+  return Cli.latestVersion.promise;
+};
+
+Cli.tryBuildingTask = function tryBuildingTask(argv) {
+  if (argv._.length === 0) {
+    return false;
+  }
+  var taskName = argv._[0];
+
+  return Cli.getTaskWithName(taskName);
+};
+
+Cli.getTaskWithName = function getTaskWithName(name) {
+  for (var i = 0; i < TASKS.length; i++) {
+    var t = TASKS[i];
+    if(t.name === name) {
+      return t;
+    }
+    if (t.alt) {
+      for(var j = 0; j < t.alt.length; j++) {
+        var alt = t.alt[j];
+        if (alt === name) {
+          return t;
+        }
+      }
+    }
+  }
+};
+
+Cli.printIonic = function printIonic() {
+  var w = function(s) {
+    process.stdout.write(s);
+  };
+
+  w('  _             _     \n');
+  w(' (_)           (_)     \n');
+  w('  _  ___  _ __  _  ___ \n');
+  w(' | |/ _ \\| \'_ \\| |/ __|\n');
+  w(' | | (_) | | | | | (__ \n');
+  w(' |_|\\___/|_| |_|_|\\___|  CLI v'+ settings.version + '\n');
+};
+
+Cli.printAvailableTasks = function printAvailableTasks(argv) {
+  Cli.printIonic();
+  process.stderr.write('\nUsage: ionic task args\n\n=======================\n\n');
+
+  if (process.argv.length > 2) {
+    process.stderr.write( (process.argv[2] + ' is not a valid task\n\n').bold.red );
+  }
+
+  process.stderr.write('Available tasks: '.bold);
+  process.stderr.write('(use --help or -h for more info)\n\n');
+
+  for (var i = 0; i < TASKS.length; i++) {
+    var task = TASKS[i];
+    if (task.summary) {
+      var name = '   ' + task.name + '  ';
+      var dots = '';
+      while ((name + dots).length < 20) {
+        dots += '.';
+      }
+      process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary.bold + '\n');
+    }
+  }
+
+  process.stderr.write('\n');
+  Cli.processExit(1);
+};
+
+Cli.printHelpLines = function printHelpLines() {
+  Cli.printIonic();
+  process.stderr.write('\n=======================\n');
+
+  for (var i = 0; i < TASKS.length; i++) {
+    var task = TASKS[i];
+    if (task.summary) {
+      Cli.printUsage(task);
+    }
+  }
+
+  process.stderr.write('\n');
+  Cli.processExit(1);
+};
+
+Cli.printUsage = function printUsage(d) {
+  var w = function(s) {
+    process.stdout.write(s);
+  };
+
+  w('\n');
+
+  var rightColumn = 41;
+  var dots = '';
+  var indent = '';
+  var x, arg;
+
+  var taskArgs = d.title;
+
+  for(arg in d.args) {
+    taskArgs += ' ' + arg;
+  }
+
+  w(taskArgs.green.bold);
+
+  while( (taskArgs + dots).length < rightColumn + 1) {
+    dots += '.';
+  }
+
+  w(' ' + dots.grey + '  ');
+
+  if(d.summary) {
+    w(d.summary.bold);
+  }
+
+  for(arg in d.args) {
+    if( !d.args[arg] ) continue;
+
+    indent = '';
+    w('\n');
+    while(indent.length < rightColumn) {
+      indent += ' ';
+    }
+    w( (indent + '    ' + arg + ' ').bold );
+
+    var argDescs = d.args[arg].split('\n');
+    var argIndent = indent + '    ';
+
+    for(x=0; x<arg.length + 1; x++) {
+      argIndent += ' ';
+    }
+
+    for(x=0; x<argDescs.length; x++) {
+      if(x===0) {
+        w( argDescs[x].bold );
+      } else {
+        w( '\n' + argIndent + argDescs[x].bold );
+      }
+    }
+  }
+
+  indent = '';
+  while(indent.length < d.name.length + 1) {
+    indent += ' ';
+  }
+
+  var optIndent = indent;
+  while(optIndent.length < rightColumn + 4) {
+    optIndent += ' ';
+  }
+
+  for(var opt in d.options) {
+    w('\n');
+    dots = '';
+
+    var optLine = indent + '[' + opt + ']  ';
+
+    w(optLine.yellow.bold);
+
+    if(d.options[opt]) {
+      while( (dots.length + optLine.length - 2) < rightColumn) {
+        dots += '.';
+      }
+      w(dots.grey + '  ');
+
+      var optDescs = d.options[opt].split('\n');
+      for(x=0; x<optDescs.length; x++) {
+        if(x===0) {
+          w( optDescs[x].bold );
+        } else {
+          w( '\n' + optIndent + optDescs[x].bold );
+        }
+      }
+    }
+  }
+
+  w('\n');
+};
+
+Cli.processExit = function processExit(code) {
+  if (Cli.cliNews && Cli.cliNews.promise) {
+    Q.all([Cli.latestVersion.promise, Cli.cliNews.promise])
+    .then(function() {
+      process.exit(code);
+    })  
+  } else {
+    Cli.latestVersion.promise.then(function() {
+      process.exit(code);
+    })
+  }
+};
+
+Cli.version = function version() {
+  process.stderr.write(settings.version + '\n');
+};
+
+Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
+  if(typeof skipNewsCheck == 'undefined') {
+    skipNewsCheck = true;
+  } 
+
+  var q = Cli.cliNews = Q.defer();
+  var proxy = process.env.PROXY || null;
+  var IonicStore = require('./ionic/store').IonicStore;
+  var ionicConfig = new IonicStore('ionic.config');
+
+  var request = require('request');
+  var monthNames = [ "January", "February", "March", "April", "May", "June",
+  "July", "August", "September", "October", "November", "December" ];
+  var d = new Date();
+
+  var downloadUrl = 'http://code.ionicframework.com/content/cli-message.json';
+  request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
+    if(!err && res && res.statusCode === 200) {
+      try {
+        var newsId = ionicConfig.get('newsId');
+        var messagesJson = {};
+        messagesJson = JSON.parse(html);
+        if(skipNewsCheck || typeof newsId == 'undefined' || newsId != messagesJson.id) {
+          ionicConfig.set('newsId', messagesJson.id)
+          ionicConfig.save()
+        } else {
+          q.resolve();
+          return q.promise;
+        }
+
+        process.stdout.write('+---------------------------------------------------------+\n'.green);
+
+        var monthMessage = ['+ New Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').green;
+        process.stdout.write(monthMessage);
+
+        for(var i = 0, j = messagesJson.list.length; i < j; i++) {
+          var entry = messagesJson.list[i];
+          var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.yellow, '\n+\n'].join('');
+          process.stdout.write(entryMessage);
+        }
+        process.stdout.write('+---------------------------------------------------------+\n'.green);
+      }catch(ex) {
+        console.log('ex', ex)
+        q.reject('Error occured in downloading the CLI messages:', ex)
+        Utils.fail(ex);
+        q.reject(ex);
+        return
+      }
+      q.resolve(messagesJson);
+    } else {
+      process.stdout.write('Unable to fetch', err, res.statusCode);
+      q.reject(res);
+    }
+  });
+  return q.promise;
+};
+
+//A little why on this reportExtras here - 
+//We need to access the CLI's package.json file
+//for that, we need the path to be relative to this,
+//not the node_module/ionic-app-lib directory
+Cli.reportExtras = function reportExtras() {
+  var commandLineInfo = process.argv;
+
+  var info = Info.gatherInfo();
+  Info.getIonicVersion(info, process.cwd());
+  Info.getIonicCliVersion(info, path.join(__dirname, '../'));
+
+  info.command = commandLineInfo;
+  return info;
+};
+
+Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
+  console.log('An uncaught exception occured and has been reported to Ionic'.error.bold);
+  var errorMessage = typeof err === 'string' ? err : err.message;
+  Utils.errorHandler(errorMessage);
+  process.exit(1);
+};
+
+Cli.attachErrorHandling = function attachErrorHandling() {
+
+  Utils.errorHandler = function errorHandler(msg, taskHelp) {
+    try {
+      // console.log('Utils.errorHandler msg', msg, typeof msg);
+      var stack = typeof msg == 'string' ? '' : msg.stack;
+      var errorMessage = typeof msg == 'string' ? msg : msg.message;
+      // console.log('stack', stack, arguments.caller);
+      if (msg) {
+        var info = Info.gatherInfo();
+        Info.getIonicVersion(info, process.cwd());
+        Info.getIonicCliVersion(info, path.join(__dirname, '../'));
+        var ionicCliVersion = info.ionic_cli;
+        process.stderr.write(errorMessage.error.bold);
+        process.stderr.write( (' (CLI v' + ionicCliVersion + ')').error.bold + '\n');
+        process.stderr.write('\n' + stack.error.bold + '\n');
+
+        Info.printInfo(info);
+      }
+      process.stderr.write('\n');
+      process.exit(1);
+      return '';
+    } catch (ex) {
+      console.log('errorHandler had an error', ex)
+      console.log(ex.stack);
+    }
+  };
+
+  var options = IonicOpbeat.cliClientOptions;
+  options.prerequestMethod = Cli.reportExtras;
+  var opbeat = IonicOpbeat.createCliClient(options);
+  opbeat.handleUncaughtExceptions(Cli.handleUncaughtExceptions);
+};
+
+//Backwards compatability for those commands that havent been 
+//converted yet.
+Cli.fail = function fail(err, taskHelp) {
+  // var error = typeof err == 'string' ? new Error(err) : err;
+  Utils.fail(err, taskHelp);
+};
+
+Cli.getContentSrc = function getContentSrc() {
+  return Utils.getContentSrc();
+};
+
+Cli.setConfigXml = function setConfigXml(settings) {
+  return ConfigXml.setConfigXml(settings);
+};
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 82c4885f2a..77083a388d 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -1,6 +1,6 @@
 var fs = require('fs'),
-    path = require('path'),
-    ionic = require('../ionic');
+    path = require('path');
+    // ionic = require('../ionic');
 
 var home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
 
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index d44b08cbd3..29aa80ebc6 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -9,16 +9,16 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
-  var self = this;
+  // var self = this;
 
-  self.ionic = ionic;
+  // self.ionic = ionic;
 
   var command = argv._[1] ? argv._[1] : '';
 
-  var task = self.ionic._getTaskWithName(command);
+  var task = ionic.getTaskWithName(command);
 
   if(command == '') {
-    self.ionic._printHelpLines();
+    ionic.printHelpLines();
     return;
   }
   else if (!task) {
@@ -26,11 +26,11 @@ IonicTask.prototype.run = function(ionic) {
     return
   }
 
-  self.ionic._printIonic();
+  ionic.printIonic();
   process.stderr.write('\n=======================\n');
 
 
-  self.ionic.printUsage(task);
+  ionic.printUsage(task);
 
   process.stderr.write('\n\n');
 
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
new file mode 100644
index 0000000000..acd842c741
--- /dev/null
+++ b/lib/tasks/cliTasks.js
@@ -0,0 +1,378 @@
+var resourcesSummary = [
+  'Automatically create icon and splash screen resources' + ' (beta)'.yellow, 
+  'Put your images in the ./resources directory, named splash or icon.',
+  'Accepted file types are .png, .ai, and .psd.',
+  'Icons should be 192x192 px without rounded corners.',
+  'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
+].join('\n\t\t\t\t\t     ');
+
+var TASKS = [
+  {
+    title: 'start',
+    name: 'start',
+    summary: 'Starts a new Ionic project in the specified PATH',
+    args: {
+      '[options]': 'any flags for the command',
+      '<PATH>': 'directory for the new project',
+      '[template]': 'Template name, ex: tabs, sidemenu, blank\n' +
+                    'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
+                    'Defaults to Ionic "tabs" starter template'
+    },
+    options: {
+      '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
+      '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
+      '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
+      '--sass|-s': 'Setup the project to use Sass CSS precompiling',
+      '--list|-l': 'List starter templates available',
+      '--io-app-id': 'The Ionic.io app ID to use'
+    },
+    module: './ionic/start'
+  },
+  {
+    title: 'serve',
+    name: 'serve',
+    summary: 'Start a local development server for app dev/testing',
+    args: {
+      '[options]': ''
+    },
+    options: {
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI',
+      '--port|-p': 'Dev server HTTP port (8100 default)',
+      '--livereload-port|-r': 'Live Reload port (35729 default)',
+      '--nobrowser|-b': 'Disable launching a browser',
+      '--nolivereload|-d': 'Do not start live reload',
+      '--noproxy|-x': 'Do not add proxies',
+      '--address': 'Use specific address or return with failure',
+      '--all|-a': 'Have the server listen on all addresses (0.0.0.0)',
+      '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
+      '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
+      '--lab|-l': 'Test your apps on multiple screen sizes and platform types'
+    },
+    module: './ionic/serve'
+  },
+  {
+    title: 'platform',
+    name: 'platform',
+    summary: 'Add platform target for building an Ionic app',
+    args: {
+      '[options]': '',
+      '<PLATFORM>': ''
+    },
+    options: {
+      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources',
+      '--nosave|-e': 'Do not save the platform to the package.json file'
+    },
+    module: './ionic/cordova'
+  },
+  {
+    title: 'run',
+    name: 'run',
+    summary: 'Run an Ionic project on a connected device',
+    args: {
+      '[options]': '',
+      '<PLATFORM>': ''
+    },
+    options: {
+      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
+      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
+      '--debug|--release': '',
+      '--device|--emulator|--target=FOO': ''
+    },
+    module: './ionic/cordova'
+  },
+  {
+    title: 'emulate',
+    name: 'emulate',
+    summary: 'Emulate an Ionic project on a simulator or emulator',
+    args: {
+      '[options]': '',
+      '<PLATFORM>': ''
+    },
+    options: {
+      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
+      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
+      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
+      '--debug|--release': '',
+      '--device|--emulator|--target=FOO': ''
+    },
+    module: './ionic/cordova'
+  },
+  {
+    title: 'build',
+    name: 'build',
+    summary: 'Locally build an Ionic project for a given platform',
+    args: {
+      '[options]': '',
+      '<PLATFORM>': ''
+    },
+    options: {
+      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
+    },
+    module: './ionic/cordova'
+  },
+  {
+    title: 'plugin add',
+    name: 'plugin',
+    summary: 'Add a Cordova plugin',
+    args: {
+      '[options]': '',
+      '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
+    },
+    options: {
+      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
+                                  'and subdirectories first for the plugin before\n' +
+                                  'looking it up in the registry.',
+      '--nosave|-e': 'Do not save the plugin to the package.json file'
+    },
+    module: './ionic/cordova'
+  },
+  {
+    title: 'prepare',
+    name: 'prepare',
+    module: './ionic/cordova'
+  },
+  {
+    title: 'compile',
+    name: 'compile',
+    module: './ionic/cordova'
+  },
+  {
+    title: 'resources',
+    name: 'resources',
+    summary: resourcesSummary,
+    options: {
+      '--icon|-i': 'Generate icon resources',
+      '--splash|-s': 'Generate splash screen resources'
+    },
+    module: './ionic/resources/generate'
+  },
+  {
+    title: 'package',
+    name: 'package',
+    alt: ['pack'],
+    summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
+    args: {
+      '[options]': '',
+      '<MODE>': '"debug" or "release"',
+      '<PLATFORM>': '"ios" or "android"'
+    },
+    options: {
+      '--android-keystore-file|-k': 'Android keystore file',
+      '--android-keystore-alias|-a': 'Android keystore alias',
+      '--android-keystore-password|-w': 'Android keystore password',
+      '--android-key-password|-r': 'Android key password',
+      '--ios-certificate-file|-c': 'iOS certificate file',
+      '--ios-certificate-password|-d': 'iOS certificate password',
+      '--ios-profile-file|-f': 'iOS profile file',
+      '--output|-o': 'Path to save the packaged app',
+      '--no-email|-n': 'Do not send a build package email',
+      '--clear-signing|-l': 'Clear out all signing data from Ionic server',
+      '--email|-e': 'Ionic account email',
+      '--password|-p': 'Ionic account password'
+    },
+    module: './ionic/package'
+  },
+  {
+    title: 'upload',
+    name: 'upload',
+    summary: 'Upload an app to your Ionic account',
+    options: {
+      '--email|-e': 'Ionic account email',
+      '--password|-p': 'Ionic account password'
+    },
+    alt: ['up'],
+    module: './ionic/upload'
+  },
+  {
+    title: 'share',
+    name: 'share',
+    summary: 'Share an app with a client, co-worker, friend, or customer',
+    args: {
+      '<EMAIL>': 'The email to share the app with',
+    },
+    module: './ionic/share'
+  },
+  {
+    title: 'lib',
+    name: 'lib',
+    summary: 'Gets Ionic library version or updates the Ionic library',
+    args: {
+      '[options]': '',
+      '[update]': 'Updates the Ionic Framework in www/lib/ionic'
+    },
+    options: {
+      '--version|-v': 'Specific Ionic version\nOtherwise it defaults to the latest version'
+    },
+    module: './ionic/lib'
+  },
+  {
+    title: 'setup',
+    name: 'setup',
+    summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
+    args: {
+      '[sass]': 'Setup the project to use Sass CSS precompiling'
+    },
+    module: './ionic/setup'
+  },
+  {
+    title: 'login',
+    name: 'login',
+    module: './ionic/login'
+  },
+  {
+    title: 'address',
+    name: 'address',
+    module: './ionic/serve'
+  },
+  {
+    title: 'app',
+    name: 'app',
+    // summary: 'Deploy a new Ionic app version or list versions',
+    // options: {
+    //   '--versions|-v': 'List recently uploaded versions of this app',
+    //   '--deploy|-d': 'Upload the current working copy and mark it as deployed',
+    //   '--note|-n': 'Add a note to a deploy',
+    //   '--uuid|-u': 'Mark an already uploaded version as deployed'
+    // },
+    module: './ionic/app'
+   },
+   {
+    title: 'push',
+    name: 'push',
+    module: './ionic/push'
+   },
+   {
+    title: 'browser',
+    name: 'browser',
+    summary: 'Add another browser for a platform ' + '(beta)'.yellow,
+    args: {
+      '<command>': '"add remove rm versions upgrade list ls revert"',
+      '[browser]': 'The browser you wish to add or remove (Crosswalk)'
+    },
+    options: {
+      '--nosave|-n': 'Do not save the platforms and plugins to the package.json file'
+    },
+    module: './ionic/browser'
+  },
+  {
+    title: 'service add',
+    name: 'service',
+    summary: 'Add an Ionic service package and install any required plugins',
+    args: {
+      '[options]': '',
+      '<SPEC>': 'Can be a service name or a git url'
+    },
+    module: './ionic/service'
+   },
+   {
+    title: 'add',
+    name: 'add',
+    summary: 'Add an Ion, bower component, or addon to the project',
+    args: {
+      '[name]': 'The name of the ion, bower component, or addon you wish to install'
+    },
+    module: './ionic/add'
+   },
+   {
+    title: 'remove',
+    name: 'remove',
+    summary: 'Remove an Ion, bower component, or addon from the project',
+    args: {
+      '[name]': 'The name of the Ion, bower component, or addon you wish to remove'
+    },
+    module: './ionic/add',
+    alt: ['rm']
+   },
+   {
+    title: 'list',
+    name: 'list',
+    summary: 'List Ions, bower components, or addons in the project',
+    module: './ionic/add',
+    alt: ['ls']
+   },
+   {
+    title: 'ions',
+    name: 'ions',
+    summary: 'List available ions to add to your project',
+    module: './ionic/ions'
+   },
+   {
+    title: 'templates',
+    name: 'templates',
+    summary: 'List available Ionic starter templates',
+    module: './ionic/templates'
+   },
+   {
+     title: 'info',
+     name: 'info',
+     summary: 'List information about the users runtime environment',
+     module: './ionic/info'
+   },
+   {
+     title: 'help',
+     name: 'help',
+     summary: 'Provides help for a certain command',
+     args: {
+       '[command]': 'The command you desire help with'
+     },
+     module: './ionic/help'
+   },
+   {
+    title: 'link',
+    name: 'link',
+    summary: 'Sets your Ionic App ID for your project',
+    args: {
+      '[appId]': 'The app ID you wish to set for this project'
+    },
+    options: {
+      '--reset|-r': 'This will reset the Ionic App ID'
+    },
+    module: './ionic/link'
+   },
+   {
+
+    title: 'hooks',
+    name: 'hooks',
+    summary: 'Manage your Ionic Cordova hooks',
+    args: {
+      '[add|remove|permissions|perm]': 'Add, remove, or modify permissions on the default Ionic Cordova hooks'
+    },
+    module: './ionic/hooks'
+  },
+  {
+    title: 'state',
+    name: 'state',
+    summary: 'Saves or restores state of your Ionic Application using the package.json file',
+    args: {
+      '<COMMAND>': '[ save | restore | clear | reset ]'
+    },
+    options: {
+      'save': 'Save the platforms and plugins into package.json',
+      'restore': 'Restore the platforms and plugins from package.json',
+      'clear': 'Clear the package.json of cordovaPlugins and cordovaPlatforms, as well as clear out the platforms and plugins folders',
+      'reset': 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
+      '--plugins': 'Only do operations with plugins',
+      '--platforms': 'Only do operations with platforms'
+    },
+    module: './ionic/state'
+   },
+   {
+    title: 'docs',
+    name: 'docs',
+    summary: 'Opens up the documentation for Ionic',
+    args: {
+      '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
+    },
+    module: './ionic/docs'
+   }
+];
+
+
+module.exports = TASKS;
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
new file mode 100644
index 0000000000..d894a57482
--- /dev/null
+++ b/spec/cli.spec.js
@@ -0,0 +1,83 @@
+var IonicAppLib = require('ionic-app-lib'),
+    Ionitron = require('../lib/ionic/ionitron'),
+    IonicCli = require('../lib/cli'),
+    Q = require('q'),
+    Utils = IonicAppLib.utils;
+
+describe('Cli', function() {
+
+  beforeEach(function() {
+    spyOn(IonicCli, 'processExit');
+    spyOn(IonicCli, 'printAvailableTasks');
+
+    spyOn(Utils, 'fail').andCallFake(function(err){
+      console.log(err);
+      console.log(err.stack);
+      throw err;
+    });
+  });
+
+  it('should have cli defined', function() {
+    expect(IonicCli).toBeDefined();
+  });
+
+  it('should have cli tasks defined', function() {
+    expect(IonicCli.Tasks).toBeDefined();
+  });
+
+  describe('#run', function() {
+    it('should run checkLatestVersion on run', function() {
+      var deferred = Q.defer();
+      deferred.resolve();
+      spyOn(IonicCli, 'checkLatestVersion').andReturn(deferred);
+      IonicCli.run({_: []});
+      expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
+    });
+
+    it('should run ionitron when argument is passed', function() {
+      spyOn(Ionitron, 'print');
+      IonicCli.run({ionitron: true});
+      expect(Ionitron.print).toHaveBeenCalled();
+    });
+
+    it('should listen to verbosity when arg is passed', function() {
+      spyOn(IonicAppLib.events, 'on');
+      spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+      IonicCli.run({verbose: true});
+      expect(IonicAppLib.events.on).toHaveBeenCalledWith('verbose', console.log);
+    });
+
+    it('should get version when version flag passed', function() {
+      spyOn(IonicCli, 'version');
+      IonicCli.run({version: true, _: []});
+      expect(IonicCli.version).toHaveBeenCalled();
+    });
+
+    it('should call help when help argument passed', function() {
+      spyOn(IonicCli, 'printHelpLines');
+      IonicCli.run({help: true});
+      expect(IonicCli.printHelpLines).toHaveBeenCalled();
+    });
+
+    xit('should store the stats opt out if arg passed', function() {
+      throw 'TODO Write this test';
+    });
+
+    it('should print available tasks if no valid command is passed', function() {
+      spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+      IonicCli.run({});
+      expect(IonicCli.printAvailableTasks).toHaveBeenCalled();
+    });
+
+    it('should call attachErrorHandling', function() {
+      spyOn(IonicCli, 'attachErrorHandling');
+      IonicCli.run({ _: [] });
+      expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
+    });
+
+    it('should run the task it finds', function() {
+      
+    });
+  });
+
+});

From 027e4f23b29f83348b69576f2c246ef3b20b3ac3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 23 Apr 2015 16:29:20 -0600
Subject: [PATCH 0596/1100] Trying to get a central location for prompts

---
 lib/ionic/prompt.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 lib/ionic/prompt.js

diff --git a/lib/ionic/prompt.js b/lib/ionic/prompt.js
new file mode 100644
index 0000000000..5e6c06fdec
--- /dev/null
+++ b/lib/ionic/prompt.js
@@ -0,0 +1,23 @@
+var prompt = require('prompt')
+    Q = require('q');
+
+var Prompt = module.exports;
+
+Prompt.promptUserPromise = function promptUserPromise(schema) {
+  var q = Q.defer();
+  var prompt = require('prompt');
+  prompt.override = argv;
+  prompt.message = '';
+  prompt.delimiter = '';
+  prompt.start();
+  prompt.get(schema, function (err, result) {
+    if (err && err.message !== 'canceled') {
+      q.reject(err);
+      return ionic.fail('Error getting Facebook app information: ' + err);
+    } else {
+      return q.resolve(false);
+    }
+    q.resolve(result);
+  });
+  return q.promise;
+};

From 19b3599f2541f92eecf6c2599cee0245929cde74 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Fri, 24 Apr 2015 12:08:01 -0500
Subject: [PATCH 0597/1100] fix(upload): fix cachebuster for android

---
 lib/ionic/upload.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5312ca9e3f..357119a8dd 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -176,10 +176,10 @@ function addCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
   $('script').each(function(i, el){
-    el.attribs.src += ";ionicCachebuster=" + randomString;
+    el.attribs.src += "?ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
-    el.attribs.href += ";ionicCachebuster=" + randomString;
+    el.attribs.href += "?ionicCachebuster=" + randomString;
   });
   try {
     fs.writeFileSync(indexPath, $.html());
@@ -192,10 +192,10 @@ function removeCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
   $('script').each(function(i, el){
-    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf(";ionicCache"));
+    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf("?ionicCache"));
   });
   $('link').each(function(i, el){
-    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf(";ionicCache"));
+    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf("?ionicCache"));
   });
   try {
     fs.writeFileSync(indexPath, $.html());

From 05198b685cd4f8d73a5eefd8a090218e350258b8 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Fri, 24 Apr 2015 16:08:58 -0500
Subject: [PATCH 0598/1100] fix(upload): use '&' for cachebuster if url already
 has a '?'

---
 lib/ionic/upload.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 357119a8dd..bc939dd07d 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -175,11 +175,14 @@ function addCachebusters(indexPath) {
   var randomString = Math.floor(Math.random() * 100000);
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
+  var hasQuestionMark;
   $('script').each(function(i, el){
-    el.attribs.src += "?ionicCachebuster=" + randomString;
+    hasQuestionMark = el.attribs.src.indexOf('?');
+    el.attribs.src += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
-    el.attribs.href += "?ionicCachebuster=" + randomString;
+    hasQuestionMark = el.attribs.href.indexOf('?');
+    el.attribs.href += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   try {
     fs.writeFileSync(indexPath, $.html());
@@ -191,11 +194,14 @@ function addCachebusters(indexPath) {
 function removeCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
+  var index;
   $('script').each(function(i, el){
-    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf("?ionicCache"));
+    index = hasQuestionMark = el.attribs.src.indexOf('?ionicCache');
+    el.attribs.src = el.attribs.src.substring(0, ++hasQuestionMark ? index : el.attribs.src.indexOf("&ionicCache"));
   });
   $('link').each(function(i, el){
-    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf("?ionicCache"));
+    index = hasQuestionMark = el.attribs.href.indexOf('?ionicCache');
+    el.attribs.href = el.attribs.href.substring(0, ++hasQuestionMark ? index : el.attribs.href.indexOf("&ionicCache"));
   });
   try {
     fs.writeFileSync(indexPath, $.html());

From c00c3a2177f1cc5317245f74d75f74bf8cb683d2 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 24 Apr 2015 16:22:07 -0600
Subject: [PATCH 0599/1100] Adding in more booleans for bin/ionic call. Adding
 console logging helpers for cli

---
 bin/ionic  |  4 +++-
 lib/cli.js | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/bin/ionic b/bin/ionic
index 21db978e28..1d27626556 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -16,7 +16,9 @@
 
 process.title = 'ionic';
 
-var argv = require('optimist').argv, 
+var argv = require('optimist')
+    .boolean(['no-cordova', 'sass', 'list', 'w','nohooks', 
+    'n', 'r', 'noresources', 'nosave', 'e']).argv,
     IonicCli = require('../lib/cli');
 
 IonicCli.run(argv);
diff --git a/lib/cli.js b/lib/cli.js
index 4260e61632..5458668c85 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -24,8 +24,8 @@ Cli.run = function run(argv) {
     IonicAppLib.events.on('log', console.log);
 
     Cli.attachErrorHandling();
-
     Cli.checkLatestVersion();
+    Cli.setUpConsoleLoggingHelpers();
 
     process.on('exit', function(){
       Cli.printVersionWarning();
@@ -60,19 +60,51 @@ Cli.run = function run(argv) {
     if(!taskSetting) {
       return Cli.printAvailableTasks();
     }
-    // var taskModule = require(taskSetting.module).IonicTask;
-    var taskModule = Cli.lookupTask(taskSetting.module);
 
+    var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
-    taskInstance.run(Cli);
+    var promise = taskInstance.run(Cli, argv);
+    return promise;
   } catch (ex) {
+    console.log(ex);
+    console.log(ex.stack);
     Utils.fail(ex);
   }
 };
 
+Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
+  var consoleInfo = console.info;
+  console.info = function() {
+    if (arguments.length === 1 && !arguments[0]) return;
+    var msg = '';
+    for (var n in arguments) {
+      msg += arguments[n] + ' ';
+    }
+    consoleInfo.call(console, msg.blue.bold);
+  };
+
+  var consoleError = console.error;
+  console.error = function() {
+    if (arguments.length === 1 && !arguments[0]) return;
+    var msg = ' ✗';
+    for (var n in arguments) {
+      msg += ' ' + arguments[n];
+    }
+    consoleError.call(console, msg.red.bold);
+  };
+
+  console.success = function() {
+    if (arguments.length === 1 && !arguments[0]) return;
+    var msg = ' ✓';
+    for (var n in arguments) {
+      msg += ' ' + arguments[n];
+    }
+    console.log(msg.green.bold);
+  };
+};
+
 Cli.lookupTask = function lookupTask(module) {
   try {
-    console.log(module);
     var taskModule = require(module).IonicTask;
     return taskModule;
   } catch (ex) {

From d99cb42bcbb8b6f5edc42880b944b3c3866899f3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 24 Apr 2015 16:22:49 -0600
Subject: [PATCH 0600/1100] Taking out argv from cordova, taking args from cli,
 and returning a promise from the cordova command.

---
 lib/ionic/cordova.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 1e4ae7822d..241e6578bd 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -2,7 +2,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
-    argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
+    // argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),
@@ -21,7 +21,7 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic, argv) {
   this.ionic = ionic;
   var self = this;
   var cmdName = process.argv[2].toLowerCase();
@@ -56,7 +56,7 @@ IonicTask.prototype.run = function(ionic) {
     }
     // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
 
-    q.then(function(){
+    return q.then(function(){
       if(addDefaultResources && self.addIcons) {
         return generate.copyIconFilesIntoResources()
         .then(function() {

From abd1b1dfbd0d672c0db482c9602dfee490bd0a93 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 24 Apr 2015 16:23:26 -0600
Subject: [PATCH 0601/1100] Taking args out from start, passing as parameter.
 returning promise for run

---
 lib/ionic/start.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 67a5104ba2..dad183e030 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,6 +1,6 @@
 var fs = require('fs'),
     shelljs = require('shelljs/global'),
-    argv = require('optimist').boolean(['no-cordova', 'sass', 'list', 'w']).argv,
+    // argv = require('optimist').boolean(['no-cordova', 'sass', 'list', 'w']).argv,
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
@@ -16,7 +16,7 @@ var fs = require('fs'),
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function run(ionic) {
+IonicTask.prototype.run = function run(ionic, argv) {
 
   if (argv.list || argv.l) {
     new IonicTemplates().run(ionic);
@@ -24,7 +24,7 @@ IonicTask.prototype.run = function run(ionic) {
   }
 
   if (argv._.length < 2) {
-    return this.ionic.fail('Invalid command', 'start');
+    return ionic.fail('Invalid command', 'start');
   }
 
   if (argv._[1] == '.') {
@@ -37,13 +37,17 @@ IonicTask.prototype.run = function run(ionic) {
       startingApp = true;
   // Grab the app's relative directory name
 
+  IonicStats.t();
+
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
     promptPromise = Q(true);
-  }
+  }  
 
-  promptPromise
+  console.log(options);
+
+  return promptPromise
   .then(function(promptToContinue) {
     if (!promptToContinue) {
       startingApp = false;
@@ -61,11 +65,7 @@ IonicTask.prototype.run = function run(ionic) {
   })
   .catch(function(error) {
     Utils.fail(error);
-    // console.log('', error);
-    // console.log(error.stack);
   });
-
-  IonicStats.t();
 };
 
 exports.IonicTask = IonicTask;

From 18532117a5243e335cd3a114e0f3194dd5fe576b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 24 Apr 2015 16:23:51 -0600
Subject: [PATCH 0602/1100] Adding in e2e calls for package (run script) and
 the jasmine node module

---
 package.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b9fdc2cc3e..ef0ec9a576 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,10 @@
     "beta-bump": "node lib/tasks/bumpversion --level pre --identifier beta",
     "publish-release": "node lib/tasks/bumpversion --npmPublish",
     "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
-    "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish"
+    "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",
+    "test": "npm run jasmine",
+    "e2e": "jasmine-node --captureExceptions ./e2e",
+    "jasmine": "jasmine-node --captureExceptions  ./spec"
   },
   "keywords": [
     "ionic",
@@ -83,5 +86,8 @@
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",
     "xml2js": "0.4.4"
+  },
+  "devDependencies": {
+    "jasmine-node": "^1.14.5"
   }
 }

From ff58a21392d7d3c634823c2a7f1ab94ace4ced15 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 24 Apr 2015 16:24:07 -0600
Subject: [PATCH 0603/1100] Addding in e2e tests

---
 e2e/e2e.spec.js | 134 ++++++++++++++++++++++++++++++++++++++++++++++++
 e2e/helpers.js  |  64 +++++++++++++++++++++++
 2 files changed, 198 insertions(+)
 create mode 100644 e2e/e2e.spec.js
 create mode 100644 e2e/helpers.js

diff --git a/e2e/e2e.spec.js b/e2e/e2e.spec.js
new file mode 100644
index 0000000000..fed8af68f0
--- /dev/null
+++ b/e2e/e2e.spec.js
@@ -0,0 +1,134 @@
+var fs = require('fs'),
+    helpers = require('./helpers'),
+    path = require('path'),
+    Q = require('q'),
+    shell = require('shelljs');
+
+var IonicCli = require('../lib/cli');
+var IonicAppLib = require('ionic-app-lib');
+
+var tmpDir = helpers.tmpDir('create_test');
+var appName = 'TestIonic';
+var appId = 'org.ionic.testing';
+var project = path.join(tmpDir, appName);
+var optimist = require('optimist');
+var start = IonicAppLib.start;
+var utils = IonicAppLib.utils;
+var optimistSpy;
+
+
+ddescribe('end-to-end', function() {
+  beforeEach(function() {
+      jasmine.getEnv().defaultTimeoutInterval = 150000;
+      // if (optimistSpy) {
+      //   optimistSpy.reset();
+      // }
+      optimistSpy = spyOn(optimist, 'boolean');
+      optimist.boolean.reset();
+
+      //Mock out call to get the app directory, return our project
+      spyOn(utils, 'getProjectDirectory').andReturn(project);
+
+      //Disable console.log statements
+      spyOn(IonicAppLib.events, 'on');
+      spyOn(process.stdout, 'write');
+
+      shell.rm('-rf', project);
+      shell.mkdir('-p', tmpDir);
+  });
+  afterEach(function() {
+      process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
+      // shell.rm('-rf', tmpDir);
+  });
+
+  describe('#start e2e', function() {
+    it('should call start with default template and folder name', function(done) {
+      console.log('default template');
+      var args = { _: ['start', 'test'], verbose: true};
+      //Mock out args from the commands.
+      // optimistSpy.andReturn({argv: args});
+      optimistSpy.andCallFake(function(){
+        return {argv: args};
+      });
+
+      Q()
+      .then(function() {
+        return IonicCli.run(args);
+      }).then(function(){
+        expect(path.join(project, 'www', 'index.html')).toExist();
+        expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
+      })
+      .catch(function(error) {
+        expect('this').toBe('not this');
+      })
+      .fin(done);
+    });
+
+    it('should call start with sidemenu template and folder name', function(done) {
+      console.log('sidemenu template');
+      var args = { _: ['start', 'test', 'sidemenu'], verbose: true};
+      //Mock out args from the commands.
+      // optimistSpy.andReturn({argv: args});
+      optimistSpy.andCallFake(function(){
+        return {argv: args};
+      });
+
+      Q()
+      .then(function() {
+        return IonicCli.run(args);
+      }).then(function(){
+        expect(path.join(project, 'www', 'index.html')).toExist();
+        expect(path.join(project, 'www', 'templates', 'menu.html')).toExist();
+      })
+      .catch(function(error) {
+        expect('this').toBe('not this');
+      })
+      .fin(done);
+    });
+
+    it('should call start with blank template and folder name', function(done) {
+      var args = { _: ['start', 'test', 'blank'], verbose: true};
+      //Mock out args from the commands.
+      optimistSpy.andCallFake(function(){
+        return {argv: args};
+      });
+
+      Q()
+      .then(function() {
+        return IonicCli.run(args);
+      }).then(function(){
+        expect(path.join(project, 'www', 'index.html')).toExist();
+        expect(path.join(project, 'www', 'js', 'app.js')).toExist();
+      })
+      .catch(function(error) {
+        expect('this').toBe('not this');
+      })
+      .fin(done);
+    });
+
+    iit('should start and serve an app', function(done) {
+      var args = { _: ['start', 'test', 'blank'], verbose: true};
+      //Mock out args from the commands.
+      optimistSpy.andCallFake(function(){
+        return {argv: args};
+      });
+
+      Q()
+      .then(function() {
+        return IonicCli.run(args);
+      }).then(function(){
+        // expect(path.join(project, 'www', 'index.html')).toExist();
+        // expect(path.join(project, 'www', 'js', 'app.js')).toExist();
+        // args._ = ['run', 'ios'];
+        console.log('running ios')
+        // return IonicCli.run(args);
+      })
+      .catch(function(error) {
+        console.log(error);
+        console.log(error.stack);
+        expect('this').toBe('not this');
+      })
+      .fin(done);
+    });
+  });
+});
diff --git a/e2e/helpers.js b/e2e/helpers.js
new file mode 100644
index 0000000000..3db75d5c96
--- /dev/null
+++ b/e2e/helpers.js
@@ -0,0 +1,64 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+var path = require('path'),
+    fs = require('fs'),
+    shell = require('shelljs'),
+    os = require('os');
+
+module.exports.tmpDir = function(subdir) {
+    var dir = path.join(os.tmpdir(), 'e2e-test');
+    if (subdir) {
+        dir = path.join(dir, subdir);
+    }
+    shell.mkdir('-p', dir);
+    return dir;
+};
+
+// Returns the platform that should be used for testing on this host platform.
+/*
+var host = os.platform();
+if (host.match(/win/)) {
+    module.exports.testPlatform = 'wp8';
+} else if (host.match(/darwin/)) {
+    module.exports.testPlatform = 'ios';
+} else {
+    module.exports.testPlatform = 'android';
+}
+*/
+
+// Just use Android everywhere; we're mocking out any calls to the `android` binary.
+module.exports.testPlatform = 'android';
+
+// Add the toExist matcher.
+beforeEach(function() {
+    this.addMatchers({
+        'toExist': function() {
+            var notText = this.isNot ? ' not' : '';
+            var self = this;
+
+            this.message = function() {
+                return 'Expected file ' + self.actual + notText + ' to exist.';
+            };
+
+            return fs.existsSync(this.actual);
+        }
+    });
+});
+

From ca9955c2b389d804d82b0e38c945f3855e07ce84 Mon Sep 17 00:00:00 2001
From: CarmaZone <carmazone@gmail.com>
Date: Sat, 25 Apr 2015 13:14:41 +0200
Subject: [PATCH 0604/1100] Ionitron multi-language - Translated to Spanish

---
 lib/ionic.js          |  4 ++-
 lib/ionic/ionitron.js | 73 ++++++++++++++++++++++++++++---------------
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index ca645b2b05..f83a51462b 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -614,7 +614,9 @@ Ionic = {
     });
 
     if(argv.ionitron) {
-      return ionitron.print();
+		var myArgs = process.argv.slice(2);
+		console.log(myArgs);
+		return ionitron.print(myArgs[1]);	
     }
 
     if( (argv.version || argv.v) && !argv._.length) {
diff --git a/lib/ionic/ionitron.js b/lib/ionic/ionitron.js
index f165b4c22a..a7b0c2ecd1 100644
--- a/lib/ionic/ionitron.js
+++ b/lib/ionic/ionitron.js
@@ -3,34 +3,57 @@ var colors = require('colors'),
     fs = require('fs');
 
 var ionitronStatements = [
-  'Hello human, what shall we build today?',
-  '*BEEP BEEP* ALL YOUR BASE ARE BELONG TO US *BEEP BEEP*',
-  'Prepare to dominate your hybrid app. Engaging now.',
-  'My sensors indicate you have an undying love for ionic,         |\n       |  or is it just me?\t\t\t\t\t\t',
-  'That\'s a nice looking app you have there. \t\t\t  |\n       |  Definitely one of the better human made apps I\'ve seen.\t',
-  'Oh, hi there. I was just not indexing your hard drive,          |\n       |  definitely not doing that.                                    ',
-  'That would need bee\'s approval',
-  'Fork you! Oh, I\'m sorry, wrong branch.'
+    'Hello human, what shall we build today?',
+    '*BEEP BEEP* ALL YOUR BASE ARE BELONG TO US *BEEP BEEP*',
+    'Prepare to dominate your hybrid app. Engaging now.',
+    'My sensors indicate you have an undying love for ionic,         |\n       |  or is it just me?\t\t\t\t\t\t',
+    'That\'s a nice looking app you have there. \t\t\t  |\n       |  Definitely one of the better human made apps I\'ve seen.\t',
+    'Oh, hi there. I was just not indexing your hard drive,          |\n       |  definitely not doing that.                                    ',
+    'That would need bee\'s approval',
+    'Fork you! Oh, I\'m sorry, wrong branch.'
+];
+
+var ionitronStatements_es = [
+    '\u0021Hola humano! \u00BFQu\u00E9 vamos a construir hoy?',
+    '*BEEP BEEP* TU BASE NOS PERTENECE *BEEP BEEP*',
+    'Prep\u00E1rate para dominar las aplicaciones h\u00EDbridas.               |\n       |  Participa ahora.\t\t\t\t\t\t',
+    'Mis sensores indican que sientes amor eterno hacia Ionic,       |\n       |  \u00BFo es solo hacia m\u00ED?\t\t\t\t\t\t',
+    'Es una bonita aplicaci\u00F3n esa que tienes.  \t\t\t  |\n       |  Eres el mejor desarrollador humano que he visto.\t\t',
+    'Oh, hola. No estaba indexando tu disco duro, no hago eso.',
+    'Es necesitaria la aprobaci\u00F3n de las abejas.',
+    'Bif\u00Farcate! Oh, Lo siento, rama equivocada. '
 ];
 
 var ionictronAsciiFile = 'ionitron.txt';
 
-module.exports.print = function print() {
-  var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
-  var contents = fs.readFileSync(ionitronPath, 'utf8');
-  var messageContent = [ionitronStatements[Math.floor(Math.random() * (ionitronStatements.length - 0) + 0)]].join('');
-  var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
-  // console.log(messageContent.length, replaceString.length)
-  if (messageContent.length < replaceString.length) {
-    var diff = (replaceString.length) - messageContent.length;
-    var i = 0;
-    // console.log(diff, i)
-    while (i < diff) {
-      messageContent = messageContent + ' ';
-      i++;
+module.exports.print = function print(lang) {
+
+    var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
+    var contents = fs.readFileSync(ionitronPath, 'utf8');
+    var messageContent;
+
+    switch (lang) {
+        case '--es':
+            //Replace the 'h' (antenna) by Ñ hahaha'
+            contents = contents.replace('h', '\u00D1');
+            messageContent = [ionitronStatements_es[Math.floor(Math.random() * (ionitronStatements_es.length - 0) + 0)]].join('');
+            break;
+        default:
+            messageContent = [ionitronStatements[Math.floor(Math.random() * (ionitronStatements.length - 0) + 0)]].join('');
+    }
+
+    var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
+    // console.log(messageContent.length, replaceString.length)
+    if (messageContent.length < replaceString.length) {
+        var diff = (replaceString.length) - messageContent.length;
+        var i = 0;
+        // console.log(diff, i)
+        while (i < diff) {
+            messageContent = messageContent + ' ';
+            i++;
+        }
     }
-  }
-  contents = contents.replace(replaceString, messageContent)
-  console.log(contents.cyan);
-  return;
+    contents = contents.replace(replaceString, messageContent)
+    console.log(contents.cyan);
+    return;
 }

From 614c8c4bd64dc485620f15fec056db0cf2242dad Mon Sep 17 00:00:00 2001
From: CarmaZone <carmazone@gmail.com>
Date: Sat, 25 Apr 2015 13:25:25 +0200
Subject: [PATCH 0605/1100] Fixed error

---
 lib/ionic.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic.js b/lib/ionic.js
index f83a51462b..317c17c811 100644
--- a/lib/ionic.js
+++ b/lib/ionic.js
@@ -615,7 +615,6 @@ Ionic = {
 
     if(argv.ionitron) {
 		var myArgs = process.argv.slice(2);
-		console.log(myArgs);
 		return ionitron.print(myArgs[1]);	
     }
 

From a50291d604a10d4e1a65d8f38f04a37fb2aca3b0 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Mon, 27 Apr 2015 10:14:01 -0500
Subject: [PATCH 0606/1100] fix(upload): don't add cachebuster to inline
 scripts

---
 lib/ionic/upload.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index bc939dd07d..733cc7c310 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -177,10 +177,12 @@ function addCachebusters(indexPath) {
   var $ = cheerio.load(indexHtml);
   var hasQuestionMark;
   $('script').each(function(i, el){
+    if (typeof el.attribs.src === "undefined") return true; //continue
     hasQuestionMark = el.attribs.src.indexOf('?');
     el.attribs.src += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
+    if (typeof el.attribs.href === "undefined") return true; //continue
     hasQuestionMark = el.attribs.href.indexOf('?');
     el.attribs.href += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
@@ -196,10 +198,12 @@ function removeCachebusters(indexPath) {
   var $ = cheerio.load(indexHtml);
   var index;
   $('script').each(function(i, el){
+    if (typeof el.attribs.src === "undefined") return true; //continue
     index = hasQuestionMark = el.attribs.src.indexOf('?ionicCache');
     el.attribs.src = el.attribs.src.substring(0, ++hasQuestionMark ? index : el.attribs.src.indexOf("&ionicCache"));
   });
   $('link').each(function(i, el){
+    if (typeof el.attribs.href === "undefined") return true; //continue
     index = hasQuestionMark = el.attribs.href.indexOf('?ionicCache');
     el.attribs.href = el.attribs.href.substring(0, ++hasQuestionMark ? index : el.attribs.href.indexOf("&ionicCache"));
   });

From d9f50235b80d6ef1ede55744631d62e1b53e0cba Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 11:24:21 -0600
Subject: [PATCH 0607/1100] Cleaning up bin/ionic

---
 bin/ionic | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/bin/ionic b/bin/ionic
index 1d27626556..3b9ca8de7c 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -1,17 +1,5 @@
 #!/usr/bin/env node
 
-
-// 'use strict';
-
-// process.title = 'ionic';
-
-// var Ionic = require('../lib/ionic').Ionic;
-
-// Ionic.run();
-
-/////////////////////
-//What I want to see
-/////////////////////
 'use strict';
 
 process.title = 'ionic';

From 3598ef83600c17d08dde63f3f4180576a7914c5f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 11:24:44 -0600
Subject: [PATCH 0608/1100] Basic e2e tests

---
 e2e/e2e.spec.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/e2e/e2e.spec.js b/e2e/e2e.spec.js
index fed8af68f0..ca32df563c 100644
--- a/e2e/e2e.spec.js
+++ b/e2e/e2e.spec.js
@@ -30,8 +30,10 @@ ddescribe('end-to-end', function() {
       spyOn(utils, 'getProjectDirectory').andReturn(project);
 
       //Disable console.log statements
-      spyOn(IonicAppLib.events, 'on');
-      spyOn(process.stdout, 'write');
+      // spyOn(IonicAppLib.events, 'on');
+      // spyOn(process.stdout, 'write');
+      spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
+
 
       shell.rm('-rf', project);
       shell.mkdir('-p', tmpDir);
@@ -107,21 +109,25 @@ ddescribe('end-to-end', function() {
     });
 
     iit('should start and serve an app', function(done) {
+
       var args = { _: ['start', 'test', 'blank'], verbose: true};
       //Mock out args from the commands.
       optimistSpy.andCallFake(function(){
         return {argv: args};
       });
+        console.log('IonicCli.run');
+      
 
       Q()
       .then(function() {
-        return IonicCli.run(args);
+        console.log('IonicCli.run');
+        // return IonicCli.run(args);
       }).then(function(){
         // expect(path.join(project, 'www', 'index.html')).toExist();
         // expect(path.join(project, 'www', 'js', 'app.js')).toExist();
-        // args._ = ['run', 'ios'];
+        args._ = ['run', 'ios'];
         console.log('running ios')
-        // return IonicCli.run(args);
+        return IonicCli.run(args);
       })
       .catch(function(error) {
         console.log(error);

From 5c8cbb52ef74fffc6542067550f306e275bcd8a8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 11:25:49 -0600
Subject: [PATCH 0609/1100] Added in dev version function for dev testing and
 error printing for CLI. Added additional color options for CLI. Added some
 verbose printing for errors, etc. Updted getContentSrc and setConfigXml
 wrappers to pass in CWD

---
 lib/cli.js | 70 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 5458668c85..3266249575 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -14,18 +14,23 @@ var Cli = module.exports,
 Cli.Tasks = TASKS = Tasks;
 
 Cli.IONIC_DASH = 'https://apps.ionic.io';
-//Cli.IONIC_DASH: 'http://localhost:8000',
+//Cli.IONIC_DASH: 'http://localhost:8000';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
+Cli.dev = function dev() {
+  if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
+    return true;
+  }
+  return false;
+};
+
 Cli.run = function run(argv) {
 
   try {    
-    IonicAppLib.events.on('log', console.log);
-
+    Cli.setUpConsoleLoggingHelpers();
     Cli.attachErrorHandling();
     Cli.checkLatestVersion();
-    Cli.setUpConsoleLoggingHelpers();
 
     process.on('exit', function(){
       Cli.printVersionWarning();
@@ -63,16 +68,34 @@ Cli.run = function run(argv) {
 
     var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
+    // console.log('taskinstance run with argv', argv);
     var promise = taskInstance.run(Cli, argv);
+    // console.log('run is going');
     return promise;
   } catch (ex) {
-    console.log(ex);
-    console.log(ex.stack);
-    Utils.fail(ex);
+    IonicAppLib.events.emit('verbose', 'Cli.Run - Error', ex);
+    IonicAppLib.events.emit('verbose', 'Cli.run stack - ', ex.stack);
+    return Utils.fail(ex);
   }
 };
 
 Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
+  IonicAppLib.events.on('log', console.log);
+
+  colors.setTheme({
+    silly: 'rainbow',
+    input: 'grey',
+    small: 'grey',
+    verbose: 'cyan',
+    prompt: 'grey',
+    info: 'white',
+    data: 'grey',
+    help: 'cyan',
+    warn: 'yellow',
+    debug: 'blue',
+    error: 'red'
+  });
+
   var consoleInfo = console.info;
   console.info = function() {
     if (arguments.length === 1 && !arguments[0]) return;
@@ -351,7 +374,7 @@ Cli.processExit = function processExit(code) {
 };
 
 Cli.version = function version() {
-  process.stderr.write(settings.version + '\n');
+  console.log(settings.version + '\n');
 };
 
 Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
@@ -395,8 +418,8 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
           process.stdout.write(entryMessage);
         }
         process.stdout.write('+---------------------------------------------------------+\n'.green);
-      }catch(ex) {
-        console.log('ex', ex)
+      } catch(ex) {
+        console.log('ex', ex.stack);
         q.reject('Error occured in downloading the CLI messages:', ex)
         Utils.fail(ex);
         q.reject(ex);
@@ -415,14 +438,23 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 //We need to access the CLI's package.json file
 //for that, we need the path to be relative to this,
 //not the node_module/ionic-app-lib directory
-Cli.reportExtras = function reportExtras() {
+Cli.reportExtras = function reportExtras(err) {
   var commandLineInfo = process.argv;
 
+  if (Cli.dev()) {
+    console.log('An error occured and was reported to Opbeat', err);
+    console.log(err.stack);
+  }
+
+  var info = Cli.gatherInfo();
+  info.command = commandLineInfo;
+  return info;
+};
+
+Cli.gatherInfo = function gatherInfo() {
   var info = Info.gatherInfo();
   Info.getIonicVersion(info, process.cwd());
   Info.getIonicCliVersion(info, path.join(__dirname, '../'));
-
-  info.command = commandLineInfo;
   return info;
 };
 
@@ -437,18 +469,16 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 
   Utils.errorHandler = function errorHandler(msg, taskHelp) {
     try {
-      // console.log('Utils.errorHandler msg', msg, typeof msg);
+      IonicAppLib.events.emit('verbose', 'Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       // console.log('stack', stack, arguments.caller);
       if (msg) {
-        var info = Info.gatherInfo();
-        Info.getIonicVersion(info, process.cwd());
-        Info.getIonicCliVersion(info, path.join(__dirname, '../'));
+        var info = Cli.gatherInfo();
         var ionicCliVersion = info.ionic_cli;
+        process.stderr.write('\n' + stack.error.bold + '\n\n');
         process.stderr.write(errorMessage.error.bold);
         process.stderr.write( (' (CLI v' + ionicCliVersion + ')').error.bold + '\n');
-        process.stderr.write('\n' + stack.error.bold + '\n');
 
         Info.printInfo(info);
       }
@@ -475,9 +505,9 @@ Cli.fail = function fail(err, taskHelp) {
 };
 
 Cli.getContentSrc = function getContentSrc() {
-  return Utils.getContentSrc();
+  return Utils.getContentSrc(process.cwd());
 };
 
 Cli.setConfigXml = function setConfigXml(settings) {
-  return ConfigXml.setConfigXml(settings);
+  return ConfigXml.setConfigXml(process.cwd(), settings);
 };

From 22a2ff244fad53cc9641911a560c39e69ee19771 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 11:26:30 -0600
Subject: [PATCH 0610/1100] Removing comments, ensuring argv is passed to other
 functions, and removed some console.log statements

---
 lib/ionic/cordova.js | 85 ++++++++------------------------------------
 1 file changed, 14 insertions(+), 71 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 241e6578bd..1eb5082b5b 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -33,7 +33,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     this.addIcons = !(argv.noresources || argv.r);
 
     if(this.isLiveReload) {
-      q = self.setupLiveReload();
+      q = self.setupLiveReload(argv);
 
     } else {
       // ensure the content node was set back to its original
@@ -54,7 +54,6 @@ IonicTask.prototype.run = function(ionic, argv) {
     if(isPlatformCmd && isAddCmd) {
       addDefaultResources = true;
     }
-    // console.log('Icons: ', addDefaultResources, 'Add icons:', this.addIcons)
 
     return q.then(function(){
       if(addDefaultResources && self.addIcons) {
@@ -67,7 +66,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       }
     })
     .then(function() {
-      return self.runCordova(cmdName);
+      return self.runCordova(cmdName, argv);
     })
     .then(function(runCode) {
       //We dont want to do anything if the cordova command failed
@@ -89,14 +88,20 @@ IonicTask.prototype.run = function(ionic, argv) {
         console.log('Removing plugin from package.json file'.blue)
         return State.removePlugin(process.cwd(), argumentName);
       }
-    });
+    })
+    .catch(function(ex) {
+      console.log('Error happened', ex)
+      console.log(ex.stack);
+      throw ex;
+    })
   } catch (ex) {
     console.log('An error occurred running a Cordova command:', ex);
     console.log(ex.stack);
   }
 }
 
-IonicTask.prototype.runCordova = function(cmdName) {
+IonicTask.prototype.runCordova = function(cmdName, argv) {
+  console.log('runCordova', cmdName);
   var deferred = Q.defer();
   var self = this;
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
@@ -123,16 +128,6 @@ IonicTask.prototype.runCordova = function(cmdName) {
     }
   }
 
-  // var noHook = argv.nohooks || argv.n;
-
-  // if (!noHook) {
-  //   console.log('Adding in default Ionic hooks'.yellow.bold)
-  //   // this.addHooks();
-  //   // this.removeOldPluginHooks();
-  // } else {
-  //   console.log('Option passed to not install default Ionic hooks'.yellow.bold)
-  // }
-
   cmdArgs.unshift(cmdName);
 
   // clean out any cmds that may confuse cordova
@@ -151,7 +146,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
         isValdCmd = false;
         break;
       }
-    }
+    }    
     if(isValdCmd) {
       // make sure --target= has double quotes around it (process.argv removes them)
       if(cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
@@ -163,7 +158,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
   }
 
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
-  // console.log('running cordova ' + cleanArgs.join(' '))
+// console.log('running cordova ' + cleanArgs.join(' '));
 
   cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);
@@ -222,7 +217,7 @@ IonicTask.prototype.runCordova = function(cmdName) {
 };
 
 
-IonicTask.prototype.setupLiveReload = function() {
+IonicTask.prototype.setupLiveReload = function(argv) {
   var d = Q.defer();
 
   console.log('Setup Live Reload'.green.bold);
@@ -235,10 +230,6 @@ IonicTask.prototype.setupLiveReload = function() {
   options.launchLab = false;
   options.isPlatformServe = true;
 
-
-  //TODO: Look up address stuffs
-
-
   // First ask user for the IP selection
   // Check ports not used
   // Set up config.xml src url
@@ -276,55 +267,7 @@ IonicTask.prototype.setupLiveReload = function() {
     console.log('There was an error serving your Ionic application for run', error);
     console.log(error.stack);
     throw error;
-  })
-
-  // .then(function() {
-    // return Serve.showFinishedServeMessage(options);
-  // })
-  // .then(function() {
-    // return Serve.listenToServeLogs(options);
-    // events.on('serverlog', console.log);
-    // events.on('consolelog', console.log);
-  // })
-
-
-  // var self = this;
-  // var serve = new require('./serve');
-  // var serveTask = new serve.IonicTask();
-  // serveTask.ionic = this.ionic;
-  // serveTask.isPlatformServe = true;
-
-  // serveTask.loadSettings();
-
-  // serveTask.getAddress()
-  // .then(function() {
-  //   return serveTask.checkPorts(true, serveTask.port, serveTask.address);
-  // })
-  // .then(function() {
-  //   if(serveTask.runLivereload) {
-  //     return serveTask.checkPorts(false, serveTask.liveReloadPort, serveTask.address);
-  //   }
-  // })
-  // .then(function() {
-
-  //   serveTask.runLivereload = true;
-  //   serveTask.launchBrowser = false;
-  //   serveTask.launchLab = false;
-  //   serveTask.start(self.ionic);
-
-  //   if(self.ionic.hasFailed) return;
-
-  //   self.ionic.setConfigXml({
-  //     devServer: serveTask.devServer
-  //   }).then(function(){
-  //     d.resolve();
-  //   });
-  // })
-  // .catch(function(error) {
-
-  // })
-
-  // return d.promise;
+  });
 };
 
 exports.IonicTask = IonicTask;

From 6c9ee2e55fc913d8bd1e40310a77d1d47f0dc352 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 15:40:15 -0500
Subject: [PATCH 0611/1100] Changing the Ionic global variable - using Utils
 module now from the app lib

---
 lib/ionic/resources/generate.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index f0e1f34f24..2c95633f36 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -11,6 +11,8 @@ var fs = require('fs'),
     Task = require('../task').Task,
     shelljs = require('shelljs'),
     moduleSettings = require('../../../package.json'),
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
     IonicStats = require('../stats').IonicStats;
 
 
@@ -789,7 +791,7 @@ function addIonicIcons(platform, forceAddResources) {
       throw error;
     })
   } catch(ex) {
-    Ionic.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
+    Utils.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
   }
 }
 
@@ -821,7 +823,7 @@ function copyIconFilesIntoResources(forceAddResources) {
   var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
   // console.log('uzip to: ', unzipPath)
   console.log('Downloading Default Ionic Resources'.yellow);
-  return Ionic.fetchArchive(unzipPath, ionicResourcesUrl)
+  return Utils.fetchArchive(unzipPath, ionicResourcesUrl)
   .then(function() {
     shelljs.config.silent = true
     shelljs.mv('resources/ionic-default-resources-master/*', 'resources')

From 51942f99a53b21f8f0da7626898f41f6ee1a8df8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 20:52:05 -0500
Subject: [PATCH 0612/1100] Removing some log statements and adding in an app
 directory for the configxml

---
 lib/cli.js                      | 2 --
 lib/ionic/cordova.js            | 6 +++---
 lib/ionic/resources/generate.js | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 3266249575..fc4797c6dd 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -68,9 +68,7 @@ Cli.run = function run(argv) {
 
     var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
-    // console.log('taskinstance run with argv', argv);
     var promise = taskInstance.run(Cli, argv);
-    // console.log('run is going');
     return promise;
   } catch (ex) {
     IonicAppLib.events.emit('verbose', 'Cli.Run - Error', ex);
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 1eb5082b5b..da098007b3 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -178,7 +178,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
     cordovaProcess.on('exit', function(){
       setTimeout(function(){
         // set it back to the original src after a few seconds
-        ConfigXml.setConfigXml({
+        ConfigXml.setConfigXml(process.cwd(), {
           resetContent: true,
           errorWhenNotFound: true
         });
@@ -188,7 +188,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 
     process.on('exit', function(){
       // verify it was set back
-      self.ionic.setConfigXml({
+      self.ionic.setConfigXml( process.cwd(), {
         resetContent: true,
         errorWhenNotFound: false
       });
@@ -256,7 +256,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     }
   })
   .then(function() {
-    ConfigXml.setConfigXml({
+    ConfigXml.setConfigXml( process.cwd(), {
       devServer: Serve.host(options.address, options.port)
     }).then(function(){
       d.resolve();
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
index 2c95633f36..c8fea33be4 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources/generate.js
@@ -15,7 +15,6 @@ var fs = require('fs'),
     Utils = IonicAppLib.utils,
     IonicStats = require('../stats').IonicStats;
 
-
 var IonicResources = function() {};
 IonicResources.prototype = new Task();
 

From 1a20d4b04fecc32f52937564397edae4f9b513e6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 27 Apr 2015 20:56:33 -0500
Subject: [PATCH 0613/1100] Removing console.log, adding in utils, calling
 utils.fail

---
 lib/ionic/start.js | 4 +---
 lib/ionic/state.js | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index dad183e030..abb7f039bd 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -43,9 +43,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
     promptPromise = Q(true);
-  }  
-
-  console.log(options);
+  }
 
   return promptPromise
   .then(function(promptToContinue) {
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 9c58bdfc98..9ac5a57eba 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -35,6 +35,8 @@ var fs = require('fs'),
   IonicStats = require('./stats').IonicStats,
   _ = require('underscore'),
   IonicProject = require('./project'),
+  IonicAppLib = require('ionic-app-lib'),
+  Utils = IonicAppLib.utils,
   IonicInfo = require('./info').IonicTask;
 
 var State = module.exports;
@@ -60,7 +62,7 @@ State.getPackageJson = function getPackageJson() {
   } catch (ex) {
     console.log('There was an error opening your package.json file.');
     console.log(ex);
-    Ionic.fail(ex);
+    Utils.fail(ex);
   }
 
   return packageJson;

From 3613ad879b6b10340b65be784dc65a7fb136f8d5 Mon Sep 17 00:00:00 2001
From: Jamieson Warner <jamiesonwarner@gmail.com>
Date: Mon, 27 Apr 2015 21:40:46 -0500
Subject: [PATCH 0614/1100] and that's a wrap

---
 npm-shrinkwrap.json | 1196 +++++++++++++++++--------------------------
 1 file changed, 477 insertions(+), 719 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4253b9780e..268d5014b9 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,102 +1,84 @@
 {
   "name": "ionic",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
+      "from": "archiver@0.5.1",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "from": "readable-stream@~1.1.9",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "from": "core-util-is@~1.0.0"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+              "from": "isarray@0.0.1"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "from": "string_decoder@~0.10.x"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+              "from": "inherits@~2.0.1"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
-          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+          "from": "zip-stream@~0.1.0",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@~1.0.24",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                  "from": "isarray@0.0.1"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@~2.0.1"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+              "from": "lodash.defaults@~2.4.1",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@~2.4.1",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                      "from": "lodash._isnative@~2.4.1"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                      "from": "lodash.isobject@~2.4.1"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                      "from": "lodash._shimkeys@~2.4.1"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                  "from": "lodash._objecttypes@~2.4.1"
                 }
               }
             }
@@ -104,33 +86,27 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+          "from": "lazystream@~0.1.0",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@~1.0.2",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                  "from": "isarray@0.0.1"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@~2.0.1"
                 }
               }
             }
@@ -138,48 +114,39 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
-          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+          "from": "file-utils@~0.1.5",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+              "from": "lodash@~2.1.0"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
-              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+              "from": "iconv-lite@~0.2.11"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+              "from": "rimraf@~2.2.2"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "from": "glob@~3.2.6",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@2"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "from": "minimatch@0.3",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.5.0",
-                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                      "version": "2.6.2",
+                      "from": "lru-cache@2"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "from": "sigmund@~1.0.0"
                     }
                   }
                 }
@@ -187,400 +154,425 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "from": "minimatch@~0.2.12",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                  "version": "2.6.2",
+                  "from": "lru-cache@2"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                  "from": "sigmund@~1.0.0"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@~0.1.2",
               "dependencies": {
                 "lodash": {
-                  "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "version": "2.4.2",
+                  "from": "lodash@~2.4.1"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
-              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
+              "from": "isbinaryfile@~0.1.9"
             }
           }
         },
         "lodash": {
-          "version": "2.4.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "version": "2.4.2",
+          "from": "lodash@~2.4.1"
         }
       }
     },
     "async": {
       "version": "0.9.0",
-      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+      "from": "async@^0.9.0"
+    },
+    "cheerio": {
+      "version": "0.19.0",
+      "from": "cheerio@^0.19.0",
+      "dependencies": {
+        "css-select": {
+          "version": "1.0.0",
+          "from": "css-select@~1.0.0",
+          "dependencies": {
+            "css-what": {
+              "version": "1.0.0",
+              "from": "css-what@1.0"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "from": "domutils@1.4",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.3.0",
+                  "from": "domelementtype@1"
+                }
+              }
+            },
+            "boolbase": {
+              "version": "1.0.0",
+              "from": "boolbase@~1.0.0"
+            },
+            "nth-check": {
+              "version": "1.0.1",
+              "from": "nth-check@~1.0.0"
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1",
+          "from": "entities@~1.1.1"
+        },
+        "htmlparser2": {
+          "version": "3.8.2",
+          "from": "htmlparser2@~3.8.1",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.3.0",
+              "from": "domhandler@2.3"
+            },
+            "domutils": {
+              "version": "1.5.1",
+              "from": "domutils@1.5"
+            },
+            "domelementtype": {
+              "version": "1.3.0",
+              "from": "domelementtype@1"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "from": "readable-stream@1.1",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@~1.0.0"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@~0.10.x"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@~2.0.1"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0",
+              "from": "entities@1.0"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.1.0",
+          "from": "dom-serializer@~0.1.0",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.3",
+              "from": "domelementtype@~1.1.1"
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.7.0",
+          "from": "lodash@^3.2.0"
+        }
+      }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "cli-table@*",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "from": "cli-table@^0.3.1",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "colors@1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+          "from": "colors@1.0.3"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+      "from": "colors@0.6.2"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+              "from": "ms@0.6.2"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+              "from": "escape-html@1.0.1"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+          "from": "parseurl@~1.3.0"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+          "from": "utils-merge@1.0.0"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
+      "from": "connect-livereload@0.5.2"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+      "from": "crc@3.2.1"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "dependencies": {
         "lru-cache": {
-          "version": "2.5.0",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+          "version": "2.6.2",
+          "from": "lru-cache@^2.5.0"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@3.0.x",
       "dependencies": {
         "through": {
-          "version": "2.3.6",
-          "from": "https://registry.npmjs.org/through/-/through-2.3.6.tgz",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.6.tgz"
+          "version": "2.3.7",
+          "from": "through@~2.3.1"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+          "from": "duplexer@~0.1.1"
         },
         "from": {
           "version": "0.1.3",
-          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
-          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+          "from": "from@~0"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
+          "from": "map-stream@~0.0.3"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+          "from": "pause-stream@0.0.11"
         },
         "split": {
           "version": "0.2.10",
-          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+          "from": "split@0.2"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+          "from": "stream-combiner@~0.0.3"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@~2.0.0",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+              "from": "ms@0.6.2"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+          "from": "escape-html@1.0.1"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@~0.0.4",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+              "from": "delayed-stream@0.0.5"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+          "from": "mime@~1.2.11"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
+          "from": "archy@^0.0.2"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@^0.5.0",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+              "from": "ansi-styles@^1.1.0"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+              "from": "escape-string-regexp@^1.0.0"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@^0.1.0",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                  "from": "ansi-regex@^0.2.0"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@^0.3.0",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                  "from": "ansi-regex@^0.2.0"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+              "from": "supports-color@^0.2.0"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+          "from": "deprecated@^0.0.1"
         },
         "gulp-util": {
           "version": "3.0.4",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
+          "from": "gulp-util@^3.0.0",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+              "from": "array-differ@^1.0.0"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
-              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+              "from": "array-uniq@^1.0.2"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
+              "from": "beeper@^1.0.0"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "from": "chalk@^1.0.0",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
+                  "from": "ansi-styles@^2.0.1"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                  "from": "escape-string-regexp@^1.0.2"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "from": "has-ansi@^1.0.3",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                      "from": "ansi-regex@^1.1.0"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                      "from": "get-stdin@^4.0.1"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "from": "strip-ansi@^2.0.1",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                      "from": "ansi-regex@^1.1.0"
                     }
                   }
                 },
                 "supports-color": {
-                  "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz"
+                  "version": "1.3.1",
+                  "from": "supports-color@^1.3.0"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
-              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@^1.0.11",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                  "from": "get-stdin@^4.0.1"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "from": "meow@*",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@^1.0.0",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                          "from": "camelcase@^1.0.1"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
+                          "from": "map-obj@^1.0.0"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "from": "indent-string@^1.1.0",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.2",
-                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "from": "repeating@^1.1.0",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                              "from": "is-finite@^1.0.0"
                             }
                           }
                         }
@@ -592,112 +584,95 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+              "from": "lodash._reescape@^3.0.0"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+              "from": "lodash._reevaluate@^3.0.0"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+              "from": "lodash._reinterpolate@^3.0.0"
             },
             "lodash.template": {
-              "version": "3.3.2",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.3.2.tgz",
+              "version": "3.5.0",
+              "from": "lodash.template@^3.0.0",
               "dependencies": {
                 "lodash._basecopy": {
-                  "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"
+                  "version": "3.0.1",
+                  "from": "lodash._basecopy@^3.0.0"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                  "from": "lodash._basetostring@^3.0.0"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+                  "from": "lodash._basevalues@^3.0.0"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.4",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.4.tgz"
+                  "version": "3.0.6",
+                  "from": "lodash._isiterateecall@^3.0.0"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                  "from": "lodash.escape@^3.0.0"
+                },
+                "lodash.isnative": {
+                  "version": "3.0.2",
+                  "from": "lodash.isnative@^3.0.0"
                 },
                 "lodash.keys": {
-                  "version": "3.0.4",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.4.tgz",
+                  "version": "3.0.6",
+                  "from": "lodash.keys@^3.0.0",
                   "dependencies": {
                     "lodash.isarguments": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"
+                      "version": "3.0.1",
+                      "from": "lodash.isarguments@^3.0.0"
                     },
                     "lodash.isarray": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"
-                    },
-                    "lodash.isnative": {
-                      "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"
+                      "version": "3.0.2",
+                      "from": "lodash.isarray@^3.0.0"
                     }
                   }
                 },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@^3.0.0"
+                },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
+                  "from": "lodash.templatesettings@^3.0.0"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@^0.1.2",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@~1.1.9",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "from": "core-util-is@~1.0.0"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                          "from": "isarray@0.0.1"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                          "from": "string_decoder@~0.10.x"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                          "from": "inherits@~2.0.1"
                         }
                       }
                     }
@@ -707,67 +682,55 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+              "from": "object-assign@^2.0.0"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+              "from": "replace-ext@0.0.1"
             },
             "through2": {
-              "version": "0.6.3",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "version": "0.6.5",
+              "from": "through2@^0.6.3",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "from": "core-util-is@~1.0.0"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                      "from": "isarray@0.0.1"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                      "from": "string_decoder@~0.10.x"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@~2.0.1"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                  "from": "xtend@>=4.0.0 <4.1.0-0"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@^0.4.3",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                  "from": "clone@^0.2.0"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                  "from": "clone-stats@^0.0.1"
                 }
               }
             }
@@ -775,96 +738,79 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
+          "from": "interpret@^0.3.2"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
-          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@^0.12.0",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@~0.1.2",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@~3.2.9",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@2"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@0.3",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "version": "2.6.2",
+                          "from": "lru-cache@2"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "from": "sigmund@~1.0.0"
                         }
                       }
                     }
                   }
                 },
                 "lodash": {
-                  "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "version": "2.4.2",
+                  "from": "lodash@~2.4.1"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+              "from": "resolve@~0.7.0"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+              "from": "minimist@~0.2.0"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
+              "from": "extend@~1.3.0"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+          "from": "minimist@^1.1.0"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
-          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@^0.3.0",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@~0.1.5",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@~1.3.0",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                      "from": "wrappy@1"
                     }
                   }
                 }
@@ -872,35 +818,29 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+              "from": "sequencify@~0.0.7"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+              "from": "stream-consume@~0.1.0"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
-          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
+          "from": "pretty-hrtime@^0.2.0"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
+          "from": "semver@^3.0.1"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "from": "tildify@^1.0.0",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+              "from": "user-home@^1.0.0"
             }
           }
         }
@@ -908,13 +848,11 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+      "from": "ncp@0.4.2"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "dependencies": {
         "abbrev": {
           "version": "1.0.5",
@@ -1477,23 +1415,19 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
-      "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
+      "from": "opbeat-ionic@^1.1.3",
       "dependencies": {
         "after-all": {
-          "version": "2.0.1",
-          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.1.tgz",
+          "version": "2.0.2",
+          "from": "after-all@^2.0.1",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "from": "once@^1.3.0",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                  "from": "wrappy@1"
                 }
               }
             }
@@ -1501,23 +1435,19 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
+          "from": "console-log-level@^1.0.0"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "from": "json-stringify-safe@^5.0.0"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
-          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "from": "stackman@^0.2.2",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-              "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
+              "from": "stackback@0.0.2"
             }
           }
         }
@@ -1530,131 +1460,107 @@
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+          "from": "wordwrap@~0.0.2"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+          "from": "minimist@~0.0.1"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+      "from": "progress@1.1.7"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+          "from": "pkginfo@0.x.x"
         },
         "read": {
           "version": "1.0.5",
-          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+          "from": "read@1.0.x",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+              "from": "mute-stream@~0.0.4"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
-          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+          "from": "revalidator@0.1.x"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@0.2.x",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+              "from": "async@~0.2.9"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
+              "from": "deep-equal@*"
             },
             "i": {
-              "version": "0.3.2",
-              "from": "https://registry.npmjs.org/i/-/i-0.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.2.tgz"
+              "version": "0.3.3",
+              "from": "i@0.3.x"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "from": "mkdirp@0.x.x",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                  "from": "minimist@0.0.8"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "from": "rimraf@2.x.x",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.2",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "version": "4.5.3",
+                  "from": "glob@^4.4.2",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@^1.0.4",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                          "from": "wrappy@1"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@2"
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "from": "minimatch@^2.0.1",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@^1.0.0",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "from": "balanced-match@^0.2.0"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                              "from": "concat-map@0.0.1"
                             }
                           }
                         }
@@ -1662,13 +1568,11 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "from": "once@^1.3.0",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                          "from": "wrappy@1"
                         }
                       }
                     }
@@ -1680,38 +1584,31 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@0.6.x",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+              "from": "async@0.1.x"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+              "from": "cycle@1.0.x"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+              "from": "eyes@0.1.x"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+              "from": "pkginfo@0.2.x"
             },
             "request": {
               "version": "2.9.203",
-              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+              "from": "request@2.9.x"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+              "from": "stack-trace@0.0.x"
             }
           }
         }
@@ -1719,48 +1616,39 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
-      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+      "from": "proxy-middleware@^0.7.0"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
+      "from": "q@1.0.1"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@~0.9.0",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@~1.0.26",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                  "from": "isarray@0.0.1"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@~2.0.1"
                 }
               }
             }
@@ -1768,28 +1656,23 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+          "from": "caseless@~0.8.0"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+          "from": "forever-agent@~0.5.0"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@~0.2.0",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.9",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
+              "version": "2.0.10",
+              "from": "mime-types@~2.0.3",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.7.0",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
+                  "version": "1.8.0",
+                  "from": "mime-db@~1.8.0"
                 }
               }
             }
@@ -1797,246 +1680,201 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "from": "json-stringify-safe@~5.0.0"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+          "from": "mime-types@~1.0.1"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+          "from": "node-uuid@~1.4.0"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+          "from": "qs@~2.3.1"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+          "from": "tunnel-agent@~0.4.0"
         },
         "tough-cookie": {
-          "version": "0.12.1",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+          "version": "1.0.0",
+          "from": "tough-cookie@>=0.12.0",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+              "from": "punycode@>=0.2.0"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@~0.10.0",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+              "from": "assert-plus@^0.1.5"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+              "from": "asn1@0.1.11"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+              "from": "ctype@0.5.3"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+          "from": "oauth-sign@~0.5.0"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+              "from": "hoek@0.9.x"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+              "from": "boom@0.4.x"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+              "from": "cryptiles@0.2.x"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+              "from": "sntp@0.2.x"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+          "from": "aws-sign2@~0.5.0"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+          "from": "stringstream@~0.0.4"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@~0.0.5",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+              "from": "delayed-stream@0.0.5"
             }
           }
         }
       }
     },
     "semver": {
-      "version": "4.3.1",
-      "from": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.1.tgz"
+      "version": "4.3.3",
+      "from": "semver@^4.2.0"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+          "from": "escape-html@1.0.1"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+          "from": "parseurl@~1.3.0"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "dependencies": {
             "debug": {
-              "version": "2.1.2",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.2.tgz",
+              "version": "2.1.3",
+              "from": "debug@~2.1.0",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                  "from": "ms@0.7.0"
                 }
               }
             },
             "depd": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
+              "version": "1.0.1",
+              "from": "depd@~1.0.0"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
-              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+              "from": "destroy@1.0.3"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
+              "from": "etag@~1.5.0"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
-              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+              "from": "fresh@0.2.4"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+              "from": "mime@1.2.11"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+              "from": "ms@0.6.2"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@~2.1.1",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
+                  "from": "ee-first@1.1.0"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
+              "from": "range-parser@~1.0.2"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+          "from": "utils-merge@1.0.0"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+      "from": "shelljs@0.2.6"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
-      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+          "from": "qs@~0.5.2"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+          "from": "faye-websocket@~0.4.3"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@~0.0.3",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@~2.0.0",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                  "from": "abbrev@1"
                 }
               }
             }
@@ -2044,89 +1882,73 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+          "from": "debug@~0.7.0"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+      "from": "underscore@~1.7.0"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
-      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@~0.1.21",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.6",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+              "from": "graceful-fs@~3.0.2"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+              "from": "inherits@~2.0.0"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "from": "mkdirp@0.5",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                  "from": "minimist@0.0.8"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "from": "rimraf@2",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.2",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+                  "version": "4.5.3",
+                  "from": "glob@^4.4.2",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@^1.0.4",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                          "from": "wrappy@1"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "from": "minimatch@^2.0.1",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@^1.0.0",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "from": "balanced-match@^0.2.0"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                              "from": "concat-map@0.0.1"
                             }
                           }
                         }
@@ -2134,13 +1956,11 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "from": "once@^1.3.0",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                          "from": "wrappy@1"
                         }
                       }
                     }
@@ -2152,86 +1972,71 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@~0.4.0",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
-              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+              "from": "over@>= 0.0.5 < 1"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+              "from": "slice-stream@>= 1.0.0 < 2"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@~0.3.0",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@~0.1.0",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                  "from": "traverse@>=0.3.0 <0.4"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+              "from": "buffers@~0.1.1"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "from": "readable-stream@~1.0.0",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "from": "core-util-is@~1.0.0"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+              "from": "isarray@0.0.1"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "from": "string_decoder@~0.10.x"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+              "from": "inherits@~2.0.1"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
+          "from": "setimmediate@~1.0.1"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@~0.0.2",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+              "from": "buffers@~0.1.1"
             }
           }
         }
@@ -2239,45 +2044,37 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "from": "glob-stream@^3.1.5",
           "dependencies": {
             "glob": {
-              "version": "4.5.2",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.2.tgz",
+              "version": "4.5.3",
+              "from": "glob@^4.3.1",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "from": "inflight@^1.0.4",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                      "from": "wrappy@1"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@~2.0.0"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "from": "once@^1.3.0",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                      "from": "wrappy@1"
                     }
                   }
                 }
@@ -2285,23 +2082,19 @@
             },
             "minimatch": {
               "version": "2.0.4",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "from": "minimatch@^2.0.1",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "from": "brace-expansion@^1.0.0",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                      "from": "balanced-match@^0.2.0"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                      "from": "concat-map@0.0.1"
                     }
                   }
                 }
@@ -2309,79 +2102,65 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+              "from": "ordered-read-streams@^0.1.0"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "from": "glob2base@^0.0.12",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                  "from": "find-index@^0.1.1"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+              "from": "unique-stream@^1.0.0"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@^0.0.6",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@^0.5.1",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@~0.1.0",
                   "dependencies": {
                     "lodash": {
-                      "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
+                      "version": "1.0.2",
+                      "from": "lodash@~1.0.1"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@~3.1.21",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                          "from": "graceful-fs@~1.2.0"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                          "from": "inherits@1"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@~0.2.11",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "version": "2.6.2",
+                          "from": "lru-cache@2"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "from": "sigmund@~1.0.0"
                         }
                       }
                     }
@@ -2393,96 +2172,79 @@
         },
         "graceful-fs": {
           "version": "3.0.6",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+          "from": "graceful-fs@^3.0.0"
         },
         "lodash": {
-          "version": "2.4.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "version": "2.4.2",
+          "from": "lodash@^2.4.1"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "from": "mkdirp@^0.5.0",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+              "from": "minimist@0.0.8"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@^1.0.0",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+              "from": "first-chunk-stream@^1.0.0"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
-              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+              "from": "is-utf8@^0.2.0"
             }
           }
         },
         "through2": {
-          "version": "0.6.3",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+          "version": "0.6.5",
+          "from": "through2@^0.6.1",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "from": "core-util-is@~1.0.0"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                  "from": "isarray@0.0.1"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                  "from": "string_decoder@~0.10.x"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                  "from": "inherits@~2.0.1"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+              "from": "xtend@>=4.0.0 <4.1.0-0"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "from": "vinyl@^0.4.0",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+              "from": "clone@^0.2.0"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+              "from": "clone-stats@^0.0.1"
             }
           }
         }
@@ -2490,23 +2252,19 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+          "from": "sax@0.6.x"
         },
         "xmlbuilder": {
           "version": "2.6.2",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+          "from": "xmlbuilder@>=1.0.0",
           "dependencies": {
             "lodash": {
               "version": "3.5.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
+              "from": "lodash@~3.5.0"
             }
           }
         }

From 6b01df6048c743283f49633cf46c001de33ed0ea Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 11:51:48 -0500
Subject: [PATCH 0615/1100] Fixing spacing with the tasks

---
 lib/tasks/cliTasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index acd842c741..6d96e012e9 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -4,7 +4,7 @@ var resourcesSummary = [
   'Accepted file types are .png, .ai, and .psd.',
   'Icons should be 192x192 px without rounded corners.',
   'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
-].join('\n\t\t\t\t\t     ');
+].join('\n\t\t      ');
 
 var TASKS = [
   {

From acef8fba633de2803aec311ce4dff645ab1c0f3f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 11:53:26 -0500
Subject: [PATCH 0616/1100] Adding in some basic spec tests

---
 spec/cli.spec.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index d894a57482..75f310536c 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -2,6 +2,7 @@ var IonicAppLib = require('ionic-app-lib'),
     Ionitron = require('../lib/ionic/ionitron'),
     IonicCli = require('../lib/cli'),
     Q = require('q'),
+    Task = require('../lib/ionic/task').Task,
     Utils = IonicAppLib.utils;
 
 describe('Cli', function() {
@@ -75,9 +76,27 @@ describe('Cli', function() {
       expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
     });
 
-    it('should run the task it finds', function() {
-      
+    it('should set up console logging helpers', function() {
+      spyOn(IonicCli, 'setUpConsoleLoggingHelpers');
+      IonicCli.run({ _: [] });
+      expect(IonicCli.setUpConsoleLoggingHelpers).toHaveBeenCalled();
     });
-  });
 
+    it('should run the corodva task', function() {
+      var fakeTask = function() {};
+      fakeTask.prototype = new Task();
+      fakeTask.prototype.run = function() {
+        // console.log('running');
+      }
+
+      spyOn(IonicCli, 'tryBuildingTask').andReturn(true);
+
+      spyOn(fakeTask.prototype, 'run').andCallThrough();
+      // var fakeTaskInstance
+      // spyOn(fakeTask, 'constructor').allCallThrough();
+      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
+      IonicCli.run({ _: ['cordova', 'run']});
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+    });
+  });
 });

From ffaafb7bd46a3dd53337d1e95983cc3a257069cb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 11:53:59 -0500
Subject: [PATCH 0617/1100] Removing old ionic.js file

---
 lib/ionic.js | 1036 --------------------------------------------------
 1 file changed, 1036 deletions(-)
 delete mode 100644 lib/ionic.js

diff --git a/lib/ionic.js b/lib/ionic.js
deleted file mode 100644
index d16e602a6d..0000000000
--- a/lib/ionic.js
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*
- _             _
-(_)           (_)
- _  ___  _ __  _  ___
-| |/ _ \| '_ \| |/ __|
-| | (_) | | | | | (__
-|_|\___/|_| |_|_|\___|
-
-http://ionicframework.com/
-
-A utility for starting and administering Ionic based mobile app projects.
-Licensed under the MIT license. See LICENSE For more.
-
-Copyright 2014 Drifty (http://drifty.com/)
-*/
-var argv = require('optimist').argv,
-    colors = require('colors'),
-    Q = require('q'),
-    settings = require('../package.json'),
-    ionicAppLib = require('ionic-app-lib'),
-    Info = ionicAppLib.info,
-    shelljs = require('shelljs/global'),
-    Multibar = require('./ionic/multibar'),
-    ionitron = require('./ionic/ionitron');
-
-var ionicCliLib = require('ionic-app-lib');
-
-ionicCliLib.events.on('log', console.log);
-//Subscribe to verbose
-
-var reportExtras = function reportExtras() {
-  var commandLineInfo = process.argv;
-  var info = Info.gatherInfo();
-  info.command = commandLineInfo;
-  return info;
-}
-
-var opbeat = require('opbeat-ionic')({
-  organizationId: '7456d1360946446791cde22d1ff90a56',
-  appId: '1a3f490314',
-  secretToken: 'f058c32e757d3c589c3c1a7236767a307b780d0b',
-  clientLogLevel: 'fatal',
-  prerequestMethod: reportExtras
-});
-
-colors.setTheme({
-  silly: 'rainbow',
-  input: 'grey',
-  small: 'grey',
-  verbose: 'cyan',
-  prompt: 'grey',
-  info: 'white',
-  data: 'grey',
-  help: 'cyan',
-  warn: 'yellow',
-  debug: 'blue',
-  error: 'red'
-});
-
-var resourcesSummary = [
-  'Automatically create icon and splash screen resources' + ' (beta)'.yellow, 
-  'Put your images in the ./resources directory, named splash or icon.',
-  'Accepted file types are .png, .ai, and .psd.',
-  'Icons should be 192x192 px without rounded corners.',
-  'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
-].join('\n\t\t\t\t\t     ');
-
-var TASKS = [
-  {
-    title: 'start',
-    name: 'start',
-    summary: 'Starts a new Ionic project in the specified PATH',
-    args: {
-      '[options]': 'any flags for the command',
-      '<PATH>': 'directory for the new project',
-      '[template]': 'Template name, ex: tabs, sidemenu, blank\n' +
-                    'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
-                    'Defaults to Ionic "tabs" starter template'
-    },
-    options: {
-      '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
-      '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
-      '--sass|-s': 'Setup the project to use Sass CSS precompiling',
-      '--list|-l': 'List starter templates available',
-      '--io-app-id': 'The Ionic.io app ID to use'
-    },
-    module: './ionic/start'
-  },
-  {
-    title: 'serve',
-    name: 'serve',
-    summary: 'Start a local development server for app dev/testing',
-    args: {
-      '[options]': ''
-    },
-    options: {
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI',
-      '--port|-p': 'Dev server HTTP port (8100 default)',
-      '--livereload-port|-r': 'Live Reload port (35729 default)',
-      '--nobrowser|-b': 'Disable launching a browser',
-      '--nolivereload|-d': 'Do not start live reload',
-      '--noproxy|-x': 'Do not add proxies',
-      '--address': 'Use specific address or return with failure',
-      '--all|-a': 'Have the server listen on all addresses (0.0.0.0)',
-      '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
-      '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
-      '--lab|-l': 'Test your apps on multiple screen sizes and platform types'
-    },
-    module: './ionic/serve'
-  },
-  {
-    title: 'platform',
-    name: 'platform',
-    summary: 'Add platform target for building an Ionic app',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources',
-      '--nosave|-e': 'Do not save the platform to the package.json file'
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'run',
-    name: 'run',
-    summary: 'Run an Ionic project on a connected device',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
-      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--debug|--release': '',
-      '--device|--emulator|--target=FOO': ''
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'emulate',
-    name: 'emulate',
-    summary: 'Emulate an Ionic project on a simulator or emulator',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
-      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
-      '--debug|--release': '',
-      '--device|--emulator|--target=FOO': ''
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'build',
-    name: 'build',
-    summary: 'Locally build an Ionic project for a given platform',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'plugin add',
-    name: 'plugin',
-    summary: 'Add a Cordova plugin',
-    args: {
-      '[options]': '',
-      '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
-    },
-    options: {
-      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
-                                  'and subdirectories first for the plugin before\n' +
-                                  'looking it up in the registry.',
-      '--nosave|-e': 'Do not save the plugin to the package.json file'
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'prepare',
-    name: 'prepare',
-    module: './ionic/cordova'
-  },
-  {
-    title: 'compile',
-    name: 'compile',
-    module: './ionic/cordova'
-  },
-  {
-    title: 'resources',
-    name: 'resources',
-    summary: resourcesSummary,
-    options: {
-      '--icon|-i': 'Generate icon resources',
-      '--splash|-s': 'Generate splash screen resources'
-    },
-    module: './ionic/resources/generate'
-  },
-  {
-    title: 'package',
-    name: 'package',
-    alt: ['pack'],
-    summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
-    args: {
-      '[options]': '',
-      '<MODE>': '"debug" or "release"',
-      '<PLATFORM>': '"ios" or "android"'
-    },
-    options: {
-      '--android-keystore-file|-k': 'Android keystore file',
-      '--android-keystore-alias|-a': 'Android keystore alias',
-      '--android-keystore-password|-w': 'Android keystore password',
-      '--android-key-password|-r': 'Android key password',
-      '--ios-certificate-file|-c': 'iOS certificate file',
-      '--ios-certificate-password|-d': 'iOS certificate password',
-      '--ios-profile-file|-f': 'iOS profile file',
-      '--output|-o': 'Path to save the packaged app',
-      '--no-email|-n': 'Do not send a build package email',
-      '--clear-signing|-l': 'Clear out all signing data from Ionic server',
-      '--email|-e': 'Ionic account email',
-      '--password|-p': 'Ionic account password'
-    },
-    module: './ionic/package'
-  },
-  {
-    title: 'upload',
-    name: 'upload',
-    summary: 'Upload an app to your Ionic account',
-    options: {
-      '--email|-e': 'Ionic account email',
-      '--password|-p': 'Ionic account password'
-    },
-    alt: ['up'],
-    module: './ionic/upload'
-  },
-  {
-    title: 'share',
-    name: 'share',
-    summary: 'Share an app with a client, co-worker, friend, or customer',
-    args: {
-      '<EMAIL>': 'The email to share the app with',
-    },
-    module: './ionic/share'
-  },
-  {
-    title: 'lib',
-    name: 'lib',
-    summary: 'Gets Ionic library version or updates the Ionic library',
-    args: {
-      '[options]': '',
-      '[update]': 'Updates the Ionic Framework in www/lib/ionic'
-    },
-    options: {
-      '--version|-v': 'Specific Ionic version\nOtherwise it defaults to the latest version'
-    },
-    module: './ionic/lib'
-  },
-  {
-    title: 'setup',
-    name: 'setup',
-    summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
-    args: {
-      '[sass]': 'Setup the project to use Sass CSS precompiling'
-    },
-    module: './ionic/setup'
-  },
-  {
-    title: 'login',
-    name: 'login',
-    module: './ionic/login'
-  },
-  {
-    title: 'address',
-    name: 'address',
-    module: './ionic/serve'
-  },
-  {
-    title: 'app',
-    name: 'app',
-    // summary: 'Deploy a new Ionic app version or list versions',
-    // options: {
-    //   '--versions|-v': 'List recently uploaded versions of this app',
-    //   '--deploy|-d': 'Upload the current working copy and mark it as deployed',
-    //   '--note|-n': 'Add a note to a deploy',
-    //   '--uuid|-u': 'Mark an already uploaded version as deployed'
-    // },
-    module: './ionic/app'
-   },
-   {
-    title: 'push',
-    name: 'push',
-    module: './ionic/push'
-   },
-   {
-    title: 'browser',
-    name: 'browser',
-    summary: 'Add another browser for a platform ' + '(beta)'.yellow,
-    args: {
-      '<command>': '"add remove rm versions upgrade list ls revert"',
-      '[browser]': 'The browser you wish to add or remove (Crosswalk)'
-    },
-    options: {
-      '--nosave|-n': 'Do not save the platforms and plugins to the package.json file'
-    },
-    module: './ionic/browser'
-  },
-  {
-    title: 'service add',
-    name: 'service',
-    summary: 'Add an Ionic service package and install any required plugins',
-    args: {
-      '[options]': '',
-      '<SPEC>': 'Can be a service name or a git url'
-    },
-    module: './ionic/service'
-   },
-   {
-    title: 'add',
-    name: 'add',
-    summary: 'Add an Ion, bower component, or addon to the project',
-    args: {
-      '[name]': 'The name of the ion, bower component, or addon you wish to install'
-    },
-    module: './ionic/add'
-   },
-   {
-    title: 'remove',
-    name: 'remove',
-    summary: 'Remove an Ion, bower component, or addon from the project',
-    args: {
-      '[name]': 'The name of the Ion, bower component, or addon you wish to remove'
-    },
-    module: './ionic/add',
-    alt: ['rm']
-   },
-   {
-    title: 'list',
-    name: 'list',
-    summary: 'List Ions, bower components, or addons in the project',
-    module: './ionic/add',
-    alt: ['ls']
-   },
-   {
-    title: 'ions',
-    name: 'ions',
-    summary: 'List available ions to add to your project',
-    module: './ionic/ions'
-   },
-   {
-    title: 'templates',
-    name: 'templates',
-    summary: 'List available Ionic starter templates',
-    module: './ionic/templates'
-   },
-   {
-     title: 'info',
-     name: 'info',
-     summary: 'List information about the users runtime environment',
-     module: './ionic/info'
-   },
-   {
-     title: 'help',
-     name: 'help',
-     summary: 'Provides help for a certain command',
-     args: {
-       '[command]': 'The command you desire help with'
-     },
-     module: './ionic/help'
-   },
-   {
-    title: 'link',
-    name: 'link',
-    summary: 'Sets your Ionic App ID for your project',
-    args: {
-      '[appId]': 'The app ID you wish to set for this project'
-    },
-    options: {
-      '--reset|-r': 'This will reset the Ionic App ID'
-    },
-    module: './ionic/link'
-   },
-   {
-
-    title: 'hooks',
-    name: 'hooks',
-    summary: 'Manage your Ionic Cordova hooks',
-    args: {
-      '[add|remove|permissions|perm]': 'Add, remove, or modify permissions on the default Ionic Cordova hooks'
-    },
-    module: './ionic/hooks'
-  },
-  {
-    title: 'state',
-    name: 'state',
-    summary: 'Saves or restores state of your Ionic Application using the package.json file',
-    args: {
-      '<COMMAND>': '[ save | restore | clear | reset ]'
-    },
-    options: {
-      'save': 'Save the platforms and plugins into package.json',
-      'restore': 'Restore the platforms and plugins from package.json',
-      'clear': 'Clear the package.json of cordovaPlugins and cordovaPlatforms, as well as clear out the platforms and plugins folders',
-      'reset': 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
-      '--plugins': 'Only do operations with plugins',
-      '--platforms': 'Only do operations with platforms'
-    },
-    module: './ionic/state'
-   },
-   {
-    title: 'docs',
-    name: 'docs',
-    summary: 'Opens up the documentation for Ionic',
-    args: {
-      '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
-    },
-    module: './ionic/docs'
-   }
-];
-
-Ionic = {
-  IONIC_DASH: 'https://apps.ionic.io',
-  //IONIC_DASH: 'http://localhost:8000',
-  IONIC_API: '/api/v1/',
-  PRIVATE_PATH: '.ionic',
-  _tryBuildingTask: function() {
-    if(argv._.length === 0) {
-      return false;
-    }
-    var taskName = argv._[0];
-
-    return this._getTaskWithName(taskName);
-  },
-
-  _getTaskWithName: function(name) {
-    for(var i = 0; i < TASKS.length; i++) {
-      var t = TASKS[i];
-      if(t.name === name) {
-        return t;
-      }
-      if(t.alt) {
-        for(var j = 0; j < t.alt.length; j++) {
-          var alt = t.alt[j];
-          if(alt === name) {
-            return t;
-          }
-        }
-      }
-    }
-  },
-
-  printUsage: function(d) {
-    var w = function(s) {
-      process.stdout.write(s);
-    };
-
-    w('\n');
-
-    var rightColumn = 41;
-    var dots = '';
-    var indent = '';
-    var x, arg;
-
-    var taskArgs = d.title;
-
-    for(arg in d.args) {
-      taskArgs += ' ' + arg;
-    }
-
-    w(taskArgs.green.bold);
-
-    while( (taskArgs + dots).length < rightColumn + 1) {
-      dots += '.';
-    }
-
-    w(' ' + dots.grey + '  ');
-
-    if(d.summary) {
-      w(d.summary.bold);
-    }
-
-    for(arg in d.args) {
-      if( !d.args[arg] ) continue;
-
-      indent = '';
-      w('\n');
-      while(indent.length < rightColumn) {
-        indent += ' ';
-      }
-      w( (indent + '    ' + arg + ' ').bold );
-
-      var argDescs = d.args[arg].split('\n');
-      var argIndent = indent + '    ';
-
-      for(x=0; x<arg.length + 1; x++) {
-        argIndent += ' ';
-      }
-
-      for(x=0; x<argDescs.length; x++) {
-        if(x===0) {
-          w( argDescs[x].bold );
-        } else {
-          w( '\n' + argIndent + argDescs[x].bold );
-        }
-      }
-    }
-
-    indent = '';
-    while(indent.length < d.name.length + 1) {
-      indent += ' ';
-    }
-
-    var optIndent = indent;
-    while(optIndent.length < rightColumn + 4) {
-      optIndent += ' ';
-    }
-
-    for(var opt in d.options) {
-      w('\n');
-      dots = '';
-
-      var optLine = indent + '[' + opt + ']  ';
-
-      w(optLine.yellow.bold);
-
-      if(d.options[opt]) {
-        while( (dots.length + optLine.length - 2) < rightColumn) {
-          dots += '.';
-        }
-        w(dots.grey + '  ');
-
-        var optDescs = d.options[opt].split('\n');
-        for(x=0; x<optDescs.length; x++) {
-          if(x===0) {
-            w( optDescs[x].bold );
-          } else {
-            w( '\n' + optIndent + optDescs[x].bold );
-          }
-        }
-      }
-    }
-
-    w('\n');
-  },
-
-  _printAvailableTasks: function() {
-    this._printIonic();
-    process.stderr.write('\nUsage: ionic task args\n\n=======================\n\n');
-
-    if(process.argv.length > 2) {
-      process.stderr.write( (process.argv[2] + ' is not a valid task\n\n').bold.red );
-    }
-
-    process.stderr.write('Available tasks: '.bold);
-    process.stderr.write('(use --help or -h for more info)\n\n');
-
-    for(var i = 0; i < TASKS.length; i++) {
-      var task = TASKS[i];
-      if(task.summary) {
-        var name = '   ' + task.name + '  ';
-        var dots = '';
-        while((name + dots).length < 20) {
-          dots += '.';
-        }
-        process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary.bold + '\n');
-      }
-    }
-
-    process.stderr.write('\n');
-    this.processExit(1);
-  },
-
-  _printHelpLines: function() {
-    this._printIonic();
-    process.stderr.write('\n=======================\n');
-
-    for(var i = 0; i < TASKS.length; i++) {
-      var task = TASKS[i];
-      if(task.summary) {
-        this.printUsage(task);
-      }
-    }
-
-    process.stderr.write('\n');
-    this.processExit(1);
-  },
-
-  _printIonic: function() {
-    var w = function(s) {
-      process.stdout.write(s);
-    };
-
-    w('  _             _     \n');
-    w(' (_)           (_)     \n');
-    w('  _  ___  _ __  _  ___ \n');
-    w(' | |/ _ \\| \'_ \\| |/ __|\n');
-    w(' | | (_) | | | | | (__ \n');
-    w(' |_|\\___/|_| |_|_|\\___|  CLI v'+ settings.version + '\n');
-
-  },
-
-  run: function() {
-    var self = this;
-
-    self.checkLatestVersion();
-
-    process.on('exit', function(){
-      self.printVersionWarning();
-    });
-
-    if(argv.ionitron) {
-      return ionitron.print();
-    }
-
-    if (argv.verbose) {
-      ionicCliLib.events.on('verbose', console.log);
-    }
-
-    if( (argv.version || argv.v) && !argv._.length) {
-      return this.version();
-    }
-
-    if(argv.help || argv.h) {
-      return this._printHelpLines();
-    }
-
-    if(argv['stats-opt-out']) {
-      var IonicStore = require('./ionic/store').IonicStore;
-      var ionicConfig = new IonicStore('ionic.config');
-      ionicConfig.set('statsOptOut', true);
-      ionicConfig.save();
-      console.log('Successful stats opt-out');
-      return;
-    }
-
-    var taskSetting = this._tryBuildingTask();
-    if(!taskSetting) {
-      return this._printAvailableTasks();
-    }
-    var taskModule = require(taskSetting.module).IonicTask;
-
-    var taskInstance = new taskModule();
-    taskInstance.run(this);
-  },
-
-  fail: function(msg, taskHelp) {
-    this.hasFailed = true;
-    if(msg) {
-      process.stderr.write(msg.error.bold);
-      process.stderr.write( (' (CLI v' + settings.version + ')').error.bold + '\n');
-      
-      var info = Info.gatherInfo();
-      Info.printInfo(info);
-    }
-    if(taskHelp) {
-      for(var i = 0; i < TASKS.length; i++) {
-        var task = TASKS[i];
-        if(task.name == taskHelp) {
-          this.printUsage(task);
-          process.stderr.write('\n');
-          break;
-        }
-      }
-    }
-    process.stderr.write('\n');
-    this.processExit(1);
-  },
-
-  version: function() {
-    process.stderr.write(settings.version + '\n');
-  },
-
-  checkLatestVersion: function() {
-    this.latestVersion = Q.defer();
-    var self = this;
-
-    try {
-      if(settings.version.indexOf('beta') > -1) {
-        // don't bother checking if its a beta
-        self.latestVersion.resolve();
-        return;
-      }
-
-      // stay silent if it errors
-      var IonicStore = require('./ionic/store').IonicStore;
-      var ionicConfig = new IonicStore('ionic.config');
-      var versionCheck = ionicConfig.get('versionCheck');
-      if(versionCheck && ((versionCheck + 86400000) > Date.now() )) {
-        // we've recently checked for the latest version, so don't bother again
-        self.latestVersion.resolve();
-        return;
-      }
-
-      var proxy = process.env.PROXY || process.env.http_proxy || null;
-      var request = require('request');
-      request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
-        try {
-          self.npmVersion = JSON.parse(body).version;
-          ionicConfig.set('versionCheck', Date.now());
-          ionicConfig.save();
-        } catch(e) {}
-        self.latestVersion.resolve();
-      });
-    } catch(e) {
-      self.latestVersion.resolve();
-    }
-
-  },
-
-  printVersionWarning: function() {
-    if(this.npmVersion && this.npmVersion != settings.version.trim()) {
-      process.stdout.write('\n------------------------------------\n'.red);
-      process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
-      process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
-      process.stdout.write( (' * Latest version: ' + this.npmVersion + '\n').yellow );
-      process.stdout.write( (' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow );
-      process.stdout.write( ' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow );
-      process.stdout.write('------------------------------------\n\n'.red);
-      this.npmVersion = null;
-    }
-  },
-
-  printNewsUpdates: function printNewsUpdates(skipNewsCheck) {
-    if(typeof skipNewsCheck == 'undefined') {
-      skipNewsCheck = true;
-    } 
-
-    var q = this.cliNews = Q.defer();
-    var proxy = process.env.PROXY || null;
-    var IonicStore = require('./ionic/store').IonicStore;
-    var ionicConfig = new IonicStore('ionic.config');
-
-    var request = require('request');
-    var monthNames = [ "January", "February", "March", "April", "May", "June",
-    "July", "August", "September", "October", "November", "December" ];
-    var d = new Date();
-
-    var downloadUrl = 'http://code.ionicframework.com/content/cli-message.json';
-    request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-      if(!err && res && res.statusCode === 200) {
-        try {
-          var newsId = ionicConfig.get('newsId');
-          var messagesJson = {};
-          messagesJson = JSON.parse(html);
-          if(skipNewsCheck || typeof newsId == 'undefined' || newsId != messagesJson.id) {
-            ionicConfig.set('newsId', messagesJson.id)
-            ionicConfig.save()
-          } else {
-            q.resolve();
-            return q.promise;
-          }
-
-          process.stdout.write('+---------------------------------------------------------+\n'.green);
-
-          var monthMessage = ['+ New Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').green;
-          process.stdout.write(monthMessage);
-
-          for(var i = 0, j = messagesJson.list.length; i < j; i++) {
-            var entry = messagesJson.list[i];
-            var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.yellow, '\n+\n'].join('');
-            process.stdout.write(entryMessage);
-          }
-          process.stdout.write('+---------------------------------------------------------+\n'.green);
-        }catch(ex) {
-          console.log('ex', ex)
-          q.reject('Error occured in downloading the CLI messages:', ex)
-          self.ionic.fail(ex);
-          q.reject(ex);
-          return
-        }
-        q.resolve(messagesJson);
-      } else {
-        process.stdout.write('Unable to fetch', err, res.statusCode);
-        q.reject(res);
-      }
-    });
-    return q.promise;
-  },
-
-  processExit: function(code) {
-    if(this.cliNews && this.cliNews.promise) {
-      Q.all([this.latestVersion.promise, this.cliNews.promise])
-      .then(function() {
-        process.exit(code);
-      })  
-    } else {
-      this.latestVersion.promise.then(function() {
-        process.exit(code);
-      })
-    }
-    
-  },
-
-  getContentSrc: function() {
-    var self = this;
-    var contentSrc;
-
-    try {
-      var fs = require('fs');
-      var path = require('path');
-      var configXmlPath = path.resolve('config.xml');
-      if( !fs.existsSync(configXmlPath) ) {
-        return 'index.html';
-      }
-
-      self.setConfigXml({
-        resetContent: true,
-        errorWhenNotFound: false
-      });
-
-      var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
-
-      var xml2js = require('xml2js');
-      var parseString = xml2js.parseString;
-      parseString(configString, function (err, jsonConfig) {
-        if(err) {
-          return self.fail('Error parsing config.xml: ' + err);
-        }
-        try {
-          contentSrc = jsonConfig.widget.content[0].$.src;
-        } catch(e) {
-          return self.fail('Error parsing ' + configXmlPath + ': ' + e);
-        }
-      });
-
-    } catch(e) {
-      return self.fail('Error loading ' + configXmlPath + ': ' + e);
-    }
-
-    return contentSrc;
-  },
-
-  /**
-   * Download a zip file, unzip it to a specific folder.
-   */
-  fetchArchive: function(targetPath, archiveUrl) {
-    var os = require('os');
-    var fs = require('fs');
-    var path = require('path');
-    var unzip = require('unzip');
-    var q = Q.defer();
-
-    // The folder name the project will be downloaded and extracted to
-    console.log('\nDownloading:'.bold, archiveUrl);
-
-    var tmpFolder = os.tmpdir();
-    var tempZipFilePath = path.join(tmpFolder, 'ionic-starter-' + new Date().getTime() + '.zip');
-
-
-    var unzipRepo = function(fileName) {
-      var readStream = fs.createReadStream(fileName);
-      readStream.on('error', function(err) {
-        console.log( ('unzipRepo readStream: ' + err).error );
-        q.reject(err);
-      });
-
-      var writeStream = unzip.Extract({ path: targetPath });
-      writeStream.on('close', function() {
-        q.resolve();
-      });
-      writeStream.on('error', function(err) {
-        console.log( ('unzipRepo writeStream: ' + err).error );
-        q.reject(err);
-      });
-      readStream.pipe(writeStream);
-    };
-
-    var proxy = process.env.PROXY || process.env.http_proxy || null;
-    var request = require('request');
-    request({ url: archiveUrl, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
-      if(err) {
-        console.error('Error fetching:'.error.bold, archiveUrl, err);
-        q.reject(err);
-        return;
-      }
-      if(!res) {
-        console.error('Invalid response:'.error.bold, archiveUrl);
-        q.reject('Unable to fetch response: ' + archiveUrl);
-        return;
-      }
-      if(res.statusCode !== 200) {
-        if(res.statusCode === 404 || res.statusCode === 406) {
-          console.error('Not found:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
-          console.error('Please verify the url and try again.'.error.bold);
-        } else {
-          console.error('Invalid response status:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
-        }
-        q.reject(res);
-        return;
-      }
-      try {
-        fs.writeFileSync(tempZipFilePath, body);
-        unzipRepo(tempZipFilePath);
-      } catch(e) {
-        console.log('fetchArchive request write: ' + e);
-        q.reject(e);
-      }
-    }).on('response', function(res){
-      // var ProgressBar = require('progress');
-      var bar = Multibar.newBar('[:bar]  :percent  :etas', {
-        complete: '=',
-        incomplete: ' ',
-        width: 30,
-        total: parseInt(res.headers['content-length'], 10)
-      });
-
-      res.on('data', function (chunk) {
-        try {
-          bar.tick(chunk.length);
-        } catch(e){}
-      });
-    });
-
-    return q.promise;
-  },
-
-  setConfigXml: function(options) {
-    var fs = require('fs');
-    var path = require('path');
-    var xml2js = require('xml2js');
-    var d = Q.defer();
-
-    var self = this;
-    var madeChange = false;
-
-    try {
-      var configXmlPath = path.resolve('config.xml');
-
-      if(!fs.existsSync(configXmlPath)) {
-        // working directory does not have the config.xml file
-        if(options.errorWhenNotFound) {
-          d.reject('Unable to locate config.xml file. Please ensure the working directory is at the root of the app where the config.xml should be located.');
-        } else {
-          d.resolve();
-        }
-        return d.promise;
-      }
-
-      var configString = fs.readFileSync(configXmlPath, { encoding: 'utf8' });
-
-      var parseString = xml2js.parseString;
-      parseString(configString, function (err, jsonConfig) {
-        if(err) {
-          d.reject(err);
-          return self.fail('Error parsing ' + configXmlPath + ': ' + err);
-        }
-
-        if(!jsonConfig.widget) {
-          throw new Error('\nYour config.xml file is invalid. You must have a <widget> element.');
-        } else if(jsonConfig.widget && !jsonConfig.widget.content) {
-          throw new Error('\nYour config.xml file does not have a <content> element. \nAdd something like: <content src="index.html"/>');
-        }
-
-        if(options.devServer) {
-          if( !jsonConfig.widget.content[0].$['original-src'] ) {
-            jsonConfig.widget.content[0].$['original-src'] = jsonConfig.widget.content[0].$.src;
-            madeChange = true;
-          }
-          if(jsonConfig.widget.content[0].$.src !== options.devServer) {
-            jsonConfig.widget.content[0].$.src = options.devServer;
-            madeChange = true;
-          }
-
-        } else if(options.resetContent) {
-
-          if( jsonConfig.widget.content[0].$['original-src'] ) {
-            jsonConfig.widget.content[0].$.src = jsonConfig.widget.content[0].$['original-src'];
-            delete jsonConfig.widget.content[0].$['original-src'];
-            madeChange = true;
-          }
-        }
-
-        if(madeChange) {
-          var xmlBuilder = new xml2js.Builder();
-          configString = xmlBuilder.buildObject(jsonConfig);
-          fs.writeFileSync(configXmlPath, configString);
-        }
-
-        d.resolve();
-      });
-
-    } catch(e) {
-      d.reject(e);
-      self.fail('Error updating ' + configXmlPath + ': ' + e);
-    }
-
-    return d.promise;
-  }
-
-};
-
-var consoleInfo = console.info;
-console.info = function() {
-  if (arguments.length === 1 && !arguments[0]) return;
-  var msg = '';
-  for (var n in arguments) {
-    msg += arguments[n] + ' ';
-  }
-  consoleInfo.call(console, msg.blue.bold);
-};
-
-var consoleError = console.error;
-console.error = function() {
-  if (arguments.length === 1 && !arguments[0]) return;
-  var msg = ' ✗';
-  for (var n in arguments) {
-    msg += ' ' + arguments[n];
-  }
-  consoleError.call(console, msg.red.bold);
-};
-
-console.success = function() {
-  if (arguments.length === 1 && !arguments[0]) return;
-  var msg = ' ✓';
-  for (var n in arguments) {
-    msg += ' ' + arguments[n];
-  }
-  console.log(msg.green.bold);
-};
-
-exports.Ionic = Ionic;

From 264d8847749c68fea4794c1f9a80470c92513f5c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 12:01:03 -0500
Subject: [PATCH 0618/1100] Version bump for beta and shrinkwrapping

---
 npm-shrinkwrap.json | 19 ++++++++++---------
 package.json        |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0a64d6b57d..220ece879c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.6",
+  "version": "1.4.0-beta.7",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,8 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.6",
-      "from": "ionic-app-lib@0.0.6",
+      "version": "0.0.7",
+      "from": "ionic-app-lib@0.0.7",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.7.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1730,7 +1731,7 @@
                                 },
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2003,7 +2004,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2183,7 +2184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2760,7 +2761,7 @@
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -3061,7 +3062,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3174,7 +3175,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index ef0ec9a576..32bd6a7572 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.6",
+  "version": "1.4.0-beta.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.6",
+    "ionic-app-lib": "0.0.7",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 944eaadebf8e51904fe424d10b5410ed2fbba492 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 15:10:20 -0500
Subject: [PATCH 0619/1100] Adding additional steps to e2e script

---
 e2e/shell.spec.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/e2e/shell.spec.js b/e2e/shell.spec.js
index c17ab763fc..d6ec55e2b6 100644
--- a/e2e/shell.spec.js
+++ b/e2e/shell.spec.js
@@ -119,6 +119,12 @@ ddescribe('end-to-end', function() {
       expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
       expect(path.join(project, 'resources', 'icon.png')).toExist();
 
+      shell.exec('ionic hooks add');
+      expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
+
+      shell.exec('ionic hooks remove');
+      expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
+
       shell.exec('ionic build ios');
       expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
 

From fe88b573e07fd20a16ea3eaa2fe025184a8408ac Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 15:10:41 -0500
Subject: [PATCH 0620/1100] Switching cordova to use Utils.fail when errors
 occur

---
 lib/ionic/cordova.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index da098007b3..295fee67ac 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -12,10 +12,10 @@ var Task = require('./task').Task,
     ionicAppLib = require('ionic-app-lib'),
     ConfigXml = ionicAppLib.configXml,
     Cordova = ionicAppLib.cordova,
-    Serve = ionicAppLib.serve,
     Hooks = ionicAppLib.hooks,
-    State = ionicAppLib.state;
-    // State = require('./state');
+    Serve = ionicAppLib.serve,
+    State = ionicAppLib.state,
+    Utils = ionicAppLib.utils;
 
 var IonicTask = function() {};
 
@@ -93,15 +93,13 @@ IonicTask.prototype.run = function(ionic, argv) {
       console.log('Error happened', ex)
       console.log(ex.stack);
       throw ex;
-    })
+    });
   } catch (ex) {
-    console.log('An error occurred running a Cordova command:', ex);
-    console.log(ex.stack);
+    Utils.fail('An error occurred running a Cordova command:' + ex);
   }
 }
 
 IonicTask.prototype.runCordova = function(cmdName, argv) {
-  console.log('runCordova', cmdName);
   var deferred = Q.defer();
   var self = this;
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);

From a13e373408bb950f90d9bb7e5bc9ba676ed01cb6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 15:11:00 -0500
Subject: [PATCH 0621/1100] Adding in plugins and platforms arguments for ionic
 cli, ensuring calls goto ionic app state commands

---
 lib/ionic/state.js | 1291 ++++++++++++++++++++++----------------------
 1 file changed, 648 insertions(+), 643 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 9ac5a57eba..d1f213e799 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -28,7 +28,7 @@
 
 var fs = require('fs'),
   path = require('path'),
-  argv = require('optimist').argv,
+  argv = require('optimist').boolean(['plugins', 'platforms']).argv,
   Q = require('q'),
   shelljs = require('shelljs'),
   Task = require('./task').Task,
@@ -36,10 +36,11 @@ var fs = require('fs'),
   _ = require('underscore'),
   IonicProject = require('./project'),
   IonicAppLib = require('ionic-app-lib'),
+  State = IonicAppLib.state,
   Utils = IonicAppLib.utils,
-  IonicInfo = require('./info').IonicTask;
+  IonicInfo = IonicAppLib.info;
 
-var State = module.exports;
+// var State = module.exports;
 
 shelljs.config.silent = true;
 
@@ -47,696 +48,697 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-State.getPackageJson = function getPackageJson() {
-  var packageJsonPath = path.resolve('.', 'package.json');
-  var packageJson = null;
+// State.getPackageJson = function getPackageJson() {
+//   var packageJsonPath = path.resolve('.', 'package.json');
+//   var packageJson = null;
 
-  try {
-    packageJson = require(packageJsonPath);
-    if (!packageJson.cordovaPlugins) {
-      packageJson.cordovaPlugins = [];
-    }
-    if (!packageJson.cordovaPlatforms) {
-      packageJson.cordovaPlatforms = [];
-    }
-  } catch (ex) {
-    console.log('There was an error opening your package.json file.');
-    console.log(ex);
-    Utils.fail(ex);
-  }
+//   try {
+//     packageJson = require(packageJsonPath);
+//     if (!packageJson.cordovaPlugins) {
+//       packageJson.cordovaPlugins = [];
+//     }
+//     if (!packageJson.cordovaPlatforms) {
+//       packageJson.cordovaPlatforms = [];
+//     }
+//   } catch (ex) {
+//     console.log('There was an error opening your package.json file.');
+//     console.log(ex);
+//     Utils.fail(ex);
+//   }
 
-  return packageJson;
-};
+//   return packageJson;
+// };
 
-State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo) {
-  var existingPlugin;
+// State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo) {
+//   var existingPlugin;
 
-  if (typeof pluginInfo === 'undefined') {
-    pluginInfo = pluginId;
-  }
+//   if (typeof pluginInfo === 'undefined') {
+//     pluginInfo = pluginId;
+//   }
 
-  //We need to check cordovaPlugins
-  //perhaps the ID already exists, or the 'id' in the object with locator exists.
-  for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
-    if (typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
-      existingPlugin = packageJson.cordovaPlugins[i];
-    } else if (packageJson.cordovaPlugins[i].id == pluginId) {
-      existingPlugin = packageJson.cordovaPlugins[i];
-    }
-  }
+//   //We need to check cordovaPlugins
+//   //perhaps the ID already exists, or the 'id' in the object with locator exists.
+//   for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
+//     if (typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
+//       existingPlugin = packageJson.cordovaPlugins[i];
+//     } else if (packageJson.cordovaPlugins[i].id == pluginId) {
+//       existingPlugin = packageJson.cordovaPlugins[i];
+//     }
+//   }
 
-  if (!existingPlugin) {
-    console.log('Adding since there was no existingPlugin')
-    packageJson.cordovaPlugins.push(pluginInfo);
-  }
-};
+//   if (!existingPlugin) {
+//     console.log('Adding since there was no existingPlugin')
+//     packageJson.cordovaPlugins.push(pluginInfo);
+//   }
+// };
+
+// State.saveState = function saveState() {
+//   console.log('Saving your Ionic app state of platforms and plugins'.blue.bold);
+//   var packageJson = State.getPackageJson();
+//   try {
+//     State.saveExistingPlatforms(packageJson);
+//     console.log('Saved platform'.green);
+//     State.saveExistingPlugins(packageJson);
+//     console.log('Saved plugins'.green);
+//     State.savePackageJson(packageJson);
+//     console.log('Saved package.json'.green);
+//   } catch (ex) {
+//     console.log('There was an error saving your current Ionic setup'.red);
+//     console.log('Error:', ex);
+//   }
+// };
+
+// State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
+//   var pp = path.resolve('.', 'platforms'),
+//     platforms = [],
+//     platformPath,
+//     platformStats;
+
+//   try {
+//     platforms = fs.readdirSync(pp);
+//   } catch (ex) {
+//     return;
+//   }
 
-State.saveState = function saveState() {
-  console.log('Saving your Ionic app state of platforms and plugins'.blue.bold);
-  var packageJson = State.getPackageJson();
-  try {
-    State.saveExistingPlatforms(packageJson);
-    console.log('Saved platform'.green);
-    State.saveExistingPlugins(packageJson);
-    console.log('Saved plugins'.green);
-    State.savePackageJson(packageJson);
-    console.log('Saved package.json'.green);
-  } catch (ex) {
-    console.log('There was an error saving your current Ionic setup'.red);
-    console.log('Error:', ex);
-  }
-};
+//   // console.log('h')
+//   platforms.forEach(function(platform) {
+//     platformPath = path.resolve('platforms', platform);
+//     platformStats = fs.statSync(platformPath);
+//     if (!platformStats.isDirectory()) {
+//       return
+//     }
 
-State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
-  var pp = path.resolve('.', 'platforms'),
-    platforms = [],
-    platformPath,
-    platformStats;
+//     try {
+//       var versionPath = path.resolve(pp, platform, 'cordova', 'version');
+//       var version = State.getPlatformVersion(versionPath);
+//       var locator = platform;
+
+//       //Check to see if its crosswalk
+//       if (platform === 'android' && version.indexOf('-dev') !== -1) {
+//         //Look up path for engine/cordova-android path
+//         var engineFiles = fs.readdirSync(path.resolve('engine'));
+//         var enginePath = null;
+//         engineFiles.forEach(function(engineDir) {
+//           if (engineDir.indexOf('android') !== -1) {
+//             enginePath = engineDir;
+//           }
+//         });
+//         locator = path.resolve('engine', enginePath);
+//       }
+
+//       var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
+
+//       if (!platformExists) {
+//         packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+//       }
+
+//     } catch (ex) {
+//       console.log('There was an error trying to save your existing state', ex);
+//     }
+//   });
+// };
 
-  try {
-    platforms = fs.readdirSync(pp);
-  } catch (ex) {
-    return;
-  }
+// State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
+//   var pluginDir = path.resolve('.', 'plugins');
+//   // console.log(pluginDir);
 
-  // console.log('h')
-  platforms.forEach(function(platform) {
-    platformPath = path.resolve('platforms', platform);
-    platformStats = fs.statSync(platformPath);
-    if (!platformStats.isDirectory()) {
-      return
-    }
-
-    try {
-      var versionPath = path.resolve(pp, platform, 'cordova', 'version');
-      var version = State.getPlatformVersion(versionPath);
-      var locator = platform;
-
-      //Check to see if its crosswalk
-      if (platform === 'android' && version.indexOf('-dev') !== -1) {
-        //Look up path for engine/cordova-android path
-        var engineFiles = fs.readdirSync(path.resolve('engine'));
-        var enginePath = null;
-        engineFiles.forEach(function(engineDir) {
-          if (engineDir.indexOf('android') !== -1) {
-            enginePath = engineDir;
-          }
-        });
-        locator = path.resolve('engine', enginePath);
-      }
-
-      var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
-
-      if (!platformExists) {
-        packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-      }
-
-    } catch (ex) {
-      console.log('There was an error trying to save your existing state', ex);
-    }
-  });
-};
+//   var plugins = fs.readdirSync(pluginDir);
+//   var pluginId;
 
-State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
-  var pluginDir = path.resolve('.', 'plugins');
-  // console.log(pluginDir);
+//   //Lets try just relying on the fetch.json file
+//   //this file lists all plugins with where they come from, etc
+//   var fetchJson;
 
-  var plugins = fs.readdirSync(pluginDir);
-  var pluginId;
+//   try {
+//     fetchJson = require(path.resolve('plugins', 'fetch.json'));
+//   } catch (ex) {
+//     // Ionic.fail('There is not a fetch.json file available in your plugins folder.');
+//     // return;
+//   }
 
-  //Lets try just relying on the fetch.json file
-  //this file lists all plugins with where they come from, etc
-  var fetchJson;
+//   var configXmlPath = path.resolve('config.xml');
+//   var plugin,
+//     pluginToAdd,
+//     locator;
+//   var cordovaPlugins = [];
+
+//   // console.log('config xml path ', configXmlPath)
+//   var configXmlData = State.getXmlData(configXmlPath);
+
+//   var pluginPath,
+//       pluginPathStats,
+//       pluginXmlPath,
+//       pluginXml,
+//       pluginName,
+//       featureParams,
+//       preferences,
+//       hasVariables = false,
+//       variableList = [],
+//       keyValueList = {};
+
+
+//   if (fetchJson) {
+//     // console.log('fetchJson', fetchJson)
+//     //This will break with what we had before
+//     for (pluginId in fetchJson) {
+//       // cordovaPlugins.push();
+//       plugin = fetchJson[pluginId];
+//       pluginToAdd = {};
+//       try {
+//         pluginPath = path.resolve('plugins', pluginId);
+//         pluginPathStats = fs.statSync(pluginPath);
+//       } catch (ex) {
+//         console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
+//         continue;
+//       }
+
+//       if (!pluginPathStats.isDirectory()) {
+//         console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
+//         continue;
+//       }
+
+//       // console.log('plugin.source.type', plugin.source.type);
+
+//       if (plugin.source.type === 'registry') {
+//         locator = pluginId;
+//       } else {
+//         if (plugin.source.type === 'local') {
+//           locator = plugin.source.path;
+//         } else { //asume its git
+//           locator = plugin.source.url;
+//         }
+//       }
+
+//       pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
+//       pluginXml = State.getXmlData(pluginXmlPath)
+
+//       pluginName = pluginXml.plugin.name;
+
+//       preferences = pluginXml.plugin.preference;
+
+//       if (preferences && preferences.length > 0) {
+//         hasVariables = true;
+
+//         preferences.forEach(function(preference) {
+//           variableList.push(preference.$.name);
+//           // console.log('looking at preference: ', preference)
+//         })
+//       }
+
+//       hasVariables = false;
+//       variableList = [];
+//       keyValueList = {};
+
+//       if (hasVariables) {
+//         // console.log('we have avariables to look at:', variableList)
+//         // var features = configXmlData.widget.feature;
+//         // console.log('features', features)
+//         featureParams = State.getPluginParameters(configXmlData, pluginName);
+//         // features.forEach(function(potFeature) {
+//         //   if(potFeature.$.name == pluginName) {
+//         //     feature = potFeature
+//         //   }
+//         // })
+
+//         // console.log('feature found:', feature);
+//         // var featureParams = feature.param;
+
+//         variableList.forEach(function(variable) {
+//           // console.log('Looking up variable:', variable)
+//           for (var i = 0, j = featureParams.length; i < j; i++) {
+//             if (variable == featureParams[i].$.name) {
+//               keyValueList[variable] = featureParams[i].$.value;
+//             }
+//           }
+//         })
+
+//         // console.log('We have the plugin parameters with values:', keyValueList)
+
+//         var pluginObj = {id: pluginId, locator: locator, variables: keyValueList};
+//         cordovaPlugins.push(pluginObj)
+
+//       } else if (plugin.source.type === 'git' || plugin.source.type === 'local') {
+//         cordovaPlugins.push({locator: locator, id: pluginId});
+//       } else {
+//         cordovaPlugins.push(pluginId)
+//       }
+
+//     }//closes for loop for fetch.json
+
+//     packageJson.cordovaPlugins = cordovaPlugins
+//   } else {
+//     console.log('There was no fetch.json file available to restore plugin information from.'.red.bold);
+//     console.log('Restoring plugins from scanning the plugins folder is still being worked on.'.red.bold);
+//   }
 
-  try {
-    fetchJson = require(path.resolve('plugins', 'fetch.json'));
-  } catch (ex) {
-    // Ionic.fail('There is not a fetch.json file available in your plugins folder.');
-    // return;
-  }
+// } //Closes saveExistingPlugins
 
-  var configXmlPath = path.resolve('config.xml');
-  var plugin,
-    pluginToAdd,
-    locator;
-  var cordovaPlugins = [];
-
-  // console.log('config xml path ', configXmlPath)
-  var configXmlData = State.getXmlData(configXmlPath);
-
-  var pluginPath,
-      pluginPathStats,
-      pluginXmlPath,
-      pluginXml,
-      pluginName,
-      featureParams,
-      preferences,
-      hasVariables = false,
-      variableList = [],
-      keyValueList = {};
-
-
-  if (fetchJson) {
-    // console.log('fetchJson', fetchJson)
-    //This will break with what we had before
-    for (pluginId in fetchJson) {
-      // cordovaPlugins.push();
-      plugin = fetchJson[pluginId];
-      pluginToAdd = {};
-      try {
-        pluginPath = path.resolve('plugins', pluginId);
-        pluginPathStats = fs.statSync(pluginPath);
-      } catch (ex) {
-        console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
-        continue;
-      }
-
-      if (!pluginPathStats.isDirectory()) {
-        console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
-        continue;
-      }
-
-      // console.log('plugin.source.type', plugin.source.type);
-
-      if (plugin.source.type === 'registry') {
-        locator = pluginId;
-      } else {
-        if (plugin.source.type === 'local') {
-          locator = plugin.source.path;
-        } else { //asume its git
-          locator = plugin.source.url;
-        }
-      }
-
-      pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
-      pluginXml = State.getXmlData(pluginXmlPath)
-
-      pluginName = pluginXml.plugin.name;
-
-      preferences = pluginXml.plugin.preference;
-
-      if (preferences && preferences.length > 0) {
-        hasVariables = true;
-
-        preferences.forEach(function(preference) {
-          variableList.push(preference.$.name);
-          // console.log('looking at preference: ', preference)
-        })
-      }
-
-      hasVariables = false;
-      variableList = [];
-      keyValueList = {};
-
-      if (hasVariables) {
-        // console.log('we have avariables to look at:', variableList)
-        // var features = configXmlData.widget.feature;
-        // console.log('features', features)
-        featureParams = State.getPluginParameters(configXmlData, pluginName);
-        // features.forEach(function(potFeature) {
-        //   if(potFeature.$.name == pluginName) {
-        //     feature = potFeature
-        //   }
-        // })
-
-        // console.log('feature found:', feature);
-        // var featureParams = feature.param;
-
-        variableList.forEach(function(variable) {
-          // console.log('Looking up variable:', variable)
-          for (var i = 0, j = featureParams.length; i < j; i++) {
-            if (variable == featureParams[i].$.name) {
-              keyValueList[variable] = featureParams[i].$.value;
-            }
-          }
-        })
-
-        // console.log('We have the plugin parameters with values:', keyValueList)
-
-        var pluginObj = {id: pluginId, locator: locator, variables: keyValueList};
-        cordovaPlugins.push(pluginObj)
-
-      } else if (plugin.source.type === 'git' || plugin.source.type === 'local') {
-        cordovaPlugins.push({locator: locator, id: pluginId});
-      } else {
-        cordovaPlugins.push(pluginId)
-      }
-
-    }//closes for loop for fetch.json
-
-    packageJson.cordovaPlugins = cordovaPlugins
-  } else {
-    console.log('There was no fetch.json file available to restore plugin information from.'.red.bold);
-    console.log('Restoring plugins from scanning the plugins folder is still being worked on.'.red.bold);
-  }
+// State.getXmlData = function getXmlData(xmlPath) {
+//   var xml2js = require('xml2js');
+//   var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
+//   var xmlData;
+//   var parseString = xml2js.parseString;
+//   parseString(xmlString, function(err, jsonConfig) {
+//     if (err) {
+//       return self.fail('Error parsing xml file: ' + err);
+//     }
+//     try {
+//       xmlData = jsonConfig;
+//     } catch (e) {
+//       return self.fail('Error parsing ' + xmlPath + ': ' + e);
+//     }
+//   });
 
-} //Closes saveExistingPlugins
-
-State.getXmlData = function getXmlData(xmlPath) {
-  var xml2js = require('xml2js');
-  var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
-  var xmlData;
-  var parseString = xml2js.parseString;
-  parseString(xmlString, function(err, jsonConfig) {
-    if (err) {
-      return self.fail('Error parsing xml file: ' + err);
-    }
-    try {
-      xmlData = jsonConfig;
-    } catch (e) {
-      return self.fail('Error parsing ' + xmlPath + ': ' + e);
-    }
-  });
-
-  return xmlData
-}
-
-State.getPlatformVersion = function getPlatformVersion(path) {
-  var result = shelljs.exec(['node', path].join(' '), { silent: true });
-  if (result.code != 0) {
-    return 'Not installed';
-  }
-  var version = result.output
-  // console.log('Version for path:', path, version)
-  return version.replace(/\n/g, '');
-}
+//   return xmlData
+// }
 
-State.addOrUpdatePlatformToPackageJson = function addOrUpdatePlatformToPackageJson(packageJson, platformId, platformInfo) {
-  // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platformId});
-  var existingPlatform;
+// State.getPlatformVersion = function getPlatformVersion(path) {
+//   var result = shelljs.exec(['node', path].join(' '), { silent: true });
+//   if (result.code != 0) {
+//     return 'Not installed';
+//   }
+//   var version = result.output
+//   // console.log('Version for path:', path, version)
+//   return version.replace(/\n/g, '');
+// }
 
-  if (typeof platformInfo === 'undefined') {
-    platformInfo = platformId;
-  }
+// State.addOrUpdatePlatformToPackageJson = function addOrUpdatePlatformToPackageJson(packageJson, platformId, platformInfo) {
+//   // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platformId});
+//   var existingPlatform;
 
-  for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
-    if (typeof packageJson.cordovaPlatforms[i] == 'string' && packageJson.cordovaPlatforms[i] == platformId) {
-      existingPlatform = packageJson.cordovaPlatforms[i];
-    } else if (packageJson.cordovaPlatforms[i].id == platformId) {
-      existingPlatform = packageJson.cordovaPlatforms[i];
-      existingPlatform.locator = platformInfo.locator;
-    }
-  }
+//   if (typeof platformInfo === 'undefined') {
+//     platformInfo = platformId;
+//   }
 
-  if (!existingPlatform) {
-    packageJson.cordovaPlatforms.push(platformInfo);
-  }
-  // console.log('platformExists:', platformExists)
-  // if (!platformExists && requiresLocator) {
-  //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
-  //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-  // } else if (!platformExists && !requiresLocator) {
-  //   packageJson.cordovaPlatforms.push(platform);
-  // } else {
-  //   platformExists.platform = platform
-  //   platformExists.locator = locator
-  // }
-}
-
-State.savePlatform = function savePlatform(platformArgs) {
-  // Locator may be:
-  // Name:        ios, android
-  // Local path:  ./engine/cordova-android-c0.6.1
-  // Http url:    https://github.com/apache/cordova-android.git
-  // console.log('platform args:', platformArgs);
-  var locator = platformArgs._[2];
-  var platform = 'ios';
-  var packageJson = State.getPackageJson();
-
-  //Test to see if its just ios or android
-  if (locator === 'ios' || locator === 'android') {
-    platform = locator;
-    State.addOrUpdatePlatformToPackageJson(packageJson, platform);
-    return State.savePackageJson(packageJson);
-  }
+//   for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
+//     if (typeof packageJson.cordovaPlatforms[i] == 'string' && packageJson.cordovaPlatforms[i] == platformId) {
+//       existingPlatform = packageJson.cordovaPlatforms[i];
+//     } else if (packageJson.cordovaPlatforms[i].id == platformId) {
+//       existingPlatform = packageJson.cordovaPlatforms[i];
+//       existingPlatform.locator = platformInfo.locator;
+//     }
+//   }
 
-  platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
+//   if (!existingPlatform) {
+//     packageJson.cordovaPlatforms.push(platformInfo);
+//   }
+//   // console.log('platformExists:', platformExists)
+//   // if (!platformExists && requiresLocator) {
+//   //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
+//   //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
+//   // } else if (!platformExists && !requiresLocator) {
+//   //   packageJson.cordovaPlatforms.push(platform);
+//   // } else {
+//   //   platformExists.platform = platform
+//   //   platformExists.locator = locator
+//   // }
+// }
+
+// State.savePlatform = function savePlatform(platformArgs) {
+//   // Locator may be:
+//   // Name:        ios, android
+//   // Local path:  ./engine/cordova-android-c0.6.1
+//   // Http url:    https://github.com/apache/cordova-android.git
+//   // console.log('platform args:', platformArgs);
+//   var locator = platformArgs._[2];
+//   var platform = 'ios';
+//   var packageJson = State.getPackageJson();
+
+//   //Test to see if its just ios or android
+//   if (locator === 'ios' || locator === 'android') {
+//     platform = locator;
+//     State.addOrUpdatePlatformToPackageJson(packageJson, platform);
+//     return State.savePackageJson(packageJson);
+//   }
 
-  var platformInfo = {
-    platform: platform,
-    locator: locator
-  };
+//   platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
 
-  State.addOrUpdatePlatformToPackageJson(packageJson, platform, platformInfo);
+//   var platformInfo = {
+//     platform: platform,
+//     locator: locator
+//   };
 
-  State.savePackageJson(packageJson);
+//   State.addOrUpdatePlatformToPackageJson(packageJson, platform, platformInfo);
 
-}
+//   State.savePackageJson(packageJson);
 
-State.savePackageJson = function savePackageJson(packageJsonData) {
-  try {
-    var packageJsonPath = path.resolve('package.json');
-    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
-  } catch (e) {
-    console.log(('Error saving ' + packageJsonPath + ': ' + e).error.bold);
-  }
-}
+// }
 
-State.restoreState = function restoreState() {
+// State.savePackageJson = function savePackageJson(packageJsonData) {
+//   try {
+//     var packageJsonPath = path.resolve('package.json');
+//     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
+//   } catch (e) {
+//     console.log(('Error saving ' + packageJsonPath + ': ' + e).error.bold);
+//   }
+// }
 
-  console.log('Attempting to restore your Ionic application from package.json\n'.yellow.bold);
+// State.restoreState = function restoreState() {
 
-  var packageJsonPath = path.resolve('.', 'package.json')
-  var packageJson = require(packageJsonPath)
+//   console.log('Attempting to restore your Ionic application from package.json\n'.yellow.bold);
 
-  //Restore plugins first - to avoid issues with platforms adding
-  //without variables
-  if (!packageJson.cordovaPlugins) {
-    packageJson.cordovaPlugins = []
-  }
+//   var packageJsonPath = path.resolve('.', 'package.json')
+//   var packageJson = require(packageJsonPath)
 
-  console.log('Restoring Platforms\n'.blue.bold)
-
-  return State.restorePlatforms(packageJson)
-  .then(function() {
-    console.log('\nRestore platforms is complete\n'.green.bold)
-    console.log('\rRestoring Plugins\n'.blue.bold)
-    return State.restorePlugins(packageJson)
-  })
-  .then(function() {
-    console.log('Restore plugins is complete\n'.green.bold)
-    console.log('Ionic state restore completed\n'.blue.bold)
-  })
-  .catch(function(ex) {
-    console.log('Ionic state restore failed\n'.red.bold)
-    console.log(ex)
-  })
-}
-
-State.restorePlugins = function restorePlugins(packageJson) {
-  var q = Q.defer();
-
-  State.processPlugin(0, packageJson, q);
-  // q.resolve();
-
-  return q.promise;
-}
-
-State.restorePlatforms = function restorePlatforms(packageJson) {
-  var q = Q.defer();
-
-  State.processPlatform(0, packageJson, q);
-
-  return q.promise;
-}
-
-State.processPlatform = function processPlatform(index, packageJson, promise) {
-  if (index >= packageJson.cordovaPlatforms.length) {
-    promise.resolve();
-    return
-  }
+//   //Restore plugins first - to avoid issues with platforms adding
+//   //without variables
+//   if (!packageJson.cordovaPlugins) {
+//     packageJson.cordovaPlugins = []
+//   }
 
-  try {
-    // console.log('processing platform', index, packageJson)
-    var platform = packageJson.cordovaPlatforms[index];
-    var platformCommand;
-
-    if (typeof platform == 'string') {
-      platformCommand = ['cordova platform add ', platform].join('')
-    } else {
-      //Here, they have either a special version, or locator for
-      //local install or github install
-      platformCommand = 'cordova platform add ' + platform.locator;
-    }
-    // var platformCommand = State.createAddRemoveStatement(platform);
-    console.log(platformCommand);
-    exec(platformCommand, function() {
-        State.processPlatform(index + 1, packageJson, promise);
-    });
-  } catch (ex) {
-    console.log('An error happened processing the previous cordova plugins')
-    console.log('Error:', ex)
-    promise.reject(ex)
-  }
-}
-
-State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
-    // console.log('Creating add/remove statement', plugin)
-    try {
-      var pluginCmd = 'cordova plugin add ';
-      if (typeof plugin === 'string') {
-        pluginCmd += plugin;
-      } else {
-        pluginCmd += plugin.locator + ' ';
-        if (plugin.variables) {
-            Object.keys(plugin.variables).forEach(function(variable) {
-                pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
-            });
-        }
-      }
-    } catch (ex) {
-      console.log('Failed to create add plugin statement:', ex)
-    }
-
-    // console.log('plugin cmd', pluginCmd)
-
-    return pluginCmd;
-}
-
-State.processPlugin = function processPlugin(index, packageJson, promise) {
-  if (index >= packageJson.cordovaPlugins.length) {
-    promise.resolve();
-    return
-  }
-  try {
-    // console.log('processing plugin', index, packageJson)
-    var plugin = packageJson.cordovaPlugins[index];
-    var pluginCommand = State.createAddRemoveStatement(plugin);
-    console.log(pluginCommand);
-    exec(pluginCommand, function() {
-        State.processPlugin(index + 1, packageJson, promise);
-    });
-  } catch (ex) {
-    console.log('An error happened processing the previous cordova plugins')
-    console.log('Error:', ex)
-    promise.reject(ex)
-  }
-}
-
-State.removePlatform = function removePlatform(platformArgs) {
-  // console.log('Args:', platformArgs);
-  //Expecting - ionic platform remove [ios|android]
-
-  //TODO - check if they pass multiple platforms
-  //ionic platform remove ios android
-  var platformToRemove = platformArgs._[2],
-    packageJson = State.getPackageJson(),
-    platformEntry;
-
-  for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
-    platformEntry = packageJson.cordovaPlatforms[i];
-    if (typeof platformEntry === 'string' && platformEntry == platformToRemove) {
-      packageJson.cordovaPlatforms.splice(i, 1);
-      break;
-    } else if (platformEntry.platform == platformToRemove) {
-      //Its object {platform: 'android', locator: './engine/cordova-android'}
-        packageJson.cordovaPlatforms.splice(i, 1);
-        break;
-    }
-  }
+//   console.log('Restoring Platforms\n'.blue.bold)
+
+//   return State.restorePlatforms(packageJson)
+//   .then(function() {
+//     console.log('\nRestore platforms is complete\n'.green.bold)
+//     console.log('\rRestoring Plugins\n'.blue.bold)
+//     return State.restorePlugins(packageJson)
+//   })
+//   .then(function() {
+//     console.log('Restore plugins is complete\n'.green.bold)
+//     console.log('Ionic state restore completed\n'.blue.bold)
+//   })
+//   .catch(function(ex) {
+//     console.log('Ionic state restore failed\n'.red.bold)
+//     console.log(ex)
+//   })
+// }
+
+// State.restorePlugins = function restorePlugins(packageJson) {
+//   var q = Q.defer();
+
+//   State.processPlugin(0, packageJson, q);
+//   // q.resolve();
+
+//   return q.promise;
+// }
+
+// State.restorePlatforms = function restorePlatforms(packageJson) {
+//   var q = Q.defer();
+
+//   State.processPlatform(0, packageJson, q);
+
+//   return q.promise;
+// }
+
+// State.processPlatform = function processPlatform(index, packageJson, promise) {
+//   if (index >= packageJson.cordovaPlatforms.length) {
+//     promise.resolve();
+//     return
+//   }
 
-  State.savePackageJson(packageJson);
-};
+//   try {
+//     // console.log('processing platform', index, packageJson)
+//     var platform = packageJson.cordovaPlatforms[index];
+//     var platformCommand;
+
+//     if (typeof platform == 'string') {
+//       platformCommand = ['cordova platform add ', platform].join('')
+//     } else {
+//       //Here, they have either a special version, or locator for
+//       //local install or github install
+//       platformCommand = 'cordova platform add ' + platform.locator;
+//     }
+//     // var platformCommand = State.createAddRemoveStatement(platform);
+//     console.log(platformCommand);
+//     exec(platformCommand, function() {
+//         State.processPlatform(index + 1, packageJson, promise);
+//     });
+//   } catch (ex) {
+//     console.log('An error happened processing the previous cordova plugins')
+//     console.log('Error:', ex)
+//     promise.reject(ex)
+//   }
+// }
+
+// State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
+//     // console.log('Creating add/remove statement', plugin)
+//     try {
+//       var pluginCmd = 'cordova plugin add ';
+//       if (typeof plugin === 'string') {
+//         pluginCmd += plugin;
+//       } else {
+//         pluginCmd += plugin.locator + ' ';
+//         if (plugin.variables) {
+//             Object.keys(plugin.variables).forEach(function(variable) {
+//                 pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
+//             });
+//         }
+//       }
+//     } catch (ex) {
+//       console.log('Failed to create add plugin statement:', ex)
+//     }
 
-State.getPluginParameters = function getPluginParameters(configXmlData, pluginName) {
-  if (!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
-    throw 'Invalid Config XML Data';
-  }
+//     // console.log('plugin cmd', pluginCmd)
 
-  var features = configXmlData.widget.feature,
-      feature;
+//     return pluginCmd;
+// }
 
-  features.forEach(function(potFeature) {
-    if (potFeature.$.name == pluginName) {
-      feature = potFeature
-    }
-  })
+// State.processPlugin = function processPlugin(index, packageJson, promise) {
+//   if (index >= packageJson.cordovaPlugins.length) {
+//     promise.resolve();
+//     return
+//   }
+//   try {
+//     // console.log('processing plugin', index, packageJson)
+//     var plugin = packageJson.cordovaPlugins[index];
+//     var pluginCommand = State.createAddRemoveStatement(plugin);
+//     console.log(pluginCommand);
+//     exec(pluginCommand, function() {
+//         State.processPlugin(index + 1, packageJson, promise);
+//     });
+//   } catch (ex) {
+//     console.log('An error happened processing the previous cordova plugins')
+//     console.log('Error:', ex)
+//     promise.reject(ex)
+//   }
+// }
+
+// State.removePlatform = function removePlatform(platformArgs) {
+//   // console.log('Args:', platformArgs);
+//   //Expecting - ionic platform remove [ios|android]
+
+//   //TODO - check if they pass multiple platforms
+//   //ionic platform remove ios android
+//   var platformToRemove = platformArgs._[2],
+//     packageJson = State.getPackageJson(),
+//     platformEntry;
+
+//   for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
+//     platformEntry = packageJson.cordovaPlatforms[i];
+//     if (typeof platformEntry === 'string' && platformEntry == platformToRemove) {
+//       packageJson.cordovaPlatforms.splice(i, 1);
+//       break;
+//     } else if (platformEntry.platform == platformToRemove) {
+//       //Its object {platform: 'android', locator: './engine/cordova-android'}
+//         packageJson.cordovaPlatforms.splice(i, 1);
+//         break;
+//     }
+//   }
 
-  if (feature && feature.param) {
-    return feature.param
-  }
+//   State.savePackageJson(packageJson);
+// };
 
-  return null;
-}
-
-//
-/**
-* Used after `ionic plugin add <id|locator>` to save the plugin
-* to package.json and config.xml.
-* @pluginArgs  {Object} contains the command line args passed
-* from the ionic command.
-* { _: [ 'plugin', 'add', '../phonegap-facebook-plugin' ],
-  variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ],
-  '$0': '/usr/local/bin/ionic' }
-*/
-State.savePlugin = function savePlugin(pluginArgs) {
-  // console.log('Saveplugin:', pluginArgs);
-
-  //Expects - either simple ID for plugin registry
-  //or a local path, with or without variables
-  //ionic plugin add org.apache.cordova.splashscreen
-  //ionic plugin add ../phonegap-facebook-plugin --variable APP_ID="123456789" --variable APP_NAME="myApplication"
-
-  //With a local file locator, we can look at the plugin.xml as it exists
-  //If its a git resource locator, we'll have to look at fetch.json
-  //Idea: this is run after platform add/rm is done
-
-  var packageJson = State.getPackageJson(),
-      pluginId,
-      pluginInfo = {},
-      plugin;
-
-  pluginId = pluginArgs._[2] //grab the org.ionic.keyboard or ./engine/cordova-android
-
-  // console.log('Plugin id:', pluginId)
-  // State.saveRemotePlugin()
-
-  if (pluginId.indexOf('/') === -1) { //its just an id
-    State.addOrUpdatePluginToPackageJson(packageJson, pluginId);
-    return State.savePackageJson(packageJson);
-  }
+// State.getPluginParameters = function getPluginParameters(configXmlData, pluginName) {
+//   if (!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
+//     throw 'Invalid Config XML Data';
+//   }
 
-  //By here, we know its not a registry plugin (git/local)
-  //Its a locator, local file path or https://github.com repo
-  pluginInfo.locator = pluginId;
-  pluginInfo.id = pluginId = State.getPluginFromFetchJsonByLocator(pluginInfo.locator);
+//   var features = configXmlData.widget.feature,
+//       feature;
 
-  // console.log('going on to variables now')
+//   features.forEach(function(potFeature) {
+//     if (potFeature.$.name == pluginName) {
+//       feature = potFeature
+//     }
+//   })
 
-  //If there are no variables, we just add to package, then save
-  if (!pluginArgs.variable) {
-    State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
-    return State.savePackageJson(packageJson);
-  }
+//   if (feature && feature.param) {
+//     return feature.param
+//   }
+
+//   return null;
+// }
+
+// //
+// /**
+// * Used after `ionic plugin add <id|locator>` to save the plugin
+// * to package.json and config.xml.
+// * @pluginArgs  {Object} contains the command line args passed
+// * from the ionic command.
+// * { _: [ 'plugin', 'add', '../phonegap-facebook-plugin' ],
+//   variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ],
+//   '$0': '/usr/local/bin/ionic' }
+// */
+// State.savePlugin = function savePlugin(pluginArgs) {
+//   // console.log('Saveplugin:', pluginArgs);
+
+//   //Expects - either simple ID for plugin registry
+//   //or a local path, with or without variables
+//   //ionic plugin add org.apache.cordova.splashscreen
+//   //ionic plugin add ../phonegap-facebook-plugin --variable APP_ID="123456789" --variable APP_NAME="myApplication"
+
+//   //With a local file locator, we can look at the plugin.xml as it exists
+//   //If its a git resource locator, we'll have to look at fetch.json
+//   //Idea: this is run after platform add/rm is done
+
+//   var packageJson = State.getPackageJson(),
+//       pluginId,
+//       pluginInfo = {},
+//       plugin;
+
+//   pluginId = pluginArgs._[2] //grab the org.ionic.keyboard or ./engine/cordova-android
+
+//   // console.log('Plugin id:', pluginId)
+//   // State.saveRemotePlugin()
+
+//   if (pluginId.indexOf('/') === -1) { //its just an id
+//     State.addOrUpdatePluginToPackageJson(packageJson, pluginId);
+//     return State.savePackageJson(packageJson);
+//   }
 
-  //Check and save for variables
+//   //By here, we know its not a registry plugin (git/local)
+//   //Its a locator, local file path or https://github.com repo
+//   pluginInfo.locator = pluginId;
+//   pluginInfo.id = pluginId = State.getPluginFromFetchJsonByLocator(pluginInfo.locator);
 
-  pluginInfo.variables = {};
-  for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
-    //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
-    var splits = pluginArgs.variable[i].split('=');
-    pluginInfo.variables[splits[0]] = splits[1];
-  }
+//   // console.log('going on to variables now')
+
+//   //If there are no variables, we just add to package, then save
+//   if (!pluginArgs.variable) {
+//     State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
+//     return State.savePackageJson(packageJson);
+//   }
 
-  // State.checkAndSaveConfigXml(pluginId);
-  // console.log('Saved config.xml');
-  // console.log('Plugin info to save: ', pluginInfo);
-  State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
+//   //Check and save for variables
 
-  console.log('Save plugin to package.json completed');
+//   pluginInfo.variables = {};
+//   for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
+//     //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
+//     var splits = pluginArgs.variable[i].split('=');
+//     pluginInfo.variables[splits[0]] = splits[1];
+//   }
 
-  //By now we assume pluginId is set, and locator might be set.
-  return State.savePackageJson(packageJson);
-}
+//   // State.checkAndSaveConfigXml(pluginId);
+//   // console.log('Saved config.xml');
+//   // console.log('Plugin info to save: ', pluginInfo);
+//   State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
 
-State.removePlugin = function removePlugin(pluginArgs) {
+//   console.log('Save plugin to package.json completed');
 
-}
+//   //By now we assume pluginId is set, and locator might be set.
+//   return State.savePackageJson(packageJson);
+// }
 
-State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
-  try {
-    var xml2js = require('xml2js');
-    var xmlBuilder = new xml2js.Builder();
-    var configString = xmlBuilder.buildObject(xmlData);
-    fs.writeFileSync(xmlPath, configString);
-  } catch (ex) {
-    console.log('Could not save your xml file to path:', xmlPath);
-  }
-}
-
-State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator(pluginLocator) {
-  var fetchJson = require(path.resolve('plugins', 'fetch.json')),
-    lookupId,
-    lookupPlugin,
-    isNotRegistyPlugin,
-    hasUrlOrPathOfLocator,
-    pluginId;
-
-  for (lookupId in fetchJson) {
-    lookupPlugin = fetchJson[lookupId];
-    isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
-    hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;
-    hasPathWithLeadingDot = lookupPlugin.source && lookupPlugin.source.replace('./', '') == pluginLocator
-
-    if ((isNotRegistyPlugin && hasUrlOrPathOfLocator) || (isNotRegistyPlugin && hasPathWithLeadingDot)) {
-      pluginId = lookupId;
-      break;
-    }
-  }
+// State.removePlugin = function removePlugin(pluginArgs) {
 
-  return pluginId;
-}
-
-State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
-  //Now we have as an array:
-  // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
-  // <param name="installPath" value="../phonegap-facebook-plugin"/>
-  // <param name="APP_ID" value="616451688482285"/>
-  // <param name="APP_NAME" value="hybrid-app"/>
-
-  //Check to see if platforms exist
-  //bug with cordova is, it doesnt add the entry into
-  //config.xml unless a platform has been added.
-  var configXmlPath = path.resolve('config.xml');
-  var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
-
-  var pluginXmlData = State.getXmlData(pluginXmlPath);
-  var configXmlData = State.getXmlData(configXmlPath);
-
-  // console.log('xml data:', pluginXmlData);
-
-  var pluginName = pluginXmlData.plugin.name[0],
-      feature,
-      param,
-      paramName;
-
-  var params = State.getPluginParameters(configXmlData, pluginName);
-  if (!params) {
-    //We need to add them
-    feature = {'$': { name: pluginName }, param: [] };
-
-    if (!configXmlData.widget.feature) {
-      configXmlData.widget.feature = [];
-    }
-
-    for (paramName in pluginInfo.variables) {
-      //Go thru vars and add to param
-      param = { '$': { name: paramName, value: pluginInfo.variables[paramName] } };
-      console.log('param:', param);
-      feature.param.push(param);
-    }
-
-    configXmlData.widget.feature.push(feature);
-
-    //Now to save config.xml file
-    // console.log('xml data:', configXmlData);
-    State.saveXmlFile(configXmlData, configXmlPath);
-  }
-}
-
-State.resetState = function resetState() {
-  shelljs.rm('-rf', ['platforms', 'plugins']);
-  console.log('Removed platforms and plugins'.blue.bold);
-  State.restoreState()
-  .then(function() {
-    console.log('Ionic reset state complete'.green.bold);
-  })
-}
-
-State.clearState = function clearState() {
-  console.log('Clearing out your Ionic app of platforms, plugins, and package.json entries'.blue.bold);
-  shelljs.rm('-rf', ['platforms', 'plugins']);
-  var packageJson = State.getPackageJson();
-  packageJson.cordovaPlatforms = packageJson.cordovaPlugins = [];
-  State.savePackageJson(packageJson);
-  console.log('Ionic app state cleared'.green.bold);
-}
+// }
+
+// State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
+//   try {
+//     var xml2js = require('xml2js');
+//     var xmlBuilder = new xml2js.Builder();
+//     var configString = xmlBuilder.buildObject(xmlData);
+//     fs.writeFileSync(xmlPath, configString);
+//   } catch (ex) {
+//     console.log('Could not save your xml file to path:', xmlPath);
+//   }
+// }
+
+// State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator(pluginLocator) {
+//   var fetchJson = require(path.resolve('plugins', 'fetch.json')),
+//     lookupId,
+//     lookupPlugin,
+//     isNotRegistyPlugin,
+//     hasUrlOrPathOfLocator,
+//     pluginId;
+
+//   for (lookupId in fetchJson) {
+//     lookupPlugin = fetchJson[lookupId];
+//     isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
+//     hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;
+//     hasPathWithLeadingDot = lookupPlugin.source && lookupPlugin.source.replace('./', '') == pluginLocator
+
+//     if ((isNotRegistyPlugin && hasUrlOrPathOfLocator) || (isNotRegistyPlugin && hasPathWithLeadingDot)) {
+//       pluginId = lookupId;
+//       break;
+//     }
+//   }
+
+//   return pluginId;
+// }
+
+// State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
+//   //Now we have as an array:
+//   // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
+//   // <param name="installPath" value="../phonegap-facebook-plugin"/>
+//   // <param name="APP_ID" value="616451688482285"/>
+//   // <param name="APP_NAME" value="hybrid-app"/>
+
+//   //Check to see if platforms exist
+//   //bug with cordova is, it doesnt add the entry into
+//   //config.xml unless a platform has been added.
+//   var configXmlPath = path.resolve('config.xml');
+//   var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
+
+//   var pluginXmlData = State.getXmlData(pluginXmlPath);
+//   var configXmlData = State.getXmlData(configXmlPath);
+
+//   // console.log('xml data:', pluginXmlData);
+
+//   var pluginName = pluginXmlData.plugin.name[0],
+//       feature,
+//       param,
+//       paramName;
+
+//   var params = State.getPluginParameters(configXmlData, pluginName);
+//   if (!params) {
+//     //We need to add them
+//     feature = {'$': { name: pluginName }, param: [] };
+
+//     if (!configXmlData.widget.feature) {
+//       configXmlData.widget.feature = [];
+//     }
+
+//     for (paramName in pluginInfo.variables) {
+//       //Go thru vars and add to param
+//       param = { '$': { name: paramName, value: pluginInfo.variables[paramName] } };
+//       console.log('param:', param);
+//       feature.param.push(param);
+//     }
+
+//     configXmlData.widget.feature.push(feature);
+
+//     //Now to save config.xml file
+//     // console.log('xml data:', configXmlData);
+//     State.saveXmlFile(configXmlData, configXmlPath);
+//   }
+// }
+
+// State.resetState = function resetState() {
+//   shelljs.rm('-rf', ['platforms', 'plugins']);
+//   console.log('Removed platforms and plugins'.blue.bold);
+//   State.restoreState()
+//   .then(function() {
+//     console.log('Ionic reset state complete'.green.bold);
+//   })
+// }
+
+// State.clearState = function clearState() {
+//   console.log('Clearing out your Ionic app of platforms, plugins, and package.json entries'.blue.bold);
+//   shelljs.rm('-rf', ['platforms', 'plugins']);
+//   var packageJson = State.getPackageJson();
+//   packageJson.cordovaPlatforms = packageJson.cordovaPlugins = [];
+//   State.savePackageJson(packageJson);
+//   console.log('Ionic app state cleared'.green.bold);
+// }
 
 IonicTask.prototype.run = function run(ionic) {
   var self = this,
       project,
       stats,
-      projectPath;
+      projectPath,
+      options = { platforms: true, plugins: true };
 
   this.ionic = ionic;
 
@@ -755,20 +757,23 @@ IonicTask.prototype.run = function run(ionic) {
     return;
   }
 
-  // console.log('Args: ', argv._);
+  //If either plugin or platforms is specified, set it to that value.
+  if (argv.platforms || argv.plugins) {
+    options = { platforms: argv.platforms, plugins: argv.plugins };
+  }
 
   switch (argv._[1]) {
     case 'save':
-      State.saveState();
+      State.saveState(process.cwd(), options);
       break;
     case 'restore':
-      State.restoreState();
+      State.restoreState(process.cwd(), options);
       break;
     case 'reset':
-      State.resetState();
+      State.resetState(process.cwd(), options);
       break;
     case 'clear':
-      State.clearState();
+      State.clearState(process.cwd(), options);
       break;
     default:
       console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);

From 6fb11affb7e543294985662f347619f62e78943c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Apr 2015 15:38:08 -0500
Subject: [PATCH 0622/1100] Calling state clear propery

---
 lib/ionic/state.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index d1f213e799..f2400af763 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -773,7 +773,7 @@ IonicTask.prototype.run = function run(ionic) {
       State.resetState(process.cwd(), options);
       break;
     case 'clear':
-      State.clearState(process.cwd(), options);
+      State.clearState(process.cwd());
       break;
     default:
       console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);

From fe4e7521067d82a9a5d25d376dbdfbb408d8b324 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 30 Apr 2015 11:04:07 -0500
Subject: [PATCH 0623/1100] Version bump, fix for hooks permissions, shrinkwrap

---
 lib/ionic/cordova.js |    3 +-
 lib/ionic/hooks.js   |   36 +-
 npm-shrinkwrap.json  | 1064 ++++++++++++++++++++++++++++--------------
 package.json         |    2 +-
 4 files changed, 752 insertions(+), 353 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 8fd4420f4a..f9bd47930a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -42,7 +42,8 @@ IonicTask.prototype.run = function(ionic) {
   var isAddCmd = argv._.indexOf('add') != -1;
   var isPluginCmd = argv._.indexOf('plugin') != -1;
   var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
-
+  
+  Hooks.setHooksPermission();
 
   if(isPlatformCmd && isAddCmd) {
     addDefaultResources = true;
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 85aec8f985..88621ce16a 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -113,7 +113,41 @@ Hooks.remove = function remove() {
 
   console.log('Removed the Ionic Cordova hooks'.green.bold);
 
-}
+};
+
+Hooks.setHooksPermission = function setHooksPermission() {
+  //Go through `hooks` directory - after_prepare
+  //for each directory, go into the directories of that path
+  //For each path, set permission on file
+  try {
+    var hooksPath = path.resolve('hooks');
+
+    var hooksDirs = fs.readdirSync(hooksPath),
+        hookDirPath,
+        hookStats,
+        hooksInDir;
+
+    hooksDirs.forEach(function(hookDir) {
+      hookStats = fs.statSync(path.join(hooksPath, hookDir));
+      if(!hookStats.isDirectory()) return;
+      hookDirPath = path.join(hooksPath, hookDir); //after_prepare
+      hooksInDir = fs.readdirSync(hookDirPath);
+
+      hooksInDir.forEach(function(hook){
+        // make the script file executable
+        try {
+          fs.chmodSync(path.resolve(hooksPath, hookDir, hook), '755');
+        } catch(e) {
+          console.log(('Hooks.setHooksPermission fs.chmodSync: ' + e).error)
+        }
+      })
+    });
+  } catch (ex) {
+    console.log('log', 'Error', ex);
+  }
+
+  console.log('Updated the hooks directory to have execute permissions'.green);
+};
 
 IonicTask.prototype.run = function run(ionic) {
   var self = this;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 268d5014b9..af3f43f2e5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,84 +1,102 @@
 {
   "name": "ionic",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
       "from": "archiver@0.5.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@~1.1.9",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1"
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@~0.1.0",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@~1.0.24",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@~2.4.1",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@~2.4.1",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@~2.4.1"
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@~2.4.1"
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@~2.4.1"
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@~2.4.1"
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
             }
@@ -86,27 +104,33 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@~0.1.0",
+          "from": "lazystream@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@~1.0.2",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             }
@@ -114,39 +138,48 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@~0.1.5",
+          "from": "file-utils@>=0.1.5 <0.2.0",
+          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@~2.1.0"
+              "from": "lodash@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@~0.2.11"
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@~2.2.2"
+              "from": "rimraf@>=2.2.2 <2.3.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@~3.2.6",
+              "from": "glob@>=3.2.6 <3.3.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2"
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@0.3",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.2",
-                      "from": "lru-cache@2"
+                      "version": "2.6.1",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@~1.0.0"
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
                 }
@@ -154,425 +187,517 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@~0.2.12",
+              "from": "minimatch@>=0.2.12 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.2",
-                  "from": "lru-cache@2"
+                  "version": "2.6.1",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@~1.0.0"
+                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@~2.4.1"
+                  "version": "2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@~0.1.9"
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@~2.4.1"
+          "version": "2.4.1",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         }
       }
     },
     "async": {
       "version": "0.9.0",
-      "from": "async@^0.9.0"
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "cheerio@^0.19.0",
+      "from": "cheerio@0.19.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "css-select@~1.0.0",
+          "from": "css-select@1.0.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "css-what@1.0"
+              "from": "css-what@1.0.0",
+              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "domutils@1.4",
+              "from": "domutils@1.4.3",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "domelementtype@1"
+                  "from": "domelementtype@1.3.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "boolbase@~1.0.0"
+              "from": "boolbase@1.0.0",
+              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "nth-check@~1.0.0"
+              "from": "nth-check@1.0.1",
+              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "entities@~1.1.1"
+          "from": "entities@1.1.1",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.2",
-          "from": "htmlparser2@~3.8.1",
+          "from": "htmlparser2@3.8.2",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "domhandler@2.3"
+              "from": "domhandler@2.3.0",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "domutils@1.5"
+              "from": "domutils@1.5.1",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "domelementtype@1"
+              "from": "domelementtype@1.3.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "readable-stream@1.1",
+              "from": "readable-stream@1.1.13",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@1.0.1",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@0.10.31",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "entities@1.0"
+              "from": "entities@1.0.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "dom-serializer@~0.1.0",
+          "from": "dom-serializer@0.1.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "domelementtype@~1.1.1"
+              "from": "domelementtype@1.1.3",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
           "version": "3.7.0",
-          "from": "lodash@^3.2.0"
+          "from": "lodash@3.7.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "cli-table@^0.3.1",
+      "from": "cli-table@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "colors@1.0.3"
+          "from": "colors@1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2"
+      "from": "colors@0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
       "from": "connect@3.1.1",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
           "from": "debug@1.0.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
           "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1"
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0"
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "connect-livereload@0.5.2"
+      "from": "connect-livereload@0.5.2",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "crc@3.2.1"
+      "from": "crc@3.2.1",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
       "from": "cross-spawn@0.2.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.2",
-          "from": "lru-cache@^2.5.0"
+          "version": "2.6.1",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@3.0.x",
+      "from": "event-stream@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.7",
-          "from": "through@~2.3.1"
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@~0.1.1"
+          "from": "duplexer@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@~0"
+          "from": "from@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "map-stream@~0.0.3"
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11"
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@0.2"
+          "from": "split@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@~0.0.3"
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
       "from": "finalhandler@0.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@~2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
       "from": "form-data@0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@~0.0.4",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5"
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@~1.2.11"
+          "from": "mime@>=1.2.11 <1.3.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
       "from": "gulp@3.8.8",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@^0.0.2"
+          "from": "archy@>=0.0.2 <0.0.3",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@^0.5.0",
+          "from": "chalk@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@^1.1.0"
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "escape-string-regexp@^1.0.0"
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@^0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.0"
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@^0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@^0.2.0"
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@^0.2.0"
+              "from": "supports-color@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@^0.0.1"
+          "from": "deprecated@>=0.0.1 <0.0.2",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.4",
-          "from": "gulp-util@^3.0.0",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "array-differ@^1.0.0"
+              "from": "array-differ@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "array-uniq@^1.0.2"
+              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "beeper@^1.0.0"
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "chalk@^1.0.0",
+              "from": "chalk@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "ansi-styles@^2.0.1"
+                  "from": "ansi-styles@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "escape-string-regexp@^1.0.2"
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "has-ansi@^1.0.3",
+                  "from": "has-ansi@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@^1.1.0"
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@^4.0.1"
+                      "from": "get-stdin@*",
+                      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "strip-ansi@^2.0.1",
+                  "from": "strip-ansi@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@^1.1.0"
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "1.3.1",
-                  "from": "supports-color@^1.3.0"
+                  "from": "supports-color@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@^1.0.11",
+              "from": "dateformat@>=1.0.11 <2.0.0",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@^4.0.1"
+                  "from": "get-stdin@*",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
                   "from": "meow@*",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@^1.0.0",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@^1.0.1"
+                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.0",
-                          "from": "map-obj@^1.0.0"
+                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "indent-string@^1.1.0",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.2",
-                          "from": "repeating@^1.1.0",
+                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@^1.0.0"
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             }
                           }
                         }
@@ -584,95 +709,117 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "lodash._reescape@^3.0.0"
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "lodash._reevaluate@^3.0.0"
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "lodash._reinterpolate@^3.0.0"
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.5.0",
-              "from": "lodash.template@^3.0.0",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.0.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "lodash._basecopy@^3.0.0"
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "lodash._basetostring@^3.0.0"
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "lodash._basevalues@^3.0.0"
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.6",
-                  "from": "lodash._isiterateecall@^3.0.0"
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.6.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "lodash.escape@^3.0.0"
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.isnative": {
                   "version": "3.0.2",
-                  "from": "lodash.isnative@^3.0.0"
+                  "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.6",
-                  "from": "lodash.keys@^3.0.0",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.6.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.1",
-                      "from": "lodash.isarguments@^3.0.0"
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.2",
-                      "from": "lodash.isarray@^3.0.0"
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "lodash.restparam@^3.0.0"
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "lodash.templatesettings@^3.0.0"
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@^0.1.2",
+              "from": "multipipe@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
                   "from": "duplexer2@0.0.2",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@~1.1.9",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@~1.0.0"
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1"
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@~0.10.x"
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@~2.0.1"
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
                     }
@@ -682,55 +829,67 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "object-assign@^2.0.0"
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "replace-ext@0.0.1"
+              "from": "replace-ext@0.0.1",
+              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.5",
-              "from": "through2@^0.6.3",
+              "from": "through2@>=0.6.3 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
                   "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@~1.0.0"
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1"
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@~0.10.x"
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1"
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0"
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@^0.4.3",
+              "from": "vinyl@>=0.4.3 <0.5.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@^0.2.0"
+                  "from": "clone@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@^0.0.1"
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
             }
@@ -738,79 +897,96 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "interpret@^0.3.2"
+          "from": "interpret@>=0.3.2 <0.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@^0.12.0",
+          "from": "liftoff@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@~0.1.2",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@~3.2.9",
+                  "from": "glob@>=3.2.9 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@2"
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@0.3",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "lru-cache@2"
+                          "version": "2.6.1",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0"
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
                   }
                 },
                 "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@~2.4.1"
+                  "version": "2.4.1",
+                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@~0.7.0"
+              "from": "resolve@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@~0.2.0"
+              "from": "minimist@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@~1.3.0"
+              "from": "extend@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "minimist@^1.1.0"
+          "from": "minimist@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@^0.3.0",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@~0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@~1.3.0",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1"
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 }
@@ -818,29 +994,35 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@~0.0.7"
+              "from": "sequencify@>=0.0.7 <0.1.0",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@~0.1.0"
+              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@^0.2.0"
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@^3.0.1"
+          "from": "semver@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@^1.0.0",
+          "from": "tildify@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "user-home@^1.0.0"
+              "from": "user-home@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
         }
@@ -848,11 +1030,13 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2"
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
       "from": "npm@2.1.3",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
           "version": "1.0.5",
@@ -1415,19 +1599,23 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "opbeat-ionic@^1.1.3",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.2",
-          "from": "after-all@^2.0.1",
+          "from": "after-all@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.1",
-              "from": "once@^1.3.0",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "wrappy@1"
+                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
             }
@@ -1435,19 +1623,23 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "console-log-level@^1.0.0"
+          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@^5.0.0"
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "stackman@^0.2.2",
+          "from": "stackman@>=0.2.2 <0.3.0",
+          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "stackback@0.0.2"
+              "from": "stackback@0.0.2",
+              "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
         }
@@ -1461,106 +1653,130 @@
     "optimist": {
       "version": "0.6.0",
       "from": "optimist@0.6.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2",
-          "from": "wordwrap@~0.0.2"
+          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@~0.0.1"
+          "from": "minimist@>=0.0.1 <0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7"
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
       "from": "prompt@0.2.12",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@0.x.x"
+          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@1.0.x",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@~0.0.4"
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@0.1.x"
+          "from": "revalidator@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@0.2.x",
+          "from": "utile@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@~0.2.9"
+              "from": "async@>=0.2.9 <0.3.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "deep-equal@*"
+              "from": "deep-equal@*",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "i@0.3.x"
+              "from": "i@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.x.x",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8"
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "rimraf@2.x.x",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "glob@^4.4.2",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@^1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1"
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@2"
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "minimatch@^2.0.1",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@^1.0.0",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@^0.2.0"
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1"
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
                         }
@@ -1568,11 +1784,13 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "once@^1.3.0",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1"
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -1584,31 +1802,38 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@0.6.x",
+          "from": "winston@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@0.1.x"
+              "from": "async@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@1.0.x"
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@0.1.x"
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@0.2.x"
+              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@2.9.x"
+              "from": "request@>=2.9.0 <2.10.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@0.0.x"
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
         }
@@ -1616,39 +1841,48 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@^0.7.0"
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1"
+      "from": "q@1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
       "from": "request@2.51.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "bl@~0.9.0",
+          "from": "bl@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@~1.0.26",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             }
@@ -1656,23 +1890,28 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "caseless@~0.8.0"
+          "from": "caseless@>=0.8.0 <0.9.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@~0.5.0"
+          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "form-data@~0.2.0",
+          "from": "form-data@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
               "version": "2.0.10",
-              "from": "mime-types@~2.0.3",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.8.0",
-                  "from": "mime-db@~1.8.0"
+                  "from": "mime-db@>=1.8.0 <1.9.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                 }
               }
             }
@@ -1680,93 +1919,114 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@~5.0.0"
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "mime-types@~1.0.1"
+          "from": "mime-types@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "node-uuid@~1.4.0"
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "qs@~2.3.1"
+          "from": "qs@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "tunnel-agent@~0.4.0"
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "1.0.0",
+          "version": "0.13.0",
           "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz",
           "dependencies": {
             "punycode": {
               "version": "1.3.2",
-              "from": "punycode@>=0.2.0"
+              "from": "punycode@>=0.2.0",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
             }
           }
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "http-signature@~0.10.0",
+          "from": "http-signature@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "assert-plus@^0.1.5"
+              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11"
+              "from": "asn1@0.1.11",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "ctype@0.5.3"
+              "from": "ctype@0.5.3",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "oauth-sign@~0.5.0"
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
           "from": "hawk@1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@0.9.x"
+              "from": "hoek@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@0.4.x"
+              "from": "boom@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@0.2.x"
+              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@0.2.x"
+              "from": "sntp@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "aws-sign2@~0.5.0"
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "stringstream@~0.0.4"
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@~0.0.5",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5"
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         }
@@ -1774,107 +2034,131 @@
     },
     "semver": {
       "version": "4.3.3",
-      "from": "semver@^4.2.0"
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
       "from": "serve-static@1.7.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1"
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@~1.3.0"
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
           "from": "send@0.10.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "debug@~2.1.0",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "ms@0.7.0"
+                  "from": "ms@0.7.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "depd@~1.0.0"
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3"
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@~1.5.0"
+              "from": "etag@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4"
+              "from": "fresh@0.2.4",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11"
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2"
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@~2.1.1",
+              "from": "on-finished@>=2.1.1 <2.2.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0"
+                  "from": "ee-first@1.1.0",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@~1.0.2"
+              "from": "range-parser@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0"
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6"
+      "from": "shelljs@0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
       "from": "tiny-lr-fork@0.0.5",
+      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@~0.5.2"
+          "from": "qs@>=0.5.2 <0.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@~0.4.3"
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@~0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@~2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@1"
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
             }
@@ -1882,73 +2166,89 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@~0.7.0"
+          "from": "debug@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@~1.7.0"
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
       "from": "unzip@0.1.9",
+      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@~0.1.21",
+          "from": "fstream@>=0.1.21 <0.2.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.6",
-              "from": "graceful-fs@~3.0.2"
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.0"
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@0.5",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8"
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.2",
-              "from": "rimraf@2",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "glob@^4.4.2",
+                  "from": "glob@>=4.4.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@^1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1"
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "2.0.4",
-                      "from": "minimatch@^2.0.1",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@^1.0.0",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@^0.2.0"
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1"
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
                         }
@@ -1956,11 +2256,13 @@
                     },
                     "once": {
                       "version": "1.3.1",
-                      "from": "once@^1.3.0",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1"
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     }
@@ -1972,71 +2274,86 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@~0.4.0",
+          "from": "pullstream@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>= 0.0.5 < 1"
+              "from": "over@>=0.0.5 <1.0.0",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>= 1.0.0 < 2"
+              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@~0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@~0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4"
+                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@~1.0.0",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1"
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@~1.0.1"
+          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@~0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@~0.1.1"
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         }
@@ -2045,36 +2362,44 @@
     "vinyl-fs": {
       "version": "0.3.7",
       "from": "vinyl-fs@0.3.7",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "glob-stream@^3.1.5",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "glob@^4.3.1",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "inflight@^1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1"
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.0"
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.1",
-                  "from": "once@^1.3.0",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@1"
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 }
@@ -2082,19 +2407,23 @@
             },
             "minimatch": {
               "version": "2.0.4",
-              "from": "minimatch@^2.0.1",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "brace-expansion@^1.0.0",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "balanced-match@^0.2.0"
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "concat-map@0.0.1"
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
                 }
@@ -2102,65 +2431,79 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "ordered-read-streams@^0.1.0"
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "glob2base@^0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "find-index@^0.1.1"
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@^1.0.0"
+              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@^0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@^0.5.1",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@~0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "lodash@~1.0.1"
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@~3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@~1.2.0"
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@1"
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@~0.2.11",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "lru-cache@2"
+                          "version": "2.6.1",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@~1.0.0"
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
                     }
@@ -2172,79 +2515,96 @@
         },
         "graceful-fs": {
           "version": "3.0.6",
-          "from": "graceful-fs@^3.0.0"
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@^2.4.1"
+          "version": "2.4.1",
+          "from": "lodash@>=2.4.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@^0.5.0",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8"
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@^1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@^1.0.0"
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@^0.2.0"
+              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "through2@^0.6.1",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
               "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@~1.0.0"
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1"
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@~0.10.x"
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@~2.0.1"
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0"
+              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@^0.4.0",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "clone@^0.2.0"
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@^0.0.1"
+              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
         }
@@ -2253,18 +2613,22 @@
     "xml2js": {
       "version": "0.4.4",
       "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@0.6.x"
+          "from": "sax@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.6.2",
           "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.5.0",
-              "from": "lodash@~3.5.0"
+              "from": "lodash@>=3.5.0 <3.6.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index a520a71021..42ab696b69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 192f96431ce5533fb4266c52b04ac80802e02cda Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Fri, 24 Apr 2015 12:08:01 -0500
Subject: [PATCH 0624/1100] fix(upload): fix cachebuster for android

---
 lib/ionic/upload.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5312ca9e3f..357119a8dd 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -176,10 +176,10 @@ function addCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
   $('script').each(function(i, el){
-    el.attribs.src += ";ionicCachebuster=" + randomString;
+    el.attribs.src += "?ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
-    el.attribs.href += ";ionicCachebuster=" + randomString;
+    el.attribs.href += "?ionicCachebuster=" + randomString;
   });
   try {
     fs.writeFileSync(indexPath, $.html());
@@ -192,10 +192,10 @@ function removeCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
   $('script').each(function(i, el){
-    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf(";ionicCache"));
+    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf("?ionicCache"));
   });
   $('link').each(function(i, el){
-    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf(";ionicCache"));
+    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf("?ionicCache"));
   });
   try {
     fs.writeFileSync(indexPath, $.html());

From 0359e0eefca790e982f3102cf467437ad9f133ad Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Fri, 24 Apr 2015 16:08:58 -0500
Subject: [PATCH 0625/1100] fix(upload): use '&' for cachebuster if url already
 has a '?'

---
 lib/ionic/upload.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 357119a8dd..bc939dd07d 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -175,11 +175,14 @@ function addCachebusters(indexPath) {
   var randomString = Math.floor(Math.random() * 100000);
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
+  var hasQuestionMark;
   $('script').each(function(i, el){
-    el.attribs.src += "?ionicCachebuster=" + randomString;
+    hasQuestionMark = el.attribs.src.indexOf('?');
+    el.attribs.src += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
-    el.attribs.href += "?ionicCachebuster=" + randomString;
+    hasQuestionMark = el.attribs.href.indexOf('?');
+    el.attribs.href += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   try {
     fs.writeFileSync(indexPath, $.html());
@@ -191,11 +194,14 @@ function addCachebusters(indexPath) {
 function removeCachebusters(indexPath) {
   var indexHtml = fs.readFileSync(indexPath, 'utf8');
   var $ = cheerio.load(indexHtml);
+  var index;
   $('script').each(function(i, el){
-    el.attribs.src = el.attribs.src.substring(0, el.attribs.src.indexOf("?ionicCache"));
+    index = hasQuestionMark = el.attribs.src.indexOf('?ionicCache');
+    el.attribs.src = el.attribs.src.substring(0, ++hasQuestionMark ? index : el.attribs.src.indexOf("&ionicCache"));
   });
   $('link').each(function(i, el){
-    el.attribs.href = el.attribs.href.substring(0, el.attribs.href.indexOf("?ionicCache"));
+    index = hasQuestionMark = el.attribs.href.indexOf('?ionicCache');
+    el.attribs.href = el.attribs.href.substring(0, ++hasQuestionMark ? index : el.attribs.href.indexOf("&ionicCache"));
   });
   try {
     fs.writeFileSync(indexPath, $.html());

From 125ec046d17a8dbd754cb1eeeac4dad90ee6f2d4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@drifty.com>
Date: Mon, 27 Apr 2015 10:14:01 -0500
Subject: [PATCH 0626/1100] fix(upload): don't add cachebuster to inline
 scripts

---
 lib/ionic/upload.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index bc939dd07d..733cc7c310 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -177,10 +177,12 @@ function addCachebusters(indexPath) {
   var $ = cheerio.load(indexHtml);
   var hasQuestionMark;
   $('script').each(function(i, el){
+    if (typeof el.attribs.src === "undefined") return true; //continue
     hasQuestionMark = el.attribs.src.indexOf('?');
     el.attribs.src += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
   $('link').each(function(i, el){
+    if (typeof el.attribs.href === "undefined") return true; //continue
     hasQuestionMark = el.attribs.href.indexOf('?');
     el.attribs.href += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
   });
@@ -196,10 +198,12 @@ function removeCachebusters(indexPath) {
   var $ = cheerio.load(indexHtml);
   var index;
   $('script').each(function(i, el){
+    if (typeof el.attribs.src === "undefined") return true; //continue
     index = hasQuestionMark = el.attribs.src.indexOf('?ionicCache');
     el.attribs.src = el.attribs.src.substring(0, ++hasQuestionMark ? index : el.attribs.src.indexOf("&ionicCache"));
   });
   $('link').each(function(i, el){
+    if (typeof el.attribs.href === "undefined") return true; //continue
     index = hasQuestionMark = el.attribs.href.indexOf('?ionicCache');
     el.attribs.href = el.attribs.href.substring(0, ++hasQuestionMark ? index : el.attribs.href.indexOf("&ionicCache"));
   });

From 565cccadc907ee206e9aa055c060ee7ee3842a79 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 30 Apr 2015 13:50:07 -0500
Subject: [PATCH 0627/1100] Fix for ionic upload cachebuster, bumping to 1.3.22

---
 CHANGELOG.md        | 12 ++++++++++++
 npm-shrinkwrap.json |  2 +-
 package.json        |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1814ef62f..f2727294c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### 1.3.22
+
+* Fix for the upload command to correct issues with the view app cachebuster
+
+### 1.3.21
+
+* Fix for Ionic default hooks permissions
+
+### 1.3.20 
+
+* Adding in a command with ionic start to provide an ionic io app ID. `ionic start --io-app-id <someid>`
+
 ### 1.3.19
 
 * Added in the `ionic docs` command to assist you in getting Ionic docs opened faster from the CLI! View all with `ionic docs ls`, or type in your desired docs `ionic docs collectionRepeat`. Ionic docs will be opened for the version of Ionic that you are using in your project (ex RC0, RC1, etc).
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index af3f43f2e5..0d2a021b5d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 42ab696b69..65c6ad8f6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From b5ea2e63ae9382c2d90c1a9bae08e1eaacfbe088 Mon Sep 17 00:00:00 2001
From: Mirko Nasato <mirko@encoded.io>
Date: Sat, 2 May 2015 13:42:12 +0100
Subject: [PATCH 0628/1100] cordova device and console plugin ids have changed

---
 lib/ionic/start.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a7a99aafee..093eacd035 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -25,8 +25,8 @@ IonicTask.WRAPPER_REPO_NAME = 'ionic-app-base';
 
 IonicTask.DEFAULT_APP = {
   "plugins": [
-    "org.apache.cordova.device",
-    "org.apache.cordova.console",
+    "cordova-plugin-device",
+    "cordova-plugin-console",
     "com.ionic.keyboard"
   ],
   "sass": false

From 69ccce1129afb6b3f46e8448aa8fb23fdb312a9e Mon Sep 17 00:00:00 2001
From: Mirko Nasato <mirko@encoded.io>
Date: Sat, 2 May 2015 13:46:03 +0100
Subject: [PATCH 0629/1100] add cordova-plugin-whitelist by default

---
 lib/ionic/start.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 093eacd035..4b2e178565 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -27,6 +27,7 @@ IonicTask.DEFAULT_APP = {
   "plugins": [
     "cordova-plugin-device",
     "cordova-plugin-console",
+    "cordova-plugin-whitelist",
     "com.ionic.keyboard"
   ],
   "sass": false

From 4b92b3a6289cb87f416955c5db244321381284eb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 4 May 2015 07:58:20 -0600
Subject: [PATCH 0630/1100] Adding alias for the info command to get browser
 versions

---
 lib/ionic/browser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 6cda40b723..cb081e5fdc 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -91,6 +91,7 @@ IonicTask.prototype.run = function run(ionic) {
       case 'check':
         console.log('Checking for engine');
         break;
+      case 'info':
       case 'versions':
         Browser.listInstalledBrowsers(appDirectory);
     }

From f6ff244b592589545334215b803b4d5612525e87 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 4 May 2015 07:58:41 -0600
Subject: [PATCH 0631/1100] Updating cli tasks for browser info command

---
 lib/tasks/cliTasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 6d96e012e9..265bd4af58 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -253,7 +253,7 @@ var TASKS = [
     name: 'browser',
     summary: 'Add another browser for a platform ' + '(beta)'.yellow,
     args: {
-      '<command>': '"add remove rm versions upgrade list ls revert"',
+      '<command>': '"add remove rm info versions upgrade list ls revert"',
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
     options: {

From 354e8b5a1671700fa0b4e6c6680c3fad5703a1c0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:27:46 -0600
Subject: [PATCH 0632/1100] Adding in the args call to the add command,
 removing argv from the require

---
 lib/ionic/add.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 5ea2b52117..a51d7f7a3c 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -3,7 +3,7 @@ require('shelljs/global')
 var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
     IonicStats = require('./stats').IonicStats,
-    argv = require('optimist').argv,
+    // argv = require('optimist').argv,
     fs = require('fs'),
     path = require('path'),
     bower = require('./bower');
@@ -57,7 +57,7 @@ IonicTask.prototype.listComponents = function listComponents() {
 // Check the directory in the projects `.bowerrc` file
 // Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
-IonicTask.prototype.run = function(ionic, callback) {
+IonicTask.prototype.run = function(ionic, argv) {
   // console.log('running ', argv._)
   this.ionic = ionic;
 

From 1ade6cc32c021481f698f232cbaf4216aa462855 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:30:56 -0600
Subject: [PATCH 0633/1100] Swapping out second param to be argv so callback
 isnt mis-interpretted

---
 lib/ionic/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 8e37604b42..6716b1f1cd 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -48,7 +48,7 @@ IonicTask.prototype.get = function(ionic, callback) {
   this.run(ionic, callback);
 };
 
-IonicTask.prototype.run = function(ionic, callback) {
+IonicTask.prototype.run = function(ionic, argv, callback) {
   var self = this;
 
   if(!this.email && !this.password) {

From 1e28322b5551194b8665d55a1e8edaa711132d75 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:42:19 -0600
Subject: [PATCH 0634/1100] App adjustments for app calls - passing args and
 callback

---
 lib/ionic/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 1f663890c1..9550679ffa 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -39,7 +39,7 @@ IonicTask.prototype.run = function(ionic) {
         var upload = new IonicUploadTask();
 
         upload.setNote(self.inputValues['note'] || '');
-        upload.run(self.ionic, function() {
+        upload.run(self.ionic, argv, function() {
           self.deploy(self);
         });
       } else {

From 453c3f78458e0ca3c2a42f18bd4b9fd6fdf63b48 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:42:33 -0600
Subject: [PATCH 0635/1100] Adjusting run call to have args and callback

---
 lib/ionic/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 6716b1f1cd..3958395d57 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -45,7 +45,7 @@ IonicTask.prototype.get = function(ionic, callback) {
     }
   }
 
-  this.run(ionic, callback);
+  this.run(ionic, argv, callback);
 };
 
 IonicTask.prototype.run = function(ionic, argv, callback) {

From fe23b5ade2e6ba8d465516a97bdc87b0b3e93a3f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:42:43 -0600
Subject: [PATCH 0636/1100] Adjusting package to pass args and callback

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 8db135b709..e3c0698fa0 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -243,7 +243,7 @@ IonicTask.prototype.packagePlatforms = function() {
   var self = this;
   var upload = new IonicUploadTask();
 
-  upload.run(self.ionic, function() {
+  upload.run(self.ionic, argv, function() {
     for(var x=0; x<self.platforms.length; x++) {
       var form = self.buildPostRequest(self.platforms[x]);
       self.submitPostRequest(form, self.platforms[x]);

From f45d2e093429e78db0fcf3a82739c69f83a852c3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:42:59 -0600
Subject: [PATCH 0637/1100] Changing run to take args and callback

---
 lib/ionic/service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 47e95d82f1..64b129ae57 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -172,7 +172,7 @@ IonicTask.prototype.listServices = function listServices() {
 // Check the directory in the projects `.bowerrc` file
 // Then go to /path/to/bower/components/<ionic-service-serviceName>/ionic-plugins.json - 'plugins'
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
-IonicTask.prototype.run = function run(ionic, callback) {
+IonicTask.prototype.run = function run(ionic, argv, callback) {
   this.ionic = ionic;
 
   IonicStats.t();

From cc2126f1994cc9eec79d3f3ab9962dffc4f5178a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:43:53 -0600
Subject: [PATCH 0638/1100] Adding in run call for upload to take args and
 callback

---
 lib/ionic/upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5312ca9e3f..e646ec40e4 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -15,7 +15,7 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic, callback) {
+IonicTask.prototype.run = function(ionic, argv, callback) {
   var project = null;
   this.ionic = ionic;
 

From b7afd2dfae0cb0f5758fd28a1675d6223dafbb8e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:45:13 -0600
Subject: [PATCH 0639/1100] Version bump to beta 10

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 32bd6a7572..baa70d7fa9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.7",
+  "version": "1.4.0-beta.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,11 +67,11 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.7",
+    "ionic-app-lib": "0.0.11",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",
-    "open": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+    "open": "0.0.5",
     "optimist": "0.6.0",
     "progress": "1.1.7",
     "prompt": "0.2.12",

From c864d06932d1becc2d9503cde430231ca1a19c7f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 11 May 2015 15:45:51 -0600
Subject: [PATCH 0640/1100] Shrinkwrapping

---
 npm-shrinkwrap.json | 213 ++++++++++++++++++++++++++------------------
 1 file changed, 127 insertions(+), 86 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 220ece879c..1123ab8c24 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.7",
+  "version": "1.4.0-beta.10",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.7",
-      "from": "ionic-app-lib@0.0.7",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.7.tgz",
+      "version": "0.0.11",
+      "from": "ionic-app-lib@0.0.11",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.11.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1150,9 +1150,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.2.1",
+                      "version": "3.2.2",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.2.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1160,9 +1160,9 @@
                           "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
                         },
                         "ieee754": {
-                          "version": "1.1.4",
+                          "version": "1.1.5",
                           "from": "ieee754@>=1.1.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz"
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.5.tgz"
                         },
                         "is-array": {
                           "version": "1.0.1",
@@ -1325,9 +1325,9 @@
                           "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz",
                           "dependencies": {
                             "ripemd160": {
-                              "version": "1.0.0",
+                              "version": "1.0.1",
                               "from": "ripemd160@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
                             },
                             "sha.js": {
                               "version": "2.4.0",
@@ -1429,19 +1429,19 @@
                       "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
                     },
                     "deps-sort": {
-                      "version": "1.3.6",
+                      "version": "1.3.8",
                       "from": "deps-sort@>=1.3.5 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.6.tgz",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.8.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "0.10.0",
-                          "from": "JSONStream@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz",
+                          "version": "1.0.3",
+                          "from": "JSONStream@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
                           "dependencies": {
                             "jsonparse": {
-                              "version": "0.0.5",
-                              "from": "jsonparse@0.0.5",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                              "version": "1.0.0",
+                              "from": "jsonparse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                             }
                           }
                         },
@@ -1504,19 +1504,19 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.4.0",
+                      "version": "6.4.2",
                       "from": "insert-module-globals@>=6.1.0 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.2.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "0.10.0",
-                          "from": "JSONStream@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz",
+                          "version": "1.0.3",
+                          "from": "JSONStream@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
                           "dependencies": {
                             "jsonparse": {
-                              "version": "0.0.5",
-                              "from": "jsonparse@0.0.5",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                              "version": "1.0.0",
+                              "from": "jsonparse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                             }
                           }
                         },
@@ -1636,19 +1636,19 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.7.8",
+                      "version": "3.7.12",
                       "from": "module-deps@>=3.6.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.8.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.12.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "0.10.0",
-                          "from": "JSONStream@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz",
+                          "version": "1.0.3",
+                          "from": "JSONStream@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
                           "dependencies": {
                             "jsonparse": {
-                              "version": "0.0.5",
-                              "from": "jsonparse@0.0.5",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                              "version": "1.0.0",
+                              "from": "jsonparse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                             }
                           }
                         },
@@ -1658,9 +1658,9 @@
                           "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
                         },
                         "detective": {
-                          "version": "4.0.1",
+                          "version": "4.0.2",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.2.tgz",
                           "dependencies": {
                             "acorn": {
                               "version": "1.0.3",
@@ -1708,9 +1708,9 @@
                                       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
                                     },
                                     "wordwrap": {
-                                      "version": "0.0.2",
+                                      "version": "0.0.3",
                                       "from": "wordwrap@>=0.0.2 <0.1.0",
-                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                                     },
                                     "type-check": {
                                       "version": "0.3.1",
@@ -1731,7 +1731,7 @@
                                 },
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2020,9 +2020,9 @@
                                   "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
                                   "dependencies": {
                                     "wordwrap": {
-                                      "version": "0.0.2",
+                                      "version": "0.0.3",
                                       "from": "wordwrap@>=0.0.2 <0.1.0",
-                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                                     }
                                   }
                                 }
@@ -2079,9 +2079,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.4.20",
+                  "version": "2.4.21",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.21.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -2100,6 +2100,11 @@
                         }
                       }
                     },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    },
                     "yargs": {
                       "version": "3.5.4",
                       "from": "yargs@>=3.5.4 <3.6.0",
@@ -2126,11 +2131,6 @@
                           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
                         }
                       }
-                    },
-                    "uglify-to-browserify": {
-                      "version": "1.0.2",
-                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
                     }
                   }
                 }
@@ -2184,7 +2184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2205,9 +2205,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.1",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -2219,9 +2219,9 @@
               }
             },
             "init-package-json": {
-              "version": "1.4.2",
+              "version": "1.5.0",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.5.0.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.5",
@@ -2246,9 +2246,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.4",
+                      "version": "2.0.7",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -2270,9 +2270,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.1",
+                      "version": "1.3.2",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -2299,9 +2299,9 @@
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
                     },
                     "semver": {
-                      "version": "4.3.3",
+                      "version": "4.3.4",
                       "from": "semver@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
                     }
                   }
                 },
@@ -2340,14 +2340,26 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.0.0",
+                      "version": "2.1.0",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.2",
                           "from": "hosted-git-info@>=2.0.2 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                        },
+                        "spdx": {
+                          "version": "0.4.0",
+                          "from": "spdx@>=0.4.0 <0.5.0",
+                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                          "dependencies": {
+                            "spdx-license-ids": {
+                              "version": "1.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                            }
+                          }
                         }
                       }
                     },
@@ -2358,10 +2370,34 @@
                     }
                   }
                 },
+                "validate-npm-package-license": {
+                  "version": "1.0.0-prerelease-2",
+                  "from": "validate-npm-package-license@1.0.0-prerelease-2",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-1.0.0-prerelease-2.tgz",
+                  "dependencies": {
+                    "spdx": {
+                      "version": "0.4.0",
+                      "from": "spdx@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.0.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "spdx-correct": {
+                      "version": "1.0.0-prerelease-3",
+                      "from": "spdx-correct@1.0.0-prerelease-3",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0-prerelease-3.tgz"
+                    }
+                  }
+                },
                 "validate-npm-package-name": {
-                  "version": "2.0.1",
+                  "version": "2.2.0",
                   "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.0.tgz",
                   "dependencies": {
                     "builtins": {
                       "version": "0.0.7",
@@ -2724,14 +2760,26 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.0.0",
+                  "version": "2.1.0",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.2",
                       "from": "hosted-git-info@>=2.0.2 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                    },
+                    "spdx": {
+                      "version": "0.4.0",
+                      "from": "spdx@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.0.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 }
@@ -2760,9 +2808,9 @@
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
-                  "version": "1.3.1",
+                  "version": "1.3.2",
                   "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -2946,16 +2994,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                 },
                 "tough-cookie": {
-                  "version": "1.0.0",
+                  "version": "1.1.0",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.0.0.tgz",
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.3.2",
-                      "from": "punycode@>=0.2.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                    }
-                  }
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
                 },
                 "http-signature": {
                   "version": "0.10.1",
@@ -3056,13 +3097,13 @@
                   "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
                 },
                 "fstream": {
-                  "version": "1.0.4",
+                  "version": "1.0.6",
                   "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz",
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3078,9 +3119,9 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.3.2",
+                      "version": "2.3.3",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
                       "dependencies": {
                         "glob": {
                           "version": "4.5.3",
@@ -3100,9 +3141,9 @@
                               }
                             },
                             "minimatch": {
-                              "version": "2.0.4",
+                              "version": "2.0.7",
                               "from": "minimatch@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                               "dependencies": {
                                 "brace-expansion": {
                                   "version": "1.1.0",
@@ -3124,9 +3165,9 @@
                               }
                             },
                             "once": {
-                              "version": "1.3.1",
+                              "version": "1.3.2",
                               "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                               "dependencies": {
                                 "wrappy": {
                                   "version": "1.0.1",

From e89f16d4e2ffe1db19a045da23bd801986f2ccc0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 12 May 2015 09:31:55 -0600
Subject: [PATCH 0641/1100] Fix(setup): Check for gulp installed globally

---
 CHANGELOG.md        |  1 +
 lib/ionic/setup.js  |  8 ++++++++
 npm-shrinkwrap.json | 36 ++++++++++++++++++------------------
 package.json        |  4 ++--
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71e764f001..b4d5a9dafe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * When starting an application on a Mac, the iOS platform will be automatically added.
 * Updating Crosswalk to have version canary version 14.42.334.0.
 * Crosswalk now contains the cordova whitelist by default.
+* Ionic sass setup now checks that gulp is installed globally - and if not - tells the user how to set it up.
 
 ### 1.3.19
 
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 818cbceb69..c1c05c23df 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -6,6 +6,8 @@ var Task = require('./task').Task,
     exec = require('child_process').exec,
     Q = require('q'),
     IonicProject = require('./project'),
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
     colors = require('colors');
 
 var IonicTask = function() {};
@@ -17,6 +19,12 @@ IonicTask.prototype.run = function(ionic) {
     return ionic.fail('Missing setup task command.', 'setup');
   }
 
+  if (!Utils.gulpInstalledGlobally()) {
+    var gulpMessage = ['You have specified Ionic CLI to set up sass.'.red, '\n', 'However, you do not have Gulp installed globally. Please run '.red, '`npm install -g gulp`'.green].join('');  
+    events.emit('log', gulpMessage);
+    return Q(gulpMessage);
+  }
+
   var tasks = argv._.slice(1);
 
   for(var x=0; x<tasks.length; x++) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1123ab8c24..696bf0c0a3 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.10",
+  "version": "1.4.0-beta.11",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.11",
-      "from": "ionic-app-lib@0.0.11",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.11.tgz",
+      "version": "0.0.13",
+      "from": "ionic-app-lib@0.0.13",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.13.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1574,9 +1574,9 @@
                               "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
                               "dependencies": {
                                 "acorn": {
-                                  "version": "1.0.3",
+                                  "version": "1.1.0",
                                   "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz"
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
                                 }
                               }
                             }
@@ -1663,9 +1663,9 @@
                           "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.2.tgz",
                           "dependencies": {
                             "acorn": {
-                              "version": "1.0.3",
+                              "version": "1.1.0",
                               "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz"
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
                             },
                             "defined": {
                               "version": "0.0.0",
@@ -1923,9 +1923,9 @@
                       "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.3.tgz",
                       "dependencies": {
                         "acorn": {
-                          "version": "1.0.3",
+                          "version": "1.1.0",
                           "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz"
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
                         }
                       }
                     },
@@ -1954,14 +1954,14 @@
                       }
                     },
                     "timers-browserify": {
-                      "version": "1.4.0",
+                      "version": "1.4.1",
                       "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz",
                       "dependencies": {
                         "process": {
-                          "version": "0.10.1",
-                          "from": "process@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz"
+                          "version": "0.11.0",
+                          "from": "process@>=0.11.0 <0.12.0",
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.0.tgz"
                         }
                       }
                     },
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2341,7 +2341,7 @@
                     },
                     "normalize-package-data": {
                       "version": "2.1.0",
-                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "from": "normalize-package-data@*",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index baa70d7fa9..2e5328003f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.10",
+  "version": "1.4.0-beta.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.11",
+    "ionic-app-lib": "0.0.13",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From f733c76e58790bd6ff1394a7a8750029300a1a4c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 12 May 2015 11:20:34 -0600
Subject: [PATCH 0642/1100] Fix(serve): Windows checks for 0.0.0.0 in host,
 corrects to localhost if so

---
 npm-shrinkwrap.json | 26 +++++++++++++-------------
 package.json        |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 696bf0c0a3..ff1fd3c144 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.11",
+  "version": "1.4.0-beta.12",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.13",
-      "from": "ionic-app-lib@0.0.13",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.13.tgz",
+      "version": "0.0.14",
+      "from": "ionic-app-lib@0.0.14",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.14.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -2179,12 +2179,12 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2341,7 +2341,7 @@
                     },
                     "normalize-package-data": {
                       "version": "2.1.0",
-                      "from": "normalize-package-data@*",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -2804,7 +2804,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3103,7 +3103,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index 2e5328003f..f0ca8f770d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.11",
+  "version": "1.4.0-beta.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.13",
+    "ionic-app-lib": "0.0.14",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From f9d698a12b5ed477b5715dcc93a35cc955f4e075 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 12 May 2015 11:32:11 -0600
Subject: [PATCH 0643/1100] Version bump for ionic lib

---
 npm-shrinkwrap.json | 12 ++++++------
 package.json        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ff1fd3c144..b42beec13b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.14",
-      "from": "ionic-app-lib@0.0.14",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.14.tgz",
+      "version": "0.0.15",
+      "from": "ionic-app-lib@0.0.15",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.15.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -2206,7 +2206,7 @@
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2804,7 +2804,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
diff --git a/package.json b/package.json
index f0ca8f770d..73ee575d5c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.14",
+    "ionic-app-lib": "0.0.15",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 609e3faf7165220bb034c0507226674525c35eeb Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 13 May 2015 10:37:12 -0600
Subject: [PATCH 0644/1100] Version bumps

---
 npm-shrinkwrap.json | 225 +++++++++++++++++++++-----------------------
 package.json        |   2 +-
 2 files changed, 110 insertions(+), 117 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b42beec13b..124d0480bc 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.12",
+  "version": "1.4.0-beta.14",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -158,7 +158,7 @@
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.9 <3.3.0",
+              "from": "glob@>=3.2.6 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
@@ -172,9 +172,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.1",
+                      "version": "2.6.2",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
@@ -191,9 +191,9 @@
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.1",
+                  "version": "2.6.2",
                   "from": "lru-cache@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
@@ -208,9 +208,9 @@
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
-                  "version": "2.4.1",
+                  "version": "2.4.2",
                   "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
@@ -222,9 +222,9 @@
           }
         },
         "lodash": {
-          "version": "2.4.1",
+          "version": "2.4.2",
           "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         }
       }
     },
@@ -235,118 +235,118 @@
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "from": "cheerio@>=0.19.0 <0.20.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "from": "css-select@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
+              "from": "css-what@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "from": "domutils@>=1.4.0 <1.5.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+              "from": "boolbase@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+              "from": "nth-check@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "from": "entities@>=1.1.1 <1.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.2",
-          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+              "from": "domhandler@>=2.3.0 <2.4.0",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "from": "domutils@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+              "from": "entities@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
-          "version": "3.7.0",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"
+          "version": "3.8.0",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
         }
       }
     },
@@ -424,9 +424,9 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.1",
+          "version": "2.6.2",
           "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
         }
       }
     },
@@ -503,7 +503,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -552,7 +552,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -564,7 +564,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -628,7 +628,7 @@
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@*",
+                      "from": "get-stdin@>=4.0.1 <5.0.0",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
@@ -659,7 +659,7 @@
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@*",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
@@ -678,9 +678,9 @@
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "map-obj@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
@@ -723,9 +723,9 @@
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.5.0",
+              "version": "3.5.1",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
@@ -743,9 +743,9 @@
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.6",
+                  "version": "3.0.7",
                   "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.6.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
@@ -758,14 +758,14 @@
                   "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
                 },
                 "lodash.keys": {
-                  "version": "3.0.6",
+                  "version": "3.0.7",
                   "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
-                      "version": "3.0.1",
+                      "version": "3.0.2",
                       "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.2",
@@ -818,7 +818,7 @@
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "inherits@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -864,7 +864,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -926,9 +926,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.1",
+                          "version": "2.6.2",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
@@ -940,9 +940,9 @@
                   }
                 },
                 "lodash": {
-                  "version": "2.4.1",
+                  "version": "2.4.2",
                   "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
@@ -979,9 +979,9 @@
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
-                  "version": "1.3.1",
+                  "version": "1.3.2",
                   "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -2179,7 +2179,7 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
@@ -2224,9 +2224,9 @@
               "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.5.0.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.5",
+                  "version": "5.0.6",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.6.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -3103,7 +3103,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -3839,9 +3839,9 @@
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
-              "version": "1.3.1",
-              "from": "once@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+              "version": "1.3.2",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
@@ -3878,7 +3878,7 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
@@ -3887,9 +3887,9 @@
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
-          "version": "0.0.2",
+          "version": "0.0.3",
           "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
@@ -3963,9 +3963,9 @@
               }
             },
             "rimraf": {
-              "version": "2.3.2",
+              "version": "2.3.3",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
@@ -3990,9 +3990,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.4",
+                      "version": "2.0.7",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -4014,9 +4014,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.1",
+                      "version": "1.3.2",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -4112,7 +4112,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -4135,14 +4135,14 @@
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.10",
+              "version": "2.0.11",
               "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.8.0",
-                  "from": "mime-db@>=1.8.0 <1.9.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                  "version": "1.9.1",
+                  "from": "mime-db@>=1.9.1 <1.10.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
                 }
               }
             }
@@ -4174,16 +4174,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "0.13.0",
+          "version": "1.1.0",
           "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz",
-          "dependencies": {
-            "punycode": {
-              "version": "1.3.2",
-              "from": "punycode@>=0.2.0",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-            }
-          }
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
@@ -4264,9 +4257,9 @@
       }
     },
     "semver": {
-      "version": "4.3.3",
+      "version": "4.3.4",
       "from": "semver@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
@@ -4424,12 +4417,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
@@ -4440,9 +4433,9 @@
               }
             },
             "rimraf": {
-              "version": "2.3.2",
+              "version": "2.3.3",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
@@ -4462,9 +4455,9 @@
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.4",
+                      "version": "2.0.7",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -4486,9 +4479,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.1",
-                      "from": "once@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -4602,7 +4595,7 @@
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "glob@>=4.4.2 <5.0.0",
+              "from": "glob@>=4.3.1 <5.0.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
@@ -4619,13 +4612,13 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
-                  "version": "1.3.1",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -4637,9 +4630,9 @@
               }
             },
             "minimatch": {
-              "version": "2.0.4",
+              "version": "2.0.7",
               "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
@@ -4727,9 +4720,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.1",
+                          "version": "2.6.2",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
@@ -4746,13 +4739,13 @@
         },
         "graceful-fs": {
           "version": "3.0.6",
-          "from": "graceful-fs@>=3.0.2 <3.1.0",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "lodash": {
-          "version": "2.4.1",
+          "version": "2.4.2",
           "from": "lodash@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
@@ -4790,7 +4783,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
diff --git a/package.json b/package.json
index 73ee575d5c..9ec4321660 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.12",
+  "version": "1.4.0-beta.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 424f06d69c9218c3db03c24aaed58199940773bb Mon Sep 17 00:00:00 2001
From: George <george@gsgd.co.uk>
Date: Wed, 13 May 2015 21:30:16 +0200
Subject: [PATCH 0645/1100] Correct ldpi setting for splash screen

Dimensions for ldpi splash screen on small screen android are incorrect and cause a distorted image on these devices.

See http://developer.android.com/guide/practices/screens_support.html#screens-table for correct ldpi resolution
---
 lib/ionic/resources/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/resources/settings.js b/lib/ionic/resources/settings.js
index 6fce0748a2..88eea64d86 100644
--- a/lib/ionic/resources/settings.js
+++ b/lib/ionic/resources/settings.js
@@ -33,13 +33,13 @@ exports.ResPlatforms = {
     },
     splash: {
       images: [
-        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 200,   density: 'land-ldpi' },
+        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 240,   density: 'land-ldpi' },
         { name: 'drawable-land-mdpi-screen.png',    width: 480,   height: 320,   density: 'land-mdpi' },
         { name: 'drawable-land-hdpi-screen.png',    width: 800,   height: 480,   density: 'land-hdpi' },
         { name: 'drawable-land-xhdpi-screen.png',   width: 1280,  height: 720,   density: 'land-xhdpi' },
         { name: 'drawable-land-xxhdpi-screen.png',  width: 1600,  height: 960,   density: 'land-xxhdpi' },
         { name: 'drawable-land-xxxhdpi-screen.png', width: 1920,  height: 1280,  density: 'land-xxxhdpi' },
-        { name: 'drawable-port-ldpi-screen.png',    width: 200,   height: 320,   density: 'port-ldpi' },
+        { name: 'drawable-port-ldpi-screen.png',    width: 240,   height: 320,   density: 'port-ldpi' },
         { name: 'drawable-port-mdpi-screen.png',    width: 320,   height: 480,   density: 'port-mdpi' },
         { name: 'drawable-port-hdpi-screen.png',    width: 480,   height: 800,   density: 'port-hdpi' },
         { name: 'drawable-port-xhdpi-screen.png',   width: 720,   height: 1280,  density: 'port-xhdpi' },

From 941df1da5ed41c4fa5b6e66e11a9cbf06f36c857 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 13 May 2015 17:17:30 -0600
Subject: [PATCH 0646/1100] Feature(serve): Add the nogulp option for serve to
 skip running gulp tasks, including tasks listing, readme, and changelog.

---
 CHANGELOG.md          |  4 +++-
 README.md             |  4 +++-
 bin/ionic             |  2 +-
 lib/ionic/serve.js    | 32 ++++++++------------------------
 lib/tasks/cliTasks.js |  3 ++-
 package.json          |  2 +-
 6 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4d5a9dafe..4adb5932fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,11 @@
 * Ionic serve now allows all IP addresses so you can access the server outside of your machine - use `ionic serve --all` or `ionic serve --address 0.0.0.0` to serve to all addresses.
 * Ionic hooks have had some issues with permissions - those are now added in when an app is started. Also there is the `ionic hooks permissions` command to grant those hooks execute permissions.
 * When starting an application on a Mac, the iOS platform will be automatically added.
-* Updating Crosswalk to have version canary version 14.42.334.0.
+* Updating Crosswalk to have canary version 14.42.334.0.
 * Crosswalk now contains the cordova whitelist by default.
 * Ionic sass setup now checks that gulp is installed globally - and if not - tells the user how to set it up.
+* Ionic serve command now has a `--nogulp` option to avoid running gulp on serve.
+
 
 ### 1.3.19
 
diff --git a/README.md b/README.md
index 969bb5e130..d13b61a862 100644
--- a/README.md
+++ b/README.md
@@ -232,7 +232,7 @@ the Grunt website.
 
 __Gulp Integration__
 
-When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by putting them into your `ionic.project` as a `gulpStartupTasks` property, as follows:
+When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by putting them into your `ionic.project` as a `gulpStartupTasks` property as follows:
 
 ```json
 {
@@ -246,6 +246,8 @@ When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by
 
 Now, when you run `ionic serve`, it will run the `watch` task while starting the Ionic server.
 
+If you would like to disable gulp from running during serve, pass the `--nogulp` option.
+
 NOTE:
 
 ```bash
diff --git a/bin/ionic b/bin/ionic
index 3b9ca8de7c..56d7c7f027 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -6,7 +6,7 @@ process.title = 'ionic';
 
 var argv = require('optimist')
     .boolean(['no-cordova', 'sass', 'list', 'w','nohooks', 
-    'n', 'r', 'noresources', 'nosave', 'e']).argv,
+    'n', 'r', 'noresources', 'nosave', 'e', 'nogulp']).argv,
     IonicCli = require('../lib/cli');
 
 IonicCli.run(argv);
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 32b6e00e67..1a7bf4792b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,26 +1,9 @@
-var fs = require('fs'),
-    Q = require('q'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    connect = require('connect'),
-    finalhandler = require('finalhandler'),
-    http = require('http'),
-    serveStatic = require('serve-static'),
-    tinylr = require('tiny-lr-fork'),
-    lr = require('connect-livereload'),
-    vfs = require('vinyl-fs'),
-    request = require('request'),
-    IonicProject = require('./project'),
-    Task = require('./task').Task,
-    proxyMiddleware = require('proxy-middleware'),
-    url = require('url'),
-    xml2js = require('xml2js'),
+var IonicAppLib = require('ionic-app-lib'),
     IonicStats = require('./stats').IonicStats,
-    ionicCliLib = require('ionic-app-lib'),
-    Serve = ionicCliLib.serve,
-    shelljs = require('shelljs'),
-    events = ionicCliLib.events,
-    ports = require('./ports');
+    events = IonicAppLib.events,
+    Q = require('q'),
+    Serve = IonicAppLib.serve,
+    Task = require('./task').Task;
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
@@ -30,7 +13,7 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic, argv) {
   var self = this;
   this.ionic = ionic;
   this.port = argv._[1];
@@ -38,7 +21,8 @@ IonicTask.prototype.run = function(ionic) {
 
   var options = Serve.loadSettings(argv);
   options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
-  //TODO: Look up address stuffs
+
+  options.nogulp = argv.nogulp;
 
   var promise;
 
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 265bd4af58..d466e3e648 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -47,7 +47,8 @@ var TASKS = [
       '--all|-a': 'Have the server listen on all addresses (0.0.0.0)',
       '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
       '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
-      '--lab|-l': 'Test your apps on multiple screen sizes and platform types'
+      '--lab|-l': 'Test your apps on multiple screen sizes and platform types',
+      '--nogulp': 'Disable running gulp during serve'
     },
     module: './ionic/serve'
   },
diff --git a/package.json b/package.json
index 9ec4321660..ad3e7fcb66 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.15",
+    "ionic-app-lib": "0.0.16",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From f5378739b8033a33f76d417483f583abad83a15a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 13 May 2015 17:28:25 -0600
Subject: [PATCH 0647/1100] Latest beta release

---
 npm-shrinkwrap.json | 16 ++++++++--------
 package.json        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 124d0480bc..44cd259d8b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.15",
-      "from": "ionic-app-lib@0.0.15",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.15.tgz",
+      "version": "0.0.16",
+      "from": "ionic-app-lib@0.0.16",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.16.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -2004,7 +2004,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2179,7 +2179,7 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -3103,7 +3103,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
diff --git a/package.json b/package.json
index ad3e7fcb66..f06ccb8bda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.14",
+  "version": "1.4.0-beta.16",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6db5b57f757b6c9699625a563e11437a7e31d4e9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 14 May 2015 08:58:39 -0600
Subject: [PATCH 0648/1100] Fix(push): Set the google api key without console
 log

---
 lib/ionic/push.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index b9a2e26bf5..d054ada93d 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -35,12 +35,8 @@ IonicTask.prototype.run = function(ionic) {
       } else {
         console.log('You need to specify a webhook url!'.bold.red);
       }
-    } else if (argv._[1] && argv._[1].trim() == 'google-api-key') {
-      if (argv._[2]) {
-        self.set_google_api_key(self, argv._[2].trim());
-      } else {
-        console.log('You need to specify a Google API Key!'.bold.red);
-      }
+    } else if (argv['google-api-key']) {
+      self.set_google_api_key(self, argv['google-api-key'].trim());
     } else if (argv['send'] || argv.s) {
       // Dev wants to send a push notification
       self.send_push(self);

From 3a02a8c59ebc5e449538778911f23e83b21ae48b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 14 May 2015 11:12:41 -0600
Subject: [PATCH 0649/1100] 1.4.0 release, changelog note, vbump

---
 CHANGELOG.md        |  2 +-
 npm-shrinkwrap.json | 18 +++++++++---------
 package.json        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4adb5932fc..7e53380590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,12 @@
 * Ionic serve now allows all IP addresses so you can access the server outside of your machine - use `ionic serve --all` or `ionic serve --address 0.0.0.0` to serve to all addresses.
 * Ionic hooks have had some issues with permissions - those are now added in when an app is started. Also there is the `ionic hooks permissions` command to grant those hooks execute permissions.
 * When starting an application on a Mac, the iOS platform will be automatically added.
+* Ionic Browser command now reverts to using the Cordova CLI if CLI v5.0 is installed.
 * Updating Crosswalk to have canary version 14.42.334.0.
 * Crosswalk now contains the cordova whitelist by default.
 * Ionic sass setup now checks that gulp is installed globally - and if not - tells the user how to set it up.
 * Ionic serve command now has a `--nogulp` option to avoid running gulp on serve.
 
-
 ### 1.3.19
 
 * Added in the `ionic docs` command to assist you in getting Ionic docs opened faster from the CLI! View all with `ionic docs ls`, or type in your desired docs `ionic docs collectionRepeat`. Ionic docs will be opened for the version of Ionic that you are using in your project (ex RC0, RC1, etc).
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 44cd259d8b..97636a4d5a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.14",
+  "version": "1.4.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -2004,7 +2004,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2179,7 +2179,7 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -2804,7 +2804,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3107,9 +3107,9 @@
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
-                      "version": "0.5.0",
+                      "version": "0.5.1",
                       "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
                       "dependencies": {
                         "minimist": {
                           "version": "0.0.8",
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index f06ccb8bda..8d1b860ac3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0-beta.16",
+  "version": "1.4.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6825f7af2444d707b2999ce7802fc54d15cc9151 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 14 May 2015 15:29:08 -0600
Subject: [PATCH 0650/1100] Fix(state): restore command now uses the passed
 application directory. Remove excess code in state.js from CLI. Bump to 1.4.1

---
 CHANGELOG.md        |   4 +
 lib/ionic/state.js  | 685 --------------------------------------------
 npm-shrinkwrap.json |  28 +-
 package.json        |   4 +-
 4 files changed, 20 insertions(+), 701 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe061cc62..e28d349047 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.4.1 
+
+* Corrected a bug with ionic state restore command - it now properly passes the app directory to be fixed.
+
 ### 1.4.0
 
 * Extracting core logic for the CLI into ionic-app-lib.
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index f2400af763..a43a2f8071 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -48,691 +48,6 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-// State.getPackageJson = function getPackageJson() {
-//   var packageJsonPath = path.resolve('.', 'package.json');
-//   var packageJson = null;
-
-//   try {
-//     packageJson = require(packageJsonPath);
-//     if (!packageJson.cordovaPlugins) {
-//       packageJson.cordovaPlugins = [];
-//     }
-//     if (!packageJson.cordovaPlatforms) {
-//       packageJson.cordovaPlatforms = [];
-//     }
-//   } catch (ex) {
-//     console.log('There was an error opening your package.json file.');
-//     console.log(ex);
-//     Utils.fail(ex);
-//   }
-
-//   return packageJson;
-// };
-
-// State.addOrUpdatePluginToPackageJson = function addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo) {
-//   var existingPlugin;
-
-//   if (typeof pluginInfo === 'undefined') {
-//     pluginInfo = pluginId;
-//   }
-
-//   //We need to check cordovaPlugins
-//   //perhaps the ID already exists, or the 'id' in the object with locator exists.
-//   for (var i = 0, j = packageJson.cordovaPlugins.length; i < j; i++) {
-//     if (typeof packageJson.cordovaPlugins[i] == 'string' && packageJson.cordovaPlugins[i] == pluginId) {
-//       existingPlugin = packageJson.cordovaPlugins[i];
-//     } else if (packageJson.cordovaPlugins[i].id == pluginId) {
-//       existingPlugin = packageJson.cordovaPlugins[i];
-//     }
-//   }
-
-//   if (!existingPlugin) {
-//     console.log('Adding since there was no existingPlugin')
-//     packageJson.cordovaPlugins.push(pluginInfo);
-//   }
-// };
-
-// State.saveState = function saveState() {
-//   console.log('Saving your Ionic app state of platforms and plugins'.blue.bold);
-//   var packageJson = State.getPackageJson();
-//   try {
-//     State.saveExistingPlatforms(packageJson);
-//     console.log('Saved platform'.green);
-//     State.saveExistingPlugins(packageJson);
-//     console.log('Saved plugins'.green);
-//     State.savePackageJson(packageJson);
-//     console.log('Saved package.json'.green);
-//   } catch (ex) {
-//     console.log('There was an error saving your current Ionic setup'.red);
-//     console.log('Error:', ex);
-//   }
-// };
-
-// State.saveExistingPlatforms = function saveExistingPlatforms(packageJson) {
-//   var pp = path.resolve('.', 'platforms'),
-//     platforms = [],
-//     platformPath,
-//     platformStats;
-
-//   try {
-//     platforms = fs.readdirSync(pp);
-//   } catch (ex) {
-//     return;
-//   }
-
-//   // console.log('h')
-//   platforms.forEach(function(platform) {
-//     platformPath = path.resolve('platforms', platform);
-//     platformStats = fs.statSync(platformPath);
-//     if (!platformStats.isDirectory()) {
-//       return
-//     }
-
-//     try {
-//       var versionPath = path.resolve(pp, platform, 'cordova', 'version');
-//       var version = State.getPlatformVersion(versionPath);
-//       var locator = platform;
-
-//       //Check to see if its crosswalk
-//       if (platform === 'android' && version.indexOf('-dev') !== -1) {
-//         //Look up path for engine/cordova-android path
-//         var engineFiles = fs.readdirSync(path.resolve('engine'));
-//         var enginePath = null;
-//         engineFiles.forEach(function(engineDir) {
-//           if (engineDir.indexOf('android') !== -1) {
-//             enginePath = engineDir;
-//           }
-//         });
-//         locator = path.resolve('engine', enginePath);
-//       }
-
-//       var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platform});
-
-//       if (!platformExists) {
-//         packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-//       }
-
-//     } catch (ex) {
-//       console.log('There was an error trying to save your existing state', ex);
-//     }
-//   });
-// };
-
-// State.saveExistingPlugins = function saveExistingPlugins(packageJson) {
-//   var pluginDir = path.resolve('.', 'plugins');
-//   // console.log(pluginDir);
-
-//   var plugins = fs.readdirSync(pluginDir);
-//   var pluginId;
-
-//   //Lets try just relying on the fetch.json file
-//   //this file lists all plugins with where they come from, etc
-//   var fetchJson;
-
-//   try {
-//     fetchJson = require(path.resolve('plugins', 'fetch.json'));
-//   } catch (ex) {
-//     // Ionic.fail('There is not a fetch.json file available in your plugins folder.');
-//     // return;
-//   }
-
-//   var configXmlPath = path.resolve('config.xml');
-//   var plugin,
-//     pluginToAdd,
-//     locator;
-//   var cordovaPlugins = [];
-
-//   // console.log('config xml path ', configXmlPath)
-//   var configXmlData = State.getXmlData(configXmlPath);
-
-//   var pluginPath,
-//       pluginPathStats,
-//       pluginXmlPath,
-//       pluginXml,
-//       pluginName,
-//       featureParams,
-//       preferences,
-//       hasVariables = false,
-//       variableList = [],
-//       keyValueList = {};
-
-
-//   if (fetchJson) {
-//     // console.log('fetchJson', fetchJson)
-//     //This will break with what we had before
-//     for (pluginId in fetchJson) {
-//       // cordovaPlugins.push();
-//       plugin = fetchJson[pluginId];
-//       pluginToAdd = {};
-//       try {
-//         pluginPath = path.resolve('plugins', pluginId);
-//         pluginPathStats = fs.statSync(pluginPath);
-//       } catch (ex) {
-//         console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
-//         continue;
-//       }
-
-//       if (!pluginPathStats.isDirectory()) {
-//         console.log(['Plugin', pluginId, 'does not exist in the plugins directory. Skipping'].join(' ').yellow);
-//         continue;
-//       }
-
-//       // console.log('plugin.source.type', plugin.source.type);
-
-//       if (plugin.source.type === 'registry') {
-//         locator = pluginId;
-//       } else {
-//         if (plugin.source.type === 'local') {
-//           locator = plugin.source.path;
-//         } else { //asume its git
-//           locator = plugin.source.url;
-//         }
-//       }
-
-//       pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
-//       pluginXml = State.getXmlData(pluginXmlPath)
-
-//       pluginName = pluginXml.plugin.name;
-
-//       preferences = pluginXml.plugin.preference;
-
-//       if (preferences && preferences.length > 0) {
-//         hasVariables = true;
-
-//         preferences.forEach(function(preference) {
-//           variableList.push(preference.$.name);
-//           // console.log('looking at preference: ', preference)
-//         })
-//       }
-
-//       hasVariables = false;
-//       variableList = [];
-//       keyValueList = {};
-
-//       if (hasVariables) {
-//         // console.log('we have avariables to look at:', variableList)
-//         // var features = configXmlData.widget.feature;
-//         // console.log('features', features)
-//         featureParams = State.getPluginParameters(configXmlData, pluginName);
-//         // features.forEach(function(potFeature) {
-//         //   if(potFeature.$.name == pluginName) {
-//         //     feature = potFeature
-//         //   }
-//         // })
-
-//         // console.log('feature found:', feature);
-//         // var featureParams = feature.param;
-
-//         variableList.forEach(function(variable) {
-//           // console.log('Looking up variable:', variable)
-//           for (var i = 0, j = featureParams.length; i < j; i++) {
-//             if (variable == featureParams[i].$.name) {
-//               keyValueList[variable] = featureParams[i].$.value;
-//             }
-//           }
-//         })
-
-//         // console.log('We have the plugin parameters with values:', keyValueList)
-
-//         var pluginObj = {id: pluginId, locator: locator, variables: keyValueList};
-//         cordovaPlugins.push(pluginObj)
-
-//       } else if (plugin.source.type === 'git' || plugin.source.type === 'local') {
-//         cordovaPlugins.push({locator: locator, id: pluginId});
-//       } else {
-//         cordovaPlugins.push(pluginId)
-//       }
-
-//     }//closes for loop for fetch.json
-
-//     packageJson.cordovaPlugins = cordovaPlugins
-//   } else {
-//     console.log('There was no fetch.json file available to restore plugin information from.'.red.bold);
-//     console.log('Restoring plugins from scanning the plugins folder is still being worked on.'.red.bold);
-//   }
-
-// } //Closes saveExistingPlugins
-
-// State.getXmlData = function getXmlData(xmlPath) {
-//   var xml2js = require('xml2js');
-//   var xmlString = fs.readFileSync(xmlPath, { encoding: 'utf8' });
-//   var xmlData;
-//   var parseString = xml2js.parseString;
-//   parseString(xmlString, function(err, jsonConfig) {
-//     if (err) {
-//       return self.fail('Error parsing xml file: ' + err);
-//     }
-//     try {
-//       xmlData = jsonConfig;
-//     } catch (e) {
-//       return self.fail('Error parsing ' + xmlPath + ': ' + e);
-//     }
-//   });
-
-//   return xmlData
-// }
-
-// State.getPlatformVersion = function getPlatformVersion(path) {
-//   var result = shelljs.exec(['node', path].join(' '), { silent: true });
-//   if (result.code != 0) {
-//     return 'Not installed';
-//   }
-//   var version = result.output
-//   // console.log('Version for path:', path, version)
-//   return version.replace(/\n/g, '');
-// }
-
-// State.addOrUpdatePlatformToPackageJson = function addOrUpdatePlatformToPackageJson(packageJson, platformId, platformInfo) {
-//   // var platformExists = _.findWhere(packageJson.cordovaPlatforms, {platform: platformId});
-//   var existingPlatform;
-
-//   if (typeof platformInfo === 'undefined') {
-//     platformInfo = platformId;
-//   }
-
-//   for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
-//     if (typeof packageJson.cordovaPlatforms[i] == 'string' && packageJson.cordovaPlatforms[i] == platformId) {
-//       existingPlatform = packageJson.cordovaPlatforms[i];
-//     } else if (packageJson.cordovaPlatforms[i].id == platformId) {
-//       existingPlatform = packageJson.cordovaPlatforms[i];
-//       existingPlatform.locator = platformInfo.locator;
-//     }
-//   }
-
-//   if (!existingPlatform) {
-//     packageJson.cordovaPlatforms.push(platformInfo);
-//   }
-//   // console.log('platformExists:', platformExists)
-//   // if (!platformExists && requiresLocator) {
-//   //   packageJson.cordovaPlatforms.push({platform: platform, locator: locator});
-//   //   // packageJson.cordovaPlatforms.push({platform: platform, version: version, locator: locator});
-//   // } else if (!platformExists && !requiresLocator) {
-//   //   packageJson.cordovaPlatforms.push(platform);
-//   // } else {
-//   //   platformExists.platform = platform
-//   //   platformExists.locator = locator
-//   // }
-// }
-
-// State.savePlatform = function savePlatform(platformArgs) {
-//   // Locator may be:
-//   // Name:        ios, android
-//   // Local path:  ./engine/cordova-android-c0.6.1
-//   // Http url:    https://github.com/apache/cordova-android.git
-//   // console.log('platform args:', platformArgs);
-//   var locator = platformArgs._[2];
-//   var platform = 'ios';
-//   var packageJson = State.getPackageJson();
-
-//   //Test to see if its just ios or android
-//   if (locator === 'ios' || locator === 'android') {
-//     platform = locator;
-//     State.addOrUpdatePlatformToPackageJson(packageJson, platform);
-//     return State.savePackageJson(packageJson);
-//   }
-
-//   platform = locator.indexOf('ios') != -1 ? 'ios' : 'android';
-
-//   var platformInfo = {
-//     platform: platform,
-//     locator: locator
-//   };
-
-//   State.addOrUpdatePlatformToPackageJson(packageJson, platform, platformInfo);
-
-//   State.savePackageJson(packageJson);
-
-// }
-
-// State.savePackageJson = function savePackageJson(packageJsonData) {
-//   try {
-//     var packageJsonPath = path.resolve('package.json');
-//     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
-//   } catch (e) {
-//     console.log(('Error saving ' + packageJsonPath + ': ' + e).error.bold);
-//   }
-// }
-
-// State.restoreState = function restoreState() {
-
-//   console.log('Attempting to restore your Ionic application from package.json\n'.yellow.bold);
-
-//   var packageJsonPath = path.resolve('.', 'package.json')
-//   var packageJson = require(packageJsonPath)
-
-//   //Restore plugins first - to avoid issues with platforms adding
-//   //without variables
-//   if (!packageJson.cordovaPlugins) {
-//     packageJson.cordovaPlugins = []
-//   }
-
-//   console.log('Restoring Platforms\n'.blue.bold)
-
-//   return State.restorePlatforms(packageJson)
-//   .then(function() {
-//     console.log('\nRestore platforms is complete\n'.green.bold)
-//     console.log('\rRestoring Plugins\n'.blue.bold)
-//     return State.restorePlugins(packageJson)
-//   })
-//   .then(function() {
-//     console.log('Restore plugins is complete\n'.green.bold)
-//     console.log('Ionic state restore completed\n'.blue.bold)
-//   })
-//   .catch(function(ex) {
-//     console.log('Ionic state restore failed\n'.red.bold)
-//     console.log(ex)
-//   })
-// }
-
-// State.restorePlugins = function restorePlugins(packageJson) {
-//   var q = Q.defer();
-
-//   State.processPlugin(0, packageJson, q);
-//   // q.resolve();
-
-//   return q.promise;
-// }
-
-// State.restorePlatforms = function restorePlatforms(packageJson) {
-//   var q = Q.defer();
-
-//   State.processPlatform(0, packageJson, q);
-
-//   return q.promise;
-// }
-
-// State.processPlatform = function processPlatform(index, packageJson, promise) {
-//   if (index >= packageJson.cordovaPlatforms.length) {
-//     promise.resolve();
-//     return
-//   }
-
-//   try {
-//     // console.log('processing platform', index, packageJson)
-//     var platform = packageJson.cordovaPlatforms[index];
-//     var platformCommand;
-
-//     if (typeof platform == 'string') {
-//       platformCommand = ['cordova platform add ', platform].join('')
-//     } else {
-//       //Here, they have either a special version, or locator for
-//       //local install or github install
-//       platformCommand = 'cordova platform add ' + platform.locator;
-//     }
-//     // var platformCommand = State.createAddRemoveStatement(platform);
-//     console.log(platformCommand);
-//     exec(platformCommand, function() {
-//         State.processPlatform(index + 1, packageJson, promise);
-//     });
-//   } catch (ex) {
-//     console.log('An error happened processing the previous cordova plugins')
-//     console.log('Error:', ex)
-//     promise.reject(ex)
-//   }
-// }
-
-// State.createAddRemoveStatement = function createAddRemoveStatement(plugin) {
-//     // console.log('Creating add/remove statement', plugin)
-//     try {
-//       var pluginCmd = 'cordova plugin add ';
-//       if (typeof plugin === 'string') {
-//         pluginCmd += plugin;
-//       } else {
-//         pluginCmd += plugin.locator + ' ';
-//         if (plugin.variables) {
-//             Object.keys(plugin.variables).forEach(function(variable) {
-//                 pluginCmd += '--variable ' + variable + '="' + plugin.variables[variable] + '" ';
-//             });
-//         }
-//       }
-//     } catch (ex) {
-//       console.log('Failed to create add plugin statement:', ex)
-//     }
-
-//     // console.log('plugin cmd', pluginCmd)
-
-//     return pluginCmd;
-// }
-
-// State.processPlugin = function processPlugin(index, packageJson, promise) {
-//   if (index >= packageJson.cordovaPlugins.length) {
-//     promise.resolve();
-//     return
-//   }
-//   try {
-//     // console.log('processing plugin', index, packageJson)
-//     var plugin = packageJson.cordovaPlugins[index];
-//     var pluginCommand = State.createAddRemoveStatement(plugin);
-//     console.log(pluginCommand);
-//     exec(pluginCommand, function() {
-//         State.processPlugin(index + 1, packageJson, promise);
-//     });
-//   } catch (ex) {
-//     console.log('An error happened processing the previous cordova plugins')
-//     console.log('Error:', ex)
-//     promise.reject(ex)
-//   }
-// }
-
-// State.removePlatform = function removePlatform(platformArgs) {
-//   // console.log('Args:', platformArgs);
-//   //Expecting - ionic platform remove [ios|android]
-
-//   //TODO - check if they pass multiple platforms
-//   //ionic platform remove ios android
-//   var platformToRemove = platformArgs._[2],
-//     packageJson = State.getPackageJson(),
-//     platformEntry;
-
-//   for (var i = 0, j = packageJson.cordovaPlatforms.length; i < j; i++) {
-//     platformEntry = packageJson.cordovaPlatforms[i];
-//     if (typeof platformEntry === 'string' && platformEntry == platformToRemove) {
-//       packageJson.cordovaPlatforms.splice(i, 1);
-//       break;
-//     } else if (platformEntry.platform == platformToRemove) {
-//       //Its object {platform: 'android', locator: './engine/cordova-android'}
-//         packageJson.cordovaPlatforms.splice(i, 1);
-//         break;
-//     }
-//   }
-
-//   State.savePackageJson(packageJson);
-// };
-
-// State.getPluginParameters = function getPluginParameters(configXmlData, pluginName) {
-//   if (!configXmlData || !configXmlData.widget || !configXmlData.widget.feature) {
-//     throw 'Invalid Config XML Data';
-//   }
-
-//   var features = configXmlData.widget.feature,
-//       feature;
-
-//   features.forEach(function(potFeature) {
-//     if (potFeature.$.name == pluginName) {
-//       feature = potFeature
-//     }
-//   })
-
-//   if (feature && feature.param) {
-//     return feature.param
-//   }
-
-//   return null;
-// }
-
-// //
-// /**
-// * Used after `ionic plugin add <id|locator>` to save the plugin
-// * to package.json and config.xml.
-// * @pluginArgs  {Object} contains the command line args passed
-// * from the ionic command.
-// * { _: [ 'plugin', 'add', '../phonegap-facebook-plugin' ],
-//   variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ],
-//   '$0': '/usr/local/bin/ionic' }
-// */
-// State.savePlugin = function savePlugin(pluginArgs) {
-//   // console.log('Saveplugin:', pluginArgs);
-
-//   //Expects - either simple ID for plugin registry
-//   //or a local path, with or without variables
-//   //ionic plugin add org.apache.cordova.splashscreen
-//   //ionic plugin add ../phonegap-facebook-plugin --variable APP_ID="123456789" --variable APP_NAME="myApplication"
-
-//   //With a local file locator, we can look at the plugin.xml as it exists
-//   //If its a git resource locator, we'll have to look at fetch.json
-//   //Idea: this is run after platform add/rm is done
-
-//   var packageJson = State.getPackageJson(),
-//       pluginId,
-//       pluginInfo = {},
-//       plugin;
-
-//   pluginId = pluginArgs._[2] //grab the org.ionic.keyboard or ./engine/cordova-android
-
-//   // console.log('Plugin id:', pluginId)
-//   // State.saveRemotePlugin()
-
-//   if (pluginId.indexOf('/') === -1) { //its just an id
-//     State.addOrUpdatePluginToPackageJson(packageJson, pluginId);
-//     return State.savePackageJson(packageJson);
-//   }
-
-//   //By here, we know its not a registry plugin (git/local)
-//   //Its a locator, local file path or https://github.com repo
-//   pluginInfo.locator = pluginId;
-//   pluginInfo.id = pluginId = State.getPluginFromFetchJsonByLocator(pluginInfo.locator);
-
-//   // console.log('going on to variables now')
-
-//   //If there are no variables, we just add to package, then save
-//   if (!pluginArgs.variable) {
-//     State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
-//     return State.savePackageJson(packageJson);
-//   }
-
-//   //Check and save for variables
-
-//   pluginInfo.variables = {};
-//   for (var i = 0, j = pluginArgs.variable.length; i < j; i++)  {
-//     //variable: [ 'APP_ID=123456789', 'APP_NAME=myApplication' ]
-//     var splits = pluginArgs.variable[i].split('=');
-//     pluginInfo.variables[splits[0]] = splits[1];
-//   }
-
-//   // State.checkAndSaveConfigXml(pluginId);
-//   // console.log('Saved config.xml');
-//   // console.log('Plugin info to save: ', pluginInfo);
-//   State.addOrUpdatePluginToPackageJson(packageJson, pluginId, pluginInfo);
-
-//   console.log('Save plugin to package.json completed');
-
-//   //By now we assume pluginId is set, and locator might be set.
-//   return State.savePackageJson(packageJson);
-// }
-
-// State.removePlugin = function removePlugin(pluginArgs) {
-
-// }
-
-// State.saveXmlFile = function saveXmlFile(xmlData, xmlPath) {
-//   try {
-//     var xml2js = require('xml2js');
-//     var xmlBuilder = new xml2js.Builder();
-//     var configString = xmlBuilder.buildObject(xmlData);
-//     fs.writeFileSync(xmlPath, configString);
-//   } catch (ex) {
-//     console.log('Could not save your xml file to path:', xmlPath);
-//   }
-// }
-
-// State.getPluginFromFetchJsonByLocator = function getPluginFromFetchJsonByLocator(pluginLocator) {
-//   var fetchJson = require(path.resolve('plugins', 'fetch.json')),
-//     lookupId,
-//     lookupPlugin,
-//     isNotRegistyPlugin,
-//     hasUrlOrPathOfLocator,
-//     pluginId;
-
-//   for (lookupId in fetchJson) {
-//     lookupPlugin = fetchJson[lookupId];
-//     isNotRegistyPlugin = lookupPlugin.source.type && lookupPlugin.source.type != 'registry';
-//     hasUrlOrPathOfLocator = lookupPlugin.source.path == pluginLocator || lookupPlugin.source.url == pluginLocator;
-//     hasPathWithLeadingDot = lookupPlugin.source && lookupPlugin.source.replace('./', '') == pluginLocator
-
-//     if ((isNotRegistyPlugin && hasUrlOrPathOfLocator) || (isNotRegistyPlugin && hasPathWithLeadingDot)) {
-//       pluginId = lookupId;
-//       break;
-//     }
-//   }
-
-//   return pluginId;
-// }
-
-// State.checkAndSaveConfigXml = function checkAndSaveConfigXml(pluginId) {
-//   //Now we have as an array:
-//   // <param name="id" value="com.phonegap.plugins.facebookconnect"/>
-//   // <param name="installPath" value="../phonegap-facebook-plugin"/>
-//   // <param name="APP_ID" value="616451688482285"/>
-//   // <param name="APP_NAME" value="hybrid-app"/>
-
-//   //Check to see if platforms exist
-//   //bug with cordova is, it doesnt add the entry into
-//   //config.xml unless a platform has been added.
-//   var configXmlPath = path.resolve('config.xml');
-//   var pluginXmlPath = path.resolve('plugins', pluginId, 'plugin.xml');
-
-//   var pluginXmlData = State.getXmlData(pluginXmlPath);
-//   var configXmlData = State.getXmlData(configXmlPath);
-
-//   // console.log('xml data:', pluginXmlData);
-
-//   var pluginName = pluginXmlData.plugin.name[0],
-//       feature,
-//       param,
-//       paramName;
-
-//   var params = State.getPluginParameters(configXmlData, pluginName);
-//   if (!params) {
-//     //We need to add them
-//     feature = {'$': { name: pluginName }, param: [] };
-
-//     if (!configXmlData.widget.feature) {
-//       configXmlData.widget.feature = [];
-//     }
-
-//     for (paramName in pluginInfo.variables) {
-//       //Go thru vars and add to param
-//       param = { '$': { name: paramName, value: pluginInfo.variables[paramName] } };
-//       console.log('param:', param);
-//       feature.param.push(param);
-//     }
-
-//     configXmlData.widget.feature.push(feature);
-
-//     //Now to save config.xml file
-//     // console.log('xml data:', configXmlData);
-//     State.saveXmlFile(configXmlData, configXmlPath);
-//   }
-// }
-
-// State.resetState = function resetState() {
-//   shelljs.rm('-rf', ['platforms', 'plugins']);
-//   console.log('Removed platforms and plugins'.blue.bold);
-//   State.restoreState()
-//   .then(function() {
-//     console.log('Ionic reset state complete'.green.bold);
-//   })
-// }
-
-// State.clearState = function clearState() {
-//   console.log('Clearing out your Ionic app of platforms, plugins, and package.json entries'.blue.bold);
-//   shelljs.rm('-rf', ['platforms', 'plugins']);
-//   var packageJson = State.getPackageJson();
-//   packageJson.cordovaPlatforms = packageJson.cordovaPlugins = [];
-//   State.savePackageJson(packageJson);
-//   console.log('Ionic app state cleared'.green.bold);
-// }
-
 IonicTask.prototype.run = function run(ionic) {
   var self = this,
       project,
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 97636a4d5a..915e3e9c20 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.16",
-      "from": "ionic-app-lib@0.0.16",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.16.tgz",
+      "version": "0.0.18",
+      "from": "ionic-app-lib@0.0.18",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.18.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1173,7 +1173,7 @@
                     },
                     "builtins": {
                       "version": "0.0.7",
-                      "from": "builtins@>=0.0.3 <0.1.0",
+                      "from": "builtins@0.0.7",
                       "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
                     },
                     "commondir": {
@@ -2179,12 +2179,12 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2341,7 +2341,7 @@
                     },
                     "normalize-package-data": {
                       "version": "2.1.0",
-                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "from": "normalize-package-data@*",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -2804,12 +2804,12 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index 8d1b860ac3..2106607a1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.16",
+    "ionic-app-lib": "0.0.18",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From d7e7e9cc3a021860b11e94227c0077f0eafdae68 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 14 May 2015 15:30:11 -0600
Subject: [PATCH 0651/1100] Additional changelog for resources image of
 portrait and landscape sizes for ldpi on android

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e28d349047..45fbf8b764 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.4.1 
 
 * Corrected a bug with ionic state restore command - it now properly passes the app directory to be fixed.
+* Corrected landscape and portrait sizes for the resources command.
 
 ### 1.4.0
 

From a5722cc5549162a12919bb2102f402bf4a3ee30e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 15 May 2015 09:10:15 -0600
Subject: [PATCH 0652/1100] Fix(serve): Add consolelogs and serverlogs
 arguments to boolean. Add task information for platform. Add platform
 argument.

---
 README.md             |  2 ++
 bin/ionic             |  3 ++-
 lib/cli.js            | 20 ++++++++++----------
 lib/tasks/cliTasks.js |  3 ++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d13b61a862..7f3e0a79f4 100644
--- a/README.md
+++ b/README.md
@@ -319,6 +319,8 @@ __Command-line flags/options:__
     [--noproxy|-x] ..........  Do not add proxies
     [--address] .............  Serves in the browser at the specified address
     [--lab] .................  Serves both iOS and Android in the browser
+    [--nogulp] ..............  Serve without running gulp tasks
+    [--platform] ............  Serve the platform specific styles in the browser (ios/android)
 
 ## Using Ionic Labs
 
diff --git a/bin/ionic b/bin/ionic
index 56d7c7f027..dd2be144e5 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -6,7 +6,8 @@ process.title = 'ionic';
 
 var argv = require('optimist')
     .boolean(['no-cordova', 'sass', 'list', 'w','nohooks', 
-    'n', 'r', 'noresources', 'nosave', 'e', 'nogulp']).argv,
+    'n', 'r', 'noresources', 'nosave', 'e', 'nogulp',
+    'consolelogs', 'serverlogs']).argv,
     IonicCli = require('../lib/cli');
 
 IonicCli.run(argv);
diff --git a/lib/cli.js b/lib/cli.js
index fc4797c6dd..b37548ccfa 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -18,12 +18,12 @@ Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
-Cli.dev = function dev() {
-  if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
-    return true;
-  }
-  return false;
-};
+// Cli.dev = function dev() {
+//   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
+//     return true;
+//   }
+//   return false;
+// };
 
 Cli.run = function run(argv) {
 
@@ -439,10 +439,10 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 Cli.reportExtras = function reportExtras(err) {
   var commandLineInfo = process.argv;
 
-  if (Cli.dev()) {
-    console.log('An error occured and was reported to Opbeat', err);
-    console.log(err.stack);
-  }
+  // if (Cli.dev()) {
+  //   console.log('An error occured and was reported to Opbeat', err);
+  //   console.log(err.stack);
+  // }
 
   var info = Cli.gatherInfo();
   info.command = commandLineInfo;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index d466e3e648..7c70a3f0c3 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -48,7 +48,8 @@ var TASKS = [
       '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
       '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
       '--lab|-l': 'Test your apps on multiple screen sizes and platform types',
-      '--nogulp': 'Disable running gulp during serve'
+      '--nogulp': 'Disable running gulp during serve',
+      '--platform|-l': 'Start serve with a specific platform (ios/android)'
     },
     module: './ionic/serve'
   },

From 0f9a9001c4c30ee98c71306c60bb3844558be28d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 15 May 2015 09:10:26 -0600
Subject: [PATCH 0653/1100] Changelog updates

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45fbf8b764..d87d400dee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.4.2
+
+* Fixing a bug with serve that will duplicate console logging from the browser.
+* Fix for a bug when serve wont start console logs with `--consolelogs` argument.
+* Added flag `--platform` for serve command that opens the browser with those platform specific styles (android/ios).
+
 ### 1.4.1 
 
 * Corrected a bug with ionic state restore command - it now properly passes the app directory to be fixed.

From 64fdaa5311dcb3eb0a80e42538326d98dc73c199 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 15 May 2015 09:20:37 -0600
Subject: [PATCH 0654/1100] Version bump 1.4.2

---
 npm-shrinkwrap.json | 42 +++++++++++++++++++++---------------------
 package.json        |  4 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 915e3e9c20..0ab15c4164 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.18",
-      "from": "ionic-app-lib@0.0.18",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.18.tgz",
+      "version": "0.0.19",
+      "from": "ionic-app-lib@0.0.19",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.19.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "4.3.0",
@@ -1126,9 +1126,9 @@
                       }
                     },
                     "browser-resolve": {
-                      "version": "1.8.2",
+                      "version": "1.9.0",
                       "from": "browser-resolve@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.0.tgz",
                       "dependencies": {
                         "resolve": {
                           "version": "1.1.6",
@@ -1173,7 +1173,7 @@
                     },
                     "builtins": {
                       "version": "0.0.7",
-                      "from": "builtins@0.0.7",
+                      "from": "builtins@>=0.0.3 <0.1.0",
                       "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
                     },
                     "commondir": {
@@ -1698,9 +1698,9 @@
                                   "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
                                   "dependencies": {
                                     "prelude-ls": {
-                                      "version": "1.1.1",
+                                      "version": "1.1.2",
                                       "from": "prelude-ls@>=1.1.1 <1.2.0",
-                                      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
                                     },
                                     "deep-is": {
                                       "version": "0.1.3",
@@ -2004,7 +2004,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2179,12 +2179,12 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.6",
-                  "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
@@ -2193,9 +2193,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.2",
+                      "version": "2.6.3",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.3.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
@@ -2242,7 +2242,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2341,7 +2341,7 @@
                     },
                     "normalize-package-data": {
                       "version": "2.1.0",
-                      "from": "normalize-package-data@*",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
@@ -2365,7 +2365,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     }
                   }
@@ -2804,12 +2804,12 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index 2106607a1c..c72464a4d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.18",
+    "ionic-app-lib": "0.0.19",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 06aab9626a3c2efdba273c5afc6be53ee893769b Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 15 May 2015 10:53:23 -0600
Subject: [PATCH 0655/1100] Fix(run): Livereload now shows the server commands.

---
 CHANGELOG.md         |  4 ++++
 lib/ionic/cordova.js | 10 ++++++++--
 npm-shrinkwrap.json  | 16 ++++++++--------
 package.json         |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d87d400dee..62fbe5a97a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.4.3
+
+* Patch an issue where the server commands are not working from the `ionic run` with livereload.
+
 ### 1.4.2
 
 * Fixing a bug with serve that will duplicate console logging from the browser.
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 295fee67ac..10c3f15990 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -34,7 +34,6 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     if(this.isLiveReload) {
       q = self.setupLiveReload(argv);
-
     } else {
       // ensure the content node was set back to its original
       q = self.ionic.setConfigXml({
@@ -55,7 +54,10 @@ IonicTask.prototype.run = function(ionic, argv) {
       addDefaultResources = true;
     }
 
-    return q.then(function(){
+    return q.then(function(serveOptions){
+      if (self.isLiveReload) {
+        self.options = serveOptions;
+      }
       if(addDefaultResources && self.addIcons) {
         return generate.copyIconFilesIntoResources()
         .then(function() {
@@ -174,6 +176,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 
   if(self.isLiveReload) {
     cordovaProcess.on('exit', function(){
+      Serve.showFinishedServeMessage(self.options);
       setTimeout(function(){
         // set it back to the original src after a few seconds
         ConfigXml.setConfigXml(process.cwd(), {
@@ -261,6 +264,9 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     });
     return Serve.start(options);
   })
+  .then(function() {
+    return options;
+  })
   .catch(function(error) {
     console.log('There was an error serving your Ionic application for run', error);
     console.log(error.stack);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0ab15c4164..075cad8b1c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1193,7 +1193,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.9 <1.2.0",
+                          "from": "readable-stream@>=1.1.13-1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -1731,7 +1731,7 @@
                                 },
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2004,7 +2004,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2804,7 +2804,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3103,7 +3103,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3184,7 +3184,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3216,7 +3216,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index c72464a4d2..13f1ccae37 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ea70fb37f6d18fe94150936999893fb969e3aaa0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 15 May 2015 13:39:33 -0600
Subject: [PATCH 0656/1100] Fix(upload): Upload now applies proxy if one is
 passed

---
 CHANGELOG.md        | 4 ++++
 lib/ionic/upload.js | 4 ++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62fbe5a97a..7c080c8ebf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.4.4
+
+* Fix upload to now work behind proxies.
+
 ### 1.4.3
 
 * Patch an issue where the server commands are not working from the `ionic run` with livereload.
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 4719722510..51f5d63afe 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -146,11 +146,14 @@ IonicTask.prototype.run = function(ionic, argv, callback) {
             project.set('app_id', d.app_id);
             project.save();
 
+            var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
+
             // Now we actually do the upload with the signed URL the dash returned
             request({
               method: 'PUT',
               preambleCRLF: true,
               postambleCRLF: true,
+              proxy: proxy,
               uri: d.signed_request,
               headers: {
                 'x-amz-acl': 'private',
@@ -167,6 +170,7 @@ IonicTask.prototype.run = function(ionic, argv, callback) {
                 // The final step is to signal the dash that the file was successfully uploaded
                 request({
                   method: 'GET',
+                  proxy: proxy,
                   uri: ionic.IONIC_DASH + ionic.IONIC_API + 'app/direct-upload/' + project.get('app_id'),
                   headers: {
                     cookie: jar.map(function(c) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 075cad8b1c..7829e0159c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.3",
+  "version": "1.4.4-beta.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index 13f1ccae37..4522701e5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.3",
+  "version": "1.4.4-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 86d150c815a4c3d6e111995cf4570d6f1b922991 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 18 May 2015 10:31:02 -0600
Subject: [PATCH 0657/1100] Fix(run): Show command tips and read in console
 when livereload is started, display command tips when cordova command
 completes

---
 lib/ionic/cordova.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 10c3f15990..2fcd549235 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -176,7 +176,8 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 
   if(self.isLiveReload) {
     cordovaProcess.on('exit', function(){
-      Serve.showFinishedServeMessage(self.options);
+      // Serve.showFinishedServeMessage(self.options);
+      Serve.printCommandTips(self.options);
       setTimeout(function(){
         // set it back to the original src after a few seconds
         ConfigXml.setConfigXml(process.cwd(), {
@@ -265,6 +266,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     return Serve.start(options);
   })
   .then(function() {
+    Serve.showFinishedServeMessage(options);
     return options;
   })
   .catch(function(error) {

From 0d1f9737ba006be79cc2208fc91412aefa7b3365 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 18 May 2015 10:31:40 -0600
Subject: [PATCH 0658/1100] Changelog updates

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c080c8ebf..038cd3f7f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ### 1.4.4
 
 * Fix upload to now work behind proxies.
+* Fix for start - now includes new plugin ID's for Cordova 5.0.
+* Fix for serve - fixes argument short name for lab and platform.
+* Ionic run with livereload now shows command tips before and after the cordova command completes.
 
 ### 1.4.3
 

From d045beba101415972d720bac76110754106d470e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 18 May 2015 10:33:12 -0600
Subject: [PATCH 0659/1100] Fix(tasks): Update text for task and readme for
 serving platform specific in browser

---
 README.md             | 2 +-
 lib/tasks/cliTasks.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f3e0a79f4..237046d20f 100644
--- a/README.md
+++ b/README.md
@@ -320,7 +320,7 @@ __Command-line flags/options:__
     [--address] .............  Serves in the browser at the specified address
     [--lab] .................  Serves both iOS and Android in the browser
     [--nogulp] ..............  Serve without running gulp tasks
-    [--platform] ............  Serve the platform specific styles in the browser (ios/android)
+    [--platform|-t] .........  Serve the platform specific styles in the browser (ios/android)
 
 ## Using Ionic Labs
 
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7c70a3f0c3..a4d82ff497 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -49,7 +49,7 @@ var TASKS = [
       '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
       '--lab|-l': 'Test your apps on multiple screen sizes and platform types',
       '--nogulp': 'Disable running gulp during serve',
-      '--platform|-l': 'Start serve with a specific platform (ios/android)'
+      '--platform|-t': 'Start serve with a specific platform (ios/android)'
     },
     module: './ionic/serve'
   },

From 2f1428e8541faf953b1a83ba5c9b15a7ffd65385 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 18 May 2015 16:23:34 -0600
Subject: [PATCH 0660/1100] Version bump

---
 npm-shrinkwrap.json | 855 ++++++++++++++++++++++++--------------------
 package.json        |   4 +-
 2 files changed, 466 insertions(+), 393 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 7829e0159c..21c8b8a87b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,101 +1,101 @@
 {
   "name": "ionic",
-  "version": "1.4.4-beta.0",
+  "version": "1.4.4",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "archiver@0.5.1",
+      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
+              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,32 +104,32 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,47 +138,47 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
+          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
+              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
                       "version": "2.6.2",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
                       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.0",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                     }
                   }
@@ -187,516 +187,516 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "minimatch@>=0.2.12 <0.3.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.6.2",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.0",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
+              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         }
       }
     },
     "async": {
       "version": "0.9.0",
-      "from": "async@>=0.9.0 <0.10.0",
+      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "cheerio@>=0.19.0 <0.20.0",
+      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "css-select@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "css-what@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "domutils@>=1.4.0 <1.5.0",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "boolbase@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "nth-check@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "entities@>=1.1.1 <1.2.0",
+          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.2",
-          "from": "htmlparser2@>=3.8.1 <3.9.0",
+          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "domhandler@>=2.3.0 <2.4.0",
+              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "domutils@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "entities@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "dom-serializer@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "domelementtype@>=1.1.1 <1.2.0",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
           "version": "3.8.0",
-          "from": "lodash@>=3.2.0 <4.0.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "cli-table@>=0.3.1 <0.4.0",
+      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "colors@1.0.3",
+          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
+          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
+      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "crc@3.2.1",
+      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.6.2",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.7",
-          "from": "through@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/through/-/through-2.3.7.tgz",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "map-stream@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
+          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "gulp@3.8.8",
+      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
+          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.4",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.0.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "chalk@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "ansi-styles@>=2.0.1 <3.0.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "has-ansi@>=1.0.3 <2.0.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "get-stdin@>=4.0.1 <5.0.0",
+                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "strip-ansi@>=2.0.1 <3.0.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "1.3.1",
-                  "from": "supports-color@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.11 <2.0.0",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "meow@*",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.0.2",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "indent-string@>=1.1.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.2",
-                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
                           "dependencies": {
                             "is-finite": {
                               "version": "1.0.0",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
                             }
                           }
@@ -709,116 +709,116 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.5.1",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.7",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.isnative": {
                   "version": "3.0.2",
-                  "from": "lodash.isnative@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.0.7",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
                   "dependencies": {
                     "lodash.isarguments": {
                       "version": "3.0.2",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.2",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -829,66 +829,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "object-assign@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
+              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.5",
-              "from": "through2@>=0.6.1 <0.7.0",
+              "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.26 <1.1.0",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
+                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -897,42 +897,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
+          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
+          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.6.2",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -941,51 +941,51 @@
                 },
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -994,34 +994,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
+          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "user-home@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -1029,24 +1029,29 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.19",
-      "from": "ionic-app-lib@0.0.19",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.19.tgz",
+      "version": "0.0.20",
+      "from": "ionic-app-lib@0.0.20",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.20.tgz",
       "dependencies": {
         "cordova-lib": {
-          "version": "4.3.0",
-          "from": "cordova-lib@>=4.3.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-4.3.0.tgz",
+          "version": "5.0.0",
+          "from": "cordova-lib@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-5.0.0.tgz",
           "dependencies": {
             "bplist-parser": {
               "version": "0.0.6",
               "from": "bplist-parser@0.0.6",
               "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
             },
+            "cordova-app-hello-world": {
+              "version": "3.9.0",
+              "from": "cordova-app-hello-world@3.9.0",
+              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
+            },
             "cordova-js": {
-              "version": "3.8.0",
-              "from": "cordova-js@3.8.0",
-              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-3.8.0.tgz",
+              "version": "3.9.0",
+              "from": "cordova-js@3.9.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-3.9.0.tgz",
               "dependencies": {
                 "browserify": {
                   "version": "7.1.0",
@@ -1193,7 +1198,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13-1 <2.0.0",
+                          "from": "readable-stream@>=1.1.9 <1.2.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -1270,9 +1275,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.4",
+                                  "version": "1.0.5",
                                   "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.5.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1391,9 +1396,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.4",
+                                  "version": "1.0.5",
                                   "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.5.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1731,7 +1736,7 @@
                                 },
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2004,7 +2009,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.7 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2079,9 +2084,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.4.21",
+                  "version": "2.4.22",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.21.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.22.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -2111,9 +2116,9 @@
                       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.0.2",
+                          "version": "1.1.0",
                           "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
                         },
                         "decamelize": {
                           "version": "1.0.0",
@@ -2136,6 +2141,74 @@
                 }
               }
             },
+            "cordova-registry-mapper": {
+              "version": "1.1.3",
+              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.3.tgz",
+              "dependencies": {
+                "tape": {
+                  "version": "3.5.0",
+                  "from": "tape@>=3.5.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
+                  "dependencies": {
+                    "deep-equal": {
+                      "version": "0.2.2",
+                      "from": "deep-equal@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                    },
+                    "defined": {
+                      "version": "0.0.0",
+                      "from": "defined@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                    },
+                    "glob": {
+                      "version": "3.2.11",
+                      "from": "glob@>=3.2.9 <3.3.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "0.3.0",
+                          "from": "minimatch@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.6.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.0",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "object-inspect": {
+                      "version": "0.4.0",
+                      "from": "object-inspect@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
+                    },
+                    "resumer": {
+                      "version": "0.0.0",
+                      "from": "resumer@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
+                    },
+                    "through": {
+                      "version": "2.3.7",
+                      "from": "through@>=2.3.4 <2.4.0",
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
             "d8": {
               "version": "0.4.4",
               "from": "d8@0.4.4",
@@ -2804,7 +2877,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3077,9 +3150,9 @@
               }
             },
             "semver": {
-              "version": "2.0.11",
-              "from": "semver@2.0.11",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"
+              "version": "2.1.0",
+              "from": "semver@2.1.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-2.1.0.tgz"
             },
             "shelljs": {
               "version": "0.3.0",
@@ -3103,7 +3176,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                     },
                     "mkdirp": {
@@ -3184,7 +3257,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3261,12 +3334,12 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2",
+      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -3830,22 +3903,22 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
+      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.2",
-          "from": "after-all@>=2.0.1 <3.0.0",
+          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.2",
-              "from": "once@>=1.3.0 <2.0.0",
+              "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -3854,22 +3927,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "stackman@>=0.2.2 <0.3.0",
+          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "stackback@0.0.2",
+              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -3878,135 +3951,135 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "optimist@0.6.0",
+      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7",
+      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
           "version": "1.0.5",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.4",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "deep-equal@*",
+              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.3",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "glob@>=4.4.2 <5.0.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "2.0.7",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4015,12 +4088,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4033,37 +4106,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -4072,47 +4145,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "request@2.51.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
+          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -4121,27 +4194,27 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
+          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
               "version": "2.0.11",
-              "from": "mime-types@>=2.0.3 <2.1.0",
+              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.9.1",
-                  "from": "mime-db@>=1.9.1 <1.10.0",
+                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
                 }
               }
@@ -4150,106 +4223,106 @@
         },
         "json-stringify-safe": {
           "version": "5.0.0",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
           "version": "1.1.0",
-          "from": "tough-cookie@>=0.12.0",
+          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
+          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "ctype@0.5.3",
+              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "hawk@1.1.1",
+          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
+              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "stringstream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -4258,130 +4331,130 @@
     },
     "semver": {
       "version": "4.3.4",
-      "from": "semver@>=4.2.0 <5.0.0",
+      "from": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "debug@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "ms@0.7.0",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.5",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
                 }
               }
@@ -4390,88 +4463,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
+      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
+          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.6",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.0",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.3.3",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "glob@>=4.4.2 <5.0.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "2.0.7",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4480,12 +4553,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4498,85 +4571,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -4585,44 +4658,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "glob@>=4.3.1 <5.0.0",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -4631,22 +4704,22 @@
             },
             "minimatch": {
               "version": "2.0.7",
-              "from": "minimatch@>=2.0.1 <3.0.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -4655,78 +4728,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
+              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.6.2",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.0",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
                         }
                       }
@@ -4739,95 +4812,95 @@
         },
         "graceful-fs": {
           "version": "3.0.6",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <2.5.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
           "version": "0.5.0",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -4836,22 +4909,22 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@0.4.4",
+      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "2.6.2",
-          "from": "xmlbuilder@>=1.0.0",
+          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.5.0",
-              "from": "lodash@>=3.5.0 <3.6.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
             }
           }
diff --git a/package.json b/package.json
index 4522701e5e..c07dd3d429 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.4-beta.0",
+  "version": "1.4.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.19",
+    "ionic-app-lib": "0.0.20",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 96140a6de1444435a202e7b2b0bcc777371c01f8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 19 May 2015 08:22:28 -0600
Subject: [PATCH 0661/1100] Fix(run): run and emulate command now respect the
 all argument for all addresses

---
 lib/ionic/cordova.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 2fcd549235..f70a0b6c24 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -239,7 +239,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
 
   var promise;
 
-  if (argv.allIps) {
+  if (argv.all) {
     promise = Q();
     console.log('Defaulting address to 0.0.0.0');
     options.address = '0.0.0.0';

From d5ad577e426f8c089e68a3201ebde752f69f095c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 19 May 2015 08:23:48 -0600
Subject: [PATCH 0662/1100] Changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 038cd3f7f6..118602c5b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Fix for start - now includes new plugin ID's for Cordova 5.0.
 * Fix for serve - fixes argument short name for lab and platform.
 * Ionic run with livereload now shows command tips before and after the cordova command completes.
+* Fix for `ionic run -l --all` - now respects the all addresses to serve on 0.0.0.0.
 
 ### 1.4.3
 

From 3c169324dc0b692a4973aeef4cd578053b8eaac6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 19 May 2015 15:37:44 -0600
Subject: [PATCH 0663/1100] Added back in the address command

---
 lib/ionic/serve.js  | 8 ++++++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 1a7bf4792b..d93905b9b9 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -19,6 +19,14 @@ IonicTask.prototype.run = function(ionic, argv) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
+  if (argv._[0] == 'address') {
+      // reset any address configs
+      var ionicConfig = require('./config').load();
+      ionicConfig.set('ionicServeAddress', null);
+      ionicConfig.set('platformServeAddress', null);
+      return Serve.getAddress({isAddressCmd: true});
+  }
+
   var options = Serve.loadSettings(argv);
   options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 21c8b8a87b..66b2b11138 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.4",
+  "version": "1.4.5-beta.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index c07dd3d429..a5154f5b5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.4",
+  "version": "1.4.5-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 7e3fb75e5252a8b7081b3e5dd8af163ac1a6bc13 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 20 May 2015 08:15:18 -0600
Subject: [PATCH 0664/1100] Fix(state): Pass variables along to state command.
 Fixes #429

---
 lib/ionic/cordova.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index f70a0b6c24..638cdbafaf 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -85,7 +85,7 @@ IonicTask.prototype.run = function(ionic, argv) {
         return State.removePlatform(process.cwd(), argumentName);
       } else if (isPluginCmd && isAddCmd) {
         console.log('Saving plugin to package.json file'.blue)
-        return State.savePlugin(process.cwd(), argumentName);
+        return State.savePlugin(process.cwd(), argumentName, argv.variable);
       } else if (isPluginCmd && isRmCmd) {
         console.log('Removing plugin from package.json file'.blue)
         return State.removePlugin(process.cwd(), argumentName);

From 4da736396f7c1a23b15716c62839ba5f411b4d8e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 20 May 2015 13:49:53 -0600
Subject: [PATCH 0665/1100] Fix(browser): Browser remove now passes browser and
 app directory. Version bump

---
 CHANGELOG.md         |   5 ++
 lib/ionic/browser.js |   2 +-
 npm-shrinkwrap.json  | 112 +++++++++++++++++++++++--------------------
 package.json         |   4 +-
 4 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 118602c5b9..ba41f89c7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.4.5
+
+* Fix for `ionic browser remove crosswalk` - fix for passing arguments and app directory.
+* Fix for `ionic browser upgrade crosswalk` - passes app directory correctly.
+
 ### 1.4.4
 
 * Fix upload to now work behind proxies.
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index cb081e5fdc..99d1dddfd1 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -72,7 +72,7 @@ IonicTask.prototype.run = function run(ionic) {
         break;
       case 'remove':
       case 'rm':
-        Browser.removeBrowser(appDirectory);
+        Browser.removeBrowser(appDirectory, browserToInstall);
         break;
       case 'revert':
         Browser.revertBrowser(appDirectory, platform);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 66b2b11138..895d9cba4b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.5-beta.0",
+  "version": "1.4.5",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1029,9 +1029,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.20",
-      "from": "ionic-app-lib@0.0.20",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.20.tgz",
+      "version": "0.0.22",
+      "from": "ionic-app-lib@0.0.22",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.22.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "5.0.0",
@@ -1275,14 +1275,19 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.5",
+                                  "version": "1.0.6",
                                   "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.5.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    },
+                                    "bn.js": {
+                                      "version": "2.0.5",
+                                      "from": "bn.js@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
                                 },
@@ -1335,9 +1340,9 @@
                               "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
                             },
                             "sha.js": {
-                              "version": "2.4.0",
+                              "version": "2.4.1",
                               "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.0.tgz"
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.1.tgz"
                             }
                           }
                         },
@@ -1396,14 +1401,19 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.5",
+                                  "version": "1.0.6",
                                   "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.5.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    },
+                                    "bn.js": {
+                                      "version": "2.0.5",
+                                      "from": "bn.js@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
                                 },
@@ -1509,9 +1519,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.4.2",
+                      "version": "6.4.3",
                       "from": "insert-module-globals@>=6.1.0 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.2.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.3.tgz",
                       "dependencies": {
                         "JSONStream": {
                           "version": "1.0.3",
@@ -1641,9 +1651,9 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.7.12",
+                      "version": "3.7.13",
                       "from": "module-deps@>=3.6.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.12.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.13.tgz",
                       "dependencies": {
                         "JSONStream": {
                           "version": "1.0.3",
@@ -2009,7 +2019,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.31 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2084,9 +2094,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.4.22",
+                  "version": "2.4.23",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.22.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.23.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -2172,14 +2182,14 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.6.3",
+                              "version": "2.6.4",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.3.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                             },
                             "sigmund": {
-                              "version": "1.0.0",
+                              "version": "1.0.1",
                               "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                             }
                           }
                         }
@@ -2187,7 +2197,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "object-inspect": {
@@ -2251,9 +2261,9 @@
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "3.0.6",
+                  "version": "3.0.7",
                   "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
@@ -2266,14 +2276,14 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.3",
+                      "version": "2.6.4",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.3.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0",
+                      "version": "1.0.1",
                       "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                     }
                   }
                 },
@@ -2315,13 +2325,13 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.7",
+                      "version": "2.0.8",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -2384,14 +2394,14 @@
                   "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
                 },
                 "read": {
-                  "version": "1.0.5",
+                  "version": "1.0.6",
                   "from": "read@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
                   "dependencies": {
                     "mute-stream": {
-                      "version": "0.0.4",
+                      "version": "0.0.5",
                       "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
                     }
                   }
                 },
@@ -2437,9 +2447,9 @@
                       }
                     },
                     "graceful-fs": {
-                      "version": "3.0.6",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                      "version": "3.0.7",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
                     }
                   }
                 },
@@ -2877,7 +2887,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3042,9 +3052,9 @@
                   "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
                 },
                 "json-stringify-safe": {
-                  "version": "5.0.0",
+                  "version": "5.0.1",
                   "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                 },
                 "mime-types": {
                   "version": "1.0.2",
@@ -3165,9 +3175,9 @@
               "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
               "dependencies": {
                 "block-stream": {
-                  "version": "0.0.7",
+                  "version": "0.0.8",
                   "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
                 },
                 "fstream": {
                   "version": "1.0.6",
@@ -3175,9 +3185,9 @@
                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz",
                   "dependencies": {
                     "graceful-fs": {
-                      "version": "3.0.6",
+                      "version": "3.0.7",
                       "from": "graceful-fs@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
                     },
                     "mkdirp": {
                       "version": "0.5.1",
@@ -3192,9 +3202,9 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.3.3",
+                      "version": "2.3.4",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
                       "dependencies": {
                         "glob": {
                           "version": "4.5.3",
@@ -3214,9 +3224,9 @@
                               }
                             },
                             "minimatch": {
-                              "version": "2.0.7",
+                              "version": "2.0.8",
                               "from": "minimatch@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                               "dependencies": {
                                 "brace-expansion": {
                                   "version": "1.1.0",
@@ -3257,7 +3267,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3289,7 +3299,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index a5154f5b5c..d1b98e603a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.5-beta.0",
+  "version": "1.4.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.20",
+    "ionic-app-lib": "0.0.22",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From f76a5e738db3f60f953b592ab4fb1e39d3de16dc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 20 May 2015 22:55:52 -0600
Subject: [PATCH 0666/1100] Closes #396 - ionitron now has spanish translation

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 895d9cba4b..778e1fa84b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.5",
+  "version": "1.4.6-beta.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
diff --git a/package.json b/package.json
index d1b98e603a..805a832057 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.5",
+  "version": "1.4.6-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a40bad7a98296817c0da5cf8c7c2fd8c42b89d7f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 22 May 2015 15:02:00 -0500
Subject: [PATCH 0667/1100] Refactor(setup): Extract setup command to use setup
 commands from ionic-app-lib

---
 lib/ionic/setup.js | 195 +++++++++------------------------------------
 1 file changed, 37 insertions(+), 158 deletions(-)

diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index c1c05c23df..1206fbd226 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -7,6 +7,7 @@ var Task = require('./task').Task,
     Q = require('q'),
     IonicProject = require('./project'),
     IonicAppLib = require('ionic-app-lib'),
+    Setup = IonicAppLib.setup,
     Utils = IonicAppLib.utils,
     colors = require('colors');
 
@@ -19,176 +20,54 @@ IonicTask.prototype.run = function(ionic) {
     return ionic.fail('Missing setup task command.', 'setup');
   }
 
-  if (!Utils.gulpInstalledGlobally()) {
-    var gulpMessage = ['You have specified Ionic CLI to set up sass.'.red, '\n', 'However, you do not have Gulp installed globally. Please run '.red, '`npm install -g gulp`'.green].join('');  
-    events.emit('log', gulpMessage);
-    return Q(gulpMessage);
-  }
-
-  var tasks = argv._.slice(1);
-
-  for(var x=0; x<tasks.length; x++) {
-    if(tasks[x].toLowerCase() == 'sass') {
-      this.sassSetup(ionic);
-    } else {
-      return ionic.fail('Invalid setup task command: ' + tasks[x], 'setup');
-    }
-  }
-
-  IonicStats.t();
-};
-
-
-IonicTask.prototype.sassSetup = function(ionic) {
-  var q = Q.defer();
   var self = this;
-  self.ionic = ionic;
-
-  this.npmInstall().then(function(){
+  var tasks = argv._.slice(1);
+  var promises = [];
 
-    var indexPath = path.resolve( path.join('www', ionic.getContentSrc()) );
-    var lines, line, keepLine, activeRemoving;
-    var cleanedLines = [];
+  var promise = Q();
 
+  for (var x = 0; x < tasks.length; x++) {
     try {
-      lines = fs.readFileSync(indexPath, 'utf8').split('\n');
-    } catch(e) {
-      q.reject(e);
-      return ionic.fail('Error loading ' + indexPath);
-    }
+      (function() {
+        //create closure for task
+        var task = self.runSetupTask(tasks[x]);
+        // console.log('Task: ', task);
+        promises.push(task);
+      })();
+    } catch (ex) {
 
-    try {
-      activeRemoving = false;
-
-      for(x=0; x<lines.length; x++) {
-        line = lines[x];
-        keepLine = true;
-
-        if( /<!--(.*?) sass (.*?)/gi.test(line) ) {
-          line = '    <!-- compiled css output -->';
-          activeRemoving = true;
-        } else if (activeRemoving && /(.*?)-->(.*?)/gi.test(line) ) {
-          keepLine = false;
-          activeRemoving = false;
-        } else if( /lib\/ionic\/css\/ionic.css|css\/style.css/gi.test(line) ) {
-          keepLine = false;
-        }
-
-        if(keepLine) {
-          cleanedLines.push(line);
-        }
-      }
-
-      var project = null;
-
-      try {
-        project = IonicProject.load();
-      } catch (ex) {
-        self.ionic.fail(ex.message);
-        return
-      }
-
-      var gulpStartupTasks = project.get('gulpStartupTasks') || [];
-      var hasSass, hasWatch;
-      gulpStartupTasks.forEach(function(taskName){
-        if(taskName == 'sass') hasSass = true;
-        if(taskName == 'watch') hasWatch = true;
-      });
-      if(!hasSass) gulpStartupTasks.push('sass');
-      if(!hasWatch) gulpStartupTasks.push('watch');
-      project.set('gulpStartupTasks', gulpStartupTasks);
-      if(!project.get('watchPatterns')){
-        project.set('watchPatterns', ['www/**/*', '!www/lib/**/*'])
-      }
-      project.save();
-
-      fs.writeFileSync(indexPath, cleanedLines.join('\n'), 'utf8');
-
-      console.log('Updated '.green.bold + indexPath.bold + ' <link href>'.yellow.bold + ' references to sass compiled css'.green.bold);
-
-      console.log('\nIonic project ready to use Sass!'.green.bold);
-      console.log(' * Customize the app using'.yellow.bold, 'scss/ionic.app.scss'.bold);
-      console.log(' * Run'.yellow.bold, 'ionic serve'.bold, 'to start a local dev server and watch/compile Sass to CSS'.yellow.bold);
-      console.log('');
-
-      self.buildSass().then(function(){
-        q.resolve();
-      });
-
-    } catch(e) {
-      q.reject(e);
-      return ionic.fail('Error parsing ' + indexPath + ': ' + e);
     }
+  }
 
-  }, function(e){
-    q.reject(e);
-  });
-
-  return q.promise;
-};
-
-
-IonicTask.prototype.buildSass = function() {
-  var q = Q.defer();
-
-  var childProcess = exec('gulp sass');
-
-  childProcess.stdout.on('data', function (data) {
-    process.stdout.write(data);
-  });
-
-  childProcess.stderr.on('data', function (data) {
-    if(data) {
-      process.stderr.write(data.toString().yellow);
-    }
+  promises.forEach(function(task) {
+    // console.log('Task foreach:', task);
+    promise = promise.then(function(){ return task(process.cwd()); });
   });
 
-  childProcess.on('exit', function(code){
-    process.stderr.write('\n');
-    if(code === 0) {
-      console.log('Successful '.green.bold + 'sass build'.bold);
-      q.resolve();
-    } else {
-      console.log( 'Error running '.error.bold + 'gulp sass'.bold );
-      q.reject();
-    }
-  });
+  promise
+  .fin(function() {
+    console.log('Ionic setup complete'.green.bold);
+  })
+  .catch(function(error) {
+    console.log('Error from setup - ' + error);
+  })
 
-  return q.promise;
+  IonicStats.t();
 };
 
-
-IonicTask.prototype.npmInstall = function() {
-  var q = Q.defer();
-
-  var childProcess = exec('npm install');
-
-  childProcess.stdout.on('data', function (data) {
-    process.stdout.write(data);
-  });
-
-  childProcess.stderr.on('data', function (data) {
-    if(data) {
-      data = data.toString();
-      if( !/no repository field/gi.test(data) ) {
-        process.stderr.write(data.yellow);
-      }
-    }
-  });
-
-  childProcess.on('exit', function(code){
-    process.stderr.write('\n');
-    if(code === 0) {
-      console.log('Successful '.green.bold + 'npm install'.bold);
-      q.resolve();
-    } else {
-      console.log( 'Error running '.error.bold + 'npm install'.bold );
-      q.reject();
-    }
-  });
-
-  return q.promise;
+IonicTask.prototype.runSetupTask = function runSetupTask(setupTask) {
+  switch (setupTask) {
+    case 'sass':
+      return Setup.sassSetup;//(process.cwd())
+      break;
+    case 'facebook':
+      return Setup.setupFacebook;//(process.cwd());
+      break;
+    default:
+      var errorMessage = 'Invalid setup task command: ' + setupTask;
+      console.log(errorMessage);
+      return Q(errorMessage);
+  }
 };
 
-
 exports.IonicTask = IonicTask;

From 51b69729c3ce5aa010b5c3673eacd7d5bbb305a0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 22 May 2015 15:41:33 -0500
Subject: [PATCH 0668/1100] Refactor(setup): Remove comments for pwd

---
 lib/ionic/setup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 1206fbd226..39cd93d3f1 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -58,10 +58,10 @@ IonicTask.prototype.run = function(ionic) {
 IonicTask.prototype.runSetupTask = function runSetupTask(setupTask) {
   switch (setupTask) {
     case 'sass':
-      return Setup.sassSetup;//(process.cwd())
+      return Setup.sassSetup;
       break;
     case 'facebook':
-      return Setup.setupFacebook;//(process.cwd());
+      return Setup.setupFacebook;
       break;
     default:
       var errorMessage = 'Invalid setup task command: ' + setupTask;

From b08af7b451b39c91c22b8128a8c2e482a3e9056d Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 2 Jun 2015 15:26:06 -0500
Subject: [PATCH 0669/1100] defined new command

---
 lib/tasks/cliTasks.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index a4d82ff497..7b8dec67a4 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -1,5 +1,5 @@
 var resourcesSummary = [
-  'Automatically create icon and splash screen resources' + ' (beta)'.yellow, 
+  'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
   'Put your images in the ./resources directory, named splash or icon.',
   'Accepted file types are .png, .ai, and .psd.',
   'Icons should be 192x192 px without rounded corners.',
@@ -244,13 +244,24 @@ var TASKS = [
     //   '--uuid|-u': 'Mark an already uploaded version as deployed'
     // },
     module: './ionic/app'
-   },
-   {
+  },
+  {
     title: 'push',
     name: 'push',
     module: './ionic/push'
-   },
-   {
+  },
+  {
+    title: 'config',
+    name: 'config',
+    summary: 'Set configuration variables for your ionic app.',
+    args: {
+      '<command>': '"set unset"'
+      '[key]': 'The key to set',
+      '[value]': 'The value to set'
+    }
+    module: './ionic/config'
+  },
+  {
     title: 'browser',
     name: 'browser',
     summary: 'Add another browser for a platform ' + '(beta)'.yellow,

From 60a89d0468fb290898eb59d0e20988dfc4434d3b Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 2 Jun 2015 16:12:09 -0500
Subject: [PATCH 0670/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d1b98e603a..3348a26ebb 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.22",
+    "ionic-app-lib": "0.0.23",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 4606aca88d29be7eccc6e119279a1ec2472bedd3 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 2 Jun 2015 16:12:21 -0500
Subject: [PATCH 0671/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3348a26ebb..07d9b0ff1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 4b30af3f73dbb53feced3c751d91281f199ff317 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 2 Jun 2015 16:18:36 -0500
Subject: [PATCH 0672/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 07d9b0ff1c..b11e5f7af7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 5aefa45b7586777e4f9d48aea5fc20b8f1df940c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 2 Jun 2015 16:56:12 -0500
Subject: [PATCH 0673/1100] new Shrink

---
 npm-shrinkwrap.json | 1232 +++++++++++++++++++++----------------------
 package.json        |    2 +-
 2 files changed, 608 insertions(+), 626 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 895d9cba4b..ebc90bd5a0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,101 +1,101 @@
 {
   "name": "ionic",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
+      "from": "archiver@0.5.1",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,32 +104,32 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,48 +138,48 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "from": "glob@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.2",
-                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                      "version": "2.6.4",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                     }
                   }
                 }
@@ -187,517 +187,524 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "from": "minimatch@>=0.2.12 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.2",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                  "version": "2.6.4",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                  "version": "1.0.1",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         }
       }
     },
     "async": {
-      "version": "0.9.0",
-      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "from": "cheerio@>=0.19.0 <0.20.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "from": "css-select@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
+              "from": "css-what@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "from": "domutils@>=1.4.0 <1.5.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+              "from": "boolbase@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+              "from": "nth-check@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "from": "entities@>=1.1.1 <1.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.2",
-          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+              "from": "domhandler@>=2.3.0 <2.4.0",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "from": "domutils@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+              "from": "entities@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
-          "version": "3.8.0",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
+          "version": "3.9.3",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "from": "cli-table@>=0.3.1 <0.4.0",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "from": "colors@1.0.3",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "from": "escape-html@1.0.1",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
+      "from": "connect-livereload@0.5.2",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+      "from": "crc@3.2.1",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.2",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+          "version": "2.6.4",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.7",
-          "from": "https://registry.npmjs.org/through/-/through-2.3.7.tgz",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
+          "from": "map-stream@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+          "from": "pause-stream@0.0.11",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "from": "archy@>=0.0.2 <0.0.3",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.4",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
+          "version": "3.0.5",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.5.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
+              "version": "1.1.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "from": "chalk@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+                  "from": "ansi-styles@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "from": "has-ansi@>=1.0.3 <2.0.0",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                      "from": "get-stdin@>=4.0.1 <5.0.0",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "from": "strip-ansi@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
+                  "from": "supports-color@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "from": "meow@*",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                          "version": "1.1.0",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
-                          "version": "1.1.2",
-                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "version": "1.1.3",
+                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
                           "dependencies": {
                             "is-finite": {
-                              "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                              "version": "1.0.1",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
                             }
                           }
                         }
@@ -709,116 +716,116 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.5.1",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
+              "version": "3.6.1",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.1.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.7",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz"
+                  "version": "3.0.9",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
-                "lodash.isnative": {
-                  "version": "3.0.2",
-                  "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
-                },
                 "lodash.keys": {
-                  "version": "3.0.7",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
+                  "version": "3.1.1",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.1.tgz",
                   "dependencies": {
+                    "lodash._getnative": {
+                      "version": "3.9.0",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.0.tgz"
+                    },
                     "lodash.isarguments": {
-                      "version": "3.0.2",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz"
+                      "version": "3.0.3",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.3.tgz"
                     },
                     "lodash.isarray": {
-                      "version": "3.0.2",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz"
+                      "version": "3.0.3",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.3.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -829,66 +836,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+              "from": "object-assign@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.5",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@>=0.4.3 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -897,43 +904,43 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@>=0.12.0 <0.13.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                          "version": "2.6.4",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
                     }
@@ -941,51 +948,51 @@
                 },
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "from": "resolve@>=0.7.0 <0.8.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "from": "minimist@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -994,34 +1001,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
+          "from": "semver@>=3.0.1 <4.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -1029,9 +1036,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.22",
-      "from": "ionic-app-lib@0.0.22",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.22.tgz",
+      "version": "0.0.23",
+      "from": "ionic-app-lib@0.0.23",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.23.tgz",
       "dependencies": {
         "cordova-lib": {
           "version": "5.0.0",
@@ -1233,29 +1240,29 @@
                       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz",
                       "dependencies": {
                         "browserify-aes": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "browserify-aes@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.1.tgz"
                         },
                         "browserify-sign": {
-                          "version": "3.0.1",
+                          "version": "3.0.2",
                           "from": "browserify-sign@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.0",
+                              "version": "2.0.1",
                               "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "elliptic": {
-                              "version": "1.0.1",
-                              "from": "elliptic@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "version": "3.0.3",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1263,57 +1270,47 @@
                                   "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
                                 },
                                 "hash.js": {
-                                  "version": "1.0.2",
+                                  "version": "1.0.3",
                                   "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
                                 }
                               }
                             },
                             "parse-asn1": {
-                              "version": "3.0.0",
+                              "version": "3.0.1",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.6",
-                                  "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
+                                  "version": "2.0.3",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    },
-                                    "bn.js": {
-                                      "version": "2.0.5",
-                                      "from": "bn.js@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
-                                },
-                                "pbkdf2-compat": {
-                                  "version": "3.0.2",
-                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
                                 }
                               }
                             }
                           }
                         },
                         "create-ecdh": {
-                          "version": "2.0.0",
+                          "version": "2.0.1",
                           "from": "create-ecdh@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "elliptic": {
-                              "version": "1.0.1",
-                              "from": "elliptic@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "version": "3.0.3",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1321,9 +1318,9 @@
                                   "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
                                 },
                                 "hash.js": {
-                                  "version": "1.0.2",
+                                  "version": "1.0.3",
                                   "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
                                 }
                               }
                             }
@@ -1352,19 +1349,19 @@
                           "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"
                         },
                         "diffie-hellman": {
-                          "version": "3.0.1",
+                          "version": "3.0.2",
                           "from": "diffie-hellman@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "miller-rabin": {
-                              "version": "1.1.5",
-                              "from": "miller-rabin@>=1.1.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz",
+                              "version": "2.0.1",
+                              "from": "miller-rabin@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1381,46 +1378,36 @@
                           "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
                         },
                         "public-encrypt": {
-                          "version": "2.0.0",
+                          "version": "2.0.1",
                           "from": "public-encrypt@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.0",
+                              "version": "2.0.1",
                               "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "parse-asn1": {
-                              "version": "3.0.0",
+                              "version": "3.0.1",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.6",
-                                  "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
+                                  "version": "2.0.3",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    },
-                                    "bn.js": {
-                                      "version": "2.0.5",
-                                      "from": "bn.js@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
-                                },
-                                "pbkdf2-compat": {
-                                  "version": "3.0.2",
-                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
                                 }
                               }
                             }
@@ -1444,14 +1431,14 @@
                       "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
                     },
                     "deps-sort": {
-                      "version": "1.3.8",
+                      "version": "1.3.9",
                       "from": "deps-sort@>=1.3.5 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.8.tgz",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1459,11 +1446,6 @@
                               "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                             }
                           }
-                        },
-                        "through2": {
-                          "version": "0.5.1",
-                          "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
                         }
                       }
                     },
@@ -1519,14 +1501,14 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.4.3",
+                      "version": "6.5.0",
                       "from": "insert-module-globals@>=6.1.0 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.3.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.0.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1589,18 +1571,18 @@
                               "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
                               "dependencies": {
                                 "acorn": {
-                                  "version": "1.1.0",
+                                  "version": "1.2.2",
                                   "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                                 }
                               }
                             }
                           }
                         },
                         "process": {
-                          "version": "0.11.0",
+                          "version": "0.11.1",
                           "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.0.tgz"
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
                         },
                         "xtend": {
                           "version": "4.0.0",
@@ -1651,14 +1633,14 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.7.13",
+                      "version": "3.8.0",
                       "from": "module-deps@>=3.6.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.13.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.0.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1673,19 +1655,14 @@
                           "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
                         },
                         "detective": {
-                          "version": "4.0.2",
+                          "version": "4.1.0",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.1.0.tgz",
                           "dependencies": {
                             "acorn": {
-                              "version": "1.1.0",
+                              "version": "1.2.2",
                               "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
-                            },
-                            "defined": {
-                              "version": "0.0.0",
-                              "from": "defined@0.0.0",
-                              "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                             },
                             "escodegen": {
                               "version": "1.6.1",
@@ -1772,6 +1749,18 @@
                             }
                           }
                         },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            }
+                          }
+                        },
                         "resolve": {
                           "version": "1.1.6",
                           "from": "resolve@>=1.1.3 <2.0.0",
@@ -1787,6 +1776,18 @@
                               "from": "through2@>=0.5.1 <0.6.0",
                               "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
                               "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@>=1.0.17 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    }
+                                  }
+                                },
                                 "xtend": {
                                   "version": "3.0.0",
                                   "from": "xtend@>=3.0.0 <3.1.0",
@@ -1796,25 +1797,6 @@
                             }
                           }
                         },
-                        "through2": {
-                          "version": "0.4.2",
-                          "from": "through2@>=0.4.1 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-                          "dependencies": {
-                            "xtend": {
-                              "version": "2.1.2",
-                              "from": "xtend@>=2.1.1 <2.2.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-                              "dependencies": {
-                                "object-keys": {
-                                  "version": "0.4.0",
-                                  "from": "object-keys@>=0.4.0 <0.5.0",
-                                  "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "xtend": {
                           "version": "4.0.0",
                           "from": "xtend@>=4.0.0 <5.0.0",
@@ -1933,14 +1915,14 @@
                       }
                     },
                     "syntax-error": {
-                      "version": "1.1.3",
+                      "version": "1.1.4",
                       "from": "syntax-error@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.3.tgz",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
                       "dependencies": {
                         "acorn": {
-                          "version": "1.1.0",
+                          "version": "1.2.2",
                           "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                         }
                       }
                     },
@@ -1974,9 +1956,9 @@
                       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz",
                       "dependencies": {
                         "process": {
-                          "version": "0.11.0",
+                          "version": "0.11.1",
                           "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.0.tgz"
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
                         }
                       }
                     },
@@ -2019,7 +2001,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.31 <0.2.0",
+                                  "from": "source-map@>=0.1.7 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2152,9 +2134,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.3",
+              "version": "1.1.5",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.5.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -2261,9 +2243,9 @@
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "3.0.7",
+                  "version": "3.0.8",
                   "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
@@ -2302,14 +2284,14 @@
               }
             },
             "init-package-json": {
-              "version": "1.5.0",
+              "version": "1.6.0",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.6.0.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.6",
+                  "version": "5.0.10",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.10.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2325,7 +2307,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2372,19 +2354,19 @@
                   }
                 },
                 "npm-package-arg": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.1.tgz",
                   "dependencies": {
                     "hosted-git-info": {
-                      "version": "2.1.2",
-                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "semver": {
-                      "version": "4.3.4",
+                      "version": "4.3.6",
                       "from": "semver@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
                     }
                   }
                 },
@@ -2423,14 +2405,14 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.1.0",
+                      "version": "2.2.0",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
-                          "version": "2.1.2",
+                          "version": "2.1.4",
                           "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "spdx": {
                           "version": "0.4.0",
@@ -2438,18 +2420,18 @@
                           "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
-                              "version": "1.0.0",
+                              "version": "1.0.1",
                               "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                             }
                           }
                         }
                       }
                     },
                     "graceful-fs": {
-                      "version": "3.0.7",
+                      "version": "3.0.8",
                       "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     }
                   }
                 },
@@ -2464,9 +2446,9 @@
                       "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                         }
                       }
                     },
@@ -2843,14 +2825,14 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.1.0",
+                  "version": "2.2.0",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
                   "dependencies": {
                     "hosted-git-info": {
-                      "version": "2.1.2",
+                      "version": "2.1.4",
                       "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "spdx": {
                       "version": "0.4.0",
@@ -2858,9 +2840,9 @@
                       "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                         }
                       }
                     }
@@ -2874,20 +2856,20 @@
               "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
               "dependencies": {
                 "config-chain": {
-                  "version": "1.1.8",
+                  "version": "1.1.9",
                   "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
                   "dependencies": {
                     "proto-list": {
-                      "version": "1.2.3",
+                      "version": "1.2.4",
                       "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2918,9 +2900,9 @@
                   "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
                   "dependencies": {
                     "abbrev": {
-                      "version": "1.0.5",
+                      "version": "1.0.7",
                       "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                     }
                   }
                 },
@@ -3077,9 +3059,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                 },
                 "tough-cookie": {
-                  "version": "1.1.0",
+                  "version": "1.2.0",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
                 },
                 "http-signature": {
                   "version": "0.10.1",
@@ -3185,9 +3167,9 @@
                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz",
                   "dependencies": {
                     "graceful-fs": {
-                      "version": "3.0.7",
+                      "version": "3.0.8",
                       "from": "graceful-fs@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     },
                     "mkdirp": {
                       "version": "0.5.1",
@@ -3267,7 +3249,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3344,12 +3326,12 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "from": "ncp@0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -3913,22 +3895,22 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
       "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.2",
-          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
+          "from": "after-all@>=2.0.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.2",
-              "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+              "from": "once@>=1.3.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -3937,22 +3919,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "from": "stackman@>=0.2.2 <0.3.0",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+              "from": "stackback@0.0.2",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -3961,135 +3943,135 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
+      "from": "progress@1.1.7",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
-          "version": "1.0.5",
-          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+          "version": "1.0.6",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
           "dependencies": {
             "mute-stream": {
-              "version": "0.0.4",
-              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+              "version": "0.0.5",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
-              "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
-              "version": "2.3.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+              "version": "2.3.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "from": "glob@>=4.4.2 <5.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.7",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                      "version": "2.0.8",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4098,12 +4080,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4116,37 +4098,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -4155,47 +4137,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -4204,135 +4186,135 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "from": "caseless@>=0.8.0 <0.9.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.11",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
+              "version": "2.0.13",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.9.1",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
+                  "version": "1.11.0",
+                  "from": "mime-db@>=1.11.0 <1.12.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
                 }
               }
             }
           }
         },
         "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "from": "mime-types@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "from": "qs@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "1.1.0",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+          "version": "1.2.0",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+              "from": "ctype@0.5.3",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+          "from": "stringstream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -4340,132 +4322,132 @@
       }
     },
     "semver": {
-      "version": "4.3.4",
-      "from": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
+      "version": "4.3.6",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "from": "debug@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "from": "ms@0.7.0",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+              "from": "depd@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
-                  "version": "1.0.5",
-                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                 }
               }
             }
@@ -4473,88 +4455,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "from": "underscore@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.6",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
-              "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
-              "version": "2.3.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+              "version": "2.3.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "from": "glob@>=4.4.2 <5.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.7",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                      "version": "2.0.8",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4563,12 +4545,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4581,85 +4563,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -4668,44 +4650,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "from": "glob@>=4.3.1 <5.0.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "from": "inflight@>=1.0.4 <2.0.0",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -4713,23 +4695,23 @@
               }
             },
             "minimatch": {
-              "version": "2.0.7",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+              "version": "2.0.8",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "from": "concat-map@0.0.1",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -4738,79 +4720,79 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "from": "glob2base@>=0.0.12 <0.0.13",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                  "from": "find-index@>=0.1.1 <0.2.0",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                          "version": "2.6.4",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
                     }
@@ -4821,96 +4803,96 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.6",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
-          "version": "0.5.0",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "from": "clone@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -4919,23 +4901,23 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.6.2",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+          "version": "2.6.4",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.5.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
+              "version": "3.9.3",
+              "from": "lodash@>=3.5.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index b11e5f7af7..9dbcef2fab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From a2e421cf35993816f9cc0e953477a19fdf6eaea1 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 2 Jun 2015 17:24:50 -0500
Subject: [PATCH 0674/1100] Hey, it does something now

---
 lib/tasks/cliTasks.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7b8dec67a4..6d1259e1ba 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -255,11 +255,11 @@ var TASKS = [
     name: 'config',
     summary: 'Set configuration variables for your ionic app.',
     args: {
-      '<command>': '"set unset"'
+      '<command>': '"set unset"',
       '[key]': 'The key to set',
       '[value]': 'The value to set'
-    }
-    module: './ionic/config'
+    },
+    module: './ionic/io-config'
   },
   {
     title: 'browser',

From 7f89180f3b42a2faf5e4ba45d505c53a71604791 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 2 Jun 2015 17:10:47 -0600
Subject: [PATCH 0675/1100] Fix(serve, project): Pass in directory for ionic
 apps with project for serve and cordova run live reload

---
 lib/ionic/cordova.js |  11 +-
 lib/ionic/login.js   | 187 +++++++++++++++-----------------
 lib/ionic/serve.js   |  11 +-
 lib/ionic/upload.js  | 250 ++++---------------------------------------
 4 files changed, 127 insertions(+), 332 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 638cdbafaf..86e0f324cd 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -224,7 +224,16 @@ IonicTask.prototype.setupLiveReload = function(argv) {
 
   console.log('Setup Live Reload'.green.bold);
 
-  var options = Serve.loadSettings(argv);
+  var project = null;
+
+  try {
+    project = IonicProject.load(process.cwd());
+  } catch (ex) {
+    console.log('Error occured', ex);
+    return Utils.fail(ex.message);
+  }
+
+  var options = Serve.loadSettings(argv, project);
   // options.address = '0.0.0.0';
   options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
   options.runLivereload = true;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 3958395d57..c42c17eb1a 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -2,14 +2,101 @@ var fs = require('fs'),
     request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
+    IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login,
+    settings = IonicAppLib.settings,
     IonicProject = require('./project'),
+    IonicStats = require('./stats').IonicStats,
     IonicStore = require('./store').IonicStore,
+    Q = require('q'),
     Task = require('./task').Task;
 
+var LoginTask = module.exports;
+
+//Login is set up a little differently than other tasks
+//First of all - we need a way to prompt the user for email/pw
+//Thats done with a prompt, so we handle that here instead of the lib
+//Any other calls to login in the lib take email/pw to login
+//The login task itself just runs LoginTask.login()
+
+LoginTask.login = function login() {
+  var email = argv.email || argv.e || process.env.IONIC_EMAIL;
+  var password = argv.password || argv.p || process.env.IONIC_PASSWORD;
+
+  var promise;
+
+  if (email && password) {
+    promise = Q({email: email, password: password});
+  } else {
+    promise = LoginTask.promptForLogin();
+  }
+
+  return promise
+  .then(function(loginInfo) {
+    return Login.requestLogIn(loginInfo.email, loginInfo.password, true);
+  })
+  .then(function(cookieJar) {
+    console.log('Logged in! :)'.green);
+    return cookieJar;
+  })
+  .catch(function(ex) {
+    console.log('Error logging in');
+    throw ex;
+    // console.log(ex);
+    // console.log(ex.stack);
+  });
+};
+
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
+LoginTask.promptForLogin = function promptForLogin() {
+  var q = Q.defer();
+  var self = this;
+
+  var schema = [{
+    name: 'email',
+    pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
+    description: 'Email:'.yellow.bold,
+    required: true
+  }, {
+    name: 'password',
+    description: 'Password:'.yellow.bold,
+    hidden: true,
+    required: true
+  }];
+
+  // prompt for log
+  console.log('\nTo continue, please login to your Ionic account.'.bold.green);
+  console.log('Don\'t have one? Create a one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
+
+  prompt.override = argv;
+  prompt.message = '';
+  prompt.delimiter = '';
+  prompt.start();
+
+  prompt.get(schema, function (err, result) {
+    if(err) {
+      return q.reject('Error logging in: ' + err);
+    }
+
+    q.resolve({email: result.email, password: result.password});
+  });
+
+  return q.promise;
+};
+
+IonicTask.prototype.run = function(ionic, argv, callback) {
+
+  var self = this;
+
+  IonicStats.t();
+
+  return LoginTask.login();
+
+};
+
 IonicTask.prototype.get = function(ionic, callback) {
   this.cookieData = new IonicStore('cookies');
 
@@ -48,102 +135,4 @@ IonicTask.prototype.get = function(ionic, callback) {
   this.run(ionic, argv, callback);
 };
 
-IonicTask.prototype.run = function(ionic, argv, callback) {
-  var self = this;
-
-  if(!this.email && !this.password) {
-
-    var schema = [{
-      name: 'email',
-      pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
-      description: 'Email:'.yellow.bold,
-      required: true
-    }, {
-      name: 'password',
-      description: 'Password:'.yellow.bold,
-      hidden: true,
-      required: true
-    }];
-
-    // prompt for log
-    console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-    console.log('Don\'t have one? Create a one at: '.bold + (ionic.IONIC_DASH + '/signup').bold + '\n');
-
-    prompt.override = argv;
-    prompt.message = '';
-    prompt.delimiter = '';
-    prompt.start();
-
-    prompt.get(schema, function (err, result) {
-      if(err) {
-        return ionic.fail('Error logging in: ' + err);
-      }
-
-      self.email = result.email;
-      self.password = result.password;
-
-      self.requestLogIn(ionic, callback, true);
-    });
-
-  } else {
-    // cmd line flag were added, use those instead of a prompt
-    self.requestLogIn(ionic, callback, false);
-  }
-
-};
-
-IonicTask.prototype.requestLogIn = function(ionic, callback, saveCookies) {
-  var self = this;
-  var transformedCookies = null;
-
-  var jar = request.jar();
-  request({
-    method: 'POST',
-    url: ionic.IONIC_DASH + ionic.IONIC_API + 'user/login',
-    jar: jar,
-    form: {
-      username: self.email.toString(),
-      password: self.password
-    },
-    proxy: process.env.PROXY || process.env.http_proxy || null
-  },
-  function (err, response, body) {
-    if(err) {
-      return ionic.fail('Error logging in: ' + err);
-    }
-
-    // Should be a 302 redirect status code if correct
-    if(response.statusCode != 200) {
-      return ionic.fail('Email or Password incorrect. Please visit '+ ionic.IONIC_DASH.white +' for help.'.red);
-    }
-
-    if(saveCookies) {
-      // save cookies
-      if(!self.cookieData) {
-        self.cookieData = new IonicStore('cookies');
-      }
-      self.cookieData.set(ionic.IONIC_DASH, jar.getCookies(ionic.IONIC_DASH));
-      self.cookieData.save();
-
-      transformedCookies = self.cookieData.get(ionic.IONIC_DASH);
-    } else {
-      try {
-        var jsonString = JSON.stringify(jar.getCookies(ionic.IONIC_DASH, null, 2));
-        transformedCookies = JSON.parse(jsonString);
-      } catch(ex) {
-        console.log('Invalid cookies from jar.getCookies'.red.bold);
-      }
-    }
-
-    // save in memory
-    ionic.jar = transformedCookies;
-
-    console.log('Logged in! :)'.green);
-
-    if(callback) {
-      callback(transformedCookies);
-    }
-  });
-};
-
-exports.IonicTask = IonicTask;
+LoginTask.IonicTask = IonicTask;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index d93905b9b9..be87da3629 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -27,7 +27,16 @@ IonicTask.prototype.run = function(ionic, argv) {
       return Serve.getAddress({isAddressCmd: true});
   }
 
-  var options = Serve.loadSettings(argv);
+  var project = null;
+
+  try {
+    project = IonicProject.load(process.cwd());
+  } catch (ex) {
+    console.log('Error occured', ex);
+    return Utils.fail(ex.message);
+  }
+
+  var options = Serve.loadSettings(argv, project);
   options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
 
   options.nogulp = argv.nogulp;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 51f5d63afe..fdafdfd6dd 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -8,6 +8,10 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
+    IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login,
+    LoginTask = require('./login'),
+    Upload = IonicAppLib.upload,
     IonicStats = require('./stats').IonicStats,
     IonicLoginTask = require('./login').IonicTask,
     IonicUtils = require('./utils');
@@ -16,241 +20,25 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic, argv, callback) {
-  var project = null;
-  this.ionic = ionic;
+IonicTask.prototype.run = function run(ionic, argv) {
+  var note = argv.note;
 
-  try {
-    project = IonicProject.load();
-  }catch (ex) {
-    this.ionic.fail(ex.message);
-    return
-  }
+  IonicStats.t();
 
-  var self = this;
-
-  // The note is a short, optional description for a version
-  if (!self.note) {
-    self.note = '';
-  }
-
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
-
-    var documentRoot = project.get('documentRoot') || 'www';
-
-    if (!fs.existsSync(path.resolve(documentRoot))) {
-      return ionic.fail(documentRoot + ' directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'upload');
-    }
-
-    var indexPath = path.join(documentRoot, 'index.html');
-
-    if (!fs.existsSync(path.resolve(indexPath))) {
-      return ionic.fail(indexPath + ' cannot be found. Make sure index.html is in your project root.', 'upload');
+  return Login.retrieveLogin()
+  .then(function(jar){
+    if (!jar) {
+      console.log('No previous login existed. Attempting to log in now.');
+      return LoginTask.login();
     }
-
-    addCachebusters(indexPath);
-
-    var TEMP_FILENAME = 'www.zip';
-
-    IonicStats.t();
-
-    var zip = fs.createWriteStream(TEMP_FILENAME);
-
-    var archive = archiver('zip');
-    archive.pipe(zip);
-
-    archive.bulk([
-      { expand: true, cwd: documentRoot, src: ['**'] }
-    ]);
-
-    archive.finalize(function(err, bytes) {
-      if (err) {
-        return ionic.fail("Error uploading: " + err);
-      }
-    });
-    zip.on('close', function() {
-      removeCachebusters(indexPath);
-
-      console.log('\nUploading app...'.bold.green);
-
-      var csrftoken = '';
-
-      csrftoken = IonicUtils.retrieveCsrfToken(jar);
-
-      var form = new FormData();
-      form.append('name', project.get('name'));
-      form.append('note', self.note);
-      form.append('csrfmiddlewaretoken', csrftoken);
-      //form.append('app_file', fs.createReadStream(path.resolve(TEMP_FILENAME)), {filename: TEMP_FILENAME, contentType: 'application/zip'});
-
-      var url = ionic.IONIC_DASH + ionic.IONIC_API + 'app/direct-upload/' + project.get('app_id');
-      var params = parseUrl(url);
-
-      form.submit({
-        protocol: params.protocol,
-        hostname: params.hostname,
-        port: params.port,
-        path: params.path,
-        headers: form.getHeaders({
-          cookie: jar.map(function(c) {
-            return c.key + "=" + encodeURIComponent(c.value);
-          }).join("; ")
-        })
-      }, function(err, response) {
-        if (err) {
-          console.log('There was an error trying to upload your app.'.red.bold);
-          var errorMessage;
-          if(err.code === 'ENOTFOUND' || err.code === 'EPIPE') {
-            errorMessage = 'The address you are trying to reach could not be found. \n' +
-            'This could be your internet connection or the server itself is having issues.';
-          } else {
-            errorMessage = 'The specific error message: ' + err;
-          }
-          return ionic.fail(errorMessage.red.bold);
-        }
-
-        response.setEncoding('utf8');
-
-        var data = "";
-        response.on('data', function(chunk){
-          data += chunk;
-        });
-
-        response.on('end', function() {
-          if ( response.statusCode == 401 ) {
-            return ionic.fail('Session expired (401). Please log in and run this command again.');
-          } else if ( response.statusCode == 403 ) {
-            return ionic.fail('Forbidden upload (403)');
-          } else if ( response.statusCode == 500 ) {
-            return ionic.fail('Server Error (500) :(');
-          } 
-
-          try {
-            var d = JSON.parse(data);
-          } catch ( parseEx ) {
-            // keep error msg reasonably short
-            return ionic.fail('Error malformed response: ' + parseEx +
-                                 '\nResponse: ' + data.substr(0, 80)); 
-          }
-
-          if ( d.errors && d.errors.length ) {
-            for ( var j = 0; j < d.errors.length; j++ ) {
-              console.error(d.errors[j]);
-            }
-            return ionic.fail('Unable to upload app');
-          }
-
-          if ( response.statusCode == 200 ) {
-            // Success
-            project.set('app_id', d.app_id);
-            project.save();
-
-            var proxy = process.env.PROXY || process.env.HTTP_PROXY || null;
-
-            // Now we actually do the upload with the signed URL the dash returned
-            request({
-              method: 'PUT',
-              preambleCRLF: true,
-              postambleCRLF: true,
-              proxy: proxy,
-              uri: d.signed_request,
-              headers: {
-                'x-amz-acl': 'private',
-                'content-type': 'application/zip'
-              },
-              body: fs.readFileSync(path.resolve(TEMP_FILENAME))
-            },
-            function(error, response, body) {
-              rm('-f', TEMP_FILENAME);
-
-              if (error) {
-                return console.log('Upload Failed:', error);
-              } else {
-                // The final step is to signal the dash that the file was successfully uploaded
-                request({
-                  method: 'GET',
-                  proxy: proxy,
-                  uri: ionic.IONIC_DASH + ionic.IONIC_API + 'app/direct-upload/' + project.get('app_id'),
-                  headers: {
-                    cookie: jar.map(function(c) {
-                      return c.key + "=" + encodeURIComponent(c.value);
-                    }).join("; ")
-                  }
-                },
-                function(error, response, body) {
-                  if (error || response.statusCode != 200) {
-                    console.log("Upload Failed:", error || "Server Error: " + response.statusCode);
-                  } else {
-                    console.log(('Successfully uploaded (' + project.get('app_id') + ')\n').bold);
-                    console.log(('Share your beautiful app with someone:\n\n$ ionic share EMAIL\n').bold);
-                  }
-                });
-              }
-            });
-          } 
-
-          if ( callback ) {
-            try {
-              callback();
-            } catch ( callbackEx ) {
-              return ionic.fail('Error upload callback: ' + callbackEx);
-            }
-          }
-        });
-      });
-    });
+    return jar;
+  })
+  .then(function(jar) {
+    return Upload.doUpload(process.cwd(), jar, note);
+  })
+  .catch(function(ex) {
+    console.log('Error', ex, ex.stack);
   });
 };
 
-IonicTask.prototype.setNote = function(note) {
-  this.note = note
-};
-
-// If your Webview's strange, and its cache is no good? Who you gonna call?
-//
-// Cachebusters!
-function addCachebusters(indexPath) {
-  var randomString = Math.floor(Math.random() * 100000);
-  var indexHtml = fs.readFileSync(indexPath, 'utf8');
-  var $ = cheerio.load(indexHtml);
-  var hasQuestionMark;
-  $('script').each(function(i, el){
-    if (typeof el.attribs.src === "undefined") return true; //continue
-    hasQuestionMark = el.attribs.src.indexOf('?');
-    el.attribs.src += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
-  });
-  $('link').each(function(i, el){
-    if (typeof el.attribs.href === "undefined") return true; //continue
-    hasQuestionMark = el.attribs.href.indexOf('?');
-    el.attribs.href += (++hasQuestionMark ? '&' : '?') + "ionicCachebuster=" + randomString;
-  });
-  try {
-    fs.writeFileSync(indexPath, $.html());
-  } catch(e) {
-    console.error("Unable to append cachebusters to index.html asset urls. Err: " + err);
-  }
-}
-
-function removeCachebusters(indexPath) {
-  var indexHtml = fs.readFileSync(indexPath, 'utf8');
-  var $ = cheerio.load(indexHtml);
-  var index;
-  $('script').each(function(i, el){
-    if (typeof el.attribs.src === "undefined") return true; //continue
-    index = hasQuestionMark = el.attribs.src.indexOf('?ionicCache');
-    el.attribs.src = el.attribs.src.substring(0, ++hasQuestionMark ? index : el.attribs.src.indexOf("&ionicCache"));
-  });
-  $('link').each(function(i, el){
-    if (typeof el.attribs.href === "undefined") return true; //continue
-    index = hasQuestionMark = el.attribs.href.indexOf('?ionicCache');
-    el.attribs.href = el.attribs.href.substring(0, ++hasQuestionMark ? index : el.attribs.href.indexOf("&ionicCache"));
-  });
-  try {
-    fs.writeFileSync(indexPath, $.html());
-  } catch(e) {
-    console.error("Unable to remove cachebusters from index.html asset urls. Err: " + err);
-  }
-}
-
 exports.IonicTask = IonicTask;

From 7a5efd6d7a035955ab3ffd9cfc963344231fbf91 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 2 Jun 2015 17:11:10 -0600
Subject: [PATCH 0676/1100] Add documentation about ionic upload, login, share,
 and how the app ID works

---
 README.md | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 237046d20f..21a19419a6 100644
--- a/README.md
+++ b/README.md
@@ -423,10 +423,49 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 5. In the `ionic.project` file, add the JavaScript property `"gulpStartupTasks": ["sass", "watch"]` (this can also be customized to whatever gulp tasks you'd like).
 
 
-# Set your Ionic Project App ID
+# Ionic.io services
+
+The CLI supports operations to use backend services for your Ionic app. To get started, [visit the ionic.io homepage](http://ionic.io) and [sign up there](https://apps.ionic.io/signup).
+
+There are a few things you can utilize the CLI for to support ease of development.
+
+## Login
+
+Type `ionic login` to get logged in the CLI.
+
+## Upload your Ionic app
+
+Use the `ionic upload` command to take your current application you are developing and upload it to the Ionic.io servers. 
+
+Now you can use [the ionic view app](http://view.ionic.io/) to view that application or have others view the application.
+
+After uploading the application, you will see a message:
+
+
+```
+Uploading app....
+
+Successfully uploaded (f23j9fjs)
+```
+
+This indicates you uploaded the application correctly, and the App ID is set to `f23j9fjs`.
+
+You can then view that App ID from the View app or the application listing on ionic.io.
+
+### Adding a note with your upload
+
+To add a note to your build, pass the `--note` option as follows: 
+
+`ionic upload --note "This version of the application fixes the menu selections"`.
+
+## Set your Ionic Project App ID manually
 
 Use the `ionic link <appId>` command to set your Ionic App ID to continue working with the same app with the Ionic platform across development enviroments.
 
+## Share the application with another user
+
+Use the `ionic share <email>` command to have an email sent to another person to have them view the Ionic application you are using. Note: You must have an ionic.io account as well as the user you are sharing with.
+
 # Ionic Docs
 
 To get Ionic documentation from the Ionic CLI, try using the `ionic docs` command. The command will look up your currently used Ionic version and open the docs specific for that version. Ex: RC0, RC1, etc.

From 97216add4b6920aa919ad4056b2b72d535c87d2a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 2 Jun 2015 17:19:22 -0600
Subject: [PATCH 0677/1100] Version bump to 1.5.0 for new login/setup/upload
 tasks

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 805a832057..f33be792eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.4.6-beta.0",
+  "version": "1.5.0-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 94e80db700bce90bf6153381aaf05cff526d6205 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 2 Jun 2015 23:13:37 -0600
Subject: [PATCH 0678/1100] Fix(start): Show the news updates after the prompt
 for ionic io login

---
 lib/ionic/start.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 41858be6b1..8651454039 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -58,10 +58,14 @@ IonicTask.prototype.run = function run(ionic, argv) {
   .then(function() {
     if (startingApp) {
       Start.printQuickHelp(options);
-      ionic.printNewsUpdates(true);
       return Start.promptLogin(options);
     }
   })
+  .then(function() {
+    if (startingApp) {
+      return ionic.printNewsUpdates(true);
+    }
+  })
   .catch(function(error) {
     Utils.fail(error);
   });

From 5a43326e31f4bf8653fe5909de4f426da1039c24 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 2 Jun 2015 23:57:45 -0600
Subject: [PATCH 0679/1100] Fix(upload): Properly handle the upload errors when
 wrong App ID is used

---
 lib/ionic/upload.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index fdafdfd6dd..ba7ee8f9bb 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     IonicProject = require('./project'),
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
     LoginTask = require('./login'),
     Upload = IonicAppLib.upload,
@@ -37,7 +38,8 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return Upload.doUpload(process.cwd(), jar, note);
   })
   .catch(function(ex) {
-    console.log('Error', ex, ex.stack);
+    // console.log('Error', ex, ex.stack);
+    Utils.fail(ex);
   });
 };
 

From 25a892709049ccfd088438226514cae533a91166 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 3 Jun 2015 00:16:35 -0600
Subject: [PATCH 0680/1100] Beta for features

---
 npm-shrinkwrap.json | 1237 +++++++++++++++++++++----------------------
 package.json        |    4 +-
 2 files changed, 611 insertions(+), 630 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 778e1fa84b..3469ccc996 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,101 +1,101 @@
 {
   "name": "ionic",
-  "version": "1.4.6-beta.0",
+  "version": "1.5.0-beta.1",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
-      "from": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
+      "from": "archiver@0.5.1",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "1.1.13",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+          "from": "readable-stream@>=1.1.9 <1.2.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "zip-stream": {
           "version": "0.1.4",
-          "from": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+          "from": "zip-stream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "lodash.defaults": {
               "version": "2.4.1",
-              "from": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+              "from": "lodash.defaults@>=2.4.1 <2.5.0",
               "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
               "dependencies": {
                 "lodash.keys": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                  "from": "lodash.keys@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                   "dependencies": {
                     "lodash._isnative": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
                     },
                     "lodash.isobject": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
                     },
                     "lodash._shimkeys": {
                       "version": "2.4.1",
-                      "from": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
+                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
                       "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                     }
                   }
                 },
                 "lodash._objecttypes": {
                   "version": "2.4.1",
-                  "from": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                 }
               }
@@ -104,32 +104,32 @@
         },
         "lazystream": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+          "from": "lazystream@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -138,48 +138,48 @@
         },
         "file-utils": {
           "version": "0.1.5",
-          "from": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+          "from": "file-utils@>=0.1.5 <0.2.0",
           "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
           "dependencies": {
             "lodash": {
               "version": "2.1.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz",
+              "from": "lodash@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
             },
             "iconv-lite": {
               "version": "0.2.11",
-              "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz",
+              "from": "iconv-lite@>=0.2.11 <0.3.0",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
             },
             "rimraf": {
               "version": "2.2.8",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+              "from": "rimraf@>=2.2.2 <2.3.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
             },
             "glob": {
               "version": "3.2.11",
-              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "from": "glob@>=3.2.6 <3.3.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
               "dependencies": {
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "minimatch": {
                   "version": "0.3.0",
-                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "from": "minimatch@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.2",
-                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                      "version": "2.6.4",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                     },
                     "sigmund": {
-                      "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                     }
                   }
                 }
@@ -187,517 +187,524 @@
             },
             "minimatch": {
               "version": "0.2.14",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+              "from": "minimatch@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.2",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                  "version": "2.6.4",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                 },
                 "sigmund": {
-                  "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                  "version": "1.0.1",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
             },
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "isbinaryfile": {
               "version": "0.1.9",
-              "from": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz",
+              "from": "isbinaryfile@>=0.1.9 <0.2.0",
               "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
             }
           }
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         }
       }
     },
     "async": {
-      "version": "0.9.0",
-      "from": "https://registry.npmjs.org/async/-/async-0.9.0.tgz",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "from": "cheerio@>=0.19.0 <0.20.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "from": "css-select@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
+              "from": "css-what@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "from": "domutils@>=1.4.0 <1.5.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+              "from": "boolbase@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+              "from": "nth-check@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "from": "entities@>=1.1.1 <1.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.2",
-          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+              "from": "domhandler@>=2.3.0 <2.4.0",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "from": "domutils@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+              "from": "entities@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
-          "version": "3.8.0",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
+          "version": "3.9.3",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "from": "cli-table@>=0.3.1 <0.4.0",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "from": "colors@1.0.3",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "from": "escape-html@1.0.1",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
+      "from": "connect-livereload@0.5.2",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+      "from": "crc@3.2.1",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.2",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+          "version": "2.6.4",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.7",
-          "from": "https://registry.npmjs.org/through/-/through-2.3.7.tgz",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.5",
-          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz",
+          "from": "map-stream@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+          "from": "pause-stream@0.0.11",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "from": "archy@>=0.0.2 <0.0.3",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.4",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz",
+          "version": "3.0.5",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.5.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz"
+              "version": "1.1.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "from": "chalk@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz",
+                  "from": "ansi-styles@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "from": "has-ansi@>=1.0.3 <2.0.0",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     },
                     "get-stdin": {
                       "version": "4.0.1",
-                      "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                      "from": "get-stdin@>=4.0.1 <5.0.0",
                       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "from": "strip-ansi@>=2.0.1 <3.0.0",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "1.1.1",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+                      "from": "ansi-regex@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "1.3.1",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz",
+                  "from": "supports-color@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "from": "meow@*",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+                          "version": "1.1.0",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
                     "indent-string": {
                       "version": "1.2.1",
-                      "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
                       "dependencies": {
                         "repeating": {
-                          "version": "1.1.2",
-                          "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz",
+                          "version": "1.1.3",
+                          "from": "repeating@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
                           "dependencies": {
                             "is-finite": {
-                              "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz"
+                              "version": "1.0.1",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
                             }
                           }
                         }
@@ -709,116 +716,116 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.5.1",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz",
+              "version": "3.6.1",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.1.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
-                  "version": "3.0.7",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz"
+                  "version": "3.0.9",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
-                "lodash.isnative": {
-                  "version": "3.0.2",
-                  "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz"
-                },
                 "lodash.keys": {
-                  "version": "3.0.7",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz",
+                  "version": "3.1.1",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.1.tgz",
                   "dependencies": {
+                    "lodash._getnative": {
+                      "version": "3.9.0",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.0.tgz"
+                    },
                     "lodash.isarguments": {
-                      "version": "3.0.2",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz"
+                      "version": "3.0.3",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.3.tgz"
                     },
                     "lodash.isarray": {
-                      "version": "3.0.2",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz"
+                      "version": "3.0.3",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.3.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -829,66 +836,66 @@
             },
             "object-assign": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz",
+              "from": "object-assign@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "0.6.5",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "from": "through2@>=0.6.3 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.4.6",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "from": "vinyl@>=0.4.3 <0.5.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
               "dependencies": {
                 "clone": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+                  "from": "clone@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -897,43 +904,43 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@>=0.12.0 <0.13.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                          "version": "2.6.4",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
                     }
@@ -941,51 +948,51 @@
                 },
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "from": "resolve@>=0.7.0 <0.8.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "from": "minimist@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -994,34 +1001,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
+          "from": "semver@>=3.0.1 <4.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
           "dependencies": {
             "user-home": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+              "from": "user-home@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
             }
           }
@@ -1029,9 +1036,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.0.22",
-      "from": "ionic-app-lib@0.0.22",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.0.22.tgz",
+      "version": "0.1.0-beta.1",
+      "from": "ionic-app-lib@beta",
       "dependencies": {
         "cordova-lib": {
           "version": "5.0.0",
@@ -1233,29 +1239,29 @@
                       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz",
                       "dependencies": {
                         "browserify-aes": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "browserify-aes@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.1.tgz"
                         },
                         "browserify-sign": {
-                          "version": "3.0.1",
+                          "version": "3.0.2",
                           "from": "browserify-sign@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.0",
+                              "version": "2.0.1",
                               "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "elliptic": {
-                              "version": "1.0.1",
-                              "from": "elliptic@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "version": "3.0.3",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1263,57 +1269,47 @@
                                   "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
                                 },
                                 "hash.js": {
-                                  "version": "1.0.2",
+                                  "version": "1.0.3",
                                   "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
                                 }
                               }
                             },
                             "parse-asn1": {
-                              "version": "3.0.0",
+                              "version": "3.0.1",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.6",
-                                  "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
+                                  "version": "2.0.3",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    },
-                                    "bn.js": {
-                                      "version": "2.0.5",
-                                      "from": "bn.js@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
-                                },
-                                "pbkdf2-compat": {
-                                  "version": "3.0.2",
-                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
                                 }
                               }
                             }
                           }
                         },
                         "create-ecdh": {
-                          "version": "2.0.0",
+                          "version": "2.0.1",
                           "from": "create-ecdh@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "elliptic": {
-                              "version": "1.0.1",
-                              "from": "elliptic@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz",
+                              "version": "3.0.3",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1321,9 +1317,9 @@
                                   "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
                                 },
                                 "hash.js": {
-                                  "version": "1.0.2",
+                                  "version": "1.0.3",
                                   "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
                                 }
                               }
                             }
@@ -1352,19 +1348,19 @@
                           "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"
                         },
                         "diffie-hellman": {
-                          "version": "3.0.1",
+                          "version": "3.0.2",
                           "from": "diffie-hellman@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "miller-rabin": {
-                              "version": "1.1.5",
-                              "from": "miller-rabin@>=1.1.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz",
+                              "version": "2.0.1",
+                              "from": "miller-rabin@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1381,46 +1377,36 @@
                           "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
                         },
                         "public-encrypt": {
-                          "version": "2.0.0",
+                          "version": "2.0.1",
                           "from": "public-encrypt@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "1.3.0",
-                              "from": "bn.js@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"
+                              "version": "2.0.5",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.0",
+                              "version": "2.0.1",
                               "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "parse-asn1": {
-                              "version": "3.0.0",
+                              "version": "3.0.1",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "1.0.6",
-                                  "from": "asn1.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.6.tgz",
+                                  "version": "2.0.3",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
                                       "from": "minimalistic-assert@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    },
-                                    "bn.js": {
-                                      "version": "2.0.5",
-                                      "from": "bn.js@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                                     }
                                   }
-                                },
-                                "pbkdf2-compat": {
-                                  "version": "3.0.2",
-                                  "from": "pbkdf2-compat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"
                                 }
                               }
                             }
@@ -1444,14 +1430,14 @@
                       "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
                     },
                     "deps-sort": {
-                      "version": "1.3.8",
+                      "version": "1.3.9",
                       "from": "deps-sort@>=1.3.5 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.8.tgz",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1459,11 +1445,6 @@
                               "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                             }
                           }
-                        },
-                        "through2": {
-                          "version": "0.5.1",
-                          "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
                         }
                       }
                     },
@@ -1519,14 +1500,14 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.4.3",
+                      "version": "6.5.0",
                       "from": "insert-module-globals@>=6.1.0 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.4.3.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.0.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1589,18 +1570,18 @@
                               "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
                               "dependencies": {
                                 "acorn": {
-                                  "version": "1.1.0",
+                                  "version": "1.2.2",
                                   "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                                 }
                               }
                             }
                           }
                         },
                         "process": {
-                          "version": "0.11.0",
+                          "version": "0.11.1",
                           "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.0.tgz"
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
                         },
                         "xtend": {
                           "version": "4.0.0",
@@ -1651,14 +1632,14 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.7.13",
+                      "version": "3.8.0",
                       "from": "module-deps@>=3.6.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.7.13.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.0.tgz",
                       "dependencies": {
                         "JSONStream": {
-                          "version": "1.0.3",
+                          "version": "1.0.4",
                           "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                           "dependencies": {
                             "jsonparse": {
                               "version": "1.0.0",
@@ -1673,19 +1654,14 @@
                           "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
                         },
                         "detective": {
-                          "version": "4.0.2",
+                          "version": "4.1.0",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.1.0.tgz",
                           "dependencies": {
                             "acorn": {
-                              "version": "1.1.0",
+                              "version": "1.2.2",
                               "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
-                            },
-                            "defined": {
-                              "version": "0.0.0",
-                              "from": "defined@0.0.0",
-                              "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                             },
                             "escodegen": {
                               "version": "1.6.1",
@@ -1772,6 +1748,18 @@
                             }
                           }
                         },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            }
+                          }
+                        },
                         "resolve": {
                           "version": "1.1.6",
                           "from": "resolve@>=1.1.3 <2.0.0",
@@ -1787,6 +1775,18 @@
                               "from": "through2@>=0.5.1 <0.6.0",
                               "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
                               "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@>=1.0.17 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    }
+                                  }
+                                },
                                 "xtend": {
                                   "version": "3.0.0",
                                   "from": "xtend@>=3.0.0 <3.1.0",
@@ -1796,25 +1796,6 @@
                             }
                           }
                         },
-                        "through2": {
-                          "version": "0.4.2",
-                          "from": "through2@>=0.4.1 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-                          "dependencies": {
-                            "xtend": {
-                              "version": "2.1.2",
-                              "from": "xtend@>=2.1.1 <2.2.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-                              "dependencies": {
-                                "object-keys": {
-                                  "version": "0.4.0",
-                                  "from": "object-keys@>=0.4.0 <0.5.0",
-                                  "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "xtend": {
                           "version": "4.0.0",
                           "from": "xtend@>=4.0.0 <5.0.0",
@@ -1933,14 +1914,14 @@
                       }
                     },
                     "syntax-error": {
-                      "version": "1.1.3",
+                      "version": "1.1.4",
                       "from": "syntax-error@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.3.tgz",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
                       "dependencies": {
                         "acorn": {
-                          "version": "1.1.0",
+                          "version": "1.2.2",
                           "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                         }
                       }
                     },
@@ -1974,9 +1955,9 @@
                       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz",
                       "dependencies": {
                         "process": {
-                          "version": "0.11.0",
+                          "version": "0.11.1",
                           "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.0.tgz"
+                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
                         }
                       }
                     },
@@ -2019,7 +2000,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.31 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2152,9 +2133,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.3",
+              "version": "1.1.5",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.3.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.5.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -2197,7 +2178,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "object-inspect": {
@@ -2261,9 +2242,9 @@
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
               "dependencies": {
                 "graceful-fs": {
-                  "version": "3.0.7",
+                  "version": "3.0.8",
                   "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
@@ -2302,14 +2283,14 @@
               }
             },
             "init-package-json": {
-              "version": "1.5.0",
+              "version": "1.6.0",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.6.0.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.6",
+                  "version": "5.0.10",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.10.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2325,7 +2306,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2372,19 +2353,19 @@
                   }
                 },
                 "npm-package-arg": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.1.tgz",
                   "dependencies": {
                     "hosted-git-info": {
-                      "version": "2.1.2",
-                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "semver": {
-                      "version": "4.3.4",
+                      "version": "4.3.6",
                       "from": "semver@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
                     }
                   }
                 },
@@ -2423,14 +2404,14 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.1.0",
+                      "version": "2.2.0",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
-                          "version": "2.1.2",
+                          "version": "2.1.4",
                           "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "spdx": {
                           "version": "0.4.0",
@@ -2438,18 +2419,18 @@
                           "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
-                              "version": "1.0.0",
+                              "version": "1.0.1",
                               "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                             }
                           }
                         }
                       }
                     },
                     "graceful-fs": {
-                      "version": "3.0.7",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     }
                   }
                 },
@@ -2464,9 +2445,9 @@
                       "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                         }
                       }
                     },
@@ -2843,14 +2824,14 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.1.0",
+                  "version": "2.2.0",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
                   "dependencies": {
                     "hosted-git-info": {
-                      "version": "2.1.2",
+                      "version": "2.1.4",
                       "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz"
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "spdx": {
                       "version": "0.4.0",
@@ -2858,9 +2839,9 @@
                       "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                         }
                       }
                     }
@@ -2874,20 +2855,20 @@
               "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
               "dependencies": {
                 "config-chain": {
-                  "version": "1.1.8",
+                  "version": "1.1.9",
                   "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
                   "dependencies": {
                     "proto-list": {
-                      "version": "1.2.3",
+                      "version": "1.2.4",
                       "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2918,9 +2899,9 @@
                   "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
                   "dependencies": {
                     "abbrev": {
-                      "version": "1.0.5",
+                      "version": "1.0.7",
                       "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                     }
                   }
                 },
@@ -3077,9 +3058,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                 },
                 "tough-cookie": {
-                  "version": "1.1.0",
+                  "version": "1.2.0",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
                 },
                 "http-signature": {
                   "version": "0.10.1",
@@ -3185,9 +3166,9 @@
                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz",
                   "dependencies": {
                     "graceful-fs": {
-                      "version": "3.0.7",
+                      "version": "3.0.8",
                       "from": "graceful-fs@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     },
                     "mkdirp": {
                       "version": "0.5.1",
@@ -3267,7 +3248,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3299,7 +3280,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -3344,12 +3325,12 @@
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "from": "ncp@0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -3913,22 +3894,22 @@
     },
     "opbeat-ionic": {
       "version": "1.1.3",
-      "from": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
       "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
       "dependencies": {
         "after-all": {
           "version": "2.0.2",
-          "from": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
+          "from": "after-all@>=2.0.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
           "dependencies": {
             "once": {
               "version": "1.3.2",
-              "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+              "from": "once@>=1.3.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 }
               }
@@ -3937,22 +3918,22 @@
         },
         "console-log-level": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
         },
         "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "stackman": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "from": "stackman@>=0.2.2 <0.3.0",
           "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
-              "from": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+              "from": "stackback@0.0.2",
               "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
             }
           }
@@ -3961,135 +3942,135 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
+      "from": "progress@1.1.7",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
-          "version": "1.0.5",
-          "from": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz",
+          "version": "1.0.6",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
           "dependencies": {
             "mute-stream": {
-              "version": "0.0.4",
-              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+              "version": "0.0.5",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
-              "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
-              "version": "2.3.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+              "version": "2.3.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "from": "glob@>=4.4.2 <5.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.7",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                      "version": "2.0.8",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4098,12 +4079,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4116,37 +4097,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -4155,47 +4136,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -4204,135 +4185,135 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "from": "caseless@>=0.8.0 <0.9.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.11",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
+              "version": "2.0.13",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.9.1",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
+                  "version": "1.11.0",
+                  "from": "mime-db@>=1.11.0 <1.12.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
                 }
               }
             }
           }
         },
         "json-stringify-safe": {
-          "version": "5.0.0",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "from": "mime-types@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "from": "qs@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.0",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "1.1.0",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+          "version": "1.2.0",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+              "from": "ctype@0.5.3",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+          "from": "stringstream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -4340,132 +4321,132 @@
       }
     },
     "semver": {
-      "version": "4.3.4",
-      "from": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.4.tgz"
+      "version": "4.3.6",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "from": "debug@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "from": "ms@0.7.0",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+              "from": "depd@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
-                  "version": "1.0.5",
-                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                 }
               }
             }
@@ -4473,88 +4454,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "from": "underscore@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
-              "version": "3.0.6",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
-              "version": "0.5.0",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
-              "version": "2.3.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+              "version": "2.3.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
-                  "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "from": "glob@>=4.4.2 <5.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.7",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                      "version": "2.0.8",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -4563,12 +4544,12 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -4581,85 +4562,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "from": "readable-stream@>=1.0.26 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -4668,44 +4649,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "from": "glob@>=4.3.1 <5.0.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "from": "inflight@>=1.0.4 <2.0.0",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -4713,23 +4694,23 @@
               }
             },
             "minimatch": {
-              "version": "2.0.7",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+              "version": "2.0.8",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
-                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "from": "concat-map@0.0.1",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -4738,79 +4719,79 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "from": "glob2base@>=0.0.12 <0.0.13",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                  "from": "find-index@>=0.1.1 <0.2.0",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.2",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
+                          "version": "2.6.4",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
                     }
@@ -4821,96 +4802,96 @@
           }
         },
         "graceful-fs": {
-          "version": "3.0.6",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
-          "version": "0.5.0",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.0",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "from": "clone@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -4919,23 +4900,23 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.6.2",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+          "version": "2.6.4",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.5.0",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
+              "version": "3.9.3",
+              "from": "lodash@>=3.5.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index f33be792eb..3543e8efe0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.0-beta.0",
+  "version": "1.5.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.0.22",
+    "ionic-app-lib": "0.1.0-beta.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 3d52e6901aa3639425802f2ca1530b00d45ba206 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 3 Jun 2015 00:16:51 -0600
Subject: [PATCH 0681/1100] Update changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba41f89c7a..30b4509a98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### 1.5.0
+
+* Fix for Project - now can work from any directory, not just a directory that contains a project.
+* Login command now exists in ionic-app-lib.
+* Upload command now exists in ionic-app-lib.
+* Setup command now exists in ionic-app-lib.
+* Add 10.39.236.1 for crosswalk lite.
+* Add in settings file to have settings across applications.
+* Fix for `ionic start --io-app-id <app_id>` to properly add the app ID to the project file.
+
 ### 1.4.5
 
 * Fix for `ionic browser remove crosswalk` - fix for passing arguments and app directory.

From 89d9e4c99c068056238434d55b78b0ee8562b8c3 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 3 Jun 2015 00:20:37 -0600
Subject: [PATCH 0682/1100] Version bump to 1.5.0.

---
 npm-shrinkwrap.json | 14 +++++++-------
 package.json        |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3469ccc996..46e9892804 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1036,8 +1036,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.1.0-beta.1",
-      "from": "ionic-app-lib@beta",
+      "version": "0.1.0",
+      "from": "ionic-app-lib@0.1.0",
       "dependencies": {
         "cordova-lib": {
           "version": "5.0.0",
@@ -1204,7 +1204,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.9 <1.2.0",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -1750,7 +1750,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "from": "readable-stream@>=1.1.13-1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -2000,7 +2000,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
+                                  "from": "source-map@>=0.1.31 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -3280,7 +3280,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index 3543e8efe0..60c3337b77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.1.0-beta.1",
+    "ionic-app-lib": "0.1.0",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 665483c03604ac26ddb3a680438fd4682bde565f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 3 Jun 2015 00:26:55 -0600
Subject: [PATCH 0683/1100] Update changelog to have fix for ionic upload
 command

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30b4509a98..647adad0b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.5.0
 
 * Fix for Project - now can work from any directory, not just a directory that contains a project.
+* Fix for Ionic upload - you can now include a note - `ionic upload --note 'This build fixes the menu'`.
 * Login command now exists in ionic-app-lib.
 * Upload command now exists in ionic-app-lib.
 * Setup command now exists in ionic-app-lib.

From 393e34f3629b536017154c5c2615c2e13094dc7a Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 3 Jun 2015 13:27:34 -0500
Subject: [PATCH 0684/1100] Basic set and unset

---
 lib/ionic/io-config.js | 75 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 lib/ionic/io-config.js

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
new file mode 100644
index 0000000000..b5f13f6112
--- /dev/null
+++ b/lib/ionic/io-config.js
@@ -0,0 +1,75 @@
+var fs = require('fs'),
+    path = require('path'),
+    parseUrl = require('url').parse,
+    request = require('request'),
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    FormData = require('form-data'),
+    IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask,
+    IonicStats = require('./stats').IonicStats;
+    Task = require('./task').Task,
+    IonicLoginTask = require('./login').IonicTask;
+
+var IonicTask = function() {};
+
+var CONFIG_FILE = './.io-config.json'
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+  self.ionic = ionic;
+
+  self.project = null;
+
+  try {
+    self.project = IonicProject.load();
+  } catch (ex) {
+    self.ionic.fail(ex.message);
+    return
+  }
+
+  var set = false,
+      key = '',
+      val = '';
+
+  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset') {
+    if (argv['_'][1] == 'set') {
+      set = true;
+    }
+    if (argv['_'][2]) {
+      key = argv['_'][2];
+      if (argv['_'][3] && set) {
+        val = argv['_'][3];
+      }
+    } else {
+      self.ionic.fail("Invalid syntax, use 'ionic config <command> key value'");
+    }
+  } else {
+    self.ionic.fail("Invalid command, must use 'set' or 'unset'");
+  }
+
+  fs.readFile(CONFIG_FILE, function(err, data) {
+    if (err) {
+      console.log("ERROR: ", err);
+    } else {
+      var jsonObj = JSON.parse(data);
+      if (set) {
+        jsonObj[key] = val
+      } else if (!set && jsonObj[key]) {
+        delete jsonObj[key]
+      }
+      fs.writeFile(CONFIG_FILE, JSON.stringify(jsonObj), function(error) {
+        if (err) {
+          console.log("ERROR: ", error);
+        } else {
+          console.log(jsonObj);
+          console.log("Successfully saved " + key );
+        }
+      });
+    }
+  });
+};
+
+exports.IonicTask = IonicTask;

From 6eb8ae2f5d288958c309ea311eaba0d65a56e9fd Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 3 Jun 2015 16:32:01 -0500
Subject: [PATCH 0685/1100] Makes a module now

---
 lib/ionic/io-config.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index b5f13f6112..b8dff055e1 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -13,7 +13,12 @@ var fs = require('fs'),
 
 var IonicTask = function() {};
 
+buildModule = function(configJson) {
+  return "angular.module('ionic.service.core.settings', [])\n.factory('ionicCoreSettings', function() {\n\tvar settings = " + JSON.stringify(configJson) + "\n\treturn {\n\t\tget: function(setting) {\n\t\t\tif (settings[setting]) {\n\t\t\t\treturn settings[setting];\n\t\t\t}\n\t\t\treturn null;\n\t\t}\n\t};\n});";
+}
+
 var CONFIG_FILE = './.io-config.json'
+var ANGULAR_MODULE = './www/lib/ionic-service-core/ionic-core-settings.js'
 
 IonicTask.prototype = new Task();
 
@@ -60,12 +65,20 @@ IonicTask.prototype.run = function(ionic) {
       } else if (!set && jsonObj[key]) {
         delete jsonObj[key]
       }
+      var self = this;
       fs.writeFile(CONFIG_FILE, JSON.stringify(jsonObj), function(error) {
         if (err) {
           console.log("ERROR: ", error);
         } else {
-          console.log(jsonObj);
           console.log("Successfully saved " + key );
+
+          fs.writeFile(ANGULAR_MODULE, buildModule(jsonObj), function(er) {
+            if(er) {
+              console.log("ERROR: ", error);
+            } else {
+              console.log("Successfully updated module " + ANGULAR_MODULE);
+            }
+          });
         }
       });
     }

From 6147211b86a0dcecf32623c8af069d3c1870f4a9 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Thu, 4 Jun 2015 11:19:49 -0400
Subject: [PATCH 0686/1100] Added help text for push

---
 lib/tasks/cliTasks.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index a4d82ff497..3983d79203 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -1,5 +1,5 @@
 var resourcesSummary = [
-  'Automatically create icon and splash screen resources' + ' (beta)'.yellow, 
+  'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
   'Put your images in the ./resources directory, named splash or icon.',
   'Accepted file types are .png, .ai, and .psd.',
   'Icons should be 192x192 px without rounded corners.',
@@ -248,6 +248,13 @@ var TASKS = [
    {
     title: 'push',
     name: 'push',
+    summary: 'Upload APNS and GCM credentials to Ionic Push ' + '(alpha)'.red,
+    options: {
+      '--ios-dev-cert': 'Upload your development .p12 file to Ionic Push',
+      '--ios-prod-cert': 'Upload your production .p12 file to Ionic Push',
+      '--production-mode=y,n': 'Tell Ionic Push to use production (y) or sandbox (n) APNS servers',
+      '--google-api-key <your-gcm-api-key>': "Set your app's GCM API key on Ionic Push" 
+    },
     module: './ionic/push'
    },
    {

From 77af1657f3c5b6b0e12efe5140ceba5c5061a799 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 11:06:27 -0600
Subject: [PATCH 0687/1100] Refactor(ionic): Run the CLI with process.argv
 instead of optimist parsed arguments

---
 bin/ionic | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/ionic b/bin/ionic
index dd2be144e5..e2cca06895 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -4,10 +4,6 @@
 
 process.title = 'ionic';
 
-var argv = require('optimist')
-    .boolean(['no-cordova', 'sass', 'list', 'w','nohooks', 
-    'n', 'r', 'noresources', 'nosave', 'e', 'nogulp',
-    'consolelogs', 'serverlogs']).argv,
-    IonicCli = require('../lib/cli');
+var IonicCli = require('../lib/cli');
 
-IonicCli.run(argv);
+IonicCli.run(process.argv);

From c6763a5a8ab0edac6670441a4dd66a967301cf97 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 11:08:01 -0600
Subject: [PATCH 0688/1100] Fix(cli): Parse the arguments with the boolean
 options from cli tasks

---
 lib/cli.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 3d52d6c715..96d2500795 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -5,6 +5,7 @@ var Cli = module.exports,
     IonicOpbeat = IonicAppLib.opbeat,
     Info = IonicAppLib.info,
     Ionitron = require('./ionic/ionitron'),
+    optimist = require('optimist'),
     path = require('path'),
     settings = require('../package.json'),
     Tasks = require('./tasks/cliTasks'),
@@ -25,9 +26,21 @@ Cli.PRIVATE_PATH = '.ionic';
 //   return false;
 // };
 
-Cli.run = function run(argv) {
+// The main entry point for the CLI
+// This takes the process.argv array for arguments
+// The args passed should be unfiltered. 
+// From here, we will filter the options/args out
+// using optimist. Each command is responsible for
+// parsing out the args/options in the way they need.
+// This way, we can still test with passing in arguments.
+Cli.run = function run(processArgv) {
+
+  try {
+    //First we parse out the args to use them.
+    //Later, we will fetch the command they are trying to 
+    //execute, grab those options, and reparse the arguments.
+    var argv = optimist(processArgv.slice(2)).argv;
 
-  try {    
     Cli.setUpConsoleLoggingHelpers();
     Cli.attachErrorHandling();
     Cli.checkLatestVersion();
@@ -67,6 +80,10 @@ Cli.run = function run(argv) {
       return Cli.printAvailableTasks();
     }
 
+    var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
+
+    argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
+
     var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
     var promise = taskInstance.run(Cli, argv);
@@ -78,6 +95,27 @@ Cli.run = function run(argv) {
   }
 };
 
+Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
+  var availableTaskOptions = task.options;
+  var booleanOptions = [];
+
+  if (availableTaskOptions) {
+    for (var key in availableTaskOptions) {
+      if (typeof availableTaskOptions[key] == 'string') {
+        continue;
+      }
+      var optionWithPipe = key;
+      var optionsSplit = optionWithPipe.split('|');
+      booleanOptions.push(optionsSplit[0].substring(2));
+      if (optionsSplit.length == 2) {
+        booleanOptions.push(optionsSplit[1].substring(1));
+      }
+    }
+  }
+
+  return booleanOptions;
+};
+
 Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
   IonicAppLib.events.on('log', console.log);
 
@@ -345,7 +383,14 @@ Cli.printUsage = function printUsage(d) {
       }
       w(dots.grey + '  ');
 
-      var optDescs = d.options[opt].split('\n');
+      var taskOpt = d.options[opt],
+          optDescs;
+
+      if (typeof taskOpt == 'string') {
+        optDescs = taskOpt.split('\n');
+      } else {
+        optDescs = taskOpt.title.split('\n');
+      }
       for(x=0; x<optDescs.length; x++) {
         if(x===0) {
           w( optDescs[x].bold );

From 420f61f53fd5ac292f8080514bb6e3da8e5c94c5 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 11:09:06 -0600
Subject: [PATCH 0689/1100] Fix(cliTasks): Add in boolean options for tasks
 with titles.

---
 lib/tasks/cliTasks.js | 141 +++++++++++++++++++++++++++++++++---------
 1 file changed, 112 insertions(+), 29 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index a4d82ff497..dd07bfc19f 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -21,10 +21,20 @@ var TASKS = [
     options: {
       '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
-      '--no-cordova|-w': 'Create a basic structure without Cordova requirements',
-      '--sass|-s': 'Setup the project to use Sass CSS precompiling',
-      '--list|-l': 'List starter templates available',
-      '--io-app-id': 'The Ionic.io app ID to use'
+      '--no-cordova|-w': {
+        title: 'Create a basic structure without Cordova requirements',
+        boolean: true
+      },
+      '--sass|-s': {
+        title: 'Setup the project to use Sass CSS precompiling',
+        boolean: true
+      },
+      '--list|-l': {
+        title: 'List starter templates available',
+        boolean: true
+      },
+      '--io-app-id': 'The Ionic.io app ID to use',
+      '--template|-t': 'Project starter template'
     },
     module: './ionic/start'
   },
@@ -36,19 +46,43 @@ var TASKS = [
       '[options]': ''
     },
     options: {
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI',
+      '--consolelogs|-c': {
+        title: 'Print app console logs to Ionic CLI',
+        boolean: true
+      },
+      '--serverlogs|-s': {
+        title: 'Print dev server logs to Ionic CLI',
+        boolean: true
+      },
       '--port|-p': 'Dev server HTTP port (8100 default)',
       '--livereload-port|-r': 'Live Reload port (35729 default)',
-      '--nobrowser|-b': 'Disable launching a browser',
-      '--nolivereload|-d': 'Do not start live reload',
-      '--noproxy|-x': 'Do not add proxies',
+      '--nobrowser|-b': {
+        title: 'Disable launching a browser',
+        boolean: true
+      },
+      '--nolivereload|-d': {
+        title: 'Do not start live reload',
+        boolean: true
+      },
+      '--noproxy|-x': {
+        title: 'Do not add proxies',
+        boolean: true
+      },
       '--address': 'Use specific address or return with failure',
-      '--all|-a': 'Have the server listen on all addresses (0.0.0.0)',
+      '--all|-a': {
+        title: 'Have the server listen on all addresses (0.0.0.0)',
+        boolean: true
+      },
       '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
       '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
-      '--lab|-l': 'Test your apps on multiple screen sizes and platform types',
-      '--nogulp': 'Disable running gulp during serve',
+      '--lab|-l': {
+        title: 'Test your apps on multiple screen sizes and platform types',
+        boolean: true
+      },
+      '--nogulp': {
+        title: 'Disable running gulp during serve',
+        boolean: true
+      },
       '--platform|-t': 'Start serve with a specific platform (ios/android)'
     },
     module: './ionic/serve'
@@ -62,8 +96,14 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--noresources|-r': 'Do not add default Ionic icons and splash screen resources',
-      '--nosave|-e': 'Do not save the platform to the package.json file'
+      '--noresources|-r': {
+        title: 'Do not add default Ionic icons and splash screen resources',
+        boolean: true
+      },
+      '--nosave|-e': {
+        title: 'Do not save the platform to the package.json file',
+        boolean: true
+      }
     },
     module: './ionic/cordova'
   },
@@ -79,9 +119,18 @@ var TASKS = [
       '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
       '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--debug|--release': '',
+      '--consolelogs|-c': {
+        title: 'Print app console logs to Ionic CLI (livereload req.)',
+        boolean: true
+      },
+      '--serverlogs|-s': {
+        title: 'Print dev server logs to Ionic CLI (livereload req.)',
+        boolean: true
+      },
+      '--debug|--release': {
+        title: '',
+        boolean: true
+      },
       '--device|--emulator|--target=FOO': ''
     },
     module: './ionic/cordova'
@@ -98,10 +147,22 @@ var TASKS = [
       '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
       '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
       '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': 'Print app console logs to Ionic CLI (livereload req.)',
-      '--serverlogs|-s': 'Print dev server logs to Ionic CLI (livereload req.)',
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
-      '--debug|--release': '',
+      '--consolelogs|-c': {
+        title: 'Print app console logs to Ionic CLI (livereload req.)',
+        boolean: true
+      },
+      '--serverlogs|-s': {
+        title: 'Print dev server logs to Ionic CLI (livereload req.)',
+        boolean: true
+      },
+      '--nohooks|-n': {
+        title: 'Do not add default Ionic hooks for Cordova',
+        boolean: true
+      },
+      '--debug|--release': {
+        title: '',
+        boolean: true
+      },
       '--device|--emulator|--target=FOO': ''
     },
     module: './ionic/cordova'
@@ -115,7 +176,10 @@ var TASKS = [
       '<PLATFORM>': ''
     },
     options: {
-      '--nohooks|-n': 'Do not add default Ionic hooks for Cordova',
+      '--nohooks|-n': {
+        title: 'Do not add default Ionic hooks for Cordova',
+        boolean: true
+      }
     },
     module: './ionic/cordova'
   },
@@ -131,7 +195,10 @@ var TASKS = [
       '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
                                   'and subdirectories first for the plugin before\n' +
                                   'looking it up in the registry.',
-      '--nosave|-e': 'Do not save the plugin to the package.json file'
+      '--nosave|-e': {
+        title: 'Do not save the plugin to the package.json file',
+        boolean: true
+      }
     },
     module: './ionic/cordova'
   },
@@ -150,8 +217,14 @@ var TASKS = [
     name: 'resources',
     summary: resourcesSummary,
     options: {
-      '--icon|-i': 'Generate icon resources',
-      '--splash|-s': 'Generate splash screen resources'
+      '--icon|-i': {
+        title: 'Generate icon resources',
+        boolean: true
+      },
+      '--splash|-s': {
+        title: 'Generate splash screen resources',
+        boolean: true
+      }
     },
     module: './ionic/resources/generate'
   },
@@ -174,7 +247,10 @@ var TASKS = [
       '--ios-certificate-password|-d': 'iOS certificate password',
       '--ios-profile-file|-f': 'iOS profile file',
       '--output|-o': 'Path to save the packaged app',
-      '--no-email|-n': 'Do not send a build package email',
+      '--no-email|-n': {
+        title: 'Do not send a build package email',
+        boolean: true
+      },
       '--clear-signing|-l': 'Clear out all signing data from Ionic server',
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password'
@@ -187,7 +263,8 @@ var TASKS = [
     summary: 'Upload an app to your Ionic account',
     options: {
       '--email|-e': 'Ionic account email',
-      '--password|-p': 'Ionic account password'
+      '--password|-p': 'Ionic account password',
+      '--note': 'The note to signify the upload'
     },
     alt: ['up'],
     module: './ionic/upload'
@@ -259,7 +336,10 @@ var TASKS = [
       '[browser]': 'The browser you wish to add or remove (Crosswalk)'
     },
     options: {
-      '--nosave|-n': 'Do not save the platforms and plugins to the package.json file'
+      '--nosave|-n': {
+        title: 'Do not save the platforms and plugins to the package.json file',
+        boolean: true
+      }
     },
     module: './ionic/browser'
   },
@@ -334,7 +414,10 @@ var TASKS = [
       '[appId]': 'The app ID you wish to set for this project'
     },
     options: {
-      '--reset|-r': 'This will reset the Ionic App ID'
+      '--reset|-r': {
+        title: 'This will reset the Ionic App ID',
+        boolean: true
+      }
     },
     module: './ionic/link'
    },

From 772257c59e561d553e0be465628590aec06c7b61 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 11:09:32 -0600
Subject: [PATCH 0690/1100] Add tests to verify fix for #455

---
 spec/cli.spec.js | 174 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 120 insertions(+), 54 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 75f310536c..b6da1117f7 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -10,6 +10,8 @@ describe('Cli', function() {
   beforeEach(function() {
     spyOn(IonicCli, 'processExit');
     spyOn(IonicCli, 'printAvailableTasks');
+    spyOn(IonicAppLib.events, 'on');
+    spyOn(process, 'on');
 
     spyOn(Utils, 'fail').andCallFake(function(err){
       console.log(err);
@@ -27,76 +29,140 @@ describe('Cli', function() {
   });
 
   describe('#run', function() {
-    it('should run checkLatestVersion on run', function() {
-      var deferred = Q.defer();
-      deferred.resolve();
-      spyOn(IonicCli, 'checkLatestVersion').andReturn(deferred);
-      IonicCli.run({_: []});
-      expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
-    });
 
-    it('should run ionitron when argument is passed', function() {
-      spyOn(Ionitron, 'print');
-      IonicCli.run({ionitron: true});
-      expect(Ionitron.print).toHaveBeenCalled();
-    });
+    beforeEach(function() {
+      var fakeTask = function() {};
+      fakeTask.prototype = new Task();
+      fakeTask.prototype.run = function() {};
 
-    it('should listen to verbosity when arg is passed', function() {
-      spyOn(IonicAppLib.events, 'on');
-      spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
-      IonicCli.run({verbose: true});
-      expect(IonicAppLib.events.on).toHaveBeenCalledWith('verbose', console.log);
+      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
     });
 
-    it('should get version when version flag passed', function() {
-      spyOn(IonicCli, 'version');
-      IonicCli.run({version: true, _: []});
-      expect(IonicCli.version).toHaveBeenCalled();
+    describe('#Cli methods', function() {
+      it('should run checkLatestVersion on run', function() {
+        var deferred = Q.defer();
+        deferred.resolve();
+        spyOn(IonicCli, 'checkLatestVersion').andReturn(deferred);
+        IonicCli.run(['node', 'bin/ionic', 'run', 'ios']);
+        expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
+      });
+
+      it('should run ionitron when argument is passed', function() {
+        spyOn(Ionitron, 'print');
+        IonicCli.run(['node', 'bin/ionic', '--ionitron']);
+        expect(Ionitron.print).toHaveBeenCalled();
+      });
+
+      it('should listen to verbosity when arg is passed', function() {
+        spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+        IonicCli.run(['node', 'bin/ionic', '--verbose']);
+        expect(IonicAppLib.events.on).toHaveBeenCalledWith('verbose', console.log);
+      });
+
+      it('should get version when version flag passed', function() {
+        spyOn(IonicCli, 'version');
+        IonicCli.run(['node', 'bin/ionic', '--version']);
+        expect(IonicCli.version).toHaveBeenCalled();
+      });
+
+      it('should call help when help argument passed', function() {
+        spyOn(IonicCli, 'printHelpLines');
+        IonicCli.run(['node', 'bin/ionic', '--help']);
+        expect(IonicCli.printHelpLines).toHaveBeenCalled();
+      });
+
+      it('should call help when help shorthand argument passed', function() {
+        spyOn(IonicCli, 'printHelpLines');
+        IonicCli.run(['node', 'bin/ionic', '--h']);
+        expect(IonicCli.printHelpLines).toHaveBeenCalled();
+      });
+
+      it('should print available tasks if no valid command is passed', function() {
+        spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+        IonicCli.run(['node', 'bin/ionic']);
+        expect(IonicCli.printAvailableTasks).toHaveBeenCalled();
+      });
+
+      it('should call attachErrorHandling', function() {
+        spyOn(IonicCli, 'attachErrorHandling');
+        IonicCli.run(['node', 'bin/ionic']);
+        expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
+      });
+
+      it('should set up console logging helpers', function() {
+        spyOn(IonicCli, 'setUpConsoleLoggingHelpers');
+        IonicCli.run(['node', 'bin/ionic']);
+        expect(IonicCli.setUpConsoleLoggingHelpers).toHaveBeenCalled();
+      });
+
+      it('should get boolean options from start task', function() {
+        var tasks = require('../lib/tasks/cliTasks');
+        var task = tasks[0];//start task
+        var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
+        //We expect 6 total = 3 options, each with short hand notation.
+        expect(booleanOptions.length).toBe(6);
+      });
     });
+  });
 
-    it('should call help when help argument passed', function() {
-      spyOn(IonicCli, 'printHelpLines');
-      IonicCli.run({help: true});
-      expect(IonicCli.printHelpLines).toHaveBeenCalled();
-    });
+  describe('#commands options', function() {
+    var fakeTask;
 
-    xit('should store the stats opt out if arg passed', function() {
-      throw 'TODO Write this test';
-    });
+    beforeEach(function() {
+      fakeTask = function() {};
+      fakeTask.prototype = new Task();
+      fakeTask.prototype.run = function() {};
 
-    it('should print available tasks if no valid command is passed', function() {
-      spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
-      IonicCli.run({});
-      expect(IonicCli.printAvailableTasks).toHaveBeenCalled();
-    });
+      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
+      spyOn(fakeTask.prototype, 'run').andCallThrough();
 
-    it('should call attachErrorHandling', function() {
-      spyOn(IonicCli, 'attachErrorHandling');
-      IonicCli.run({ _: [] });
-      expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
     });
 
-    it('should set up console logging helpers', function() {
-      spyOn(IonicCli, 'setUpConsoleLoggingHelpers');
-      IonicCli.run({ _: [] });
-      expect(IonicCli.setUpConsoleLoggingHelpers).toHaveBeenCalled();
+    it('should parse start options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
+      var tasks = require('../lib/tasks/cliTasks');
+      var task = tasks[0];//start task
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+      expect(taskArgv._.length).toBe(2);
+      expect(taskArgv._[0]).toBe('start');
+      expect(taskArgv._[1]).toBe('s1');
+      expect(taskArgv.appname).toBe('asdf');
+      expect(taskArgv.s).toBe(false);
+      expect(taskArgv.sass).toBe(false);
+      expect(taskArgv.l).toBe(false);
+      expect(taskArgv.list).toBe(false);
+      expect(taskArgv['no-cordova']).toBe(false);
+      expect(taskArgv.w).toBe(true);
+      expect(taskArgv.id).toBeUndefined();
+      expect(taskArgv.i).toBeUndefined();
     });
 
-    it('should run the corodva task', function() {
-      var fakeTask = function() {};
-      fakeTask.prototype = new Task();
-      fakeTask.prototype.run = function() {
-        // console.log('running');
-      }
+    it('should parse serve options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
+      var tasks = require('../lib/tasks/cliTasks');
+      var task = tasks[1];//serve task
 
-      spyOn(IonicCli, 'tryBuildingTask').andReturn(true);
+      IonicCli.run(processArgs);
 
-      spyOn(fakeTask.prototype, 'run').andCallThrough();
-      // var fakeTaskInstance
-      // spyOn(fakeTask, 'constructor').allCallThrough();
-      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
-      IonicCli.run({ _: ['cordova', 'run']});
       expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+      // console.log('taskArgv', taskArgv);
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(1);
+      expect(taskArgv.browser).toBe('firefox');
+      expect(taskArgv.nogulp).toBe(true);
+      expect(taskArgv.all).toBe(true);
+      expect(taskArgv.lab).toBe(false);
+      expect(taskArgv.nobrowser).toBe(false);
+
     });
   });
 });

From 5a6a35fb5dbe9811dc181969d5fbb2bc1981367f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 22:29:46 -0600
Subject: [PATCH 0691/1100] Refactor(cliTasks): Trim out duplicate options, put
 into variable, reference from 'run' and 'emulate' options.

---
 lib/tasks/cliTasks.js | 61 +++++++++++++++----------------------------
 spec/cli.spec.js      | 23 ++++++++++++++++
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index dd07bfc19f..da17f1343d 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -6,6 +6,25 @@ var resourcesSummary = [
   'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
 ].join('\n\t\t      ');
 
+var cordovaRunEmulateOptions = {
+  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
+  '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+  '--consolelogs|-c': {
+    title: 'Print app console logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--serverlogs|-s': {
+    title: 'Print dev server logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--debug|--release': {
+    title: '',
+    boolean: true
+  },
+  '--device|--emulator|--target=FOO': ''
+};
+
 var TASKS = [
   {
     title: 'start',
@@ -115,24 +134,7 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
-    options: {
-      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
-      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': {
-        title: 'Print app console logs to Ionic CLI (livereload req.)',
-        boolean: true
-      },
-      '--serverlogs|-s': {
-        title: 'Print dev server logs to Ionic CLI (livereload req.)',
-        boolean: true
-      },
-      '--debug|--release': {
-        title: '',
-        boolean: true
-      },
-      '--device|--emulator|--target=FOO': ''
-    },
+    options: cordovaRunEmulateOptions,
     module: './ionic/cordova'
   },
   {
@@ -143,28 +145,7 @@ var TASKS = [
       '[options]': '',
       '<PLATFORM>': ''
     },
-    options: {
-      '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-      '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
-      '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-      '--consolelogs|-c': {
-        title: 'Print app console logs to Ionic CLI (livereload req.)',
-        boolean: true
-      },
-      '--serverlogs|-s': {
-        title: 'Print dev server logs to Ionic CLI (livereload req.)',
-        boolean: true
-      },
-      '--nohooks|-n': {
-        title: 'Do not add default Ionic hooks for Cordova',
-        boolean: true
-      },
-      '--debug|--release': {
-        title: '',
-        boolean: true
-      },
-      '--device|--emulator|--target=FOO': ''
-    },
+    options: cordovaRunEmulateOptions,
     module: './ionic/cordova'
   },
   {
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index b6da1117f7..2ba4405c0b 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -1,6 +1,7 @@
 var IonicAppLib = require('ionic-app-lib'),
     Ionitron = require('../lib/ionic/ionitron'),
     IonicCli = require('../lib/cli'),
+    LoginTask = require('../lib/ionic/login'),
     Q = require('q'),
     Task = require('../lib/ionic/task').Task,
     Utils = IonicAppLib.utils;
@@ -164,5 +165,27 @@ describe('Cli', function() {
       expect(taskArgv.nobrowser).toBe(false);
 
     });
+
+
+    it('should parse upload options correctly', function() {
+      var note = 'A note for notes';
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'upload', '--email', 'user@ionic.io', '--password', 'pass', '--note', note];
+      var tasks = require('../lib/tasks/cliTasks');
+      var task = tasks[1];//serve task
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+      
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(1);
+      expect(taskArgv.note).toBe(note);
+      expect(taskArgv.email).toBe('user@ionic.io');
+      expect(taskArgv.password).toBe('pass');
+
+    });
   });
 });

From 462926e77b3f47e2253675cc8c070062a94666ba Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 22:30:25 -0600
Subject: [PATCH 0692/1100] Fix(test): Add test for run, emulate, start, serve,
 and task lookup by name

---
 spec/cli.spec.js | 75 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 66 insertions(+), 9 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 2ba4405c0b..2ea8de00b7 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -1,7 +1,6 @@
 var IonicAppLib = require('ionic-app-lib'),
     Ionitron = require('../lib/ionic/ionitron'),
     IonicCli = require('../lib/cli'),
-    LoginTask = require('../lib/ionic/login'),
     Q = require('q'),
     Task = require('../lib/ionic/task').Task,
     Utils = IonicAppLib.utils;
@@ -84,6 +83,13 @@ describe('Cli', function() {
         expect(IonicCli.printAvailableTasks).toHaveBeenCalled();
       });
 
+      it('should get the correct task by name', function() {
+        var task = IonicCli.getTaskWithName('start');
+        expect(task).toBeDefined();
+        expect(task.name).toBe('start');
+        expect(task.args).toBeDefined();
+      });
+
       it('should call attachErrorHandling', function() {
         spyOn(IonicCli, 'attachErrorHandling');
         IonicCli.run(['node', 'bin/ionic']);
@@ -98,7 +104,7 @@ describe('Cli', function() {
 
       it('should get boolean options from start task', function() {
         var tasks = require('../lib/tasks/cliTasks');
-        var task = tasks[0];//start task
+        var task = IonicCli.getTaskWithName('start');
         var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
         //We expect 6 total = 3 options, each with short hand notation.
         expect(booleanOptions.length).toBe(6);
@@ -121,8 +127,6 @@ describe('Cli', function() {
 
     it('should parse start options correctly', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
-      var tasks = require('../lib/tasks/cliTasks');
-      var task = tasks[0];//start task
 
       IonicCli.run(processArgs);
 
@@ -146,8 +150,6 @@ describe('Cli', function() {
 
     it('should parse serve options correctly', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
-      var tasks = require('../lib/tasks/cliTasks');
-      var task = tasks[1];//serve task
 
       IonicCli.run(processArgs);
 
@@ -170,8 +172,6 @@ describe('Cli', function() {
     it('should parse upload options correctly', function() {
       var note = 'A note for notes';
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'upload', '--email', 'user@ionic.io', '--password', 'pass', '--note', note];
-      var tasks = require('../lib/tasks/cliTasks');
-      var task = tasks[1];//serve task
 
       IonicCli.run(processArgs);
 
@@ -179,7 +179,7 @@ describe('Cli', function() {
       var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
       var taskArgv = taskArgs[1];
-      
+
       //should only have serve in the command args
       expect(taskArgv._.length).toBe(1);
       expect(taskArgv.note).toBe(note);
@@ -187,5 +187,62 @@ describe('Cli', function() {
       expect(taskArgv.password).toBe('pass');
 
     });
+
+    it('should parse login options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(1);
+      expect(taskArgv.email).toBe('user@ionic.io');
+      expect(taskArgv.password).toBe('pass');
+    });
+
+    it('should parse run options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(2);
+      expect(taskArgv.r).toBe(35730);
+      expect(taskArgv.port).toBe(5000);
+      expect(taskArgv.consolelogs).toBe(true);
+      expect(taskArgv.serverlogs).toBe(true);
+      expect(taskArgv.livereload).toBe(true);
+    });
+
+    it('should parse emulate options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(2);
+      expect(taskArgv._[1]).toBe('android');
+      expect(taskArgv.r).toBe(35730);
+      expect(taskArgv.port).toBe(5000);
+      expect(taskArgv.consolelogs).toBe(true);
+      expect(taskArgv.serverlogs).toBe(true);
+      expect(taskArgv.livereload).toBe(true);
+    });
+
+
   });
 });

From 060fb237809fe428472208e02e2ab1bb60833723 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 22:42:02 -0600
Subject: [PATCH 0693/1100] Fix(readme): Add circle CI badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 21a19419a6..339bff6f52 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Circle CI](https://circleci.com/gh/driftyco/ionic-cli.svg?style=svg)](https://circleci.com/gh/driftyco/ionic-cli)
+
 Ionic-Cli
 =========
 

From d089d442d4e07a261a4e72206bf2c62c957b25f8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 4 Jun 2015 22:49:31 -0600
Subject: [PATCH 0694/1100] Fix(state): Add boolean values in cli tasks for
 state (platforms/plugins). Tests to verify plugin, build, and state commands

---
 lib/tasks/cliTasks.js | 10 +++++++--
 spec/cli.spec.js      | 52 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 5ea11a7a63..d83ec9e411 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -431,8 +431,14 @@ var TASKS = [
       'restore': 'Restore the platforms and plugins from package.json',
       'clear': 'Clear the package.json of cordovaPlugins and cordovaPlatforms, as well as clear out the platforms and plugins folders',
       'reset': 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
-      '--plugins': 'Only do operations with plugins',
-      '--platforms': 'Only do operations with platforms'
+      '--plugins': {
+        title: 'Only do operations with plugins',
+        boolean: true
+      },
+      '--platforms': {
+        title: 'Only do operations with platforms',
+        boolean: true
+      }
     },
     module: './ionic/state'
    },
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 2ea8de00b7..33dcde820a 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -243,6 +243,58 @@ describe('Cli', function() {
       expect(taskArgv.livereload).toBe(true);
     });
 
+    it('should parse state options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(2);
+      expect(taskArgv._[1]).toBe('save');
+      expect(taskArgv.plugins).toBe(true);
+      expect(taskArgv.platforms).toBe(false);
+    });
+
+    it('should parse plugin options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'plugin', 'add', 'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(3);
+      expect(taskArgv._[0]).toBe('plugin');
+      expect(taskArgv._[1]).toBe('add');
+      expect(taskArgv._[2]).toBe('org.apache.cordova.splashscreen');
+      expect(taskArgv.nosave).toBe(true);
+      expect(taskArgv.searchpath).toBe('../');
+    });
+
+    it('should parse build options correctly', function() {
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
+
+      IonicCli.run(processArgs);
+
+      expect(fakeTask.prototype.run).toHaveBeenCalled();
+      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+      var taskArgv = taskArgs[1];
+
+      //should only have serve in the command args
+      expect(taskArgv._.length).toBe(2);
+      expect(taskArgv._[0]).toBe('build');
+      expect(taskArgv._[1]).toBe('ios');
+      expect(taskArgv.nohooks).toBe(true);
+    });
 
   });
 });

From 452e22c745d602c38ecf8e554b7f3fe71e3cfd6e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Jun 2015 10:16:35 -0600
Subject: [PATCH 0695/1100] Fix(package): Remove package from tasks.

---
 lib/tasks/cliTasks.js | 58 +++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index d83ec9e411..560153a95b 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -209,35 +209,35 @@ var TASKS = [
     },
     module: './ionic/resources/generate'
   },
-  {
-    title: 'package',
-    name: 'package',
-    alt: ['pack'],
-    summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
-    args: {
-      '[options]': '',
-      '<MODE>': '"debug" or "release"',
-      '<PLATFORM>': '"ios" or "android"'
-    },
-    options: {
-      '--android-keystore-file|-k': 'Android keystore file',
-      '--android-keystore-alias|-a': 'Android keystore alias',
-      '--android-keystore-password|-w': 'Android keystore password',
-      '--android-key-password|-r': 'Android key password',
-      '--ios-certificate-file|-c': 'iOS certificate file',
-      '--ios-certificate-password|-d': 'iOS certificate password',
-      '--ios-profile-file|-f': 'iOS profile file',
-      '--output|-o': 'Path to save the packaged app',
-      '--no-email|-n': {
-        title: 'Do not send a build package email',
-        boolean: true
-      },
-      '--clear-signing|-l': 'Clear out all signing data from Ionic server',
-      '--email|-e': 'Ionic account email',
-      '--password|-p': 'Ionic account password'
-    },
-    module: './ionic/package'
-  },
+  // {
+  //   title: 'package',
+  //   name: 'package',
+  //   alt: ['pack'],
+  //   summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
+  //   args: {
+  //     '[options]': '',
+  //     '<MODE>': '"debug" or "release"',
+  //     '<PLATFORM>': '"ios" or "android"'
+  //   },
+  //   options: {
+  //     '--android-keystore-file|-k': 'Android keystore file',
+  //     '--android-keystore-alias|-a': 'Android keystore alias',
+  //     '--android-keystore-password|-w': 'Android keystore password',
+  //     '--android-key-password|-r': 'Android key password',
+  //     '--ios-certificate-file|-c': 'iOS certificate file',
+  //     '--ios-certificate-password|-d': 'iOS certificate password',
+  //     '--ios-profile-file|-f': 'iOS profile file',
+  //     '--output|-o': 'Path to save the packaged app',
+  //     '--no-email|-n': {
+  //       title: 'Do not send a build package email',
+  //       boolean: true
+  //     },
+  //     '--clear-signing|-l': 'Clear out all signing data from Ionic server',
+  //     '--email|-e': 'Ionic account email',
+  //     '--password|-p': 'Ionic account password'
+  //   },
+  //   module: './ionic/package'
+  // },
   {
     title: 'upload',
     name: 'upload',

From 38f8140bedc2a3053e9ee26f129189bcac286b45 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Jun 2015 10:21:17 -0600
Subject: [PATCH 0696/1100] Refactor(upload): Remove unused variables

---
 lib/ionic/upload.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index ba7ee8f9bb..ada0fd17de 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,21 +1,11 @@
-var fs = require('fs'),
-    path = require('path'),
-    cheerio = require('cheerio'),
-    request = require('request'),
-    parseUrl = require('url').parse,
-    archiver = require('archiver'),
-    argv = require('optimist').argv,
-    FormData = require('form-data'),
-    IonicProject = require('./project'),
-    Task = require('./task').Task,
-    IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
+var IonicAppLib = require('ionic-app-lib'),
+    IonicLoginTask = require('./login').IonicTask,
+    IonicStats = require('./stats').IonicStats,
     Login = IonicAppLib.login,
     LoginTask = require('./login'),
+    Task = require('./task').Task,
     Upload = IonicAppLib.upload,
-    IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask,
-    IonicUtils = require('./utils');
+    Utils = IonicAppLib.utils;
 
 var IonicTask = function() {};
 

From 9e05c750ee0653f2d9086deee4ef6d529094f728 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Jun 2015 10:21:44 -0600
Subject: [PATCH 0697/1100] Refactor(login): Remove unused variables. Pass argv
 to commands

---
 lib/ionic/login.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index c42c17eb1a..f82cdcbbb3 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,14 +1,10 @@
-var fs = require('fs'),
-    request = require('request'),
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    IonicAppLib = require('ionic-app-lib'),
-    Login = IonicAppLib.login,
-    settings = IonicAppLib.settings,
-    IonicProject = require('./project'),
+var IonicAppLib = require('ionic-app-lib'),
     IonicStats = require('./stats').IonicStats,
     IonicStore = require('./store').IonicStore,
+    Login = IonicAppLib.login,
+    prompt = require('prompt'),
     Q = require('q'),
+    settings = IonicAppLib.settings,
     Task = require('./task').Task;
 
 var LoginTask = module.exports;
@@ -19,7 +15,7 @@ var LoginTask = module.exports;
 //Any other calls to login in the lib take email/pw to login
 //The login task itself just runs LoginTask.login()
 
-LoginTask.login = function login() {
+LoginTask.login = function login(argv) {
   var email = argv.email || argv.e || process.env.IONIC_EMAIL;
   var password = argv.password || argv.p || process.env.IONIC_PASSWORD;
 
@@ -28,7 +24,7 @@ LoginTask.login = function login() {
   if (email && password) {
     promise = Q({email: email, password: password});
   } else {
-    promise = LoginTask.promptForLogin();
+    promise = LoginTask.promptForLogin(argv);
   }
 
   return promise
@@ -51,7 +47,7 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-LoginTask.promptForLogin = function promptForLogin() {
+LoginTask.promptForLogin = function promptForLogin(argv) {
   var q = Q.defer();
   var self = this;
 
@@ -93,7 +89,7 @@ IonicTask.prototype.run = function(ionic, argv, callback) {
 
   IonicStats.t();
 
-  return LoginTask.login();
+  return LoginTask.login(argv);
 
 };
 

From 8dd985325b1acb385da3632eb88cda01aa41976a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Jun 2015 10:22:40 -0600
Subject: [PATCH 0698/1100] Fix(test): Add test for cordova run to check for
 boolean flag for device

---
 spec/cli.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 33dcde820a..4037438935 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -205,7 +205,7 @@ describe('Cli', function() {
     });
 
     it('should parse run options correctly', function() {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
 
       IonicCli.run(processArgs);
 
@@ -221,6 +221,8 @@ describe('Cli', function() {
       expect(taskArgv.consolelogs).toBe(true);
       expect(taskArgv.serverlogs).toBe(true);
       expect(taskArgv.livereload).toBe(true);
+      expect(taskArgv.device).toBe(true);
+
     });
 
     it('should parse emulate options correctly', function() {

From 28913b20b8fcbe350e9b0f074fb395cb1ded884d Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 5 Jun 2015 10:23:03 -0600
Subject: [PATCH 0699/1100] Update(readme): Add login information for
 environment variables and inline email/password for Login command

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 339bff6f52..e505c7e72f 100644
--- a/README.md
+++ b/README.md
@@ -435,6 +435,18 @@ There are a few things you can utilize the CLI for to support ease of developmen
 
 Type `ionic login` to get logged in the CLI.
 
+### Login without prompt
+
+You can pass the email and password to login without being prompted for email and password.
+
+`ionic login --email user@ionic.io --password somepass`
+
+### Login with environment variables
+
+The CLI also supports settings environment variables to read off the email and password for the user.
+
+Set `IONIC_EMAIL` and `IONIC_PASSWORD` as variables to have the CLI read these instead of being prompted for them.
+
 ## Upload your Ionic app
 
 Use the `ionic upload` command to take your current application you are developing and upload it to the Ionic.io servers. 

From f135ebcd9562f58052d1dc7d82ed08c329602db1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 6 Jun 2015 22:01:00 -0600
Subject: [PATCH 0700/1100] Beta bump for CLI and ionic-app-lib

---
 CHANGELOG.md | 8 ++++++++
 package.json | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647adad0b0..333f7ffeb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 1.5.1
+
+* Fix for ionic serve to specify a browser.
+* Added help test for ionic push - `ionic help push`.
+* Added a plethora of tests for confidence in refactoring of the command options.
+* Fix for the repeated "Ionic not Defined" error.
+* Fix for ionic upload - removes the BOM (byte order mark) certain users were having - was leaving unwanted artifacts. This has been corrected.
+
 ### 1.5.0
 
 * Fix for Project - now can work from any directory, not just a directory that contains a project.
diff --git a/package.json b/package.json
index 60c3337b77..84667cf3c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.0",
+  "version": "1.5.1-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.1.0",
+    "ionic-app-lib": "0.1.1-beta.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 1f2835dca2c487793143fbf4f90fa2f61aa69130 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 6 Jun 2015 22:02:46 -0600
Subject: [PATCH 0701/1100] Shrinkwrap for beta

---
 npm-shrinkwrap.json | 50 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 46e9892804..b6b498b2d7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.0",
+  "version": "1.5.1-beta.0",
   "dependencies": {
     "archiver": {
       "version": "0.5.1",
@@ -1036,8 +1036,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.1.0",
-      "from": "ionic-app-lib@0.1.0",
+      "version": "0.1.1-beta.1",
+      "from": "ionic-app-lib@0.1.1-beta.1",
       "dependencies": {
         "cordova-lib": {
           "version": "5.0.0",
@@ -1204,7 +1204,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "from": "readable-stream@>=1.1.9 <1.2.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -1259,9 +1259,9 @@
                               "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "elliptic": {
-                              "version": "3.0.3",
+                              "version": "3.0.4",
                               "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.4.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1307,9 +1307,9 @@
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "elliptic": {
-                              "version": "3.0.3",
+                              "version": "3.0.4",
                               "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.4.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1336,9 +1336,9 @@
                               "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
                             },
                             "sha.js": {
-                              "version": "2.4.1",
+                              "version": "2.4.2",
                               "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.1.tgz"
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.2.tgz"
                             }
                           }
                         },
@@ -1632,9 +1632,9 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.8.0",
+                      "version": "3.8.1",
                       "from": "module-deps@>=3.6.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.0.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.1.tgz",
                       "dependencies": {
                         "JSONStream": {
                           "version": "1.0.4",
@@ -1750,7 +1750,7 @@
                         },
                         "readable-stream": {
                           "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13-1 <2.0.0",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
@@ -2000,7 +2000,7 @@
                               "dependencies": {
                                 "source-map": {
                                   "version": "0.1.43",
-                                  "from": "source-map@>=0.1.31 <0.2.0",
+                                  "from": "source-map@>=0.1.40 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
@@ -2178,7 +2178,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "object-inspect": {
@@ -2306,7 +2306,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2414,9 +2414,9 @@
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "spdx": {
-                          "version": "0.4.0",
+                          "version": "0.4.1",
                           "from": "spdx@>=0.4.0 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.0.1",
@@ -2429,7 +2429,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.8",
-                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     }
                   }
@@ -2440,9 +2440,9 @@
                   "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-1.0.0-prerelease-2.tgz",
                   "dependencies": {
                     "spdx": {
-                      "version": "0.4.0",
+                      "version": "0.4.1",
                       "from": "spdx@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.0.1",
@@ -2834,9 +2834,9 @@
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "spdx": {
-                      "version": "0.4.0",
+                      "version": "0.4.1",
                       "from": "spdx@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.0.1",
@@ -3248,7 +3248,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -3280,7 +3280,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }

From 64351a3eed20240b5d629939f9817cbd18bee492 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sun, 14 Jun 2015 21:52:41 -0600
Subject: [PATCH 0702/1100] Fix(upload): Remove archiver from package. Update
 ionic-app-lib to 0.2.0 to have archiver 0.14.4. Bump version to beta

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 84667cf3c3..42c948d96c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.1-beta.0",
+  "version": "1.5.1-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -54,7 +54,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "archiver": "0.5.1",
     "async": "^0.9.0",
     "cheerio": "^0.19.0",
     "cli-table": "^0.3.1",
@@ -67,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.1.1-beta.1",
+    "ionic-app-lib": "0.2.0",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 4103928a81ad7029a755bffa04ffa1e76cd435cc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 15 Jun 2015 08:47:22 -0600
Subject: [PATCH 0703/1100] Bump to 1.5.1. Update shrinkwrap. Remove the hooks
 permissions from running on every cordova command

---
 lib/ionic/cordova.js |   4 +-
 npm-shrinkwrap.json  | 881 ++++++++++++++++---------------------------
 package.json         |   2 +-
 3 files changed, 327 insertions(+), 560 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 86e0f324cd..00677562d1 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -48,7 +48,9 @@ IonicTask.prototype.run = function(ionic, argv) {
     var isPluginCmd = argv._.indexOf('plugin') != -1;
     var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
-    Hooks.setHooksPermission(process.cwd());
+    if (isPlatformCmd || isAddCmd) {
+      Hooks.setHooksPermission(process.cwd());    
+    }
 
     if(isPlatformCmd && isAddCmd) {
       addDefaultResources = true;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b6b498b2d7..41ad059605 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,233 +1,7 @@
 {
   "name": "ionic",
-  "version": "1.5.1-beta.0",
+  "version": "1.5.1",
   "dependencies": {
-    "archiver": {
-      "version": "0.5.1",
-      "from": "archiver@0.5.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.1.tgz",
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.1.13",
-          "from": "readable-stream@>=1.1.9 <1.2.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "zip-stream": {
-          "version": "0.1.4",
-          "from": "zip-stream@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "lodash.defaults": {
-              "version": "2.4.1",
-              "from": "lodash.defaults@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-              "dependencies": {
-                "lodash.keys": {
-                  "version": "2.4.1",
-                  "from": "lodash.keys@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash._isnative": {
-                      "version": "2.4.1",
-                      "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                    },
-                    "lodash.isobject": {
-                      "version": "2.4.1",
-                      "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
-                    },
-                    "lodash._shimkeys": {
-                      "version": "2.4.1",
-                      "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                    }
-                  }
-                },
-                "lodash._objecttypes": {
-                  "version": "2.4.1",
-                  "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "lazystream": {
-          "version": "0.1.0",
-          "from": "lazystream@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "file-utils": {
-          "version": "0.1.5",
-          "from": "file-utils@>=0.1.5 <0.2.0",
-          "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "2.1.0",
-              "from": "lodash@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
-            },
-            "iconv-lite": {
-              "version": "0.2.11",
-              "from": "iconv-lite@>=0.2.11 <0.3.0",
-              "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
-            },
-            "rimraf": {
-              "version": "2.2.8",
-              "from": "rimraf@>=2.2.2 <2.3.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-            },
-            "glob": {
-              "version": "3.2.11",
-              "from": "glob@>=3.2.6 <3.3.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-              "dependencies": {
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "0.3.0",
-                  "from": "minimatch@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.6.4",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "minimatch": {
-              "version": "0.2.14",
-              "from": "minimatch@>=0.2.9 <0.3.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "2.6.4",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
-                },
-                "sigmund": {
-                  "version": "1.0.1",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                }
-              }
-            },
-            "findup-sync": {
-              "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "dependencies": {
-                "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                }
-              }
-            },
-            "isbinaryfile": {
-              "version": "0.1.9",
-              "from": "isbinaryfile@>=0.1.9 <0.2.0",
-              "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
-            }
-          }
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        }
-      }
-    },
     "async": {
       "version": "0.9.2",
       "from": "async@>=0.9.0 <0.10.0",
@@ -1036,13 +810,183 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.1.1-beta.1",
-      "from": "ionic-app-lib@0.1.1-beta.1",
+      "version": "0.2.0",
+      "from": "ionic-app-lib@0.2.0",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.0.tgz",
       "dependencies": {
-        "cordova-lib": {
-          "version": "5.0.0",
-          "from": "cordova-lib@>=5.0.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-5.0.0.tgz",
+        "archiver": {
+          "version": "0.14.4",
+          "from": "archiver@0.14.4",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.14.4.tgz",
+          "dependencies": {
+            "buffer-crc32": {
+              "version": "0.2.5",
+              "from": "buffer-crc32@>=0.2.1 <0.3.0",
+              "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
+            },
+            "glob": {
+              "version": "4.3.5",
+              "from": "glob@>=4.3.0 <4.4.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "2.0.8",
+                  "from": "minimatch@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lazystream": {
+              "version": "0.1.0",
+              "from": "lazystream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
+            },
+            "lodash": {
+              "version": "3.2.0",
+              "from": "lodash@>=3.2.0 <3.3.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "tar-stream": {
+              "version": "1.1.5",
+              "from": "tar-stream@>=1.1.0 <1.2.0",
+              "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.5.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "bl@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz"
+                },
+                "end-of-stream": {
+                  "version": "1.1.0",
+                  "from": "end-of-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "zip-stream": {
+              "version": "0.5.2",
+              "from": "zip-stream@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.2.tgz",
+              "dependencies": {
+                "compress-commons": {
+                  "version": "0.2.9",
+                  "from": "compress-commons@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.9.tgz",
+                  "dependencies": {
+                    "crc32-stream": {
+                      "version": "0.3.4",
+                      "from": "crc32-stream@>=0.3.1 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz"
+                    },
+                    "node-int64": {
+                      "version": "0.3.3",
+                      "from": "node-int64@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "ionic-cordova-lib": {
+          "version": "5.1.2",
+          "from": "ionic-cordova-lib@5.1.2",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.2.tgz",
           "dependencies": {
             "bplist-parser": {
               "version": "0.0.6",
@@ -1055,36 +999,36 @@
               "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
             },
             "cordova-js": {
-              "version": "3.9.0",
-              "from": "cordova-js@3.9.0",
-              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-3.9.0.tgz",
+              "version": "4.0.0",
+              "from": "cordova-js@4.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
               "dependencies": {
                 "browserify": {
-                  "version": "7.1.0",
-                  "from": "browserify@7.1.0",
-                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz",
+                  "version": "10.1.3",
+                  "from": "browserify@10.1.3",
+                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
                   "dependencies": {
                     "JSONStream": {
-                      "version": "0.8.4",
-                      "from": "JSONStream@>=0.8.3 <0.9.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+                      "version": "1.0.4",
+                      "from": "JSONStream@>=1.0.3 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
                       "dependencies": {
                         "jsonparse": {
-                          "version": "0.0.5",
-                          "from": "jsonparse@0.0.5",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"
+                          "version": "1.0.0",
+                          "from": "jsonparse@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
                         }
                       }
                     },
                     "assert": {
-                      "version": "1.1.2",
-                      "from": "assert@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz"
+                      "version": "1.3.0",
+                      "from": "assert@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
                     },
                     "browser-pack": {
-                      "version": "3.2.0",
-                      "from": "browser-pack@>=3.2.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+                      "version": "4.0.4",
+                      "from": "browser-pack@>=4.0.3 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
                       "dependencies": {
                         "combine-source-map": {
                           "version": "0.3.0",
@@ -1102,9 +1046,9 @@
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
                                   "dependencies": {
                                     "amdefine": {
-                                      "version": "0.1.0",
+                                      "version": "0.1.1",
                                       "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                                     }
                                   }
                                 }
@@ -1121,9 +1065,9 @@
                               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                               "dependencies": {
                                 "amdefine": {
-                                  "version": "0.1.0",
+                                  "version": "0.1.1",
                                   "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                                 }
                               }
                             }
@@ -1132,21 +1076,38 @@
                         "through2": {
                           "version": "0.5.1",
                           "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@>=1.0.17 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "xtend": {
+                              "version": "3.0.0",
+                              "from": "xtend@>=3.0.0 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                            }
+                          }
+                        },
+                        "umd": {
+                          "version": "3.0.1",
+                          "from": "umd@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
                         }
                       }
                     },
                     "browser-resolve": {
                       "version": "1.9.0",
-                      "from": "browser-resolve@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.0.tgz",
-                      "dependencies": {
-                        "resolve": {
-                          "version": "1.1.6",
-                          "from": "resolve@1.1.6",
-                          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
-                        }
-                      }
+                      "from": "browser-resolve@>=1.7.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.0.tgz"
                     },
                     "browserify-zlib": {
                       "version": "0.1.4",
@@ -1154,9 +1115,9 @@
                       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
                       "dependencies": {
                         "pako": {
-                          "version": "0.2.6",
+                          "version": "0.2.7",
                           "from": "pako@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.6.tgz"
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.7.tgz"
                         }
                       }
                     },
@@ -1171,9 +1132,9 @@
                           "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
                         },
                         "ieee754": {
-                          "version": "1.1.5",
+                          "version": "1.1.6",
                           "from": "ieee754@>=1.1.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.5.tgz"
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
                         },
                         "is-array": {
                           "version": "1.0.1",
@@ -1193,26 +1154,14 @@
                       "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
                     },
                     "concat-stream": {
-                      "version": "1.4.8",
+                      "version": "1.4.10",
                       "from": "concat-stream@>=1.4.1 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.8.tgz",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
                       "dependencies": {
                         "typedarray": {
                           "version": "0.0.6",
                           "from": "typedarray@>=0.0.5 <0.1.0",
                           "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.9 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            }
-                          }
                         }
                       }
                     },
@@ -1259,9 +1208,9 @@
                               "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "elliptic": {
-                              "version": "3.0.4",
+                              "version": "3.1.0",
                               "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.4.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1281,9 +1230,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.0.3",
+                                  "version": "2.0.4",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.4.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1307,9 +1256,9 @@
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
                             },
                             "elliptic": {
-                              "version": "3.0.4",
+                              "version": "3.1.0",
                               "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.4.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1397,9 +1346,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.0.3",
+                                  "version": "2.0.4",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.3.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.4.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1420,33 +1369,19 @@
                       }
                     },
                     "deep-equal": {
-                      "version": "0.2.2",
-                      "from": "deep-equal@>=0.2.1 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                      "version": "1.0.0",
+                      "from": "deep-equal@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
                     },
                     "defined": {
-                      "version": "0.0.0",
-                      "from": "defined@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                      "version": "1.0.0",
+                      "from": "defined@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
                     },
                     "deps-sort": {
                       "version": "1.3.9",
-                      "from": "deps-sort@>=1.3.5 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
-                      "dependencies": {
-                        "JSONStream": {
-                          "version": "1.0.4",
-                          "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
-                          "dependencies": {
-                            "jsonparse": {
-                              "version": "1.0.0",
-                              "from": "jsonparse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
+                      "from": "deps-sort@>=1.3.7 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
                     },
                     "domain-browser": {
                       "version": "1.1.4",
@@ -1456,27 +1391,23 @@
                     "duplexer2": {
                       "version": "0.0.2",
                       "from": "duplexer2@>=0.0.2 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.9 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
+                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
                     },
                     "events": {
                       "version": "1.0.2",
                       "from": "events@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
                     },
+                    "has": {
+                      "version": "1.0.0",
+                      "from": "has@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.0.tgz"
+                    },
+                    "htmlescape": {
+                      "version": "1.1.0",
+                      "from": "htmlescape@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
+                    },
                     "http-browserify": {
                       "version": "1.7.0",
                       "from": "http-browserify@>=1.4.0 <2.0.0",
@@ -1501,21 +1432,9 @@
                     },
                     "insert-module-globals": {
                       "version": "6.5.0",
-                      "from": "insert-module-globals@>=6.1.0 <7.0.0",
+                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
                       "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.0.tgz",
                       "dependencies": {
-                        "JSONStream": {
-                          "version": "1.0.4",
-                          "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
-                          "dependencies": {
-                            "jsonparse": {
-                              "version": "1.0.0",
-                              "from": "jsonparse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
-                            }
-                          }
-                        },
                         "combine-source-map": {
                           "version": "0.3.0",
                           "from": "combine-source-map@>=0.3.0 <0.4.0",
@@ -1532,9 +1451,9 @@
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
                                   "dependencies": {
                                     "amdefine": {
-                                      "version": "0.1.0",
+                                      "version": "0.1.1",
                                       "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                                     }
                                   }
                                 }
@@ -1551,9 +1470,9 @@
                               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                               "dependencies": {
                                 "amdefine": {
-                                  "version": "0.1.0",
+                                  "version": "0.1.1",
                                   "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                                 }
                               }
                             }
@@ -1577,16 +1496,6 @@
                               }
                             }
                           }
-                        },
-                        "process": {
-                          "version": "0.11.1",
-                          "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.0",
-                          "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                         }
                       }
                     },
@@ -1605,18 +1514,6 @@
                           "from": "stream-splicer@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz",
                           "dependencies": {
-                            "readable-stream": {
-                              "version": "1.1.13",
-                              "from": "readable-stream@>=1.1.13-1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.1",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                                }
-                              }
-                            },
                             "readable-wrap": {
                               "version": "1.0.0",
                               "from": "readable-wrap@>=1.0.0 <2.0.0",
@@ -1633,26 +1530,9 @@
                     },
                     "module-deps": {
                       "version": "3.8.1",
-                      "from": "module-deps@>=3.6.3 <4.0.0",
+                      "from": "module-deps@>=3.7.11 <4.0.0",
                       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.1.tgz",
                       "dependencies": {
-                        "JSONStream": {
-                          "version": "1.0.4",
-                          "from": "JSONStream@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
-                          "dependencies": {
-                            "jsonparse": {
-                              "version": "1.0.0",
-                              "from": "jsonparse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "defined": {
-                          "version": "1.0.0",
-                          "from": "defined@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-                        },
                         "detective": {
                           "version": "4.1.0",
                           "from": "detective@>=4.0.0 <5.0.0",
@@ -1726,9 +1606,9 @@
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
-                                      "version": "0.1.0",
+                                      "version": "0.1.1",
                                       "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                                     }
                                   }
                                 }
@@ -1736,35 +1616,6 @@
                             }
                           }
                         },
-                        "parents": {
-                          "version": "1.0.1",
-                          "from": "parents@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-                          "dependencies": {
-                            "path-platform": {
-                              "version": "0.11.15",
-                              "from": "path-platform@>=0.11.15 <0.12.0",
-                              "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
-                            }
-                          }
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "resolve": {
-                          "version": "1.1.6",
-                          "from": "resolve@>=1.1.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
-                        },
                         "stream-combiner2": {
                           "version": "1.0.2",
                           "from": "stream-combiner2@>=1.0.0 <1.1.0",
@@ -1795,11 +1646,6 @@
                               }
                             }
                           }
-                        },
-                        "xtend": {
-                          "version": "4.0.0",
-                          "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                         }
                       }
                     },
@@ -1809,14 +1655,14 @@
                       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
                     },
                     "parents": {
-                      "version": "0.0.3",
-                      "from": "parents@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.3.tgz",
+                      "version": "1.0.1",
+                      "from": "parents@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
                       "dependencies": {
                         "path-platform": {
-                          "version": "0.0.1",
-                          "from": "path-platform@>=0.0.1 <0.0.2",
-                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz"
+                          "version": "0.11.15",
+                          "from": "path-platform@>=0.11.15 <0.12.0",
+                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
                         }
                       }
                     },
@@ -1826,24 +1672,36 @@
                       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
                     },
                     "process": {
-                      "version": "0.8.0",
-                      "from": "process@>=0.8.0 <0.9.0",
-                      "resolved": "https://registry.npmjs.org/process/-/process-0.8.0.tgz"
+                      "version": "0.11.1",
+                      "from": "process@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
                     },
                     "punycode": {
-                      "version": "1.2.4",
-                      "from": "punycode@>=1.2.3 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
+                      "version": "1.3.2",
+                      "from": "punycode@>=1.3.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                     },
                     "querystring-es3": {
                       "version": "0.2.1",
                       "from": "querystring-es3@>=0.2.0 <0.3.0",
                       "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
                     },
+                    "read-only-stream": {
+                      "version": "1.1.1",
+                      "from": "read-only-stream@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
+                      "dependencies": {
+                        "readable-wrap": {
+                          "version": "1.0.0",
+                          "from": "readable-wrap@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                        }
+                      }
+                    },
                     "readable-stream": {
-                      "version": "1.0.33",
-                      "from": "readable-stream@>=1.0.33-1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.13 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
@@ -1853,9 +1711,9 @@
                       }
                     },
                     "resolve": {
-                      "version": "0.7.4",
-                      "from": "resolve@>=0.7.1 <0.8.0",
-                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+                      "version": "1.1.6",
+                      "from": "resolve@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
                     },
                     "shallow-copy": {
                       "version": "0.0.1",
@@ -1928,116 +1786,23 @@
                     "through2": {
                       "version": "1.1.1",
                       "from": "through2@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13-1 <1.2.0-0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "xtend": {
-                          "version": "4.0.0",
-                          "from": "xtend@>=4.0.0 <4.1.0-0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
-                        }
-                      }
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
                     },
                     "timers-browserify": {
                       "version": "1.4.1",
                       "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz",
-                      "dependencies": {
-                        "process": {
-                          "version": "0.11.1",
-                          "from": "process@>=0.11.0 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
-                        }
-                      }
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
                     },
                     "tty-browserify": {
                       "version": "0.0.0",
                       "from": "tty-browserify@>=0.0.0 <0.1.0",
                       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
                     },
-                    "umd": {
-                      "version": "2.1.0",
-                      "from": "umd@>=2.1.0 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
-                      "dependencies": {
-                        "rfile": {
-                          "version": "1.0.0",
-                          "from": "rfile@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
-                          "dependencies": {
-                            "callsite": {
-                              "version": "1.0.0",
-                              "from": "callsite@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
-                            },
-                            "resolve": {
-                              "version": "0.3.1",
-                              "from": "resolve@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz"
-                            }
-                          }
-                        },
-                        "ruglify": {
-                          "version": "1.0.0",
-                          "from": "ruglify@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
-                          "dependencies": {
-                            "uglify-js": {
-                              "version": "2.2.5",
-                              "from": "uglify-js@>=2.2.0 <2.3.0",
-                              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
-                              "dependencies": {
-                                "source-map": {
-                                  "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "0.1.0",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "optimist": {
-                                  "version": "0.3.7",
-                                  "from": "optimist@>=0.3.5 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-                                  "dependencies": {
-                                    "wordwrap": {
-                                      "version": "0.0.3",
-                                      "from": "wordwrap@>=0.0.2 <0.1.0",
-                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
                     "url": {
                       "version": "0.10.3",
                       "from": "url@>=0.10.1 <0.11.0",
                       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
                       "dependencies": {
-                        "punycode": {
-                          "version": "1.3.2",
-                          "from": "punycode@1.3.2",
-                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                        },
                         "querystring": {
                           "version": "0.2.0",
                           "from": "querystring@0.2.0",
@@ -2063,9 +1828,9 @@
                       }
                     },
                     "xtend": {
-                      "version": "3.0.0",
-                      "from": "xtend@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                      "version": "4.0.0",
+                      "from": "xtend@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                     }
                   }
                 },
@@ -2090,9 +1855,9 @@
                       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
                       "dependencies": {
                         "amdefine": {
-                          "version": "0.1.0",
+                          "version": "0.1.1",
                           "from": "amdefine@>=0.0.4",
-                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
                         }
                       }
                     },
@@ -2133,9 +1898,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.5",
+              "version": "1.1.8",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.5.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.8.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -2178,7 +1943,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "object-inspect": {
@@ -2225,9 +1990,9 @@
               }
             },
             "elementtree": {
-              "version": "0.1.5",
-              "from": "elementtree@0.1.5",
-              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz",
+              "version": "0.1.6",
+              "from": "elementtree@0.1.6",
+              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
               "dependencies": {
                 "sax": {
                   "version": "0.3.5",
@@ -2306,7 +2071,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
@@ -2404,9 +2169,9 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.2.0",
+                      "version": "2.2.1",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.1.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
@@ -2429,7 +2194,7 @@
                     },
                     "graceful-fs": {
                       "version": "3.0.8",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     }
                   }
@@ -2824,9 +2589,9 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.2.0",
+                  "version": "2.2.1",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.1.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
@@ -2868,7 +2633,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3058,9 +2823,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                 },
                 "tough-cookie": {
-                  "version": "1.2.0",
+                  "version": "2.0.0",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
                 },
                 "http-signature": {
                   "version": "0.10.1",
@@ -3167,7 +2932,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.8",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     },
                     "mkdirp": {
@@ -3183,9 +2948,9 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.3.4",
+                      "version": "2.4.0",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz",
                       "dependencies": {
                         "glob": {
                           "version": "4.5.3",
@@ -3280,7 +3045,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
diff --git a/package.json b/package.json
index 42c948d96c..bd2f587246 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.1-beta.3",
+  "version": "1.5.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From cce18bbca89436ae25186d04363c8d71fc3ceea8 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 15 Jun 2015 08:48:05 -0600
Subject: [PATCH 0704/1100] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 333f7ffeb7..b1eadd40c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Added a plethora of tests for confidence in refactoring of the command options.
 * Fix for the repeated "Ionic not Defined" error.
 * Fix for ionic upload - removes the BOM (byte order mark) certain users were having - was leaving unwanted artifacts. This has been corrected.
+* Fix to no longer run the hooks permissions on every cordova command.
 
 ### 1.5.0
 

From a4f81759e1a508fbfae854deb46879efb6be9507 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Mon, 15 Jun 2015 12:43:53 -0500
Subject: [PATCH 0705/1100] No need for angular module, just json

---
 lib/ionic/io-config.js | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index b8dff055e1..d2fbec086b 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -13,12 +13,7 @@ var fs = require('fs'),
 
 var IonicTask = function() {};
 
-buildModule = function(configJson) {
-  return "angular.module('ionic.service.core.settings', [])\n.factory('ionicCoreSettings', function() {\n\tvar settings = " + JSON.stringify(configJson) + "\n\treturn {\n\t\tget: function(setting) {\n\t\t\tif (settings[setting]) {\n\t\t\t\treturn settings[setting];\n\t\t\t}\n\t\t\treturn null;\n\t\t}\n\t};\n});";
-}
-
-var CONFIG_FILE = './.io-config.json'
-var ANGULAR_MODULE = './www/lib/ionic-service-core/ionic-core-settings.js'
+var CONFIG_FILE = './www/lib/ionic-service-core/ionic-core-settings.json'
 
 IonicTask.prototype = new Task();
 
@@ -71,14 +66,6 @@ IonicTask.prototype.run = function(ionic) {
           console.log("ERROR: ", error);
         } else {
           console.log("Successfully saved " + key );
-
-          fs.writeFile(ANGULAR_MODULE, buildModule(jsonObj), function(er) {
-            if(er) {
-              console.log("ERROR: ", error);
-            } else {
-              console.log("Successfully updated module " + ANGULAR_MODULE);
-            }
-          });
         }
       });
     }

From 618d7aca108ced63ea0fa868eef7d3200113d1aa Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 15 Jun 2015 12:57:55 -0600
Subject: [PATCH 0706/1100] Fix(push/upload): Fix to get new login system with
 push and upload. Pass in the argv object. Closes #482

---
 lib/ionic/push.js   | 26 +++++++++++++++++++-------
 lib/ionic/upload.js |  2 +-
 npm-shrinkwrap.json |  2 +-
 package.json        |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index d054ada93d..096cc78a61 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -9,15 +9,17 @@ var fs = require('fs'),
     IonicTask = require('./task').IonicTask,
     IonicStats = require('./stats').IonicStats;
     Task = require('./task').Task,
-    IonicLoginTask = require('./login').IonicTask;
+    IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login,
+    LoginTask = require('./login');
+    // IonicLoginTask = require('./login').IonicTask;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic, argv) {
   var self = this;
-
   self.ionic = ionic;
   self.inputValues = {};
   self.inputFiles = {};
@@ -25,8 +27,15 @@ IonicTask.prototype.run = function(ionic) {
 
   this.getCmdLineOptions();
 
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
+  Login.retrieveLogin()
+  .then(function(jar){
+    if (!jar) {
+      console.log('No previous login existed. Attempting to log in now.');
+      return LoginTask.login(argv);
+    }
+    return jar;
+  })
+  .then(function(jar) {
     self.jar = jar;
 
     if (argv._[1] && argv._[1].trim() == 'webhook_url') {
@@ -49,8 +58,11 @@ IonicTask.prototype.run = function(ionic) {
       // where y will put into live and n will put into dev
       self.set_production_mode(self);
     }
-  
-  });
+  })
+  .catch(function(ex) {
+    console.log('An error occurred', ex);
+  })
+
 };
 
 IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index ada0fd17de..b1d7d0d98d 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -20,7 +20,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   .then(function(jar){
     if (!jar) {
       console.log('No previous login existed. Attempting to log in now.');
-      return LoginTask.login();
+      return LoginTask.login(argv);
     }
     return jar;
   })
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 41ad059605..26746e4ab4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "dependencies": {
     "async": {
       "version": "0.9.2",
diff --git a/package.json b/package.json
index bd2f587246..e1d2e17abb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 50c234c1e95782e1a6b46bc39ed1f779f9978e05 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Jun 2015 08:09:33 -0600
Subject: [PATCH 0707/1100] Fix(share): Change login to app lib login, correct
 share. Closes #485 and #487

---
 CHANGELOG.md       |  9 +++++++++
 lib/ionic/share.js | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1eadd40c0..b725cdbdc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### 1.5.3
+
+* Fix for login issue with share - now correctly prompts for ionic.io login.
+
+
+### 1.5.2
+
+* Fix for login issue with upload and push - now correctly prompts for ionic.io login.
+
 ### 1.5.1
 
 * Fix for ionic serve to specify a browser.
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index b15e2b3c15..2ffc1eb37f 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -15,7 +15,8 @@ var fs = require('fs'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask;
+    IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login;
 
 
 var IonicTask = function() {};
@@ -31,7 +32,7 @@ IonicTask.prototype.getCsrfToken = function(jar) {
   return '';
 }
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function(ionic, argv) {
   this.ionic = ionic;
   var self = this;
 
@@ -53,8 +54,15 @@ IonicTask.prototype.run = function(ionic) {
 
   console.log('Sharing app', project.get('app_id'), 'with', email);
 
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
+  return Login.retrieveLogin()
+  .then(function(jar){
+    if (!jar) {
+      console.log('No previous login existed. Attempting to log in now.');
+      return LoginTask.login(argv);
+    }
+    return jar;
+  })
+  .then(function(jar) {
     self.jar = jar;
 
     var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/share';

From ceef8e4c723e83d228d81adb87eb274fa8a3a5aa Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Jun 2015 08:10:09 -0600
Subject: [PATCH 0708/1100] Bump to 1.5.3

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 26746e4ab4..b2aba0f55b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "dependencies": {
     "async": {
       "version": "0.9.2",
diff --git a/package.json b/package.json
index e1d2e17abb..e09a98f7d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 6c63aa62dd85990bf6a0c2f79109f198e38b850e Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 16 Jun 2015 12:17:44 -0600
Subject: [PATCH 0709/1100] Fix(browser): Fix for error adding Crosswalk to
 existing ionic project. Closes #491 and Closes #490

---
 CHANGELOG.md        |  4 ++++
 npm-shrinkwrap.json | 18 +++++++++---------
 package.json        |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b725cdbdc1..35abc5e70f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.5.4
+
+* Fix for error adding Crosswalk to existing ionic project.
+
 ### 1.5.3
 
 * Fix for login issue with share - now correctly prompts for ionic.io login.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b2aba0f55b..de41489f97 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -810,9 +810,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.2.0",
-      "from": "ionic-app-lib@0.2.0",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.0.tgz",
+      "version": "0.2.1",
+      "from": "ionic-app-lib@0.2.1",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.1.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.14.4",
@@ -872,7 +872,7 @@
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -938,7 +938,7 @@
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -1943,7 +1943,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "object-inspect": {
@@ -2633,7 +2633,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2932,7 +2932,7 @@
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.8",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     },
                     "mkdirp": {
diff --git a/package.json b/package.json
index e09a98f7d7..25daa9ecf6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.2.0",
+    "ionic-app-lib": "0.2.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From a079ddd2dd27d9843ad4a4fc57c832bf598beb92 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 16 Jun 2015 16:23:45 -0500
Subject: [PATCH 0710/1100] can now edit the index.html

---
 lib/ionic/add.js       |  1 +
 lib/ionic/io-config.js | 78 +++++++++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index a51d7f7a3c..54cc67bbf6 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -3,6 +3,7 @@ require('shelljs/global')
 var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
     IonicStats = require('./stats').IonicStats,
+    IonicIoConfig = require('./io-config'),
     // argv = require('optimist').argv,
     fs = require('fs'),
     path = require('path'),
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index d2fbec086b..48f93be73b 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -1,22 +1,72 @@
 var fs = require('fs'),
+    cheerio = require('cheerio'),
     path = require('path'),
     parseUrl = require('url').parse,
     request = require('request'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
-    FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
     Task = require('./task').Task,
     IonicLoginTask = require('./login').IonicTask;
 
 var IonicTask = function() {};
 
-var CONFIG_FILE = './www/lib/ionic-service-core/ionic-core-settings.json'
+var CONFIG_FILE = './www/lib/ionic-service-core/ionic-core-settings.json';
+var INDEX_FILE = './www/index.html'
 
 IonicTask.prototype = new Task();
 
+IonicTask.prototype.writeIoConfig = function writeIoConfig(key, val, set) {
+  fs.readFile(CONFIG_FILE, function(err, data) {
+    if (err) {
+      console.log("ERROR: ", err);
+    } else {
+      var jsonObj = JSON.parse(data);
+      if (set) {
+        jsonObj[key] = val
+      } else if (!set && jsonObj[key]) {
+        delete jsonObj[key]
+      }
+      fs.writeFile(CONFIG_FILE, JSON.stringify(jsonObj), function(error) {
+        if (err) {
+          console.log("ERROR: ", error);
+        } else {
+          console.log("Successfully saved " + key );
+        }
+      });
+    }
+  });
+};
+
+IonicTask.prototype.writeIoIndex = function writeIoIndex(set, path) {
+  fs.readFile(INDEX_FILE, function(err, data) {
+    if (err) {
+      console.log("ERROR: ", err);
+    } else {
+      var exists = false;
+      $ = cheerio.load(data);
+      $("script").each(function() {
+        if (!set && $(this).attr('src') === path) {
+          console.log("Deleting component from index.html");
+          $(this).remove();
+        } else if (set && $(this).attr('src') === path) {
+          exists = true;
+        }
+      });
+      if (set && !exists) {
+        console.log('Adding component to index.html');
+        $('head').append("<script src='" + path + "'></script>");
+      }
+      fs.writeFile(INDEX_FILE, $.html(), function(error) {
+        if (err) {
+          console.log("ERROR: ", error);
+        }
+      });
+    }
+  });
+}
+
 IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
@@ -50,26 +100,8 @@ IonicTask.prototype.run = function(ionic) {
     self.ionic.fail("Invalid command, must use 'set' or 'unset'");
   }
 
-  fs.readFile(CONFIG_FILE, function(err, data) {
-    if (err) {
-      console.log("ERROR: ", err);
-    } else {
-      var jsonObj = JSON.parse(data);
-      if (set) {
-        jsonObj[key] = val
-      } else if (!set && jsonObj[key]) {
-        delete jsonObj[key]
-      }
-      var self = this;
-      fs.writeFile(CONFIG_FILE, JSON.stringify(jsonObj), function(error) {
-        if (err) {
-          console.log("ERROR: ", error);
-        } else {
-          console.log("Successfully saved " + key );
-        }
-      });
-    }
-  });
+  this.writeIoConfig(key, val, set);
+  this.writeIoIndex(false, 'foo/bar');
 };
 
 exports.IonicTask = IonicTask;

From ec1b5ae343d16662b31d32341371cf267696d6fe Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 16 Jun 2015 17:12:27 -0500
Subject: [PATCH 0711/1100] push, deploy, and analytics auto include in
 index.html

---
 lib/ionic/add.js       | 23 +++++++++++++++
 lib/ionic/io-config.js | 66 +++++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 54cc67bbf6..37d3e8064a 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -71,10 +71,28 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   var action = argv._[0]
   var componentName = argv._[1];
+  var ioPath = false;
+  var ioSet = false;
 
   try {
+
+    // Add the default path to the component for our IO components
+    switch (componentName) {
+      case 'ionic-service-push':
+        ioPath = 'lib/ionic-service-push/ionic-push.js';
+        break;
+      case 'ionic-service-deploy':
+        ioPath = 'lib/ionic-service-deploy/ionic-deploy.js';
+        break;
+      case 'ionic-service-analytics':
+        ioPath = 'lib/ionic-service-analytics/ionic-analytics.js';
+        break;
+      default:
+        break;
+    }
     switch (action) {
       case 'add':
+        ioSet = true;
         this.installBowerComponent(componentName);
         break;
       case 'remove':
@@ -91,6 +109,11 @@ IonicTask.prototype.run = function(ionic, argv) {
     var errorMessage = error.message ? error.message : error;
     this.ionic.fail(errorMessage, 'service')
   }
+
+  // If it's one of our components, auto-include it in the index.
+  if (ioPath) {
+    IonicIoConfig.writeIoIndex(ioSet, ioPath);
+  }
 }
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 48f93be73b..350f2a95f3 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -39,34 +39,6 @@ IonicTask.prototype.writeIoConfig = function writeIoConfig(key, val, set) {
   });
 };
 
-IonicTask.prototype.writeIoIndex = function writeIoIndex(set, path) {
-  fs.readFile(INDEX_FILE, function(err, data) {
-    if (err) {
-      console.log("ERROR: ", err);
-    } else {
-      var exists = false;
-      $ = cheerio.load(data);
-      $("script").each(function() {
-        if (!set && $(this).attr('src') === path) {
-          console.log("Deleting component from index.html");
-          $(this).remove();
-        } else if (set && $(this).attr('src') === path) {
-          exists = true;
-        }
-      });
-      if (set && !exists) {
-        console.log('Adding component to index.html');
-        $('head').append("<script src='" + path + "'></script>");
-      }
-      fs.writeFile(INDEX_FILE, $.html(), function(error) {
-        if (err) {
-          console.log("ERROR: ", error);
-        }
-      });
-    }
-  });
-}
-
 IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
@@ -101,7 +73,43 @@ IonicTask.prototype.run = function(ionic) {
   }
 
   this.writeIoConfig(key, val, set);
-  this.writeIoIndex(false, 'foo/bar');
+};
+
+exports.writeIoIndex = function(set, path) {
+  fs.readFile(INDEX_FILE, function(err, data) {
+    if (err) {
+      console.log("ERROR: ", err);
+    } else {
+      var exists = false;
+      var coreScript = false;
+      $ = cheerio.load(data);
+      $("script").each(function() {
+        if ($(this).attr('src') === "lib/ionic-service-core/ionic-core.js") {
+          coreScript = this;
+        }
+        if (!set && $(this).attr('src') === path) {
+          console.log("Deleting component from index.html");
+          $(this).remove();
+        } else if (set && $(this).attr('src') === path) {
+          exists = true;
+        }
+      });
+      if (set && !exists) {
+        console.log('Adding component to index.html');
+        var newScript = "\n<script src='" + path + "'></script>";
+        if (coreScript) {
+          $(coreScript).after(newScript);
+        } else {
+          $('head').append(newScript);
+        }
+      }
+      fs.writeFile(INDEX_FILE, $.html(), function(error) {
+        if (err) {
+          console.log("ERROR: ", error);
+        }
+      });
+    }
+  });
 };
 
 exports.IonicTask = IonicTask;

From b29396e8e3efcf70a61136f314c4b0ee779e727d Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 17 Jun 2015 12:36:29 -0500
Subject: [PATCH 0712/1100] Auto injecting into angular module, yo

---
 lib/ionic/add.js       |  6 +++++-
 lib/ionic/io-config.js | 29 +++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 37d3e8064a..d90cc32a82 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -72,6 +72,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   var action = argv._[0]
   var componentName = argv._[1];
   var ioPath = false;
+  var ioName = false;
   var ioSet = false;
 
   try {
@@ -80,12 +81,15 @@ IonicTask.prototype.run = function(ionic, argv) {
     switch (componentName) {
       case 'ionic-service-push':
         ioPath = 'lib/ionic-service-push/ionic-push.js';
+        ioName = 'ionic.service.push';
         break;
       case 'ionic-service-deploy':
         ioPath = 'lib/ionic-service-deploy/ionic-deploy.js';
+        ioName = 'ionic.service.deploy';
         break;
       case 'ionic-service-analytics':
         ioPath = 'lib/ionic-service-analytics/ionic-analytics.js';
+        ioName = 'ionic.service.analytics';
         break;
       default:
         break;
@@ -112,7 +116,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // If it's one of our components, auto-include it in the index.
   if (ioPath) {
-    IonicIoConfig.writeIoIndex(ioSet, ioPath);
+    IonicIoConfig.injectIoComponent(ioSet, ioPath, ioName);
   }
 }
 
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 350f2a95f3..74de7d3297 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -13,7 +13,8 @@ var fs = require('fs'),
 var IonicTask = function() {};
 
 var CONFIG_FILE = './www/lib/ionic-service-core/ionic-core-settings.json';
-var INDEX_FILE = './www/index.html'
+var INDEX_FILE = './www/index.html';
+var APP_FILE = './www/js/app.js';
 
 IonicTask.prototype = new Task();
 
@@ -75,10 +76,11 @@ IonicTask.prototype.run = function(ionic) {
   this.writeIoConfig(key, val, set);
 };
 
-exports.writeIoIndex = function(set, path) {
+exports.injectIoComponent = function(set, path, name) {
   fs.readFile(INDEX_FILE, function(err, data) {
     if (err) {
       console.log("ERROR: ", err);
+      console.log("Have you run 'ionic add ionic-service-core' yet?");
     } else {
       var exists = false;
       var coreScript = false;
@@ -110,6 +112,29 @@ exports.writeIoIndex = function(set, path) {
       });
     }
   });
+
+  fs.readFile(APP_FILE, function(err, data) {
+    if (err) {
+      console.log("ERROR: ", err);
+      console.log("Is your app declaration contained in 'app.js'?");
+    } else {
+      if (set) {
+        var jsFile = String(data);
+        console.log('injecting ' + name + ' into "app.js"');
+        jsFile = jsFile.replace("\'ionic.service.core\',", "\'ionic.service.core\'," + "\'" + name + "\',");
+        jsFile = jsFile.replace('\"ionic.service.core\",', '\"ionic.service.core\",' + "\'" + name + "\',");
+      } else {
+        console.log('removing ' + name + ' from "app.js"');
+        jsFile = jsFile.replace("\'" + name + "\',", '');
+        jsFile = jsFile.replace('\"' + name + '\",', '');
+      }
+      fs.writeFile(APP_FILE, jsFile, function(error) {
+        if (err) {
+          console.log("ERROR: ", error);
+        }
+      });
+    }
+  });
 };
 
 exports.IonicTask = IonicTask;

From 4c2f0d2fe25de86f3d773a4fdb87072d086b8dee Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 17 Jun 2015 11:37:15 -0600
Subject: [PATCH 0713/1100] Update changelog. Bump to 1.5.5. Release

---
 CHANGELOG.md        |  4 ++++
 npm-shrinkwrap.json | 10 +++++-----
 package.json        |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35abc5e70f..0057c5d3bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.5.5
+
+* Fix(start): Fetch codepen was trying to fetch invalid html/css/js files because of a leading '/'. The trailing slash has been removed.
+
 ### 1.5.4
 
 * Fix for error adding Crosswalk to existing ionic project.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index de41489f97..634a4d1f56 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -810,9 +810,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.2.1",
-      "from": "ionic-app-lib@0.2.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.1.tgz",
+      "version": "0.2.2",
+      "from": "ionic-app-lib@0.2.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.14.4",
@@ -872,7 +872,7 @@
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
diff --git a/package.json b/package.json
index 25daa9ecf6..0ab65f0929 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.2.1",
+    "ionic-app-lib": "0.2.2",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From eb6ed6d3272719690c22e12222d13a8254994c9e Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 17 Jun 2015 12:40:16 -0500
Subject: [PATCH 0714/1100] Always remove injections first.

---
 lib/ionic/io-config.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 74de7d3297..ca94da8920 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -118,15 +118,16 @@ exports.injectIoComponent = function(set, path, name) {
       console.log("ERROR: ", err);
       console.log("Is your app declaration contained in 'app.js'?");
     } else {
+      // Parse the file to string and remove existing references to the component
+      var jsFile = String(data);
+      jsFile = jsFile.replace("\'" + name + "\',", '');
+      jsFile = jsFile.replace('\"' + name + '\",', '');
       if (set) {
-        var jsFile = String(data);
         console.log('injecting ' + name + ' into "app.js"');
         jsFile = jsFile.replace("\'ionic.service.core\',", "\'ionic.service.core\'," + "\'" + name + "\',");
         jsFile = jsFile.replace('\"ionic.service.core\",', '\"ionic.service.core\",' + "\'" + name + "\',");
       } else {
         console.log('removing ' + name + ' from "app.js"');
-        jsFile = jsFile.replace("\'" + name + "\',", '');
-        jsFile = jsFile.replace('\"' + name + '\",', '');
       }
       fs.writeFile(APP_FILE, jsFile, function(error) {
         if (err) {

From 164c5a46e1b12053924be751f903707796709aca Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Thu, 18 Jun 2015 10:03:39 -0500
Subject: [PATCH 0715/1100] Automatic adding of app ID

---
 lib/ionic/add.js       | 23 +++++++---
 lib/ionic/io-config.js | 96 +-----------------------------------------
 2 files changed, 20 insertions(+), 99 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index d90cc32a82..1208b5164c 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -3,9 +3,9 @@ require('shelljs/global')
 var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
     IonicStats = require('./stats').IonicStats,
-    IonicIoConfig = require('./io-config'),
     // argv = require('optimist').argv,
     fs = require('fs'),
+    ioLib = require('ionic-app-lib').ioConfig,
     path = require('path'),
     bower = require('./bower');
 
@@ -71,14 +71,19 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   var action = argv._[0]
   var componentName = argv._[1];
-  var ioPath = false;
-  var ioName = false;
-  var ioSet = false;
+  var ioInit = false,
+      ioPath = false,
+      ioName = false,
+      ioSet = false;
 
   try {
 
     // Add the default path to the component for our IO components
     switch (componentName) {
+      case 'ionic-service-core':
+        ioPath = 'lib/ionic-service-core/ionic-core.js';
+        ioName = 'ionic.service.core';
+        ioInit = true;
       case 'ionic-service-push':
         ioPath = 'lib/ionic-service-push/ionic-push.js';
         ioName = 'ionic.service.push';
@@ -116,7 +121,15 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // If it's one of our components, auto-include it in the index.
   if (ioPath) {
-    IonicIoConfig.injectIoComponent(ioSet, ioPath, ioName);
+    ioLib.injectIoComponent(ioSet, ioPath, ioName);
+  }
+
+  // If it's ionic-service-core, add the app ID and tell them to add the API key
+  if (ioInit) {
+    var appId = ioLib.getAppId();
+    ioLib.writeIoConfig('app_id', appId, true);
+    console.log("To use the ionic.io services, add your public API key with:");
+    console.log("$ \'ionic config set api_key <YOUR_PUBLIC_KEY>\'");
   }
 }
 
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index ca94da8920..4a46ee7689 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -1,8 +1,4 @@
-var fs = require('fs'),
-    cheerio = require('cheerio'),
-    path = require('path'),
-    parseUrl = require('url').parse,
-    request = require('request'),
+var ioLib = require('ionic-app-lib').ioConfig,
     argv = require('optimist').argv,
     prompt = require('prompt'),
     IonicProject = require('./project'),
@@ -12,34 +8,8 @@ var fs = require('fs'),
 
 var IonicTask = function() {};
 
-var CONFIG_FILE = './www/lib/ionic-service-core/ionic-core-settings.json';
-var INDEX_FILE = './www/index.html';
-var APP_FILE = './www/js/app.js';
-
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.writeIoConfig = function writeIoConfig(key, val, set) {
-  fs.readFile(CONFIG_FILE, function(err, data) {
-    if (err) {
-      console.log("ERROR: ", err);
-    } else {
-      var jsonObj = JSON.parse(data);
-      if (set) {
-        jsonObj[key] = val
-      } else if (!set && jsonObj[key]) {
-        delete jsonObj[key]
-      }
-      fs.writeFile(CONFIG_FILE, JSON.stringify(jsonObj), function(error) {
-        if (err) {
-          console.log("ERROR: ", error);
-        } else {
-          console.log("Successfully saved " + key );
-        }
-      });
-    }
-  });
-};
-
 IonicTask.prototype.run = function(ionic) {
   var self = this;
   self.ionic = ionic;
@@ -73,69 +43,7 @@ IonicTask.prototype.run = function(ionic) {
     self.ionic.fail("Invalid command, must use 'set' or 'unset'");
   }
 
-  this.writeIoConfig(key, val, set);
-};
-
-exports.injectIoComponent = function(set, path, name) {
-  fs.readFile(INDEX_FILE, function(err, data) {
-    if (err) {
-      console.log("ERROR: ", err);
-      console.log("Have you run 'ionic add ionic-service-core' yet?");
-    } else {
-      var exists = false;
-      var coreScript = false;
-      $ = cheerio.load(data);
-      $("script").each(function() {
-        if ($(this).attr('src') === "lib/ionic-service-core/ionic-core.js") {
-          coreScript = this;
-        }
-        if (!set && $(this).attr('src') === path) {
-          console.log("Deleting component from index.html");
-          $(this).remove();
-        } else if (set && $(this).attr('src') === path) {
-          exists = true;
-        }
-      });
-      if (set && !exists) {
-        console.log('Adding component to index.html');
-        var newScript = "\n<script src='" + path + "'></script>";
-        if (coreScript) {
-          $(coreScript).after(newScript);
-        } else {
-          $('head').append(newScript);
-        }
-      }
-      fs.writeFile(INDEX_FILE, $.html(), function(error) {
-        if (err) {
-          console.log("ERROR: ", error);
-        }
-      });
-    }
-  });
-
-  fs.readFile(APP_FILE, function(err, data) {
-    if (err) {
-      console.log("ERROR: ", err);
-      console.log("Is your app declaration contained in 'app.js'?");
-    } else {
-      // Parse the file to string and remove existing references to the component
-      var jsFile = String(data);
-      jsFile = jsFile.replace("\'" + name + "\',", '');
-      jsFile = jsFile.replace('\"' + name + '\",', '');
-      if (set) {
-        console.log('injecting ' + name + ' into "app.js"');
-        jsFile = jsFile.replace("\'ionic.service.core\',", "\'ionic.service.core\'," + "\'" + name + "\',");
-        jsFile = jsFile.replace('\"ionic.service.core\",', '\"ionic.service.core\",' + "\'" + name + "\',");
-      } else {
-        console.log('removing ' + name + ' from "app.js"');
-      }
-      fs.writeFile(APP_FILE, jsFile, function(error) {
-        if (err) {
-          console.log("ERROR: ", error);
-        }
-      });
-    }
-  });
+  ioLib.writeIoConfig(key, val, set);
 };
 
 exports.IonicTask = IonicTask;

From 84defbb03e706ae90d7f3b0a6b19785e480d078f Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Mon, 22 Jun 2015 17:19:38 -0500
Subject: [PATCH 0716/1100] Progress

---
 lib/ionic/add.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 1208b5164c..40b3e112e0 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -84,6 +84,7 @@ IonicTask.prototype.run = function(ionic, argv) {
         ioPath = 'lib/ionic-service-core/ionic-core.js';
         ioName = 'ionic.service.core';
         ioInit = true;
+        break;
       case 'ionic-service-push':
         ioPath = 'lib/ionic-service-push/ionic-push.js';
         ioName = 'ionic.service.push';
@@ -126,10 +127,10 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // If it's ionic-service-core, add the app ID and tell them to add the API key
   if (ioInit) {
+    console.log("To use the ionic.io services, add your public API key with:");
+    console.log("  ionic config set api_key <YOUR_PUBLIC_KEY>");
     var appId = ioLib.getAppId();
     ioLib.writeIoConfig('app_id', appId, true);
-    console.log("To use the ionic.io services, add your public API key with:");
-    console.log("$ \'ionic config set api_key <YOUR_PUBLIC_KEY>\'");
   }
 }
 

From ac0508abd1ee044385e7167a20961c6167b02102 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 24 Jun 2015 09:40:50 -0500
Subject: [PATCH 0717/1100] removed bad console logs

---
 lib/ionic/add.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 40b3e112e0..98d2ef60b7 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -127,8 +127,6 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // If it's ionic-service-core, add the app ID and tell them to add the API key
   if (ioInit) {
-    console.log("To use the ionic.io services, add your public API key with:");
-    console.log("  ionic config set api_key <YOUR_PUBLIC_KEY>");
     var appId = ioLib.getAppId();
     ioLib.writeIoConfig('app_id', appId, true);
   }

From 558cf7b3b6c45ea813d14f2352c6001cddfb1218 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 24 Jun 2015 09:41:13 -0500
Subject: [PATCH 0718/1100] Now you can say 'platform' or 'platforms', that's
 pretty neat

---
 lib/ionic/cordova.js  |  6 +++---
 lib/tasks/cliTasks.js | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 00677562d1..b931af5dc2 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -43,13 +43,13 @@ IonicTask.prototype.run = function(ionic, argv) {
     }
 
     var addDefaultResources = false;
-    var isPlatformCmd = argv._.indexOf('platform') != -1;
+    var isPlatformCmd = argv._.indexOf('platform') != -1 || argv._.indexOf('platforms') != -1;
     var isAddCmd = argv._.indexOf('add') != -1;
     var isPluginCmd = argv._.indexOf('plugin') != -1;
     var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
     if (isPlatformCmd || isAddCmd) {
-      Hooks.setHooksPermission(process.cwd());    
+      Hooks.setHooksPermission(process.cwd());
     }
 
     if(isPlatformCmd && isAddCmd) {
@@ -148,7 +148,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
         isValdCmd = false;
         break;
       }
-    }    
+    }
     if(isValdCmd) {
       // make sure --target= has double quotes around it (process.argv removes them)
       if(cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 54433b9eac..f35035f5db 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -126,6 +126,26 @@ var TASKS = [
     },
     module: './ionic/cordova'
   },
+  {
+    title: 'platforms',
+    name: 'platforms',
+    summary: 'Add platform target for building an Ionic app',
+    args: {
+      '[options]': '',
+      '<PLATFORM>': ''
+    },
+    options: {
+      '--noresources|-r': {
+        title: 'Do not add default Ionic icons and splash screen resources',
+        boolean: true
+      },
+      '--nosave|-e': {
+        title: 'Do not save the platform to the package.json file',
+        boolean: true
+      }
+    },
+    module: './ionic/cordova'
+  },
   {
     title: 'run',
     name: 'run',
@@ -311,7 +331,7 @@ var TASKS = [
       '--ios-dev-cert': 'Upload your development .p12 file to Ionic Push',
       '--ios-prod-cert': 'Upload your production .p12 file to Ionic Push',
       '--production-mode=y,n': 'Tell Ionic Push to use production (y) or sandbox (n) APNS servers',
-      '--google-api-key <your-gcm-api-key>': "Set your app's GCM API key on Ionic Push" 
+      '--google-api-key <your-gcm-api-key>': "Set your app's GCM API key on Ionic Push"
     },
     module: './ionic/push'
   },

From dc70494c71d4d0fd3a79c52bb25c4113ad2095f6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 13:20:37 -0600
Subject: [PATCH 0719/1100] Fix(tasks): Provide 'platforms' an alias to
 'platform'

---
 lib/tasks/cliTasks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 560153a95b..a8a7d58896 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -124,7 +124,8 @@ var TASKS = [
         boolean: true
       }
     },
-    module: './ionic/cordova'
+    module: './ionic/cordova',
+    alt: ['platforms']
   },
   {
     title: 'run',

From 2298f5a1ec5cc0c58bac87b671c5fa1bfb8c49d9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 13:23:06 -0600
Subject: [PATCH 0720/1100] Refactor(share): Use the share command from the
 ionic-app-lib

---
 lib/ionic/share.js | 76 ++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 57 deletions(-)

diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 2ffc1eb37f..48de2912da 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,8 +1,4 @@
-var fs = require('fs'),
-    os = require('os'),
-    request = require('request'),
-    ncp = require('ncp').ncp,
-    path = require('path'),
+var path = require('path'),
     parseUrl = require('url').parse,
     shelljs = require('shelljs/global'),
     argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
@@ -11,92 +7,58 @@ var fs = require('fs'),
     xml2js = require('xml2js'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
-    IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
+    LoginTask = require('./login'),
     IonicAppLib = require('ionic-app-lib'),
-    Login = IonicAppLib.login;
-
+    Share = IonicAppLib.share,
+    Login = IonicAppLib.login,
+    Utils = IonicAppLib.utils;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.getCsrfToken = function(jar) {
-  for (var i = 0; i < jar.length; i++) {
-    if (jar[i].key == 'csrftoken') {
-      return jar[i].value;
-    }
-  }
-  return '';
-}
-
 IonicTask.prototype.run = function(ionic, argv) {
-  this.ionic = ionic;
-  var self = this;
+  var project;
 
   if(argv._.length < 2) {
-    return this.ionic.fail('Invalid command', 'share');
+    return ionic.fail('Invalid command', 'share');
   }
 
   try {
     project = IonicProject.load();
   } catch (ex) {
-    this.ionic.fail(ex.message);
+    ionic.fail(ex.message);
     return
   }
   
   var email = argv._[1];
+
   if(email.indexOf('@') < 0) {
-    return this.ionic.fail('Invalid email address', 'share');
+    return ionic.fail('Invalid email address', 'share');
   }
 
   console.log('Sharing app', project.get('app_id'), 'with', email);
 
+  IonicStats.t();
+
   return Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
       console.log('No previous login existed. Attempting to log in now.');
-      return LoginTask.login(argv);
+      return LoginTask.login();
     }
     return jar;
   })
   .then(function(jar) {
-    self.jar = jar;
-
-    var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/share';
-    var params = parseUrl(url);
-
-    var form = new FormData();
-    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
-    form.append('e', email);
-    form.submit({
-      protocol: params.protocol,
-      hostname: params.hostname,
-      port: params.port,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: jar.map(function(c) {
-          return c.key + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    }, function (err, response) {
-      if(err) {
-        return ionic.fail('Error sharing: ' + err);
-      }
-      response.on("data", function(data) {
-        if(err || response.statusCode !== 200) {
-          console.log(body);
-          return ionic.fail('Error sharing: ' + err);
-        }
-        console.log('An invite to view your app was sent.');
-        //console.log('\n', data.toString('utf-8'));
-      })
-    });
-    
+    return Share.shareApp(process.cwd(), jar, email);
+  })
+  .catch(function(ex) {
+    // console.log('Error', ex, ex.stack);
+    Utils.fail(ex);
   });
-
-}
+};
 
 exports.IonicTask = IonicTask;

From 4e521ab06a2e5c844248af73090a02a2da279cf0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 13:45:22 -0600
Subject: [PATCH 0721/1100] Feature(cli): Add check runtime to ensure
 dependencies for node and cordova are fulfilled. Check run time will show a
 warning to upgrade those dependencies

---
 lib/cli.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/cli.js b/lib/cli.js
index 96d2500795..9bf666cecc 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -49,6 +49,11 @@ Cli.run = function run(processArgv) {
       Cli.printVersionWarning();
     });
 
+    //Before taking any more steps, lets check their
+    //environment and display any upgrade warnings
+    Info.checkRuntime();
+
+
     if(argv.ionitron) {
       var lang = argv.es ? 'es' : 'en';
       return Ionitron.print(lang);

From 77eb7ba3aec31c35b88c1d6b5137949dda54b92a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 13:45:42 -0600
Subject: [PATCH 0722/1100] Bumping version to 1.6.0 for ionic app lib
 extracting share command

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0ab65f0929..03c72cda31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.2.2",
+    "ionic-app-lib": "0.3.0",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From dd4d41a627ae65c5894c06241e33e2013dbceb71 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 16:30:45 -0600
Subject: [PATCH 0723/1100] Add test to mock out info call for checkruntime.

---
 spec/cli.spec.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 4037438935..dfbc531613 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -3,6 +3,7 @@ var IonicAppLib = require('ionic-app-lib'),
     IonicCli = require('../lib/cli'),
     Q = require('q'),
     Task = require('../lib/ionic/task').Task,
+    Info = IonicAppLib.info,
     Utils = IonicAppLib.utils;
 
 describe('Cli', function() {
@@ -12,6 +13,7 @@ describe('Cli', function() {
     spyOn(IonicCli, 'printAvailableTasks');
     spyOn(IonicAppLib.events, 'on');
     spyOn(process, 'on');
+    spyOn(Info, 'checkRuntime');
 
     spyOn(Utils, 'fail').andCallFake(function(err){
       console.log(err);
@@ -47,6 +49,12 @@ describe('Cli', function() {
         expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
       });
 
+      it('should run info checkruntime on run', function() {
+        spyOn(IonicCli, 'printHelpLines');
+        IonicCli.run(['node', 'bin/ionic', '--h']);
+        expect(Info.checkRuntime).toHaveBeenCalled();
+      });
+
       it('should run ionitron when argument is passed', function() {
         spyOn(Ionitron, 'print');
         IonicCli.run(['node', 'bin/ionic', '--ionitron']);

From 8fbaa5c9f27b96eb84738c32fff8e02be098e8fc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 30 Jun 2015 18:16:05 -0600
Subject: [PATCH 0724/1100] Fix(share): Properly checking that the app exists
 with app id before attemping to upload. Fix login passing args to get from
 args or prompting

---
 lib/ionic/share.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 48de2912da..8e00f146a3 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -33,6 +33,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     ionic.fail(ex.message);
     return
   }
+
+  if (project.get('app_id') == '') {
+    return ionic.fail('You must first upload the app to share it');
+  }
   
   var email = argv._[1];
 
@@ -40,7 +44,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     return ionic.fail('Invalid email address', 'share');
   }
 
-  console.log('Sharing app', project.get('app_id'), 'with', email);
+  console.log(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
 
   IonicStats.t();
 
@@ -48,7 +52,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   .then(function(jar){
     if (!jar) {
       console.log('No previous login existed. Attempting to log in now.');
-      return LoginTask.login();
+      return LoginTask.login(argv);
     }
     return jar;
   })
@@ -57,7 +61,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   })
   .catch(function(ex) {
     // console.log('Error', ex, ex.stack);
-    Utils.fail(ex);
+    return Utils.fail(ex);
   });
 };
 

From adec4072ee9d06f50e5943db2d22432d4fd6305c Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Wed, 1 Jul 2015 14:10:01 -0500
Subject: [PATCH 0725/1100] Removed terribad switch

---
 lib/ionic/add.js      | 40 ++++------------------------------------
 lib/tasks/cliTasks.js | 21 +--------------------
 2 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 98d2ef60b7..bd3b2da7e6 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -71,35 +71,9 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   var action = argv._[0]
   var componentName = argv._[1];
-  var ioInit = false,
-      ioPath = false,
-      ioName = false,
-      ioSet = false;
+  var ioSet = false;
 
   try {
-
-    // Add the default path to the component for our IO components
-    switch (componentName) {
-      case 'ionic-service-core':
-        ioPath = 'lib/ionic-service-core/ionic-core.js';
-        ioName = 'ionic.service.core';
-        ioInit = true;
-        break;
-      case 'ionic-service-push':
-        ioPath = 'lib/ionic-service-push/ionic-push.js';
-        ioName = 'ionic.service.push';
-        break;
-      case 'ionic-service-deploy':
-        ioPath = 'lib/ionic-service-deploy/ionic-deploy.js';
-        ioName = 'ionic.service.deploy';
-        break;
-      case 'ionic-service-analytics':
-        ioPath = 'lib/ionic-service-analytics/ionic-analytics.js';
-        ioName = 'ionic.service.analytics';
-        break;
-      default:
-        break;
-    }
     switch (action) {
       case 'add':
         ioSet = true;
@@ -120,16 +94,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     this.ionic.fail(errorMessage, 'service')
   }
 
-  // If it's one of our components, auto-include it in the index.
-  if (ioPath) {
-    ioLib.injectIoComponent(ioSet, ioPath, ioName);
-  }
+  // Inject the component into our index.html, if necessary, and save the app_id
+  ioLib.injectIoComponent(ioSet, componentName);
+  ioLib.writeIoConfig('app_id', ioLib.getAppId(), true);
 
-  // If it's ionic-service-core, add the app ID and tell them to add the API key
-  if (ioInit) {
-    var appId = ioLib.getAppId();
-    ioLib.writeIoConfig('app_id', appId, true);
-  }
 }
 
 exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index f35035f5db..29816adef9 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -109,26 +109,7 @@ var TASKS = [
   {
     title: 'platform',
     name: 'platform',
-    summary: 'Add platform target for building an Ionic app',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--noresources|-r': {
-        title: 'Do not add default Ionic icons and splash screen resources',
-        boolean: true
-      },
-      '--nosave|-e': {
-        title: 'Do not save the platform to the package.json file',
-        boolean: true
-      }
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'platforms',
-    name: 'platforms',
+    alt: ['platforms'],
     summary: 'Add platform target for building an Ionic app',
     args: {
       '[options]': '',

From 07ecec24cc4de2ebbf1db4b2c2e9d809aa9b461a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 1 Jul 2015 15:21:12 -0600
Subject: [PATCH 0726/1100] Beta version to test changes to solve #495

---
 CHANGELOG.md        |  24 ++
 npm-shrinkwrap.json | 989 ++++++++++++++++++++++++++++++--------------
 package.json        |   4 +-
 3 files changed, 712 insertions(+), 305 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0057c5d3bb..af91343d5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+### 1.6.0
+
+* Fix(upload): Bumped archiver back to 0.5.1 - it was causing an issue related to unzipped compressed files on Android devices - see: https://github.com/driftyco/ionic-cli/issues/494 and https://github.com/archiverjs/node-archiver/issues/113.
+* Refactor(share): Share is now available in ionic-app-lib.
+* Update serve method `start` to check for document root and reject promise if it does not exist instead of exiting process with Util.fail.
+* Fix for upload - if you have a script with a query string, it will not get mangled from the removeCacheBusters call. Fixes issue https://github.com/driftyco/ionic-cli/issues/504.
+* Fix(browser): Fix for remove crosswalk, pass in the app directory for the project file, then use that instance object to save. Fixes CLI bug https://github.com/driftyco/ionic-cli/issues/500.
+* Fix(state): cordovaPlatforms in package.json no longer gets duplicate entry.
+* Feature(start): add the ability to add bower packages to a starter project.
+* Fix(start): Ensure appSetup.bower is set so that the appSetup.bower.length call doesnt cause a run time exception. Handle the exception thrown from initCordova in the chain by rethrowing the exception if the app setup process fails.
+* Fix(platform): Remove console.log command from ionic-cordova-lib, bump to 5.1.5 to have that change.
+* Fix(lab): Update preview.html to have utf-8 charset meta tag.
+* Style(share): Show the finished message as green
+* Fix(login): Remove lowercase of email.
+* Feature(project): Expose project to module.
+* Fix(upload): Remove entity parsing to fix https://github.com/driftyco/ionic-cli/issues/452#issuecomment-117376542
+* Fix(info): Add check runtime call to show upgrade messages for dependencies that are not fulfilled.
+* Fix(start): Ensure appSetup.bower is set so that the appSetup.bower.length call doesnt cause a run time exception. Handle the exception thrown from initCordova in the chain by rethrowing the exception if the app setup process fails.
+* Fix(platform): Remove console.log command from ionic-cordova-lib, bump to 5.1.5 to have that change.
+* Update ionic-cordova-lib to 5.1.4 for fix with cordova lib run propagating errors to callers.
+* Fix for serve - directory root is using path.join instead of path.resolve.
+* Add build platform to the cordova command. 
+* Bump version of ionic-cordova-lib.
+
 ### 1.5.5
 
 * Fix(start): Fetch codepen was trying to fetch invalid html/css/js files because of a leading '/'. The trailing slash has been removed.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 634a4d1f56..5ff9f249ca 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.5.5",
+  "version": "1.6.0-beta.1",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -52,9 +52,9 @@
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
-          "version": "3.8.2",
+          "version": "3.8.3",
           "from": "htmlparser2@>=3.8.1 <3.9.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
@@ -118,9 +118,9 @@
           }
         },
         "lodash": {
-          "version": "3.9.3",
+          "version": "3.10.0",
           "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
         }
       }
     },
@@ -198,9 +198,9 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.4",
+          "version": "2.6.5",
           "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
         }
       }
     },
@@ -225,9 +225,9 @@
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
-          "version": "0.0.5",
+          "version": "0.0.6",
           "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.5.tgz"
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
@@ -356,9 +356,9 @@
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.5",
+          "version": "3.0.6",
           "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
@@ -376,14 +376,14 @@
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
-              "version": "1.0.0",
+              "version": "1.1.0",
               "from": "chalk@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
               "dependencies": {
                 "ansi-styles": {
-                  "version": "2.0.1",
-                  "from": "ansi-styles@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
@@ -391,38 +391,33 @@
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
-                  "version": "1.0.3",
-                  "from": "has-ansi@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
-                    },
-                    "get-stdin": {
-                      "version": "4.0.1",
-                      "from": "get-stdin@>=4.0.1 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
-                  "version": "2.0.1",
-                  "from": "strip-ansi@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
-                      "version": "1.1.1",
-                      "from": "ansi-regex@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "supports-color": {
-                  "version": "1.3.1",
-                  "from": "supports-color@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                 }
               }
             },
@@ -433,13 +428,13 @@
               "dependencies": {
                 "get-stdin": {
                   "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
-                  "version": "3.1.0",
+                  "version": "3.3.0",
                   "from": "meow@*",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
@@ -504,9 +499,9 @@
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
-              "version": "3.6.1",
+              "version": "3.6.2",
               "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.1.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
@@ -514,9 +509,9 @@
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
-                  "version": "3.0.0",
+                  "version": "3.0.1",
                   "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
@@ -534,24 +529,24 @@
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
-                  "version": "3.1.1",
+                  "version": "3.1.2",
                   "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
                   "dependencies": {
                     "lodash._getnative": {
-                      "version": "3.9.0",
+                      "version": "3.9.1",
                       "from": "lodash._getnative@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
                     },
                     "lodash.isarguments": {
-                      "version": "3.0.3",
+                      "version": "3.0.4",
                       "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.3.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
                     },
                     "lodash.isarray": {
-                      "version": "3.0.3",
+                      "version": "3.0.4",
                       "from": "lodash.isarray@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.3.tgz"
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
                     }
                   }
                 },
@@ -609,9 +604,9 @@
               }
             },
             "object-assign": {
-              "version": "2.0.0",
-              "from": "object-assign@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz"
+              "version": "3.0.0",
+              "from": "object-assign@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
@@ -619,53 +614,63 @@
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
-              "version": "0.6.5",
-              "from": "through2@>=0.6.3 <0.7.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "version": "2.0.0",
+              "from": "through2@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "version": "2.0.1",
+                  "from": "readable-stream@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
                     "isarray": {
                       "version": "0.0.1",
                       "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
+                    "process-nextick-args": {
+                      "version": "1.0.1",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                    },
                     "string_decoder": {
                       "version": "0.10.31",
                       "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    "util-deprecate": {
+                      "version": "1.0.1",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "from": "xtend@>=4.0.0 <4.1.0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
             "vinyl": {
-              "version": "0.4.6",
-              "from": "vinyl@>=0.4.3 <0.5.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "version": "0.5.0",
+              "from": "vinyl@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.0.tgz",
               "dependencies": {
                 "clone": {
-                  "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                  "version": "1.0.2",
+                  "from": "clone@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
@@ -707,9 +712,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.4",
+                          "version": "2.6.5",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -796,107 +801,32 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
-          "version": "1.0.0",
+          "version": "1.1.0",
           "from": "tildify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.0.tgz",
           "dependencies": {
-            "user-home": {
-              "version": "1.1.1",
-              "from": "user-home@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+            "os-homedir": {
+              "version": "1.0.0",
+              "from": "os-homedir@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
             }
           }
         }
       }
     },
     "ionic-app-lib": {
-      "version": "0.2.2",
-      "from": "ionic-app-lib@0.2.2",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.2.2.tgz",
+      "version": "0.3.1",
+      "from": "ionic-app-lib@0.3.1",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.1.tgz",
       "dependencies": {
         "archiver": {
-          "version": "0.14.4",
-          "from": "archiver@0.14.4",
-          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.14.4.tgz",
+          "version": "0.5.2",
+          "from": "archiver@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
           "dependencies": {
-            "buffer-crc32": {
-              "version": "0.2.5",
-              "from": "buffer-crc32@>=0.2.1 <0.3.0",
-              "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
-            },
-            "glob": {
-              "version": "4.3.5",
-              "from": "glob@>=4.3.0 <4.4.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "2.0.8",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.0",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.2.0",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "lazystream": {
-              "version": "0.1.0",
-              "from": "lazystream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
-            },
-            "lodash": {
-              "version": "3.2.0",
-              "from": "lodash@>=3.2.0 <3.3.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"
-            },
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -916,77 +846,153 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
-            "tar-stream": {
-              "version": "1.1.5",
-              "from": "tar-stream@>=1.1.0 <1.2.0",
-              "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.5.tgz",
+            "zip-stream": {
+              "version": "0.1.4",
+              "from": "zip-stream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
               "dependencies": {
-                "bl": {
-                  "version": "0.9.4",
-                  "from": "bl@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz"
-                },
-                "end-of-stream": {
-                  "version": "1.1.0",
-                  "from": "end-of-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
                   "dependencies": {
-                    "once": {
-                      "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "from": "lodash.keys@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
                       "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash.isobject": {
+                          "version": "2.4.1",
+                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1",
+                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
                         }
                       }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
                     }
                   }
-                },
-                "xtend": {
-                  "version": "4.0.0",
-                  "from": "xtend@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                 }
               }
             },
-            "zip-stream": {
-              "version": "0.5.2",
-              "from": "zip-stream@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.2.tgz",
+            "lazystream": {
+              "version": "0.1.0",
+              "from": "lazystream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
+            },
+            "file-utils": {
+              "version": "0.1.5",
+              "from": "file-utils@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
               "dependencies": {
-                "compress-commons": {
-                  "version": "0.2.9",
-                  "from": "compress-commons@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.9.tgz",
+                "lodash": {
+                  "version": "2.1.0",
+                  "from": "lodash@>=2.1.0 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+                },
+                "iconv-lite": {
+                  "version": "0.2.11",
+                  "from": "iconv-lite@>=0.2.11 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+                },
+                "rimraf": {
+                  "version": "2.2.8",
+                  "from": "rimraf@>=2.2.2 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                },
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.6.5",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "0.2.14",
+                  "from": "minimatch@>=0.2.12 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                   "dependencies": {
-                    "crc32-stream": {
-                      "version": "0.3.4",
-                      "from": "crc32-stream@>=0.3.1 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz"
+                    "lru-cache": {
+                      "version": "2.6.5",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                     },
-                    "node-int64": {
-                      "version": "0.3.3",
-                      "from": "node-int64@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz"
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "findup-sync": {
+                  "version": "0.1.3",
+                  "from": "findup-sync@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "2.4.2",
+                      "from": "lodash@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                     }
                   }
+                },
+                "isbinaryfile": {
+                  "version": "0.1.9",
+                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
                 }
               }
+            },
+            "lodash": {
+              "version": "2.4.2",
+              "from": "lodash@>=2.4.1 <2.5.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
             }
           }
         },
         "ionic-cordova-lib": {
-          "version": "5.1.2",
-          "from": "ionic-cordova-lib@5.1.2",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.2.tgz",
+          "version": "5.1.5",
+          "from": "ionic-cordova-lib@5.1.5",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.5.tgz",
           "dependencies": {
             "bplist-parser": {
               "version": "0.0.6",
@@ -1122,9 +1128,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.2.2",
+                      "version": "3.3.0",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.2.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.3.0.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1198,9 +1204,9 @@
                           "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.0.5",
+                              "version": "2.1.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "2.0.1",
@@ -1230,9 +1236,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.0.4",
+                                  "version": "2.1.0",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.4.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.0.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1251,9 +1257,9 @@
                           "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.0.5",
+                              "version": "2.1.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
                             },
                             "elliptic": {
                               "version": "3.1.0",
@@ -1302,9 +1308,9 @@
                           "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.0.5",
+                              "version": "2.1.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
                             },
                             "miller-rabin": {
                               "version": "2.0.1",
@@ -1331,9 +1337,9 @@
                           "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.0.5",
+                              "version": "2.1.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.5.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "2.0.1",
@@ -1346,9 +1352,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.0.4",
+                                  "version": "2.1.0",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.0.4.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.0.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1431,9 +1437,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.5.0",
+                      "version": "6.5.1",
                       "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.1.tgz",
                       "dependencies": {
                         "combine-source-map": {
                           "version": "0.3.0",
@@ -1510,9 +1516,9 @@
                       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
                       "dependencies": {
                         "stream-splicer": {
-                          "version": "1.3.1",
+                          "version": "1.3.2",
                           "from": "stream-splicer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz",
+                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
                           "dependencies": {
                             "readable-wrap": {
                               "version": "1.0.0",
@@ -1534,9 +1540,9 @@
                       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.1.tgz",
                       "dependencies": {
                         "detective": {
-                          "version": "4.1.0",
+                          "version": "4.1.1",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.1.1.tgz",
                           "dependencies": {
                             "acorn": {
                               "version": "1.2.2",
@@ -1928,9 +1934,9 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.6.4",
+                              "version": "2.6.5",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
@@ -2022,9 +2028,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.4",
+                      "version": "2.6.5",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -2048,14 +2054,14 @@
               }
             },
             "init-package-json": {
-              "version": "1.6.0",
+              "version": "1.7.0",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.6.0.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.7.0.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.10",
+                  "version": "5.0.12",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.10.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.12.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2169,26 +2175,14 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.2.1",
+                      "version": "2.3.0",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.0.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
                           "from": "hosted-git-info@>=2.0.2 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "spdx": {
-                          "version": "0.4.1",
-                          "from": "spdx@>=0.4.0 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
-                          "dependencies": {
-                            "spdx-license-ids": {
-                              "version": "1.0.1",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
-                            }
-                          }
                         }
                       }
                     },
@@ -2200,9 +2194,9 @@
                   }
                 },
                 "validate-npm-package-license": {
-                  "version": "1.0.0-prerelease-2",
-                  "from": "validate-npm-package-license@1.0.0-prerelease-2",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-1.0.0-prerelease-2.tgz",
+                  "version": "2.0.0",
+                  "from": "validate-npm-package-license@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
                   "dependencies": {
                     "spdx": {
                       "version": "0.4.1",
@@ -2217,16 +2211,16 @@
                       }
                     },
                     "spdx-correct": {
-                      "version": "1.0.0-prerelease-3",
-                      "from": "spdx-correct@1.0.0-prerelease-3",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0-prerelease-3.tgz"
+                      "version": "1.0.0",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
                     }
                   }
                 },
                 "validate-npm-package-name": {
-                  "version": "2.2.0",
+                  "version": "2.2.2",
                   "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
                   "dependencies": {
                     "builtins": {
                       "version": "0.0.7",
@@ -2589,24 +2583,36 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.2.1",
+                  "version": "2.3.0",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.0.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
                       "from": "hosted-git-info@>=2.0.2 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
-                    "spdx": {
-                      "version": "0.4.1",
-                      "from": "spdx@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
+                    "validate-npm-package-license": {
+                      "version": "2.0.0",
+                      "from": "validate-npm-package-license@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
                       "dependencies": {
-                        "spdx-license-ids": {
-                          "version": "1.0.1",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
+                        "spdx": {
+                          "version": "0.4.1",
+                          "from": "spdx@>=0.4.0 <0.5.0",
+                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
+                          "dependencies": {
+                            "spdx-license-ids": {
+                              "version": "1.0.1",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "spdx-correct": {
+                          "version": "1.0.0",
+                          "from": "spdx-correct@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
                         }
                       }
                     }
@@ -2926,9 +2932,9 @@
                   "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
                 },
                 "fstream": {
-                  "version": "1.0.6",
+                  "version": "1.0.7",
                   "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.7.tgz",
                   "dependencies": {
                     "graceful-fs": {
                       "version": "3.0.8",
@@ -2948,9 +2954,9 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.4.0",
+                      "version": "2.4.1",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
                       "dependencies": {
                         "glob": {
                           "version": "4.5.3",
@@ -3085,15 +3091,392 @@
               }
             }
           }
-        }
-      }
-    },
-    "ncp": {
-      "version": "0.4.2",
-      "from": "ncp@0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
-    },
-    "npm": {
+        },
+        "vinyl-fs": {
+          "version": "1.0.0",
+          "from": "vinyl-fs@1.0.0",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
+          "dependencies": {
+            "duplexify": {
+              "version": "3.4.2",
+              "from": "duplexify@>=3.2.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
+              "dependencies": {
+                "end-of-stream": {
+                  "version": "1.0.0",
+                  "from": "end-of-stream@1.0.0",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.1",
+                  "from": "readable-stream@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.1",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.1",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "glob-stream": {
+              "version": "4.1.1",
+              "from": "glob-stream@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=4.3.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.8",
+                  "from": "minimatch@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ordered-read-streams": {
+                  "version": "0.1.0",
+                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+                },
+                "glob2base": {
+                  "version": "0.0.12",
+                  "from": "glob2base@>=0.0.12 <0.0.13",
+                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1",
+                      "from": "find-index@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "2.2.0",
+                  "from": "unique-stream@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
+                  "dependencies": {
+                    "through2-filter": {
+                      "version": "2.0.0",
+                      "from": "through2-filter@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+                      "dependencies": {
+                        "through2": {
+                          "version": "2.0.0",
+                          "from": "through2@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.1",
+                              "from": "readable-stream@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.1",
+                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.1",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.0",
+                          "from": "xtend@>=4.0.0 <4.1.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "glob-watcher": {
+              "version": "0.0.8",
+              "from": "glob-watcher@>=0.0.8 <0.0.9",
+              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
+              "dependencies": {
+                "gaze": {
+                  "version": "0.5.1",
+                  "from": "gaze@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+                  "dependencies": {
+                    "globule": {
+                      "version": "0.1.0",
+                      "from": "globule@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "1.0.2",
+                          "from": "lodash@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                        },
+                        "glob": {
+                          "version": "3.1.21",
+                          "from": "glob@>=3.1.21 <3.2.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@>=1.2.0 <1.3.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            },
+                            "inherits": {
+                              "version": "1.0.0",
+                              "from": "inherits@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "from": "minimatch@>=0.2.11 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.6.5",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "merge-stream": {
+              "version": "0.1.8",
+              "from": "merge-stream@>=0.1.7 <0.2.0",
+              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "2.1.1",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "from": "strip-bom@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0",
+                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+                },
+                "is-utf8": {
+                  "version": "0.2.0",
+                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "from": "through2@>=0.6.1 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "from": "vinyl@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+    },
+    "npm": {
       "version": "2.1.3",
       "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
@@ -3688,13 +4071,13 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "stackman": {
-          "version": "0.2.2",
+          "version": "0.2.3",
           "from": "stackman@>=0.2.2 <0.3.0",
-          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.2.tgz",
+          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.3.tgz",
           "dependencies": {
             "stackback": {
               "version": "0.0.2",
@@ -3792,9 +4175,9 @@
               }
             },
             "rimraf": {
-              "version": "2.3.4",
+              "version": "2.4.1",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
@@ -3964,14 +4347,14 @@
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.0.13",
+              "version": "2.0.14",
               "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.11.0",
-                  "from": "mime-db@>=1.11.0 <1.12.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
+                  "version": "1.12.0",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
                 }
               }
             }
@@ -4003,9 +4386,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
         },
         "tough-cookie": {
-          "version": "1.2.0",
+          "version": "2.0.0",
           "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
@@ -4246,12 +4629,12 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
@@ -4262,9 +4645,9 @@
               }
             },
             "rimraf": {
-              "version": "2.3.4",
+              "version": "2.4.1",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
               "dependencies": {
                 "glob": {
                   "version": "4.5.3",
@@ -4368,7 +4751,7 @@
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.26 <1.1.0",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
@@ -4441,7 +4824,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -4549,9 +4932,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.4",
+                          "version": "2.6.5",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -4612,7 +4995,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -4679,9 +5062,9 @@
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.9.3",
+              "version": "3.10.0",
               "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz"
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index 03c72cda31..8267a32255 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.0",
+  "version": "1.6.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.0",
+    "ionic-app-lib": "0.3.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 1c91eedf8cf77ba61e9e24979fb7765d7e22716e Mon Sep 17 00:00:00 2001
From: Mike Carter <mike@buddasworld.co.uk>
Date: Wed, 1 Jul 2015 23:53:10 +0100
Subject: [PATCH 0727/1100] Fixed spelling mistake of error output in 3 places

Fixes #511
---
 lib/cli.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 96d2500795..0e1c57e83f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -464,7 +464,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
         process.stdout.write('+---------------------------------------------------------+\n'.green);
       } catch(ex) {
         console.log('ex', ex.stack);
-        q.reject('Error occured in downloading the CLI messages:', ex)
+        q.reject('Error occurred in downloading the CLI messages:', ex)
         Utils.fail(ex);
         q.reject(ex);
         return
@@ -486,7 +486,7 @@ Cli.reportExtras = function reportExtras(err) {
   var commandLineInfo = process.argv;
 
   // if (Cli.dev()) {
-  //   console.log('An error occured and was reported to Opbeat', err);
+  //   console.log('An error occurred and was reported to Opbeat', err);
   //   console.log(err.stack);
   // }
 
@@ -503,7 +503,7 @@ Cli.gatherInfo = function gatherInfo() {
 };
 
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
-  console.log('An uncaught exception occured and has been reported to Ionic'.error.bold);
+  console.log('An uncaught exception occurred and has been reported to Ionic'.error.bold);
   var errorMessage = typeof err === 'string' ? err : err.message;
   Utils.errorHandler(errorMessage);
   process.exit(1);

From 4078e1ebf8e65fef31ca2bf49865eb7085e0d99a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Fri, 3 Jul 2015 13:27:39 -0600
Subject: [PATCH 0728/1100] Release 1.6.0

---
 npm-shrinkwrap.json | 30 +++++++++++++++---------------
 package.json        |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5ff9f249ca..0f40168faf 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.0-beta.1",
+  "version": "1.6.0",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -815,9 +815,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.1",
-      "from": "ionic-app-lib@0.3.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.1.tgz",
+      "version": "0.3.2",
+      "from": "ionic-app-lib@0.3.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1236,9 +1236,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.0",
+                                  "version": "2.1.1",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1352,9 +1352,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.0",
+                                  "version": "2.1.1",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1963,9 +1963,9 @@
                       "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
                     },
                     "through": {
-                      "version": "2.3.7",
+                      "version": "2.3.8",
                       "from": "through@>=2.3.4 <2.4.0",
-                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
                     }
                   }
                 }
@@ -2059,9 +2059,9 @@
               "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.7.0.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.12",
+                  "version": "5.0.13",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.12.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.13.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2824,9 +2824,9 @@
                   "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
                 },
                 "tunnel-agent": {
-                  "version": "0.4.0",
+                  "version": "0.4.1",
                   "from": "tunnel-agent@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                 },
                 "tough-cookie": {
                   "version": "2.0.0",
@@ -3109,7 +3109,7 @@
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
diff --git a/package.json b/package.json
index 8267a32255..7aaf1f51d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.0-beta.1",
+  "version": "1.6.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.1",
+    "ionic-app-lib": "0.3.2",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From cfd7ea48a500a63640d503cd4ee9a8ee58645b31 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 4 Jul 2015 11:40:04 -0600
Subject: [PATCH 0729/1100] Bump CLI to 1.6.1. Bump the ionic-app-lib to 0.3.3

---
 npm-shrinkwrap.json | 74 ++++++++++++++++++++-------------------------
 package.json        |  4 +--
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0f40168faf..26fbc4fa0c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -815,9 +815,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.2",
-      "from": "ionic-app-lib@0.3.2",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.2.tgz",
+      "version": "0.3.3",
+      "from": "ionic-app-lib@0.3.3",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1204,9 +1203,9 @@
                           "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.1.0",
+                              "version": "2.2.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "2.0.1",
@@ -1257,9 +1256,9 @@
                           "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.1.0",
+                              "version": "2.2.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "elliptic": {
                               "version": "3.1.0",
@@ -1308,9 +1307,9 @@
                           "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.1.0",
+                              "version": "2.2.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "miller-rabin": {
                               "version": "2.0.1",
@@ -1337,9 +1336,9 @@
                           "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.1.0",
+                              "version": "2.2.0",
                               "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.1.0.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "2.0.1",
@@ -1437,43 +1436,34 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.5.1",
+                      "version": "6.5.2",
                       "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.1.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.2.tgz",
                       "dependencies": {
                         "combine-source-map": {
-                          "version": "0.3.0",
-                          "from": "combine-source-map@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "version": "0.6.1",
+                          "from": "combine-source-map@>=0.6.1 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
                           "dependencies": {
+                            "convert-source-map": {
+                              "version": "1.1.1",
+                              "from": "convert-source-map@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.1.tgz"
+                            },
                             "inline-source-map": {
-                              "version": "0.3.1",
-                              "from": "inline-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-                              "dependencies": {
-                                "source-map": {
-                                  "version": "0.3.0",
-                                  "from": "source-map@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "0.1.1",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
+                              "version": "0.5.0",
+                              "from": "inline-source-map@>=0.5.0 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
                             },
-                            "convert-source-map": {
-                              "version": "0.3.5",
-                              "from": "convert-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            "lodash.memoize": {
+                              "version": "3.0.4",
+                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
                             },
                             "source-map": {
-                              "version": "0.1.43",
-                              "from": "source-map@>=0.1.31 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "version": "0.4.2",
+                              "from": "source-map@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
                               "dependencies": {
                                 "amdefine": {
                                   "version": "0.1.1",
@@ -3109,7 +3099,7 @@
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
diff --git a/package.json b/package.json
index 7aaf1f51d9..a5f51d6627 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.2",
+    "ionic-app-lib": "0.3.3",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 0bce662fe7bc5b84f1c521e5d491f54da514a1b0 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sun, 5 Jul 2015 21:28:46 -0500
Subject: [PATCH 0730/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e505c7e72f..e126dc6719 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In the future, it will also have support for our mobile development services and tools that make Ionic even more powerful.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!) easy integration with the [Ionic Platform], a set of mobile services perfect for Ionic apps.
 
 Use the `ionic --help` command for more detailed task information.
 

From 6bc839834b750609dc0e94fec9139063d6c1a4ef Mon Sep 17 00:00:00 2001
From: Can Tecim <can.tecim@gmail.com>
Date: Sat, 11 Jul 2015 18:37:06 +0300
Subject: [PATCH 0731/1100] encoding options

fs.readFileSync and fs.writeFileSync encoding options passed with an object

There was a bug in non-latin characters that will be convert them to html entities
---
 lib/hooks/after_prepare/010_add_platform_class.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index bda3e41585..06049c2898 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -19,7 +19,9 @@ function addPlatformBodyTag(indexPath, platform) {
     var platformClass = 'platform-' + platform;
     var cordovaClass = 'platform-cordova platform-webview';
 
-    var html = fs.readFileSync(indexPath, 'utf8');
+    var html = fs.readFileSync(indexPath, {
+      encoding: 'utf8'
+    });
 
     var bodyTag = findBodyTag(html);
     if(!bodyTag) return; // no opening body tag, something's wrong
@@ -43,7 +45,9 @@ function addPlatformBodyTag(indexPath, platform) {
 
     html = html.replace(bodyTag, newBodyTag);
 
-    fs.writeFileSync(indexPath, html, 'utf8');
+    fs.writeFileSync(indexPath, html, {
+      encoding: 'utf8'
+    });
 
     process.stdout.write('add to body class: ' + platformClass + '\n');
   } catch(e) {

From 78ec6f8c7e0102bdfd0dcf08165556adf02598da Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Thu, 16 Jul 2015 14:02:38 -0500
Subject: [PATCH 0732/1100] Remove extra call from add

---
 lib/ionic/add.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index bd3b2da7e6..022280c21b 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -96,7 +96,6 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // Inject the component into our index.html, if necessary, and save the app_id
   ioLib.injectIoComponent(ioSet, componentName);
-  ioLib.writeIoConfig('app_id', ioLib.getAppId(), true);
 
 }
 

From b86126ce019d8a9edf15062afdfa450cbfce33c8 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Fri, 17 Jul 2015 07:24:33 -0500
Subject: [PATCH 0733/1100] Added deploy flag to ionic upload cmd

---
 lib/ionic/upload.js   | 3 ++-
 lib/tasks/cliTasks.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index b1d7d0d98d..2c31f89ab7 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -13,6 +13,7 @@ IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic, argv) {
   var note = argv.note;
+  var deploy = argv.deploy || false;
 
   IonicStats.t();
 
@@ -25,7 +26,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return jar;
   })
   .then(function(jar) {
-    return Upload.doUpload(process.cwd(), jar, note);
+    return Upload.doUpload(process.cwd(), jar, note, deploy);
   })
   .catch(function(ex) {
     // console.log('Error', ex, ex.stack);
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 78bcc5ea82..c81f20b8b5 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -247,7 +247,8 @@ var TASKS = [
     options: {
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password',
-      '--note': 'The note to signify the upload'
+      '--note': 'The note to signify the upload',
+      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
     },
     alt: ['up'],
     module: './ionic/upload'

From 8be679c163f489e95d977f050b9af22f10c0973f Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Fri, 17 Jul 2015 10:00:51 -0500
Subject: [PATCH 0734/1100] Warnings

---
 lib/ionic/add.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 022280c21b..01f593b59a 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -96,7 +96,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   // Inject the component into our index.html, if necessary, and save the app_id
   ioLib.injectIoComponent(ioSet, componentName);
-
+  ioLib.warnMissingData();
 }
 
 exports.IonicTask = IonicTask;

From 3ee376545816b6c7ef8633f9825605ea9f9b4fb7 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Mon, 20 Jul 2015 09:40:57 -0500
Subject: [PATCH 0735/1100] ionic config build

---
 lib/ionic/io-config.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 4a46ee7689..79bbf23be5 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -1,5 +1,6 @@
 var ioLib = require('ionic-app-lib').ioConfig,
     argv = require('optimist').argv,
+    fs = require('fs'),
     prompt = require('prompt'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
@@ -24,26 +25,33 @@ IonicTask.prototype.run = function(ionic) {
   }
 
   var set = false,
+      build = false,
       key = '',
       val = '';
 
-  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset') {
-    if (argv['_'][1] == 'set') {
-      set = true;
-    }
-    if (argv['_'][2]) {
-      key = argv['_'][2];
-      if (argv['_'][3] && set) {
-        val = argv['_'][3];
-      }
+  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset' || argv['_'][1] == 'build') {
+    if (argv['_'][1] == 'build') {
+      build = true;
+      ioLib.writeIoConfig(false, false, true);
     } else {
-      self.ionic.fail("Invalid syntax, use 'ionic config <command> key value'");
+      if (argv['_'][1] == 'set') {
+        set = true;
+      }
+      if (argv['_'][2]) {
+        key = argv['_'][2];
+        if (argv['_'][3] && set) {
+          val = argv['_'][3];
+        }
+      } else {
+        self.ionic.fail("Invalid syntax, use 'ionic config <command> key value'");
+      }
     }
   } else {
     self.ionic.fail("Invalid command, must use 'set' or 'unset'");
   }
-
-  ioLib.writeIoConfig(key, val, set);
+  if (!build) {
+    ioLib.writeIoConfig(key, val, set);
+  }
 };
 
 exports.IonicTask = IonicTask;

From ff04781e49a21e94e2283cfe80b380dd1ed1866f Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 21 Jul 2015 10:23:52 -0500
Subject: [PATCH 0736/1100] Added list

---
 lib/ionic/io-config.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 79bbf23be5..6f72a1072f 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -25,14 +25,17 @@ IonicTask.prototype.run = function(ionic) {
   }
 
   var set = false,
-      build = false,
+      write = false,
       key = '',
       val = '';
 
-  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset' || argv['_'][1] == 'build') {
+  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset' || argv['_'][1] == 'build' || argv['_'][1] == 'info') {
     if (argv['_'][1] == 'build') {
-      build = true;
+      write = true;
       ioLib.writeIoConfig(false, false, true);
+    } else if (argv['_'][1] == 'info') {
+      write = true;
+      ioLib.listConfig();
     } else {
       if (argv['_'][1] == 'set') {
         set = true;
@@ -49,7 +52,7 @@ IonicTask.prototype.run = function(ionic) {
   } else {
     self.ionic.fail("Invalid command, must use 'set' or 'unset'");
   }
-  if (!build) {
+  if (!write) {
     ioLib.writeIoConfig(key, val, set);
   }
 };

From 28e63a20187d10cb5aef61034acdfb1ebb55b355 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Thu, 23 Jul 2015 10:32:26 -0500
Subject: [PATCH 0737/1100] Tooltips

---
 lib/tasks/cliTasks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index c81f20b8b5..8e4fab8702 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -321,9 +321,9 @@ var TASKS = [
   {
     title: 'config',
     name: 'config',
-    summary: 'Set configuration variables for your ionic app.',
+    summary: 'Set configuration variables for your ionic app ' + '(alpha)'.red,
     args: {
-      '<command>': '"set unset"',
+      '<command>': 'set'.yellow + ', ' + 'unset'.yellow + ', ' + 'build'.yellow + ', or ' + 'info'.yellow,
       '[key]': 'The key to set',
       '[value]': 'The value to set'
     },

From 5f28852f1d190036ab56ba8e51a960cc4059106f Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 23 Jul 2015 09:56:24 -0600
Subject: [PATCH 0738/1100] Feature(start): Add task readme to include zip file
 url for download

---
 lib/tasks/cliTasks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index a8a7d58896..038543f3ab 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -53,7 +53,8 @@ var TASKS = [
         boolean: true
       },
       '--io-app-id': 'The Ionic.io app ID to use',
-      '--template|-t': 'Project starter template'
+      '--template|-t': 'Project starter template',
+      '--zip-file|-z': 'URL to download zipfile for starter template'
     },
     module: './ionic/start'
   },

From db6ce8284f80525a0a42d0a081acb00ecf60cc82 Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Fri, 24 Jul 2015 10:11:25 -0500
Subject: [PATCH 0739/1100] io init skeleton

---
 lib/ionic/io-config.js | 2 +-
 lib/tasks/cliTasks.js  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index 6f72a1072f..e0f39c05ec 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -50,7 +50,7 @@ IonicTask.prototype.run = function(ionic) {
       }
     }
   } else {
-    self.ionic.fail("Invalid command, must use 'set' or 'unset'");
+    self.ionic.fail("Invalid command, must use 'set', 'unset', 'build', or 'info'");
   }
   if (!write) {
     ioLib.writeIoConfig(key, val, set);
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 8e4fab8702..7c24e32924 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -306,6 +306,15 @@ var TASKS = [
     // },
     module: './ionic/app'
   },
+  {
+    title: 'io',
+    name: 'io',
+    summary: 'Integrate your app with the ionic.io platform services ' + '(alpha)'.red,
+    options: {
+      '<command>': 'set'.yellow
+    },
+    module: './ionic/io-init'
+  },
   {
     title: 'push',
     name: 'push',

From 1b62d9e56c1e3b326e51747ff07d4620aca107de Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Mon, 27 Jul 2015 15:16:58 -0500
Subject: [PATCH 0740/1100] io init command

---
 lib/cli.js           | 14 ++++++-------
 lib/ionic/io-init.js | 48 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 lib/ionic/io-init.js

diff --git a/lib/cli.js b/lib/cli.js
index ac80bfd403..e25860b04f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -15,7 +15,7 @@ var Cli = module.exports,
 Cli.Tasks = TASKS = Tasks;
 
 Cli.IONIC_DASH = 'https://apps.ionic.io';
-//Cli.IONIC_DASH: 'http://localhost:8000';
+//Cli.IONIC_DASH = 'http://localhost:8000';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
@@ -28,7 +28,7 @@ Cli.PRIVATE_PATH = '.ionic';
 
 // The main entry point for the CLI
 // This takes the process.argv array for arguments
-// The args passed should be unfiltered. 
+// The args passed should be unfiltered.
 // From here, we will filter the options/args out
 // using optimist. Each command is responsible for
 // parsing out the args/options in the way they need.
@@ -37,7 +37,7 @@ Cli.run = function run(processArgv) {
 
   try {
     //First we parse out the args to use them.
-    //Later, we will fetch the command they are trying to 
+    //Later, we will fetch the command they are trying to
     //execute, grab those options, and reparse the arguments.
     var argv = optimist(processArgv.slice(2)).argv;
 
@@ -414,7 +414,7 @@ Cli.processExit = function processExit(code) {
     Q.all([Cli.latestVersion.promise, Cli.cliNews.promise])
     .then(function() {
       process.exit(code);
-    })  
+    })
   } else {
     Cli.latestVersion.promise.then(function() {
       process.exit(code);
@@ -429,7 +429,7 @@ Cli.version = function version() {
 Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   if(typeof skipNewsCheck == 'undefined') {
     skipNewsCheck = true;
-  } 
+  }
 
   var q = Cli.cliNews = Q.defer();
   var proxy = process.env.PROXY || null;
@@ -483,7 +483,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   return q.promise;
 };
 
-//A little why on this reportExtras here - 
+//A little why on this reportExtras here -
 //We need to access the CLI's package.json file
 //for that, we need the path to be relative to this,
 //not the node_module/ionic-app-lib directory
@@ -546,7 +546,7 @@ Cli.attachErrorHandling = function attachErrorHandling() {
   opbeat.handleUncaughtExceptions(Cli.handleUncaughtExceptions);
 };
 
-//Backwards compatability for those commands that havent been 
+//Backwards compatability for those commands that havent been
 //converted yet.
 Cli.fail = function fail(err, taskHelp) {
   // var error = typeof err == 'string' ? new Error(err) : err;
diff --git a/lib/ionic/io-init.js b/lib/ionic/io-init.js
new file mode 100644
index 0000000000..24c10ccbe2
--- /dev/null
+++ b/lib/ionic/io-init.js
@@ -0,0 +1,48 @@
+var ioLib = require('ionic-app-lib').ioConfig,
+    argv = require('optimist').argv,
+    prompt = require('prompt'),
+    IonicProject = require('./project'),
+    IonicTask = require('./task').IonicTask,
+    Task = require('./task').Task,
+    Login = require('ionic-app-lib').login,
+    LoginTask = require('./login');
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic) {
+  var self = this;
+  self.ionic = ionic;
+
+  self.project = null;
+
+  try {
+    self.project = IonicProject.load();
+  } catch (ex) {
+    self.ionic.fail(ex.message);
+    return
+  }
+
+  Login.retrieveLogin()
+  .then(function(jar){
+    if (!jar) {
+      console.log('No previous login existed. Attempting to log in now.');
+      return LoginTask.login(argv);
+    }
+    return jar;
+  })
+  .then(function(jar) {
+    if (argv['_'][1] == 'init') {
+      ioLib.initIoPlatform(process.cwd(), jar);
+    } else {
+      self.ionic.fail("Invalid command");
+    }
+  })
+  .catch(function(ex) {
+    console.log('Error', ex, ex.stack);
+    Utils.fail(ex);
+  });
+};
+
+exports.IonicTask = IonicTask;

From 195c06140d0c8179758d778ea78980e2371dfba6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Jul 2015 09:50:02 -0600
Subject: [PATCH 0741/1100] Bump version to 1.6.2. Update changelog. Shrinkwrap

---
 CHANGELOG.md        |  11 +++
 npm-shrinkwrap.json | 177 +++++++++++++++++++++++++-------------------
 package.json        |   4 +-
 3 files changed, 114 insertions(+), 78 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af91343d5d..169fc58549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### 1.6.2
+
+* Added `io init` command to initialize your project with ionic.io.
+* Added config command to centralize ionic.io services configuration.
+* Added `--deploy` flag to upload command. 
+
+### 1.6.1
+
+* Fix(share): Properly checking that the app exists with app id before attemping to upload. Fix login passing args to get from args or prompting.
+* Fix(spelling): Fix spelling mistake of CLI output.
+
 ### 1.6.0
 
 * Fix(upload): Bumped archiver back to 0.5.1 - it was causing an issue related to unzipped compressed files on Android devices - see: https://github.com/driftyco/ionic-cli/issues/494 and https://github.com/archiverjs/node-archiver/issues/113.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 26fbc4fa0c..ff9a325264 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -815,8 +815,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.3",
-      "from": "ionic-app-lib@0.3.3",
+      "version": "0.3.6",
+      "from": "ionic-app-lib@0.3.6",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.6.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -989,9 +990,9 @@
           }
         },
         "ionic-cordova-lib": {
-          "version": "5.1.5",
-          "from": "ionic-cordova-lib@5.1.5",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.5.tgz",
+          "version": "5.1.7",
+          "from": "ionic-cordova-lib@5.1.7",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.7.tgz",
           "dependencies": {
             "bplist-parser": {
               "version": "0.0.6",
@@ -1051,9 +1052,9 @@
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
                                   "dependencies": {
                                     "amdefine": {
-                                      "version": "0.1.1",
+                                      "version": "1.0.0",
                                       "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                                     }
                                   }
                                 }
@@ -1070,9 +1071,9 @@
                               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                               "dependencies": {
                                 "amdefine": {
-                                  "version": "0.1.1",
+                                  "version": "1.0.0",
                                   "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                                 }
                               }
                             }
@@ -1127,9 +1128,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.3.0",
+                      "version": "3.3.1",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.3.1.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1193,9 +1194,16 @@
                       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz",
                       "dependencies": {
                         "browserify-aes": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "browserify-aes@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.2.tgz",
+                          "dependencies": {
+                            "buffer-xor": {
+                              "version": "1.0.2",
+                              "from": "buffer-xor@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.2.tgz"
+                            }
+                          }
                         },
                         "browserify-sign": {
                           "version": "3.0.2",
@@ -1235,9 +1243,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.1",
+                                  "version": "2.1.3",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1312,10 +1320,15 @@
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "miller-rabin": {
-                              "version": "2.0.1",
+                              "version": "2.1.0",
                               "from": "miller-rabin@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.1.0.tgz",
                               "dependencies": {
+                                "bn.js": {
+                                  "version": "3.1.1",
+                                  "from": "bn.js@>=3.1.1 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-3.1.1.tgz"
+                                },
                                 "brorand": {
                                   "version": "1.0.5",
                                   "from": "brorand@>=1.0.1 <2.0.0",
@@ -1351,9 +1364,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.1",
+                                  "version": "2.1.3",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.3.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1404,9 +1417,16 @@
                       "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
                     },
                     "has": {
-                      "version": "1.0.0",
+                      "version": "1.0.1",
                       "from": "has@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+                      "dependencies": {
+                        "function-bind": {
+                          "version": "1.0.2",
+                          "from": "function-bind@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
+                        }
+                      }
                     },
                     "htmlescape": {
                       "version": "1.1.0",
@@ -1461,14 +1481,14 @@
                               "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
                             },
                             "source-map": {
-                              "version": "0.4.2",
+                              "version": "0.4.4",
                               "from": "source-map@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
                               "dependencies": {
                                 "amdefine": {
-                                  "version": "0.1.1",
+                                  "version": "1.0.0",
                                   "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                                 }
                               }
                             }
@@ -1525,9 +1545,9 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.8.1",
+                      "version": "3.9.0",
                       "from": "module-deps@>=3.7.11 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.8.1.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.0.tgz",
                       "dependencies": {
                         "detective": {
                           "version": "4.1.1",
@@ -1602,9 +1622,9 @@
                                   "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
                                   "dependencies": {
                                     "amdefine": {
-                                      "version": "0.1.1",
+                                      "version": "1.0.0",
                                       "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                                     }
                                   }
                                 }
@@ -1761,9 +1781,9 @@
                       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
                       "dependencies": {
                         "minimist": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
                         }
                       }
                     },
@@ -1836,9 +1856,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.4.23",
+                  "version": "2.4.24",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.23.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -1851,9 +1871,9 @@
                       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
                       "dependencies": {
                         "amdefine": {
-                          "version": "0.1.1",
+                          "version": "1.0.0",
                           "from": "amdefine@>=0.0.4",
-                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                         }
                       }
                     },
@@ -1894,9 +1914,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.8",
+              "version": "1.1.9",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.8.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.9.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -2044,14 +2064,14 @@
               }
             },
             "init-package-json": {
-              "version": "1.7.0",
+              "version": "1.7.1",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.7.0.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.7.1.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.13",
+                  "version": "5.0.14",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.13.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2071,9 +2091,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.8",
+                      "version": "2.0.10",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -2114,9 +2134,9 @@
                   }
                 },
                 "npm-package-arg": {
-                  "version": "4.0.1",
+                  "version": "4.0.2",
                   "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
@@ -2124,9 +2144,9 @@
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "semver": {
-                      "version": "4.3.6",
-                      "from": "semver@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+                      "version": "5.0.1",
+                      "from": "semver@>=4.0.0 <5.0.0||>=5.0.0 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"
                     }
                   }
                 },
@@ -2165,9 +2185,9 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.3.0",
+                      "version": "2.3.1",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.1.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
@@ -2194,9 +2214,9 @@
                       "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
                     },
@@ -2573,9 +2593,9 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.3.0",
+                  "version": "2.3.1",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.1.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
@@ -2593,9 +2613,9 @@
                           "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
                         },
@@ -2629,7 +2649,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -2944,14 +2964,14 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.4.1",
+                      "version": "2.4.2",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
                       "dependencies": {
                         "glob": {
-                          "version": "4.5.3",
-                          "from": "glob@>=4.4.2 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                          "version": "5.0.14",
+                          "from": "glob@>=5.0.14 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
                           "dependencies": {
                             "inflight": {
                               "version": "1.0.4",
@@ -2966,9 +2986,9 @@
                               }
                             },
                             "minimatch": {
-                              "version": "2.0.8",
+                              "version": "2.0.10",
                               "from": "minimatch@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                               "dependencies": {
                                 "brace-expansion": {
                                   "version": "1.1.0",
@@ -3000,6 +3020,11 @@
                                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                                 }
                               }
+                            },
+                            "path-is-absolute": {
+                              "version": "1.0.0",
+                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                             }
                           }
                         }
@@ -3112,9 +3137,9 @@
                   }
                 },
                 "readable-stream": {
-                  "version": "2.0.1",
+                  "version": "2.0.2",
                   "from": "readable-stream@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
@@ -3132,9 +3157,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -3179,7 +3204,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -3192,9 +3217,9 @@
                   }
                 },
                 "minimatch": {
-                  "version": "2.0.8",
+                  "version": "2.0.10",
                   "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
                     "brace-expansion": {
                       "version": "1.1.0",
@@ -3248,9 +3273,9 @@
                           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
                           "dependencies": {
                             "readable-stream": {
-                              "version": "2.0.1",
+                              "version": "2.0.2",
                               "from": "readable-stream@>=2.0.0 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
@@ -3268,9 +3293,9 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "process-nextick-args": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
                                 },
                                 "string_decoder": {
                                   "version": "0.10.31",
diff --git a/package.json b/package.json
index a5f51d6627..a79c3cbca4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.3",
+    "ionic-app-lib": "0.3.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 67f6db01bce8fb49ceab13998acb34cbe9901f0b Mon Sep 17 00:00:00 2001
From: Rudy <drawncloser@gmail.com>
Date: Tue, 28 Jul 2015 11:14:57 -0500
Subject: [PATCH 0742/1100] Tooltip

---
 lib/tasks/cliTasks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7c24e32924..88b74fbfaa 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -310,8 +310,8 @@ var TASKS = [
     title: 'io',
     name: 'io',
     summary: 'Integrate your app with the ionic.io platform services ' + '(alpha)'.red,
-    options: {
-      '<command>': 'set'.yellow
+    args: {
+      '<command>': 'init'.yellow
     },
     module: './ionic/io-init'
   },

From 16f057c2ab16af013db58028bf3cd25da2b55f74 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 28 Jul 2015 10:46:30 -0600
Subject: [PATCH 0743/1100] Bump package, shrinkwrap. Update changelog

---
 CHANGELOG.md        |  4 ++++
 npm-shrinkwrap.json | 12 ++++++------
 package.json        |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 169fc58549..a74e0f4a0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.3
+
+* Updated tooltips for io command.
+
 ### 1.6.2
 
 * Added `io init` command to initialize your project with ionic.io.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ff9a325264..6616476a8e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -815,9 +815,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.6",
-      "from": "ionic-app-lib@0.3.6",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.6.tgz",
+      "version": "0.3.7",
+      "from": "ionic-app-lib@0.3.7",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.7.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -2649,7 +2649,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -3204,7 +3204,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
diff --git a/package.json b/package.json
index a79c3cbca4..e79b1844c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.6",
+    "ionic-app-lib": "0.3.7",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 62069a40d1439d6ba1ca3ba063602e84166ef629 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Thu, 30 Jul 2015 13:02:38 -0500
Subject: [PATCH 0744/1100] bumping version to 1.6.4-beta.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e79b1844c9..3ecddcc830 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.3",
+  "version": "1.6.4-beta.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.7",
+    "ionic-app-lib": "0.3.8-beta.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From b48aaaf2aa5180783a1d12bf936b90c40a0f2a71 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Thu, 30 Jul 2015 13:19:46 -0500
Subject: [PATCH 0745/1100] bumping to 1.6.4-beta.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3ecddcc830..04f8915920 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.4-beta.0",
+  "version": "1.6.4-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 409659428c1ca7ae4f33cd3f84c2195c69e42cdf Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Thu, 30 Jul 2015 14:13:30 -0500
Subject: [PATCH 0746/1100] updating shrinkwrap

---
 npm-shrinkwrap.json | 98 +++++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6616476a8e..c5664b5b8b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.3",
+  "version": "1.6.4-beta.1",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -210,9 +210,9 @@
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
-          "version": "2.3.7",
+          "version": "2.3.8",
           "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz"
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
@@ -442,9 +442,9 @@
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.1.0",
+                          "version": "1.2.0",
                           "from": "camelcase@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
@@ -454,9 +454,9 @@
                       }
                     },
                     "indent-string": {
-                      "version": "1.2.1",
+                      "version": "1.2.2",
                       "from": "indent-string@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz",
                       "dependencies": {
                         "repeating": {
                           "version": "1.1.3",
@@ -619,9 +619,9 @@
               "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "2.0.1",
+                  "version": "2.0.2",
                   "from": "readable-stream@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
@@ -639,9 +639,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -750,9 +750,9 @@
           }
         },
         "minimist": {
-          "version": "1.1.1",
+          "version": "1.1.2",
           "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
@@ -766,7 +766,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -806,18 +806,18 @@
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.0.tgz",
           "dependencies": {
             "os-homedir": {
-              "version": "1.0.0",
+              "version": "1.0.1",
               "from": "os-homedir@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
             }
           }
         }
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.7",
-      "from": "ionic-app-lib@0.3.7",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.7.tgz",
+      "version": "0.3.8-beta.1",
+      "from": "ionic-app-lib@0.3.8-beta.1",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.8-beta.1.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1888,9 +1888,9 @@
                       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.1.0",
+                          "version": "1.2.0",
                           "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
                         },
                         "decamelize": {
                           "version": "1.0.0",
@@ -3199,12 +3199,12 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -4080,9 +4080,9 @@
           }
         },
         "console-log-level": {
-          "version": "1.0.0",
+          "version": "1.1.0",
           "from": "console-log-level@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.1.0.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.1",
@@ -4190,14 +4190,14 @@
               }
             },
             "rimraf": {
-              "version": "2.4.1",
+              "version": "2.4.2",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=4.4.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "version": "5.0.14",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -4217,9 +4217,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.8",
+                      "version": "2.0.10",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -4251,6 +4251,11 @@
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
                 }
@@ -4396,9 +4401,9 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
-          "version": "0.4.0",
+          "version": "0.4.1",
           "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
           "version": "2.0.0",
@@ -4660,14 +4665,14 @@
               }
             },
             "rimraf": {
-              "version": "2.4.1",
+              "version": "2.4.2",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.1.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=4.4.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "version": "5.0.14",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -4682,9 +4687,9 @@
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.8",
+                      "version": "2.0.10",
                       "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.0",
@@ -4716,6 +4721,11 @@
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
                 }
@@ -4839,7 +4849,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
@@ -4857,9 +4867,9 @@
               }
             },
             "minimatch": {
-              "version": "2.0.8",
+              "version": "2.0.10",
               "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.0",

From d43af1c933e81dc62cd9e0d752a41f827c85bd7f Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Thu, 30 Jul 2015 14:45:51 -0500
Subject: [PATCH 0747/1100] 1.6.4 release

---
 CHANGELOG.md        |  4 ++++
 npm-shrinkwrap.json | 14 +++++++-------
 package.json        |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74e0f4a0b..9864c66b73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.4
+
+* Updating app-lib dependency
+
 ### 1.6.3
 
 * Updated tooltips for io command.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c5664b5b8b..3c32e430a5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.4-beta.1",
+  "version": "1.6.4",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -815,9 +815,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.8-beta.1",
-      "from": "ionic-app-lib@0.3.8-beta.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.8-beta.1.tgz",
+      "version": "0.3.8",
+      "from": "ionic-app-lib@0.3.8",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.8.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -3199,12 +3199,12 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -3433,7 +3433,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
diff --git a/package.json b/package.json
index 04f8915920..59a5dc8962 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.4-beta.1",
+  "version": "1.6.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.8-beta.1",
+    "ionic-app-lib": "0.3.8",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From d1ce9696afb8e4f40163a03463ff79cb9e31c51a Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 31 Jul 2015 16:59:03 -0500
Subject: [PATCH 0748/1100] corresponding changes from app lib for start

---
 lib/cli.js         |  3 +++
 lib/ionic/start.js | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index e25860b04f..0d63544fe1 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -10,6 +10,7 @@ var Cli = module.exports,
     settings = require('../package.json'),
     Tasks = require('./tasks/cliTasks'),
     Utils = IonicAppLib.utils,
+    logging = IonicAppLib.logging,
     Q = require('q');
 
 Cli.Tasks = TASKS = Tasks;
@@ -19,6 +20,8 @@ Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
+Cli.defaultLogger = logging.defaultLogger;
+
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
 //     return true;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 8651454039..56549e2e66 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -7,16 +7,19 @@ var fs = require('fs'),
     open = require('open'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
-    Task = require('./task').Task;
+    Cli = require('../cli'),
+    Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
-    cliLib = require('ionic-app-lib'),
-    Start = cliLib.start,
-    Utils = cliLib.utils;
+    IonicAppLib = require('ionic-app-lib'),
+    Start = IonicAppLib.start,
+    Utils = IonicAppLib.utils;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
+Start.logger = Cli.defaultLogger;
+
 IonicTask.prototype.run = function run(ionic, argv) {
 
   if (argv.list || argv.l) {

From dde768f61cabbc84a804fa9d514c9cfa57457ce3 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 11:25:42 -0500
Subject: [PATCH 0749/1100] logger for browser and configxml command

---
 lib/cli.js           | 1 +
 lib/ionic/browser.js | 3 +++
 lib/ionic/cordova.js | 6 ++++--
 lib/ionic/start.js   | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 0d63544fe1..e681b6a792 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -21,6 +21,7 @@ Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
 Cli.defaultLogger = logging.defaultLogger;
+ConfigXml.logger = Cli.defaultLogger;
 
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 99d1dddfd1..25316a6196 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -16,6 +16,7 @@
 //Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
 var argv = require('optimist').argv,
+    Cli = require('../cli'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
@@ -24,6 +25,8 @@ var argv = require('optimist').argv,
     Info = IonicAppLib.info,
     Browser = IonicAppLib.browser;
 
+Browser.logger = Cli.defaultLogger;
+
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index b931af5dc2..d874daaaa6 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,4 +1,5 @@
-var Task = require('./task').Task,
+var Cli = require('../cli'),
+    Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
@@ -17,8 +18,9 @@ var Task = require('./task').Task,
     State = ionicAppLib.state,
     Utils = ionicAppLib.utils;
 
-var IonicTask = function() {};
+ConfigXml.logger = Cli.defaultLogger;
 
+var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 56549e2e66..a26ff08000 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -14,12 +14,11 @@ var fs = require('fs'),
     Start = IonicAppLib.start,
     Utils = IonicAppLib.utils;
 
-var IonicTask = function() {};
+Start.logger = Cli.defaultLogger;
 
+var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
-Start.logger = Cli.defaultLogger;
-
 IonicTask.prototype.run = function run(ionic, argv) {
 
   if (argv.list || argv.l) {

From 7988f59715e1a5adb56dca9e646374687cc05f4f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 11:43:57 -0500
Subject: [PATCH 0750/1100] logger for cordova task

---
 lib/ionic/cordova.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index d874daaaa6..a83af84498 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -10,15 +10,16 @@ var Cli = require('../cli'),
     shelljs = require('shelljs'),
     generate = require('./resources/generate'),
     settings = require('./resources/settings'),
-    ionicAppLib = require('ionic-app-lib'),
-    ConfigXml = ionicAppLib.configXml,
-    Cordova = ionicAppLib.cordova,
-    Hooks = ionicAppLib.hooks,
-    Serve = ionicAppLib.serve,
-    State = ionicAppLib.state,
-    Utils = ionicAppLib.utils;
+    IonicAppLib = require('ionic-app-lib'),
+    ConfigXml = IonicAppLib.configXml,
+    Cordova = IonicAppLib.cordova,
+    Hooks = IonicAppLib.hooks,
+    Serve = IonicAppLib.serve,
+    State = IonicAppLib.state,
+    Utils = IonicAppLib.utils;
 
 ConfigXml.logger = Cli.defaultLogger;
+Cordova.logger = Cli.defaultLogger;
 
 var IonicTask = function() {};
 IonicTask.prototype = new Task();

From 1bbb2ab0b0ba150246941318a5fd655a1ceff7e4 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 13:46:32 -0500
Subject: [PATCH 0751/1100] app-lib logger is now package-level, not
 module-level

---
 lib/cli.js           | 4 ++--
 lib/ionic/browser.js | 3 ---
 lib/ionic/cordova.js | 6 +-----
 lib/ionic/start.js   | 3 ---
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index e681b6a792..1908af6dc7 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -20,8 +20,8 @@ Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
-Cli.defaultLogger = logging.defaultLogger;
-ConfigXml.logger = Cli.defaultLogger;
+// This is where the logger for the app-lib can be configured (or replaced).
+logging.logger.level = 'info';
 
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 25316a6196..99d1dddfd1 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -16,7 +16,6 @@
 //Run project - cordova run android BUILD_MULTIPLE_APKS=true
 
 var argv = require('optimist').argv,
-    Cli = require('../cli'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
@@ -25,8 +24,6 @@ var argv = require('optimist').argv,
     Info = IonicAppLib.info,
     Browser = IonicAppLib.browser;
 
-Browser.logger = Cli.defaultLogger;
-
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index a83af84498..63b5dd8c19 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,5 +1,4 @@
-var Cli = require('../cli'),
-    Task = require('./task').Task,
+var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     Q = require('q'),
@@ -18,9 +17,6 @@ var Cli = require('../cli'),
     State = IonicAppLib.state,
     Utils = IonicAppLib.utils;
 
-ConfigXml.logger = Cli.defaultLogger;
-Cordova.logger = Cli.defaultLogger;
-
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index a26ff08000..5427d5ce41 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -7,15 +7,12 @@ var fs = require('fs'),
     open = require('open'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
-    Cli = require('../cli'),
     Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     IonicAppLib = require('ionic-app-lib'),
     Start = IonicAppLib.start,
     Utils = IonicAppLib.utils;
 
-Start.logger = Cli.defaultLogger;
-
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 

From d7ae1bbf41fd87d071e19a72b0a1708a0c3e1dd4 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 14:34:44 -0500
Subject: [PATCH 0752/1100] using logger in cli, setting log level when
 --verbose

---
 lib/cli.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 1908af6dc7..5561635992 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -64,10 +64,10 @@ Cli.run = function run(processArgv) {
     }
 
     if (argv.verbose) {
-      IonicAppLib.events.on('verbose', console.log);
+      logging.logger.level = 'debug';
     }
 
-    if( (argv.version || argv.v) && !argv._.length) {
+    if ((argv.version || argv.v) && !argv._.length) {
       return Cli.version();
     }
 
@@ -98,8 +98,7 @@ Cli.run = function run(processArgv) {
     var promise = taskInstance.run(Cli, argv);
     return promise;
   } catch (ex) {
-    IonicAppLib.events.emit('verbose', 'Cli.Run - Error', ex);
-    IonicAppLib.events.emit('verbose', 'Cli.run stack - ', ex.stack);
+    logging.logger.debug('Cli.Run - Error', ex);
     return Utils.fail(ex);
   }
 };
@@ -126,8 +125,6 @@ Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
 };
 
 Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
-  IonicAppLib.events.on('log', console.log);
-
   colors.setTheme({
     silly: 'rainbow',
     input: 'grey',
@@ -522,7 +519,7 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 
   Utils.errorHandler = function errorHandler(msg, taskHelp) {
     try {
-      IonicAppLib.events.emit('verbose', 'Cli.Utils.errorHandler msg', msg, typeof msg);
+      logging.logger.verbose('Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       // console.log('stack', stack, arguments.caller);

From b7854aa1a98bd774214feb86e3a9c6b12027f59d Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 14:55:15 -0500
Subject: [PATCH 0753/1100] typo in method name

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 5561635992..4558f9abe6 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -519,7 +519,7 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 
   Utils.errorHandler = function errorHandler(msg, taskHelp) {
     try {
-      logging.logger.verbose('Cli.Utils.errorHandler msg', msg, typeof msg);
+      logging.logger.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       // console.log('stack', stack, arguments.caller);

From 98d7434f6abc8ee339ebb561dc4733eb7fed5d91 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 3 Aug 2015 15:01:38 -0500
Subject: [PATCH 0754/1100] fixing verbosity log level test

---
 spec/cli.spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index dfbc531613..37ae1c021c 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -61,10 +61,11 @@ describe('Cli', function() {
         expect(Ionitron.print).toHaveBeenCalled();
       });
 
-      it('should listen to verbosity when arg is passed', function() {
+      it('should change log level to debug when verbose arg is passed', function() {
         spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+        expect(IonicAppLib.logging.logger.level).toBe('info');
         IonicCli.run(['node', 'bin/ionic', '--verbose']);
-        expect(IonicAppLib.events.on).toHaveBeenCalledWith('verbose', console.log);
+        expect(IonicAppLib.logging.logger.level).toBe('debug');
       });
 
       it('should get version when version flag passed', function() {

From 76d617eb6cacbb5878886653bfc448edf80367a6 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 3 Aug 2015 23:54:34 -0600
Subject: [PATCH 0755/1100] Feature(stats): Add in the email and account id
 from the users ionic.config file to be passed into mixpanel

---
 lib/ionic/stats.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 38e9eeda39..0113116145 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -597,6 +597,14 @@ exports.IonicStats = {
         if(statsData.cli_version.indexOf('beta') > -1) return;
       } catch(e2) {}
 
+      try {
+        statsData.email = ionicConfig.get('email');
+      } catch (e2) {}
+
+      try {
+        statsData.account_id = ionicConfig.get('id');
+      } catch (e2) {}
+
       this.mp(cmdName, statsData);
       //console.log(cmdName, statsData);
 

From 6414ce4c3e9cc106f0e465fc39c7176ab1174560 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 31 Jul 2015 11:35:39 -0500
Subject: [PATCH 0756/1100] starting package command

---
 lib/ionic/package.js  | 640 +++---------------------------------------
 lib/tasks/cliTasks.js |  12 +
 2 files changed, 45 insertions(+), 607 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index e3c0698fa0..0dca98b0b0 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,622 +1,48 @@
-var fs = require('fs'),
-    request = require('request'),
-    path = require('path'),
-    parseUrl = require('url').parse,
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    shelljs = require('shelljs/global'),
-    FormData = require('form-data'),
-    IonicProject = require('./project'),
-    IonicStore = require('./store').IonicStore,
-    Task = require('./task').Task,
-    IonicUploadTask = require('./upload').IonicTask,
-    IonicStats = require('./stats').IonicStats,
-    IonicLoginTask = require('./login').IonicTask,
-    IonicUtils = require('./utils');
+var IonicAppLib = require('ionic-app-lib'),
+    Login = IonicAppLib.login,
+    Package = IonicAppLib.package,
+    LoginTask = require('./login'),
+    Task = require('./task').Task;
 
+var Project = IonicAppLib.project;
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-  self.ionic = ionic;
+IonicTask.prototype.run = function(ionic, argv) {
 
-  self.project = null;
-
-  try {
-    self.project = IonicProject.load();
-  } catch (ex) {
-    self.ionic.fail(ex.message);
-    return
-  }
-
-
-  self.inputFiles = {};
-  self.inputValues = {};
-  self.useCmdArgs = false;
-
-  IonicStats.t();
-
-  if(argv['clear-signing'] || argv.l) {
-    self.clearSigning();
-    return;
-  }
-
-  self.loadProject();
-
-  this.getCmdLineOptions();
-
-  if(self.ionic.hasFailed) return;
-
-  var login = new IonicLoginTask();
-  login.get(self.ionic, function(jar) {
-    self.jar = jar;
-
-    self.loadAppSigning(function(){
-      self.initPlatforms();
-    });
-  });
-
-};
-
-
-IonicTask.prototype.loadProject = function() {
-  var appName = this.project.get('name') || "app";
-  console.log( ('Loading ' + appName + '...').bold.green );
-
-  if(argv._.length < 3) {
-    return this.ionic.fail('No platforms or build mode specified.', 'package');
-  }
-
-  this.mode = argv._[2].toLowerCase();
-  if(this.mode != 'debug' && this.mode != 'release') {
-    // ionic package debug android
-    this.mode = argv._[1].toLowerCase();
-    this.platforms = argv._.slice(2);
-  } else {
-    // ionic package android debug
-    this.platforms = [ argv._[1].toLowerCase() ];
+  if (argv._.length < 2) {
+    return ionic.fail("Specify a valid platform (android or ios).", 'package')
   }
 
-  if(this.mode != 'debug' && this.mode != 'release') {
-    return this.ionic.fail('Package build mode must be "debug" or "release".', 'package');
-  }
-
-  if(this.platforms.length < 1) {
-    return this.ionic.fail('No platforms specified.', 'package');
-  }
-
-  this.buildStatusEmail = (!argv['no-email'] && !argv.n);
-
-  this.loadPlugins();
-};
-
-
-IonicTask.prototype.loadPlugins = function() {
-  this.plugins = [];
+  var dir = null,
+      project = null,
+      appId = null,
+      release = argv.release ? true : false;
 
   try {
-    var pluginsPath = resolvePath('./plugins/');
-    var pluginDirs = fs.readdirSync(pluginsPath);
-
-    for(var x=0; x<pluginDirs.length; x++) {
-      try {
-        var plugingPackage = resolvePath(pluginsPath + '/' + pluginDirs[x] + '/package.json');
-        var packageObj = JSON.parse( fs.readFileSync(plugingPackage, { encoding: 'utf8' }) );
-        if(packageObj.repo || packageObj.name) {
-          this.plugins.push(packageObj);
-        }
-      } catch(e) {}
-    }
-  } catch(pluginError) {
-    return this.ionic.fail('Unable to find plugin directory. Make sure the working directory is an Ionic project.');
-  }
-};
-
-
-IonicTask.prototype.getCmdLineOptions = function() {
-  var self = this;
-
-  function getCmdArgValue(propertyName, shortName) {
-    var value = argv[propertyName] || argv[shortName];
-    if(value) {
-      self.inputValues[propertyName] = value;
-      self.useCmdArgs = true;
-    }
-  }
-
-  function getCmdArgFile(propertyName, shortName) {
-    var value = argv[propertyName] || argv[shortName];
-    if(value) {
-      if(!fileExists(value)) {
-        return self.ionic.fail("Unable to find file: " + argv[propertyName]);
-      }
-      self.inputFiles[propertyName] = value;
-      self.useCmdArgs = true;
-    }
-  }
-
-  getCmdArgValue('android-keystore-alias', 'a');
-  getCmdArgValue('android-keystore-password', 'w');
-  getCmdArgValue('android-key-password', 'r');
-  getCmdArgValue('ios-certificate-password', 'd');
-
-  getCmdArgFile('android-keystore-file', 'k');
-  getCmdArgFile('ios-certificate-file', 'c');
-  getCmdArgFile('ios-profile-file', 'f');
-};
-
-
-IonicTask.prototype.loadAppSigning = function(callback) {
-  var self = this;
-
-  if(self.useCmdArgs) {
-    // if they used cmd line args, don't bother checking
-    callback();
-    return;
-  }
-
-  if(!self.project.get('app_id')) {
-    // if its the first load we won't have an appId yet
-    callback();
-    return;
-  }
-
-  var privateData = new IonicStore(self.project.get('app_id'));
-  var cck = privateData.get('cck');
-  if(!cck) {
-    // if there's no client key don't bother
-    callback();
-    return;
-  }
-
-  var options = {
-    url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/signing',
-    headers: {
-      cookie: IonicUtils.transformCookies(self.jar),
-      cck: cck
-    },
-    proxy: process.env.PROXY || process.env.http_proxy || null
-  };
-
-  request(options, function(err, response, body) {
-    if(err) {
-      return self.ionic.fail("Error loading app signing info: " + err);
-    }
-
-    if(response.statusCode == 200) {
-      try {
-        self.signing = JSON.parse(body);
-
-        if(!self.signing) {
-          return self.ionic.fail("Invalid app signing information");
-        }
-
-      } catch(e) {
-        return self.ionic.fail("Error parsing app signing: " + e);
-      }
-    }
-
-    callback();
-  });
-};
-
-
-IonicTask.prototype.initPlatforms = function() {
-  var self = this;
-
-  if(self.useCmdArgs) {
-    self.packagePlatforms();
-
-  } else {
-    prompt.override = argv;
-    prompt.message = '';
-    prompt.delimiter = '';
-    prompt.start();
-
-    var promptProperties = self.buildPromptProperties();
-
-    prompt.get({properties: promptProperties}, function (err, promptResult) {
-      if(err) {
-        return self.ionic.fail('Error packaging: ' + err);
-      }
-
-      for(var propertyName in promptResult) {
-        var promptValue = promptResult[propertyName];
-        if( !promptValue ) continue;
-
-        if(promptProperties[propertyName].isFile) {
-          self.inputFiles[propertyName] = promptValue;
-        } else {
-          self.inputValues[propertyName] = promptValue;
-        }
-      }
-
-      self.packagePlatforms();
-    });
-  }
-
-};
-
-IonicTask.prototype.packagePlatforms = function() {
-  var self = this;
-  var upload = new IonicUploadTask();
-
-  upload.run(self.ionic, argv, function() {
-    for(var x=0; x<self.platforms.length; x++) {
-      var form = self.buildPostRequest(self.platforms[x]);
-      self.submitPostRequest(form, self.platforms[x]);
-    }
-  });
-};
-
-
-IonicTask.prototype.buildPromptProperties = function() {
-  // Just prompt for some build properties
-  var promptProperties = {};
-
-  for(var x=0; x<this.platforms.length; x++) {
-
-    if(this.platforms[x] == 'android') {
-
-      // Android debug doesn't require anything
-      if(this.mode == 'release') {
-
-        promptProperties['android-keystore-file']= {
-          name: 'android-keystore-file',
-          description: 'Android Keystore File (.keystore):'.yellow.bold,
-          required: true,
-          conform: fileExists,
-          isFile: true
-        };
-
-        promptProperties['android-keystore-alias'] = {
-          name: 'android-keystore-alias',
-          description: 'Keystore Alias:'.yellow.bold.yellow.bold,
-          required: true
-        };
-
-        promptProperties['android-keystore-password'] = {
-          name: 'android-keystore-password',
-          description: 'Keystore Password:'.yellow.bold,
-          hidden: true,
-          required: true
-        };
-
-        promptProperties['android-key-password'] = {
-          name: 'android-key-password',
-          description: 'Key Password (optional):'.yellow.bold,
-          hidden: true
-        };
-      }
-
-    } else if(this.platforms[x] == 'ios') {
-      // iOS
-      promptProperties['ios-certificate-file'] = {
-        name: 'ios-certificate-file',
-        description: 'iOS Certificate File (.p12):'.yellow.bold,
-        required: true,
-        conform: fileExists,
-        isFile: true
-      };
-
-      promptProperties['ios-certificate-password'] = {
-        name: 'ios-certificate-password',
-        description: 'Certificate Password:'.yellow.bold,
-        hidden: true,
-        required: true
-      };
-
-      promptProperties['ios-profile-file'] = {
-        name: 'ios-profile-file',
-        description: 'iOS Mobile Provisioning Profile (.mobileprovision):'.yellow.bold,
-        required: true,
-        conform: fileExists,
-        isFile: true
-      };
-
-    }
-
-  }
-
-  // Don't prompt for properties we already have stored on the server
-  if(this.signing){
-    for (var propertyName in promptProperties) {
-      if(this.signing['is_valid_' + propertyName.replace(/-/g, '_')]) {
-        delete promptProperties[propertyName];
-      }
-    }
-  }
-
-  return promptProperties;
-};
-
-
-IonicTask.prototype.buildPostRequest = function(platform) {
-  var csrfmiddlewaretoken = null;
-
-  csrfmiddlewaretoken = IonicUtils.retrieveCsrfToken(this.jar)
-
-  var form = new FormData();
-
-  form.append('build_status_email', this.buildStatusEmail.toString());
-  form.append('name', this.project.get('name') || '');
-  form.append('platform', platform);
-  form.append('build_mode', this.mode);
-  form.append('csrfmiddlewaretoken', csrfmiddlewaretoken);
-
-  for (var i = 0; i < this.plugins.length; i++) {
-    form.append('plugin_' + i, this.plugins[i].repo ? this.plugins[i].repo : this.plugins[i].name);
-    if(this.plugins[i].name) {
-      form.append('plugin_' + i + '_name', this.plugins[i].name);
-    }
-    if(this.plugins[i].version) {
-      form.append('plugin_' + i + '_version', this.plugins[i].version);
-    }
-  }
-
-  for(var propertyName in this.inputValues) {
-    form.append(propertyName.replace(/-/g, '_'), this.inputValues[propertyName]);
-  }
-
-  for(propertyName in this.inputFiles) {
-    var inputFile = this.inputFiles[propertyName];
-    if( !inputFile ) continue;
-
-    try {
-      inputFile = inputFile.replace(/\\ /g, ' ').trim();
-      form.append(propertyName.replace(/-/g, '_'), fs.createReadStream( resolvePath(inputFile) ) );
-    } catch(e) {
-      return this.ionic.fail("Error loading " + resolvePath(inputFile));
-    }
-  }
-
-  var configFilePath = resolvePath('./config.xml');
-  if(fs.existsSync(configFilePath)){
-    var xmlString = fs.readFileSync(configFilePath, { encoding: 'utf8' });
-    form.append('config_file', xmlString);
-  }
-
-  return form;
-};
-
-
-IonicTask.prototype.submitPostRequest = function(form, platform) {
-  var self = this;
-  var params = parseUrl(self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + self.project.get('app_id') + '/package');
-  var privateData = new IonicStore(this.project.get('app_id'));
-  var headersToTransform = {cookie: IonicUtils.transformCookies(self.jar)};
-
-  console.log((platform + ' ' + self.mode + ' building...').bold);
-  if(privateData.get('cck')) {
-    headersToTransform['cck'] = privateData.get('cck');
-  }
-
-  form.submit({
-    protocol: params.protocol,
-    hostname: params.hostname,
-    port: params.port,
-    path: params.path,
-    headers: form.getHeaders(headersToTransform)
-  },
-  function(err, response) {
-
-    if(err) {
-      return self.ionic.fail("Error packaging " + platform + ": " + err);
-    }
-
-    response.setEncoding('utf8');
-    response.on("data", function(data) {
-      try {
-        var d = JSON.parse(data);
-
-        if(d.errors && d.errors.length) {
-          for (var j = 0; j < d.errors.length; j++) {
-            console.log( d.errors[j].bold.error );
-          }
-          console.log('');
-
-        } else if(d.build_status_url) {
-          process.stderr.write('.');
-          setTimeout(function(){
-            var requestOptions = {
-              url: d.build_status_url,
-              headers: {
-                cookie: IonicUtils.transformCookies(self.jar)
-              }
-            };
-            pingBuildStatus(self.ionic, requestOptions, platform, 1);
-          }, 5000);
-        }
-
-        if(d.cck) {
-          var privateData = new IonicStore(self.project.get('app_id'));
-          privateData.set('cck', d.cck);
-          privateData.save();
-        }
-
-        if(d.app_id) {
-          self.project.set('app_id', d.app_id);
-        }
-        if(d.name) {
-          self.project.set('name', d.name);
-        }
-        self.project.save();
-
-      } catch(e) {
-        return self.ionic.fail('Error submitPostRequest: ' + e);
-      }
+    dir = process.cwd();
+    project = Project.load(dir);
+    appId = project.get('app_id');
+  } catch (ex) {
+    return Utils.fail(ex.message);
+  }
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(jar) {
+      Package.doPackage(appId, dir, jar, release);
+    })
+    .catch(function(ex) {
+      Utils.fail(ex);
     });
 
-  });
 };
 
-
-IonicTask.prototype.clearSigning = function() {
-  var self = this;
-  console.log('Clearing app signing and credential information...'.yellow.bold);
-
-  var appId = self.project.get('app_id');
-
-  if(!appId) {
-    return self.ionic.fail('App Id is not known');
-  }
-
-  var login = new IonicLoginTask();
-  login.get(self.ionic, function(jar) {
-    var options = {
-      url: self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + appId + '/signing/clear',
-      headers: {
-        cookie: IonicUtils.transformCookies(self.jar)
-      },
-      proxy: process.env.PROXY || null
-    };
-
-    request(options, function(err, response, body) {
-      if(err) {
-        return self.ionic.fail("Error clearing app signing: " + err);
-      }
-      console.log( ('App (' + appId + ') signing and credential information cleared\n').green.bold );
-    });
-  });
-};
-
-
-function pingBuildStatus(ionic, requestOptions, platform, attempt) {
-  process.stderr.clearLine();
-  process.stderr.cursorTo(0);
-
-  for(var x=0; x<attempt; x++) {
-    process.stderr.write('.');
-  }
-
-  request(requestOptions, function(err, response, body) {
-    if(err) {
-      return ionic.fail("\nError pinging build status: " + err);
-    }
-
-    try {
-      var d = JSON.parse(body);
-
-      if(d.errors && d.errors.length) {
-        for(var x=0; x<d.errors.length; x++) {
-          console.log( ('\n' + d.errors[x]).bold.red );
-        }
-        return;
-      }
-
-      if(d.message) {
-        console.log( ('\n' + d.message).bold.red );
-      }
-
-      // STATUS_INITIALIZED = 0
-      // STATUS_QUEUED      = 1
-      // STATUS_BUILDING    = 2
-      // STATUS_SUCCESS     = 3
-      // STATUS_FAILED      = 4
-
-      if(d.status >= 0 && d.status < 3) {
-        // still queued/building
-        attempt++;
-
-        if(attempt > 60) {
-          return ionic.fail("\nUnable to receive build status");
-        }
-
-        setTimeout(function(){
-          pingBuildStatus(ionic, requestOptions, platform, attempt);
-        }, 5000);
-
-      } else if(d.status == 4) {
-        console.log("Use 'ionic package --clear-signing' to clear app signing and credential data if needed.".bold.red);
-        return ionic.fail("Build failed");
-      } else if(d.status == 3) {
-        downloadBuildPackage(platform, d);
-      } else {
-        return ionic.fail("\nError receiving build status");
-      }
-
-    } catch(e) {
-      return ionic.fail("\nError pinging build status: " + e);
-    }
-
-  });
-}
-
-
-function downloadBuildPackage(platform, data) {
-  console.log( ('\n\n' + platform + ' build complete, downloading package...').bold );
-
-  var filePath = argv.output;
-
-  if(!filePath) {
-    var dirPath = resolvePath('./packages');
-    filePath = resolvePath(dirPath + '/' + data.package_filename);
-
-    if(!fs.existsSync(dirPath)) {
-      fs.mkdirSync(dirPath);
-    }
-  }
-
-  var file = fs.createWriteStream(filePath);
-
-  var proxy = process.env.PROXY || null;
-  request({ url: data.package_url, proxy: proxy }, function(err, res, body) {
-    if(res.statusCode !== 200) {
-      console.error(err);
-      return;
-    }
-    try {
-      file.write(body);
-      file.close(function(){
-        console.log( ('Saved ' + platform + ' package: ' + filePath + '\n').bold.green );
-      });
-    } catch(e) {
-      q.reject(e);
-    }
-  }).on('response', function(res){
-
-    var ProgressBar = require('progress');
-    var bar = new ProgressBar('[:bar]  :percent  :etas', {
-      complete: '=',
-      incomplete: ' ',
-      width: 30,
-      total: parseInt(res.headers['content-length'], 10)
-    });
-
-    res.on('data', function (chunk) {
-      try {
-        bar.tick(chunk.length);
-      } catch(e){}
-    });
-
-    res.on('end', function () {
-      console.log('\n');
-    });
-
-  }).on('error', function(err) {
-    try {
-      fs.unlink(filePath);
-    } catch(e) {
-      console.error(e);
-    }
-    console.error(err);
-  });
-}
-
-
-function fileExists(filePath) {
-  // check if a file exists with a relative path or absolute path
-  filePath = filePath.replace(/\\ /g, ' ').trim();
-  return fs.existsSync(resolvePath(filePath));
-}
-
-function resolvePath (p) {
-  if (p.substr(0, 1) === '~') {
-    p = process.env.HOME + p.substr(1);
-  }
-  return path.resolve(p);
-}
-
 exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 3f77ff73df..a28dd7c898 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -328,6 +328,18 @@ var TASKS = [
     },
     module: './ionic/push'
   },
+  {
+    title: 'package',
+    name: 'package',
+    summary: 'Package up your app into .apk or .ipa files with Ionic Package ' + '(alpha)'.red,
+    args: {
+      '<platform>': 'android'.yellow + ' or ' + 'ios'.yellow,
+    },
+    options: {
+      '--release': 'Mark this build as a release'
+    },
+    module: './ionic/package'
+  },
   {
     title: 'config',
     name: 'config',

From 49544c9d58a36ffb4dd96fd630574ed67a674d93 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 5 Aug 2015 10:13:28 -0500
Subject: [PATCH 0757/1100] pass in platform and build mode to package lib

---
 lib/ionic/package.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 0dca98b0b0..00b6df6aef 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -18,7 +18,8 @@ IonicTask.prototype.run = function(ionic, argv) {
   var dir = null,
       project = null,
       appId = null,
-      release = argv.release ? true : false;
+      platform = argv._[1],
+      buildMode = argv.release ? 'release' : 'debug';
 
   try {
     dir = process.cwd();
@@ -37,7 +38,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       return jar;
     })
     .then(function(jar) {
-      Package.doPackage(appId, dir, jar, release);
+      Package.doPackage(appId, dir, jar, platform, buildMode);
     })
     .catch(function(ex) {
       Utils.fail(ex);

From 529b6c99404a5f9114eb4117b83b3ce1780d7804 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 11:46:37 -0600
Subject: [PATCH 0758/1100] Fix(cli): Only run the check runtime method if it
 has not already been run and stored that version check in ionic.config. This
 should decrease run time and speed up performance

---
 lib/cli.js       | 63 ++++++++++++++++++++++++++++++------------------
 spec/cli.spec.js | 36 ++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index e25860b04f..d2a031dc21 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -2,6 +2,8 @@ var Cli = module.exports,
     colors = require('colors'),
     IonicAppLib = require('ionic-app-lib'),
     ConfigXml = IonicAppLib.configXml,
+    IonicStore = require('./ionic/store').IonicStore,
+    IonicConfig = new IonicStore('ionic.config'),
     IonicOpbeat = IonicAppLib.opbeat,
     Info = IonicAppLib.info,
     Ionitron = require('./ionic/ionitron'),
@@ -10,7 +12,9 @@ var Cli = module.exports,
     settings = require('../package.json'),
     Tasks = require('./tasks/cliTasks'),
     Utils = IonicAppLib.utils,
-    Q = require('q');
+    logging = IonicAppLib.logging,
+    Q = require('q'),
+    semver = require('semver');
 
 Cli.Tasks = TASKS = Tasks;
 
@@ -19,6 +23,9 @@ Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
+// This is where the logger for the app-lib can be configured (or replaced).
+// logging.logger.level = 'info';
+
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
 //     return true;
@@ -51,8 +58,11 @@ Cli.run = function run(processArgv) {
 
     //Before taking any more steps, lets check their
     //environment and display any upgrade warnings
-    Info.checkRuntime();
+    Cli.doRuntimeCheck(settings.version);
 
+    if ((argv.version || argv.v) && !argv._.length) {
+      return Cli.version();
+    }
 
     if(argv.ionitron) {
       var lang = argv.es ? 'es' : 'en';
@@ -63,19 +73,13 @@ Cli.run = function run(processArgv) {
       IonicAppLib.events.on('verbose', console.log);
     }
 
-    if( (argv.version || argv.v) && !argv._.length) {
-      return Cli.version();
-    }
-
     if(argv.help || argv.h) {
       return Cli.printHelpLines();
     }
 
     if(argv['stats-opt-out']) {
-      var IonicStore = require('./ionic/store').IonicStore;
-      var ionicConfig = new IonicStore('ionic.config');
-      ionicConfig.set('statsOptOut', true);
-      ionicConfig.save();
+      IonicConfig.set('statsOptOut', true);
+      IonicConfig.save();
       console.log('Successful stats opt-out');
       return;
     }
@@ -166,6 +170,9 @@ Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
     }
     console.log(msg.green.bold);
   };
+
+  //Default level is set to 'info'
+  IonicAppLib.logging.createDefaultLogger();
 };
 
 Cli.lookupTask = function lookupTask(module) {
@@ -200,10 +207,7 @@ Cli.checkLatestVersion = function checkLatestVersion() {
       return;
     }
 
-    // stay silent if it errors
-    var IonicStore = require('./ionic/store').IonicStore;
-    var ionicConfig = new IonicStore('ionic.config');
-    var versionCheck = ionicConfig.get('versionCheck');
+    var versionCheck = IonicConfig.get('versionCheck');
     if (versionCheck && ((versionCheck + 86400000) > Date.now() )) {
       // we've recently checked for the latest version, so don't bother again
       Cli.latestVersion.resolve();
@@ -215,8 +219,8 @@ Cli.checkLatestVersion = function checkLatestVersion() {
     request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
       try {
         Cli.npmVersion = JSON.parse(body).version;
-        ionicConfig.set('versionCheck', Date.now());
-        ionicConfig.save();
+        IonicConfig.set('versionCheck', Date.now());
+        IonicConfig.save();
       } catch(e) {}
       Cli.latestVersion.resolve();
     });
@@ -433,8 +437,6 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 
   var q = Cli.cliNews = Q.defer();
   var proxy = process.env.PROXY || null;
-  var IonicStore = require('./ionic/store').IonicStore;
-  var ionicConfig = new IonicStore('ionic.config');
 
   var request = require('request');
   var monthNames = [ "January", "February", "March", "April", "May", "June",
@@ -445,12 +447,11 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
     if(!err && res && res.statusCode === 200) {
       try {
-        var newsId = ionicConfig.get('newsId');
-        var messagesJson = {};
+        var newsId = IonicConfig.get('newsId');
         messagesJson = JSON.parse(html);
         if(skipNewsCheck || typeof newsId == 'undefined' || newsId != messagesJson.id) {
-          ionicConfig.set('newsId', messagesJson.id)
-          ionicConfig.save()
+          IonicConfig.set('newsId', messagesJson.id);
+          IonicConfig.save();
         } else {
           q.resolve();
           return q.promise;
@@ -515,7 +516,6 @@ Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
 };
 
 Cli.attachErrorHandling = function attachErrorHandling() {
-
   Utils.errorHandler = function errorHandler(msg, taskHelp) {
     try {
       IonicAppLib.events.emit('verbose', 'Cli.Utils.errorHandler msg', msg, typeof msg);
@@ -560,3 +560,20 @@ Cli.getContentSrc = function getContentSrc() {
 Cli.setConfigXml = function setConfigXml(settings) {
   return ConfigXml.setConfigXml(process.cwd(), settings);
 };
+
+Cli.doRuntimeCheck = function doRuntimeCheck(version) {
+  var lastVersionChecked = IonicConfig.get('lastVersionChecked');
+  var versionHasBeenChecked;
+
+  try {
+    versionHasBeenChecked = semver.satisfies(version, lastVersionChecked);
+  } catch (ex) {
+    console.log(ex);
+  }
+
+  if (!lastVersionChecked || !versionHasBeenChecked) {
+    Info.checkRuntime();
+    IonicConfig.set('lastVersionChecked', version);
+    IonicConfig.save();
+  }
+};
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index dfbc531613..e87a9f72c6 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -4,13 +4,15 @@ var IonicAppLib = require('ionic-app-lib'),
     Q = require('q'),
     Task = require('../lib/ionic/task').Task,
     Info = IonicAppLib.info,
-    Utils = IonicAppLib.utils;
+    Utils = IonicAppLib.utils,
+    rewire = require('rewire');
 
 describe('Cli', function() {
 
   beforeEach(function() {
     spyOn(IonicCli, 'processExit');
     spyOn(IonicCli, 'printAvailableTasks');
+    spyOn(IonicCli, 'doRuntimeCheck');
     spyOn(IonicAppLib.events, 'on');
     spyOn(process, 'on');
     spyOn(Info, 'checkRuntime');
@@ -49,10 +51,10 @@ describe('Cli', function() {
         expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
       });
 
-      it('should run info checkruntime on run', function() {
+      it('should run info doRuntimeCheck on run', function() {
         spyOn(IonicCli, 'printHelpLines');
         IonicCli.run(['node', 'bin/ionic', '--h']);
-        expect(Info.checkRuntime).toHaveBeenCalled();
+        expect(IonicCli.doRuntimeCheck).toHaveBeenCalled();
       });
 
       it('should run ionitron when argument is passed', function() {
@@ -306,5 +308,33 @@ describe('Cli', function() {
       expect(taskArgv.nohooks).toBe(true);
     });
 
+    describe('version checking for checkRuntime', function() {
+      var IonicCli;
+      beforeEach(function() {
+        IonicCli = rewire('../lib/cli');
+      });
+
+      it('should do runtime check when version is not checked', function() {
+        var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
+        IonicConfigSpy.get.andReturn('1.6.4');
+        IonicCli.__set__('IonicConfig', IonicConfigSpy);
+        IonicCli.doRuntimeCheck('1.6.4');
+        expect(Info.checkRuntime).not.toHaveBeenCalled();
+        expect(IonicConfigSpy.set).not.toHaveBeenCalled();
+        expect(IonicConfigSpy.save).not.toHaveBeenCalled();
+      });
+
+      it('should do runtime check when version is not checked', function() {
+        var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
+        IonicConfigSpy.get.andReturn('1.6.4');
+        IonicCli.__set__('IonicConfig', IonicConfigSpy);
+        IonicCli.doRuntimeCheck('1.6.5');
+        expect(Info.checkRuntime).toHaveBeenCalled();
+        expect(IonicConfigSpy.get).toHaveBeenCalled();
+        expect(IonicConfigSpy.set).toHaveBeenCalledWith('lastVersionChecked', '1.6.5');
+        expect(IonicConfigSpy.save).toHaveBeenCalled();
+      });
+    })
+
   });
 });

From cf3982200b34904a314a17570e68df3639ee87f9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 13:36:11 -0600
Subject: [PATCH 0759/1100] Feature(rewire): Add rewire to dev dependencies

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 04f8915920..0421247d44 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "xml2js": "0.4.4"
   },
   "devDependencies": {
-    "jasmine-node": "^1.14.5"
+    "jasmine-node": "^1.14.5",
+    "rewire": "^2.3.4"
   }
 }

From 05fd6cf1e53bcf2f81fcaadf17c67e68fcefa8d1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 13:44:47 -0600
Subject: [PATCH 0760/1100] Fix(help): Update help text for start to include
 local path. Closes #552

---
 lib/tasks/cliTasks.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 3f77ff73df..aa69a7dec8 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -33,7 +33,9 @@ var TASKS = [
     args: {
       '[options]': 'any flags for the command',
       '<PATH>': 'directory for the new project',
-      '[template]': 'Template name, ex: tabs, sidemenu, blank\n' +
+      '[template]': 'Starter templates can either come from a named template, \n' +
+                    '(ex: tabs, sidemenu, blank),\n' +
+                    'a Github repo, a Codepen url, or a local directory.\n' +
                     'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
                     'Defaults to Ionic "tabs" starter template'
     },

From 4aa95b2245e53c1c8223022b59a4d4884356d1e9 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 13:48:47 -0600
Subject: [PATCH 0761/1100] Shrinkwrap

---
 npm-shrinkwrap.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c5664b5b8b..4ea0c05ce1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -118,9 +118,9 @@
           }
         },
         "lodash": {
-          "version": "3.10.0",
+          "version": "3.10.1",
           "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
         }
       }
     },
@@ -442,9 +442,9 @@
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "camelcase@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
@@ -663,9 +663,9 @@
               }
             },
             "vinyl": {
-              "version": "0.5.0",
+              "version": "0.5.1",
               "from": "vinyl@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.1.tgz",
               "dependencies": {
                 "clone": {
                   "version": "1.0.2",
@@ -766,7 +766,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -846,7 +846,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1128,9 +1128,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.3.1",
+                      "version": "3.4.0",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.4.0.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1888,9 +1888,9 @@
                       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "decamelize": {
                           "version": "1.0.0",
@@ -3199,7 +3199,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
@@ -3453,7 +3453,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -5087,9 +5087,9 @@
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.10.0",
+              "version": "3.10.1",
               "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
             }
           }
         }

From c0b2f72777fa9e4c0146aff71afe69f8b3d918f1 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 15:35:54 -0600
Subject: [PATCH 0762/1100] Fix(package): Update ionic-app-lib to latest beta.
 Shrinkwrap

---
 npm-shrinkwrap.json | 1449 ++++++++++++++++++++++++++++++++-----------
 package.json        |    2 +-
 2 files changed, 1094 insertions(+), 357 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4ea0c05ce1..55ef00664a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -326,7 +326,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -338,7 +338,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -815,9 +815,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.8-beta.1",
-      "from": "ionic-app-lib@0.3.8-beta.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.8-beta.1.tgz",
+      "version": "0.3.9-beta.2",
+      "from": "ionic-app-lib@0.3.9-beta.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-beta.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -846,7 +846,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -990,9 +990,9 @@
           }
         },
         "ionic-cordova-lib": {
-          "version": "5.1.7",
-          "from": "ionic-cordova-lib@5.1.7",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.7.tgz",
+          "version": "5.1.10",
+          "from": "ionic-cordova-lib@5.1.10",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
           "dependencies": {
             "bplist-parser": {
               "version": "0.0.6",
@@ -1981,15 +1981,49 @@
                 }
               }
             },
-            "d8": {
-              "version": "0.4.4",
-              "from": "d8@0.4.4",
-              "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+            "cordova-serve": {
+              "version": "0.1.2",
+              "from": "cordova-serve@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.2.tgz",
               "dependencies": {
-                "m8": {
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "d8": {
                   "version": "0.4.4",
-                  "from": "m8@>=0.4.3",
-                  "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                  "from": "d8@>=0.4.4 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+                  "dependencies": {
+                    "m8": {
+                      "version": "0.4.4",
+                      "from": "m8@>=0.4.3",
+                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.3.4",
+                  "from": "mime@>=1.2.11 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+                },
+                "q": {
+                  "version": "1.4.1",
+                  "from": "q@>=1.4.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+                },
+                "shelljs": {
+                  "version": "0.5.1",
+                  "from": "shelljs@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.1.tgz"
                 }
               }
             },
@@ -2024,7 +2058,7 @@
               "dependencies": {
                 "graceful-fs": {
                   "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "from": "graceful-fs@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                 },
                 "inherits": {
@@ -2142,11 +2176,6 @@
                       "version": "2.1.4",
                       "from": "hosted-git-info@>=2.1.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    },
-                    "semver": {
-                      "version": "5.0.1",
-                      "from": "semver@>=4.0.0 <5.0.0||>=5.0.0 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"
                     }
                   }
                 },
@@ -2241,399 +2270,1069 @@
                 }
               }
             },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            },
             "npm": {
-              "version": "1.3.4",
-              "from": "npm@1.3.4",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-1.3.4.tgz",
+              "version": "2.13.3",
+              "from": "npm@>=2.10.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.13.3.tgz",
               "dependencies": {
-                "semver": {
-                  "version": "2.0.8",
-                  "from": "semver@latest"
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.7 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                 },
-                "ini": {
-                  "version": "1.1.0",
-                  "from": "ini@latest"
+                "ansi": {
+                  "version": "0.3.0",
+                  "from": "ansi@latest",
+                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
                 },
-                "slide": {
-                  "version": "1.1.4",
-                  "from": "slide@latest"
+                "ansicolors": {
+                  "version": "0.3.2",
+                  "from": "ansicolors@latest"
                 },
-                "abbrev": {
+                "ansistyles": {
+                  "version": "0.1.3",
+                  "from": "ansistyles@0.1.3",
+                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+                },
+                "archy": {
+                  "version": "1.0.0",
+                  "from": "archy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+                },
+                "async-some": {
+                  "version": "1.0.2",
+                  "from": "async-some@>=1.0.2 <1.1.0"
+                },
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@0.0.8",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "char-spinner": {
+                  "version": "1.0.1",
+                  "from": "char-spinner@latest",
+                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+                },
+                "chmodr": {
+                  "version": "0.1.1",
+                  "from": "chmodr@0.1.1",
+                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-0.1.1.tgz"
+                },
+                "chownr": {
+                  "version": "0.0.2",
+                  "from": "chownr@0.0.2",
+                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"
+                },
+                "cmd-shim": {
+                  "version": "2.0.1",
+                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "columnify": {
+                  "version": "1.5.1",
+                  "from": "columnify@>=1.5.1 <1.6.0",
+                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.1.tgz",
+                  "dependencies": {
+                    "strip-ansi": {
+                      "version": "2.0.1",
+                      "from": "strip-ansi@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "1.1.1",
+                          "from": "ansi-regex@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                        }
+                      }
+                    },
+                    "wcwidth": {
+                      "version": "1.0.0",
+                      "from": "wcwidth@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+                      "dependencies": {
+                        "defaults": {
+                          "version": "1.0.2",
+                          "from": "defaults@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+                          "dependencies": {
+                            "clone": {
+                              "version": "0.1.19",
+                              "from": "clone@>=0.1.5 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.9 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "dezalgo": {
+                  "version": "1.0.3",
+                  "from": "dezalgo@>=1.0.3 <1.1.0",
+                  "dependencies": {
+                    "asap": {
+                      "version": "2.0.3",
+                      "from": "asap@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+                    }
+                  }
+                },
+                "editor": {
+                  "version": "1.0.0",
+                  "from": "editor@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
+                },
+                "fs-vacuum": {
+                  "version": "1.2.6",
+                  "from": "fs-vacuum@>=1.2.5 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.6.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "fs-write-stream-atomic": {
+                  "version": "1.0.3",
+                  "from": "fs-write-stream-atomic@1.0.3",
+                  "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.3.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "fstream": {
+                  "version": "1.0.7",
+                  "from": "fstream@>=1.0.7 <1.1.0",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "fstream-npm": {
                   "version": "1.0.4",
-                  "from": "abbrev@latest"
+                  "from": "fstream-npm@>=1.0.3 <1.1.0",
+                  "dependencies": {
+                    "fstream-ignore": {
+                      "version": "1.0.2",
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
+                    }
+                  }
+                },
+                "github-url-from-git": {
+                  "version": "1.4.0",
+                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
+                },
+                "github-url-from-username-repo": {
+                  "version": "1.0.2",
+                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
+                },
+                "glob": {
+                  "version": "5.0.14",
+                  "from": "glob@latest",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
+                  "dependencies": {
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
                 },
                 "graceful-fs": {
-                  "version": "2.0.0",
-                  "from": "graceful-fs@2"
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=3.0.8 <3.1.0"
+                },
+                "hosted-git-info": {
+                  "version": "2.1.4",
+                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                },
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <1.1.0"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@latest",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@latest",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "init-package-json": {
+                  "version": "1.7.1",
+                  "from": "init-package-json@>=1.7.1 <1.8.0",
+                  "dependencies": {
+                    "promzard": {
+                      "version": "0.3.0",
+                      "from": "promzard@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                    }
+                  }
+                },
+                "lockfile": {
+                  "version": "1.0.1",
+                  "from": "lockfile@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+                },
+                "lru-cache": {
+                  "version": "2.6.5",
+                  "from": "lru-cache@2.6.5",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
                 },
                 "minimatch": {
-                  "version": "0.2.12",
-                  "from": "minimatch@latest",
+                  "version": "2.0.10",
+                  "from": "minimatch@2.0.10",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
-                    "sigmund": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registrytwo.npmjs.com/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "node-gyp": {
+                  "version": "2.0.2",
+                  "from": "node-gyp@latest",
+                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-2.0.2.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.8",
+                          "from": "minimatch@>=2.0.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.0",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.0",
+                                  "from": "balanced-match@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    },
+                    "minimatch": {
                       "version": "1.0.0",
-                      "from": "sigmund@~1.0.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                      "from": "minimatch@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                      "dependencies": {
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-array": {
+                      "version": "1.0.0",
+                      "from": "path-array@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                      "dependencies": {
+                        "array-index": {
+                          "version": "0.1.1",
+                          "from": "array-index@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                          "dependencies": {
+                            "debug": {
+                              "version": "2.2.0",
+                              "from": "debug@*",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                              "dependencies": {
+                                "ms": {
+                                  "version": "0.7.1",
+                                  "from": "ms@0.7.1",
+                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "semver": {
+                      "version": "4.3.6",
+                      "from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+                    },
+                    "tar": {
+                      "version": "1.0.3",
+                      "from": "tar@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
                     }
                   }
                 },
                 "nopt": {
-                  "version": "2.1.1",
-                  "from": "nopt@latest"
+                  "version": "3.0.3",
+                  "from": "nopt@>=3.0.3 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.3.tgz"
                 },
-                "rimraf": {
-                  "version": "2.2.0",
-                  "from": "rimraf@2.2"
+                "normalize-git-url": {
+                  "version": "3.0.1",
+                  "from": "normalize-git-url@latest"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.1",
+                  "from": "normalize-package-data@>=2.3.1 <2.4.0"
+                },
+                "npm-cache-filename": {
+                  "version": "1.0.2",
+                  "from": "npm-cache-filename@1.0.2",
+                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
+                },
+                "npm-install-checks": {
+                  "version": "1.0.6",
+                  "from": "npm-install-checks@>=1.0.6 <1.1.0"
+                },
+                "npm-package-arg": {
+                  "version": "4.0.2",
+                  "from": "npm-package-arg@>=4.0.2 <4.1.0"
+                },
+                "npm-registry-client": {
+                  "version": "6.5.1",
+                  "from": "npm-registry-client@>=6.5.1 <6.6.0",
+                  "dependencies": {
+                    "concat-stream": {
+                      "version": "1.5.0",
+                      "from": "concat-stream@>=1.4.6 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "2.0.2",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.2",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.1",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "npm-user-validate": {
+                  "version": "0.1.2",
+                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
+                },
+                "npmlog": {
+                  "version": "1.2.1",
+                  "from": "npmlog@>=1.2.1 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "dependencies": {
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.0",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.0",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.0",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+                        },
+                        "lodash._basetostring": {
+                          "version": "3.0.0",
+                          "from": "lodash._basetostring@3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                        },
+                        "lodash._createpadding": {
+                          "version": "3.6.0",
+                          "from": "lodash._createpadding@3.6.0",
+                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
+                          "dependencies": {
+                            "lodash.repeat": {
+                              "version": "3.0.0",
+                              "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.2 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                },
+                "opener": {
+                  "version": "1.4.1",
+                  "from": "opener@>=1.4.1 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@0.1.3",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.0",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-inside": {
+                  "version": "1.0.1",
+                  "from": "path-is-inside@1.0.1",
+                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+                },
+                "read": {
+                  "version": "1.0.6",
+                  "from": "read@1.0.6",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-installed": {
+                  "version": "4.0.2",
+                  "from": "read-installed@>=4.0.2 <4.1.0",
+                  "dependencies": {
+                    "debuglog": {
+                      "version": "1.0.1",
+                      "from": "debuglog@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+                    },
+                    "readdir-scoped-modules": {
+                      "version": "1.0.1",
+                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz"
+                    },
+                    "util-extend": {
+                      "version": "1.0.1",
+                      "from": "util-extend@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+                    },
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.0",
+                  "from": "read-package-json@>=2.0.0 <2.1.0",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.0",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    }
+                  }
+                },
+                "realize-package-specifier": {
+                  "version": "3.0.1",
+                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
                 },
                 "request": {
-                  "version": "2.21.0",
-                  "from": "request@latest",
+                  "version": "2.60.0",
+                  "from": "request@2.60.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.60.0.tgz",
                   "dependencies": {
-                    "qs": {
-                      "version": "0.6.5",
-                      "from": "qs@~0.6.0"
+                    "bl": {
+                      "version": "1.0.0",
+                      "from": "bl@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.2",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.2",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.1",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
                     },
-                    "json-stringify-safe": {
-                      "version": "4.0.0",
-                      "from": "json-stringify-safe@~4.0.0"
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                     },
                     "forever-agent": {
-                      "version": "0.5.0",
-                      "from": "forever-agent@~0.5.0"
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.0 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
+                    "form-data": {
+                      "version": "1.0.0-rc2",
+                      "from": "form-data@>=1.0.0-rc1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc2.tgz",
+                      "dependencies": {
+                        "async": {
+                          "version": "1.4.0",
+                          "from": "async@>=1.2.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
+                        }
+                      }
+                    },
+                    "json-stringify-safe": {
+                      "version": "5.0.1",
+                      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                    },
+                    "mime-types": {
+                      "version": "2.1.3",
+                      "from": "mime-types@>=2.1.2 <2.2.0",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.15.0",
+                          "from": "mime-db@>=1.15.0 <1.16.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"
+                        }
+                      }
+                    },
+                    "node-uuid": {
+                      "version": "1.4.3",
+                      "from": "node-uuid@>=1.4.0 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                    },
+                    "qs": {
+                      "version": "4.0.0",
+                      "from": "qs@>=4.0.0 <4.1.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"
                     },
                     "tunnel-agent": {
-                      "version": "0.3.0",
-                      "from": "tunnel-agent@~0.3.0"
+                      "version": "0.4.1",
+                      "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                    },
+                    "tough-cookie": {
+                      "version": "2.0.0",
+                      "from": "tough-cookie@>=0.12.0",
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
                     },
                     "http-signature": {
-                      "version": "0.9.11",
-                      "from": "http-signature@~0.9.11",
+                      "version": "0.11.0",
+                      "from": "http-signature@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
                       "dependencies": {
                         "assert-plus": {
-                          "version": "0.1.2",
-                          "from": "assert-plus@0.1.2"
+                          "version": "0.1.5",
+                          "from": "assert-plus@>=0.1.5 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                         },
                         "asn1": {
                           "version": "0.1.11",
-                          "from": "asn1@0.1.11"
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
                         },
                         "ctype": {
-                          "version": "0.5.2",
-                          "from": "ctype@0.5.2"
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
                         }
                       }
                     },
+                    "oauth-sign": {
+                      "version": "0.8.0",
+                      "from": "oauth-sign@>=0.8.0 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                    },
                     "hawk": {
-                      "version": "0.13.1",
-                      "from": "hawk@~0.13.0",
+                      "version": "3.1.0",
+                      "from": "hawk@>=3.1.0 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
                       "dependencies": {
                         "hoek": {
-                          "version": "0.8.5",
-                          "from": "hoek@0.8.x"
+                          "version": "2.14.0",
+                          "from": "hoek@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
                         },
                         "boom": {
-                          "version": "0.4.2",
-                          "from": "boom@0.4.x",
+                          "version": "2.8.0",
+                          "from": "boom@>=2.8.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.8.0.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.4",
+                          "from": "cryptiles@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        }
+                      }
+                    },
+                    "aws-sign2": {
+                      "version": "0.5.0",
+                      "from": "aws-sign2@>=0.5.0 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                    },
+                    "stringstream": {
+                      "version": "0.0.4",
+                      "from": "stringstream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                    },
+                    "combined-stream": {
+                      "version": "1.0.5",
+                      "from": "combined-stream@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "isstream": {
+                      "version": "0.1.2",
+                      "from": "isstream@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                    },
+                    "har-validator": {
+                      "version": "1.8.0",
+                      "from": "har-validator@>=1.6.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+                      "dependencies": {
+                        "bluebird": {
+                          "version": "2.9.34",
+                          "from": "bluebird@>=2.9.30 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"
+                        },
+                        "chalk": {
+                          "version": "1.1.0",
+                          "from": "chalk@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
                           "dependencies": {
-                            "hoek": {
-                              "version": "0.9.1",
-                              "from": "hoek@0.9.x",
-                              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                            "ansi-styles": {
+                              "version": "2.1.0",
+                              "from": "ansi-styles@>=2.1.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                            },
+                            "escape-string-regexp": {
+                              "version": "1.0.3",
+                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                            },
+                            "has-ansi": {
+                              "version": "2.0.0",
+                              "from": "has-ansi@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                              "dependencies": {
+                                "ansi-regex": {
+                                  "version": "2.0.0",
+                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                }
+                              }
+                            },
+                            "strip-ansi": {
+                              "version": "3.0.0",
+                              "from": "strip-ansi@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                              "dependencies": {
+                                "ansi-regex": {
+                                  "version": "2.0.0",
+                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                }
+                              }
+                            },
+                            "supports-color": {
+                              "version": "2.0.0",
+                              "from": "supports-color@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                             }
                           }
                         },
-                        "cryptiles": {
-                          "version": "0.2.1",
-                          "from": "cryptiles@0.2.x"
-                        },
-                        "sntp": {
-                          "version": "0.2.4",
-                          "from": "sntp@0.2.x",
+                        "commander": {
+                          "version": "2.8.1",
+                          "from": "commander@>=2.8.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
                           "dependencies": {
-                            "hoek": {
-                              "version": "0.9.1",
-                              "from": "hoek@0.9.x",
-                              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                            "graceful-readlink": {
+                              "version": "1.0.1",
+                              "from": "graceful-readlink@>=1.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                             }
                           }
-                        }
-                      }
-                    },
-                    "aws-sign": {
-                      "version": "0.3.0",
-                      "from": "aws-sign@~0.3.0"
-                    },
-                    "oauth-sign": {
-                      "version": "0.3.0",
-                      "from": "oauth-sign@~0.3.0"
-                    },
-                    "cookie-jar": {
-                      "version": "0.3.0",
-                      "from": "cookie-jar@~0.3.0"
-                    },
-                    "node-uuid": {
-                      "version": "1.4.0",
-                      "from": "node-uuid@~1.4.0"
-                    },
-                    "mime": {
-                      "version": "1.2.9",
-                      "from": "mime@~1.2.9"
-                    },
-                    "form-data": {
-                      "version": "0.0.8",
-                      "from": "form-data@0.0.8",
-                      "dependencies": {
-                        "combined-stream": {
-                          "version": "0.0.4",
-                          "from": "combined-stream@~0.0.4",
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.0",
+                          "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz",
                           "dependencies": {
-                            "delayed-stream": {
-                              "version": "0.0.5",
-                              "from": "delayed-stream@0.0.5"
+                            "generate-function": {
+                              "version": "2.0.0",
+                              "from": "generate-function@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                            },
+                            "generate-object-property": {
+                              "version": "1.2.0",
+                              "from": "generate-object-property@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                              "dependencies": {
+                                "is-property": {
+                                  "version": "1.0.2",
+                                  "from": "is-property@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "jsonpointer": {
+                              "version": "1.1.0",
+                              "from": "jsonpointer@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"
+                            },
+                            "xtend": {
+                              "version": "4.0.0",
+                              "from": "xtend@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                             }
                           }
-                        },
-                        "async": {
-                          "version": "0.2.9",
-                          "from": "async@~0.2.7"
                         }
                       }
                     }
                   }
                 },
-                "which": {
-                  "version": "1.0.5",
-                  "from": "which@1"
-                },
-                "tar": {
-                  "version": "0.1.17",
-                  "from": "tar@0.1.17",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"
-                },
-                "fstream": {
-                  "version": "0.1.23",
-                  "from": "fstream@latest"
-                },
-                "block-stream": {
-                  "version": "0.0.6",
-                  "from": "block-stream@*"
+                "retry": {
+                  "version": "0.6.1",
+                  "from": "retry@>=0.6.1 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"
                 },
-                "inherits": {
-                  "version": "1.0.0",
-                  "from": "git://github.com/isaacs/inherits"
+                "rimraf": {
+                  "version": "2.4.2",
+                  "from": "rimraf@2.4.2",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz"
                 },
-                "mkdirp": {
-                  "version": "0.3.5",
-                  "from": "mkdirp@0.3.5",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+                "semver": {
+                  "version": "5.0.1",
+                  "from": "semver@>=5.0.1 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"
                 },
-                "read": {
-                  "version": "1.0.4",
-                  "from": "read@~1.0.3",
+                "sha": {
+                  "version": "1.3.0",
+                  "from": "sha@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/sha/-/sha-1.3.0.tgz",
                   "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.3",
-                      "from": "mute-stream@~0.0.2"
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
                     }
                   }
                 },
-                "lru-cache": {
-                  "version": "2.3.0",
-                  "from": "lru-cache@latest"
+                "slide": {
+                  "version": "1.1.6",
+                  "from": "slide@>=1.1.6 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
                 },
-                "node-gyp": {
-                  "version": "0.10.6",
-                  "from": "node-gyp@latest"
+                "sorted-object": {
+                  "version": "1.0.0",
+                  "from": "sorted-object@"
                 },
-                "fstream-npm": {
-                  "version": "0.1.4",
-                  "from": "fstream-npm@latest",
+                "spdx": {
+                  "version": "0.4.1",
+                  "from": "spdx@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
                   "dependencies": {
-                    "fstream-ignore": {
-                      "version": "0.0.6",
-                      "from": "fstream-ignore@~0.0.5"
+                    "spdx-license-ids": {
+                      "version": "1.0.1",
+                      "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
                     }
                   }
                 },
-                "uid-number": {
-                  "version": "0.0.3",
-                  "from": "../uid-number"
-                },
-                "archy": {
-                  "version": "0.0.2",
-                  "from": "archy@0.0.2"
-                },
-                "chownr": {
-                  "version": "0.0.1",
-                  "from": "../chownr"
-                },
-                "npmlog": {
-                  "version": "0.0.4",
-                  "from": "npmlog@latest"
+                "tar": {
+                  "version": "2.1.1",
+                  "from": "tar@>=2.1.1 <2.2.0"
                 },
-                "ansi": {
-                  "version": "0.1.2",
-                  "from": "ansi@~0.1.2"
+                "text-table": {
+                  "version": "0.2.0",
+                  "from": "text-table@~0.2.0"
                 },
-                "npm-registry-client": {
-                  "version": "0.2.27",
-                  "from": "npm-registry-client@latest",
-                  "dependencies": {
-                    "couch-login": {
-                      "version": "0.1.17",
-                      "from": "couch-login@~0.1.15"
-                    }
-                  }
+                "uid-number": {
+                  "version": "0.0.6",
+                  "from": "uid-number@>=0.0.6 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
                 },
-                "read-package-json": {
+                "umask": {
                   "version": "1.1.0",
-                  "from": "read-package-json@1",
-                  "dependencies": {
-                    "normalize-package-data": {
-                      "version": "0.2.0",
-                      "from": "normalize-package-data@~0.2",
-                      "dependencies": {
-                        "github-url-from-git": {
-                          "version": "1.1.1",
-                          "from": "github-url-from-git@~1.1.1"
-                        }
-                      }
-                    }
-                  }
-                },
-                "read-installed": {
-                  "version": "0.2.2",
-                  "from": "read-installed@latest"
-                },
-                "glob": {
-                  "version": "3.2.3",
-                  "from": "glob@latest",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.0",
-                      "from": "inherits@2"
-                    }
-                  }
+                  "from": "umask@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
                 },
-                "init-package-json": {
-                  "version": "0.0.10",
-                  "from": "init-package-json@latest",
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@2.2.2",
                   "dependencies": {
-                    "promzard": {
-                      "version": "0.2.0",
-                      "from": "promzard@~0.2.0"
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7"
                     }
                   }
                 },
-                "osenv": {
-                  "version": "0.0.3",
-                  "from": "osenv@latest"
-                },
-                "lockfile": {
-                  "version": "0.4.0",
-                  "from": "lockfile@latest"
-                },
-                "retry": {
-                  "version": "0.6.0",
-                  "from": "retry"
-                },
-                "once": {
+                "which": {
                   "version": "1.1.1",
-                  "from": "once"
-                },
-                "npmconf": {
-                  "version": "0.1.1",
-                  "from": "npmconf@latest",
+                  "from": "which@>=1.1.1 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.1.1.tgz",
                   "dependencies": {
-                    "config-chain": {
-                      "version": "1.1.7",
-                      "from": "config-chain@~1.1.1",
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
                       "dependencies": {
-                        "proto-list": {
-                          "version": "1.2.2",
-                          "from": "proto-list@~1.2.1"
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
                         }
                       }
                     }
                   }
                 },
-                "opener": {
-                  "version": "1.3.0",
-                  "from": "opener@latest"
-                },
-                "chmodr": {
-                  "version": "0.1.0",
-                  "from": "chmodr@latest"
-                },
-                "cmd-shim": {
-                  "version": "1.1.0",
-                  "from": "cmd-shim@"
-                },
-                "sha": {
+                "wrappy": {
                   "version": "1.0.1",
-                  "from": "sha@~1.0.1"
-                },
-                "editor": {
-                  "version": "0.0.4",
-                  "from": "editor@"
-                },
-                "child-process-close": {
-                  "version": "0.1.1",
-                  "from": "child-process-close@",
-                  "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
+                  "from": "wrappy@1.0.1",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 },
-                "npm-user-validate": {
-                  "version": "0.0.3",
-                  "from": "npm-user-validate@0.0.3",
-                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
+                "write-file-atomic": {
+                  "version": "1.1.2",
+                  "from": "write-file-atomic@>=1.1.2 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.2.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>=3.0.2 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
                 },
-                "normalize-package-data": {
-                  "version": "2.3.1",
-                  "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.1.tgz",
+                "validate-npm-package-license": {
+                  "version": "2.0.0",
+                  "from": "validate-npm-package-license@2.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
                   "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    },
-                    "validate-npm-package-license": {
-                      "version": "2.0.0",
-                      "from": "validate-npm-package-license@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
-                      "dependencies": {
-                        "spdx": {
-                          "version": "0.4.1",
-                          "from": "spdx@>=0.4.0 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
-                          "dependencies": {
-                            "spdx-license-ids": {
-                              "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "spdx-correct": {
-                          "version": "1.0.0",
-                          "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
-                        }
-                      }
+                    "spdx-correct": {
+                      "version": "1.0.0",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
                     }
                   }
                 }
               }
             },
             "npmconf": {
-              "version": "0.1.16",
-              "from": "npmconf@0.1.16",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz",
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
               "dependencies": {
                 "config-chain": {
                   "version": "1.1.9",
@@ -2652,32 +3351,27 @@
                   "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
-                "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
                   "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                     }
                   }
                 },
-                "mkdirp": {
-                  "version": "0.3.5",
-                  "from": "mkdirp@>=0.3.3 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                },
-                "osenv": {
-                  "version": "0.0.3",
-                  "from": "osenv@0.0.3",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"
-                },
                 "nopt": {
-                  "version": "2.2.1",
-                  "from": "nopt@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+                  "version": "3.0.3",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.3.tgz",
                   "dependencies": {
                     "abbrev": {
                       "version": "1.0.7",
@@ -2686,10 +3380,22 @@
                     }
                   }
                 },
-                "ini": {
-                  "version": "1.1.0",
-                  "from": "ini@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
                 }
               }
             },
@@ -2921,11 +3627,6 @@
                 }
               }
             },
-            "semver": {
-              "version": "2.1.0",
-              "from": "semver@2.1.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-2.1.0.tgz"
-            },
             "shelljs": {
               "version": "0.3.0",
               "from": "shelljs@0.3.0",
@@ -3088,10 +3789,9 @@
               "from": "valid-identifier@0.0.1",
               "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
             },
-            "xcode": {
-              "version": "0.6.7",
-              "from": "xcode@0.6.7",
-              "resolved": "https://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz",
+            "ionic-xcode": {
+              "version": "0.8.3",
+              "from": "ionic-xcode@0.8.3",
               "dependencies": {
                 "pegjs": {
                   "version": "0.6.2",
@@ -3204,7 +3904,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -3433,7 +4133,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -3453,7 +4153,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -3483,6 +4183,43 @@
               }
             }
           }
+        },
+        "winston": {
+          "version": "1.0.1",
+          "from": "winston@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.0.1.tgz",
+          "dependencies": {
+            "colors": {
+              "version": "1.0.3",
+              "from": "colors@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "from": "isstream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+            },
+            "pkginfo": {
+              "version": "0.3.0",
+              "from": "pkginfo@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
         }
       }
     },
@@ -4849,7 +5586,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
diff --git a/package.json b/package.json
index 0421247d44..d49306b936 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.8-beta.1",
+    "ionic-app-lib": "0.3.9-beta.2",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From a8cd73156aaf4afbcbce013e38b6a1c4e125bdc7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Wed, 5 Aug 2015 16:21:45 -0600
Subject: [PATCH 0763/1100] Fix(state): Pass correct arguments to state
 commands from CLI caller. Ensure clear state is passed options for
 plugins/platforms. Closes #553

---
 lib/ionic/state.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index a43a2f8071..bfddfdb08b 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -28,7 +28,7 @@
 
 var fs = require('fs'),
   path = require('path'),
-  argv = require('optimist').boolean(['plugins', 'platforms']).argv,
+  // argv = require('optimist').boolean(['plugins', 'platforms']).argv,
   Q = require('q'),
   shelljs = require('shelljs'),
   Task = require('./task').Task,
@@ -48,7 +48,7 @@ var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function run(ionic) {
+IonicTask.prototype.run = function run(ionic, argv) {
   var self = this,
       project,
       stats,
@@ -88,7 +88,7 @@ IonicTask.prototype.run = function run(ionic) {
       State.resetState(process.cwd(), options);
       break;
     case 'clear':
-      State.clearState(process.cwd());
+      State.clearState(process.cwd(), options);
       break;
     default:
       console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);

From 1943ec856a59ee0507b14b932e0b1698f817d430 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 6 Aug 2015 16:40:57 -0500
Subject: [PATCH 0764/1100] add support for android release

---
 lib/ionic/package.js  | 47 ++++++++++++++++++++++++++++++++++++++-----
 lib/tasks/cliTasks.js | 35 +++++---------------------------
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 00b6df6aef..946b90fad7 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,4 +1,9 @@
-var IonicAppLib = require('ionic-app-lib'),
+var fs = require('fs'),
+    prompt = require('prompt'),
+    _ = require('underscore'),
+    Q = require('q'),
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
@@ -12,7 +17,7 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.run = function(ionic, argv) {
 
   if (argv._.length < 2) {
-    return ionic.fail("Specify a valid platform (android or ios).", 'package')
+    return Utils.fail("Specify a valid platform (android or ios).", 'package')
   }
 
   var dir = null,
@@ -21,12 +26,16 @@ IonicTask.prototype.run = function(ionic, argv) {
       platform = argv._[1],
       buildMode = argv.release ? 'release' : 'debug';
 
+  if (!_.contains(['android', 'ios'], platform)) {
+    return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'package');
+  }
+
   try {
     dir = process.cwd();
     project = Project.load(dir);
     appId = project.get('app_id');
   } catch (ex) {
-    return Utils.fail(ex.message);
+    return Utils.fail(ex, 'package');
   }
 
   return Login.retrieveLogin()
@@ -38,10 +47,38 @@ IonicTask.prototype.run = function(ionic, argv) {
       return jar;
     })
     .then(function(jar) {
-      Package.doPackage(appId, dir, jar, platform, buildMode);
+      var q = Q.defer();
+
+      if (platform === 'android') {
+        if (buildMode === 'debug') {
+          q.resolve(Package.packageAndroidDebug(appId, dir, jar));
+        } else if (buildMode === 'release') {
+          prompt.override = argv;
+          prompt.message = '';
+          prompt.delimiter = '';
+          prompt.start();
+
+          prompt.get([
+              { name: 'keystore', description: 'Keystore File'.yellow.bold, required: true },
+              { name: 'keystore-password', description: 'Keystore Password'.yellow.bold, hidden: true, required: true },
+              { name: 'key-alias', description: 'Key Alias'.yellow.bold, required: true },
+              { name: 'key-password', description: 'Key Password'.yellow.bold, hidden: true, required: true }
+          ], function(err, result) {
+            var keystoreFilePath = result['keystore'],
+                keystorePassword = result['keystore-password'],
+                keyAlias = result['key-alias'],
+                keyPassword = result['key-password'],
+                keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+            q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+          });
+        }
+      }
+
+      return q.promise;
     })
     .catch(function(ex) {
-      Utils.fail(ex);
+      return Utils.fail(ex, 'package');
     });
 
 };
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 16d66e006c..fc0f0f2462 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -214,35 +214,6 @@ var TASKS = [
     },
     module: './ionic/resources/generate'
   },
-  // {
-  //   title: 'package',
-  //   name: 'package',
-  //   alt: ['pack'],
-  //   summary: 'Package an app using the Ionic Build service' + ' (beta)'.yellow,
-  //   args: {
-  //     '[options]': '',
-  //     '<MODE>': '"debug" or "release"',
-  //     '<PLATFORM>': '"ios" or "android"'
-  //   },
-  //   options: {
-  //     '--android-keystore-file|-k': 'Android keystore file',
-  //     '--android-keystore-alias|-a': 'Android keystore alias',
-  //     '--android-keystore-password|-w': 'Android keystore password',
-  //     '--android-key-password|-r': 'Android key password',
-  //     '--ios-certificate-file|-c': 'iOS certificate file',
-  //     '--ios-certificate-password|-d': 'iOS certificate password',
-  //     '--ios-profile-file|-f': 'iOS profile file',
-  //     '--output|-o': 'Path to save the packaged app',
-  //     '--no-email|-n': {
-  //       title: 'Do not send a build package email',
-  //       boolean: true
-  //     },
-  //     '--clear-signing|-l': 'Clear out all signing data from Ionic server',
-  //     '--email|-e': 'Ionic account email',
-  //     '--password|-p': 'Ionic account password'
-  //   },
-  //   module: './ionic/package'
-  // },
   {
     title: 'upload',
     name: 'upload',
@@ -338,7 +309,11 @@ var TASKS = [
       '<platform>': 'android'.yellow + ' or ' + 'ios'.yellow,
     },
     options: {
-      '--release': 'Mark this build as a release'
+      '--release': 'Mark this build as a release',
+      '--keystore': 'For Android release builds, specify the location of your keystore file',
+      '--keystore-password': 'For Android release builds, specify your keystore password (exclude for prompt)',
+      '--key-alias': 'For Android release builds, specify your key alias for this app',
+      '--key-password': 'For Android release builds, specify your key password for this app (exclude for prompt)'
     },
     module: './ionic/package'
   },

From b236b068bde22780954b424198f00c28f574bdab Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 6 Aug 2015 17:16:34 -0500
Subject: [PATCH 0765/1100] add support for ios builds

---
 lib/ionic/package.js  | 59 +++++++++++++++++++++++++++++++++----------
 lib/tasks/cliTasks.js |  5 +++-
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 946b90fad7..94da42f717 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -49,30 +49,61 @@ IonicTask.prototype.run = function(ionic, argv) {
     .then(function(jar) {
       var q = Q.defer();
 
-      if (platform === 'android') {
-        if (buildMode === 'debug') {
-          q.resolve(Package.packageAndroidDebug(appId, dir, jar));
-        } else if (buildMode === 'release') {
+      try {
+        if (platform === 'android') {
+          if (buildMode === 'debug') {
+            q.resolve(Package.packageAndroidDebug(appId, dir, jar));
+          } else if (buildMode === 'release') {
+            prompt.override = argv;
+            prompt.message = '';
+            prompt.delimiter = '';
+            prompt.start();
+
+            prompt.get([
+                { name: 'keystore', description: 'Keystore File:'.yellow.bold, required: true },
+                { name: 'keystore-password', description: 'Keystore Password:'.yellow.bold, hidden: true, required: true },
+                { name: 'key-alias', description: 'Key Alias:'.yellow.bold, required: true },
+                { name: 'key-password', description: 'Key Password:'.yellow.bold, hidden: true, required: true }
+            ], function(err, result) {
+              if (err) {
+                return q.reject('Error retrieving Android information: ' + err);
+              }
+
+              var keystoreFilePath = result['keystore'],
+                  keystorePassword = result['keystore-password'],
+                  keyAlias = result['key-alias'],
+                  keyPassword = result['key-password'],
+                  keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+              return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+            });
+          }
+        } else if (platform === 'ios') {
           prompt.override = argv;
           prompt.message = '';
           prompt.delimiter = '';
           prompt.start();
 
           prompt.get([
-              { name: 'keystore', description: 'Keystore File'.yellow.bold, required: true },
-              { name: 'keystore-password', description: 'Keystore Password'.yellow.bold, hidden: true, required: true },
-              { name: 'key-alias', description: 'Key Alias'.yellow.bold, required: true },
-              { name: 'key-password', description: 'Key Password'.yellow.bold, hidden: true, required: true }
+              { name: 'cert', description: 'Certificate File:'.yellow.bold, required: true },
+              { name: 'cert-password', description: 'Certificate Password:'.yellow.bold, hidden: true, required: true },
+              { name: 'provisioning-profile', description: 'Provisioning Profile:'.yellow.bold, required: true }
           ], function(err, result) {
-            var keystoreFilePath = result['keystore'],
-                keystorePassword = result['keystore-password'],
-                keyAlias = result['key-alias'],
-                keyPassword = result['key-password'],
-                keystoreFileStream = fs.createReadStream(keystoreFilePath);
+            if (err) {
+              return q.reject('Error retrieving iOS information: ' + err);
+            }
+
+            var certificateFilePath = result['cert'],
+                certificatePassword = result['cert-password'],
+                provisioningProfileFilePath = result['provisioning-profile'],
+                certificateFileStream = fs.createReadStream(certificateFilePath),
+                provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
-            q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+            return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
           });
         }
+      } catch (ex) {
+        q.reject(ex);
       }
 
       return q.promise;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index fc0f0f2462..04aeaa7772 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -313,7 +313,10 @@ var TASKS = [
       '--keystore': 'For Android release builds, specify the location of your keystore file',
       '--keystore-password': 'For Android release builds, specify your keystore password (exclude for prompt)',
       '--key-alias': 'For Android release builds, specify your key alias for this app',
-      '--key-password': 'For Android release builds, specify your key password for this app (exclude for prompt)'
+      '--key-password': 'For Android release builds, specify your key password for this app (exclude for prompt)',
+      '--cert': 'For iOS builds, specify the location of your .p12 file',
+      '--cert-password': 'For iOS builds, specify your certificate password (exclude for prompt)',
+      '--provisioning-profile': 'For iOS builds, specify the location of your .mobileprovision file'
     },
     module: './ionic/package'
   },

From 7e37fee8ae7b3bbd926556578cd094e1ad044519 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 7 Aug 2015 10:32:11 -0500
Subject: [PATCH 0766/1100] use reusable prompt utility

---
 lib/cli.js           |  2 +-
 lib/ionic/package.js | 88 +++++++++++++++++++++-----------------------
 lib/ionic/prompt.js  | 19 ++++++----
 3 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 386cd297f4..11c7acda26 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -128,7 +128,7 @@ Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
     input: 'grey',
     small: 'grey',
     verbose: 'cyan',
-    prompt: 'grey',
+    prompt: ['yellow', 'bold'],
     info: 'white',
     data: 'grey',
     help: 'cyan',
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 94da42f717..3ec658210b 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,5 +1,4 @@
 var fs = require('fs'),
-    prompt = require('prompt'),
     _ = require('underscore'),
     Q = require('q'),
     IonicAppLib = require('ionic-app-lib'),
@@ -7,6 +6,7 @@ var fs = require('fs'),
     Login = IonicAppLib.login,
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
+    Prompt = require('./prompt'),
     Task = require('./task').Task;
 
 var Project = IonicAppLib.project;
@@ -54,53 +54,49 @@ IonicTask.prototype.run = function(ionic, argv) {
           if (buildMode === 'debug') {
             q.resolve(Package.packageAndroidDebug(appId, dir, jar));
           } else if (buildMode === 'release') {
-            prompt.override = argv;
-            prompt.message = '';
-            prompt.delimiter = '';
-            prompt.start();
-
-            prompt.get([
-                { name: 'keystore', description: 'Keystore File:'.yellow.bold, required: true },
-                { name: 'keystore-password', description: 'Keystore Password:'.yellow.bold, hidden: true, required: true },
-                { name: 'key-alias', description: 'Key Alias:'.yellow.bold, required: true },
-                { name: 'key-password', description: 'Key Password:'.yellow.bold, hidden: true, required: true }
-            ], function(err, result) {
-              if (err) {
-                return q.reject('Error retrieving Android information: ' + err);
-              }
-
-              var keystoreFilePath = result['keystore'],
-                  keystorePassword = result['keystore-password'],
-                  keyAlias = result['key-alias'],
-                  keyPassword = result['key-password'],
-                  keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-              return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
-            });
+            Prompt.prompt([
+                { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
+                { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
+                { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
+                { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
+            ], argv)
+              .then(function(result) {
+                var keystoreFilePath = result['keystore'],
+                    keystorePassword = result['keystore-password'],
+                    keyAlias = result['key-alias'],
+                    keyPassword = result['key-password'],
+                    keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+                return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+              })
+              .fail(function(err) {
+                return Utils.fail(err);
+              })
+              .catch(function(ex) {
+                return Utils.fail(ex);
+              });
           }
         } else if (platform === 'ios') {
-          prompt.override = argv;
-          prompt.message = '';
-          prompt.delimiter = '';
-          prompt.start();
-
-          prompt.get([
-              { name: 'cert', description: 'Certificate File:'.yellow.bold, required: true },
-              { name: 'cert-password', description: 'Certificate Password:'.yellow.bold, hidden: true, required: true },
-              { name: 'provisioning-profile', description: 'Provisioning Profile:'.yellow.bold, required: true }
-          ], function(err, result) {
-            if (err) {
-              return q.reject('Error retrieving iOS information: ' + err);
-            }
-
-            var certificateFilePath = result['cert'],
-                certificatePassword = result['cert-password'],
-                provisioningProfileFilePath = result['provisioning-profile'],
-                certificateFileStream = fs.createReadStream(certificateFilePath),
-                provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
-
-            return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
-          });
+          Prompt.prompt([
+              { name: 'cert', description: 'Certificate File:'.prompt, required: true },
+              { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
+              { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
+          ], argv)
+            .then(function(result) {
+              var certificateFilePath = result['cert'],
+                  certificatePassword = result['cert-password'],
+                  provisioningProfileFilePath = result['provisioning-profile'],
+                  certificateFileStream = fs.createReadStream(certificateFilePath),
+                  provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+
+              return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
+            })
+            .fail(function(err) {
+              return Utils.fail(err);
+            })
+            .catch(function(ex) {
+              return Utils.fail(ex);
+            });
         }
       } catch (ex) {
         q.reject(ex);
diff --git a/lib/ionic/prompt.js b/lib/ionic/prompt.js
index 5e6c06fdec..c4306a477c 100644
--- a/lib/ionic/prompt.js
+++ b/lib/ionic/prompt.js
@@ -1,23 +1,26 @@
 var prompt = require('prompt')
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
     Q = require('q');
 
 var Prompt = module.exports;
 
-Prompt.promptUserPromise = function promptUserPromise(schema) {
+Prompt.prompt = function(schema, argv) {
   var q = Q.defer();
-  var prompt = require('prompt');
   prompt.override = argv;
   prompt.message = '';
   prompt.delimiter = '';
   prompt.start();
   prompt.get(schema, function (err, result) {
-    if (err && err.message !== 'canceled') {
-      q.reject(err);
-      return ionic.fail('Error getting Facebook app information: ' + err);
-    } else {
-      return q.resolve(false);
+    if (err) {
+      if (err.message === 'canceled') {
+        return q.reject(false);
+      } else {
+        return q.reject(err);
+      }
     }
-    q.resolve(result);
+
+    return q.resolve(result);
   });
   return q.promise;
 };

From 0024748cd9ed0be768f36d3d15b9634a51decf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D0=B2=D0=BE=D1=80=D0=BE=D0=B4=D0=B0=20?=
 =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=90=D0=BD=D0=B4=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?= <chalkerx@gmail.com>
Date: Tue, 18 Aug 2015 02:44:45 +0300
Subject: [PATCH 0767/1100] Require `util` instead of the deprecated `sys`.

---
 lib/hooks/after_platform_add/010_install_plugins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
index b23635c304..f162e60fd4 100644
--- a/lib/hooks/after_platform_add/010_install_plugins.js
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -6,7 +6,7 @@
  */
 var exec = require('child_process').exec;
 var path = require('path');
-var sys = require('sys');
+var util = require('util');
 
 var packageJSON = null;
 
@@ -24,6 +24,6 @@ var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
 packageJSON.cordovaPlugins.forEach(function (plugin) {
   exec('cordova plugin add ' + plugin, function (error, stdout, stderr) {
-    sys.puts(stdout);
+    util.puts(stdout);
   });
 });

From 98c0e19b4b34863fcd3985ae8d227bbcb934923d Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 24 Aug 2015 09:58:05 -0500
Subject: [PATCH 0768/1100] stub out list and download commands

---
 lib/ionic/package.js  | 137 ++++++++++++++++++++++++++++--------------
 lib/tasks/cliTasks.js |  32 +++++++---
 2 files changed, 116 insertions(+), 53 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 3ec658210b..523a7a58bf 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -17,13 +17,34 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.run = function(ionic, argv) {
 
   if (argv._.length < 2) {
-    return Utils.fail("Specify a valid platform (android or ios).", 'package')
+    return Utils.fail("Specify a subcommand (build, list, or download).", 'package');
+  }
+
+  var cmd = argv._[1];
+
+  switch (cmd) {
+    case 'build':
+      return packageBuild(ionic, argv);
+    case 'list':
+      return packageList(ionic, argv);
+    case 'download':
+      return packageDownload(ionic, argv);
+  }
+
+  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'package')
+
+};
+
+function packageBuild(ionic, argv) {
+
+  if (argv._.length < 3) {
+    return Utils.fail("Specify a valid platform (android or ios).", 'package');
   }
 
   var dir = null,
       project = null,
       appId = null,
-      platform = argv._[1],
+      platform = argv._[2],
       buildMode = argv.release ? 'release' : 'debug';
 
   if (!_.contains(['android', 'ios'], platform)) {
@@ -47,49 +68,24 @@ IonicTask.prototype.run = function(ionic, argv) {
       return jar;
     })
     .then(function(jar) {
-      var q = Q.defer();
-
-      try {
-        if (platform === 'android') {
-          if (buildMode === 'debug') {
-            q.resolve(Package.packageAndroidDebug(appId, dir, jar));
-          } else if (buildMode === 'release') {
-            Prompt.prompt([
-                { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
-                { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
-                { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
-                { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
-            ], argv)
-              .then(function(result) {
-                var keystoreFilePath = result['keystore'],
-                    keystorePassword = result['keystore-password'],
-                    keyAlias = result['key-alias'],
-                    keyPassword = result['key-password'],
-                    keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-                return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
-              })
-              .fail(function(err) {
-                return Utils.fail(err);
-              })
-              .catch(function(ex) {
-                return Utils.fail(ex);
-              });
-          }
-        } else if (platform === 'ios') {
-          Prompt.prompt([
-              { name: 'cert', description: 'Certificate File:'.prompt, required: true },
-              { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
-              { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
+      if (platform === 'android') {
+        if (buildMode === 'debug') {
+          return Package.packageAndroidDebug(appId, dir, jar);
+        } else if (buildMode === 'release') {
+          return Prompt.prompt([
+              { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
+              { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
+              { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
+              { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
           ], argv)
             .then(function(result) {
-              var certificateFilePath = result['cert'],
-                  certificatePassword = result['cert-password'],
-                  provisioningProfileFilePath = result['provisioning-profile'],
-                  certificateFileStream = fs.createReadStream(certificateFilePath),
-                  provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+              var keystoreFilePath = result['keystore'],
+                  keystorePassword = result['keystore-password'],
+                  keyAlias = result['key-alias'],
+                  keyPassword = result['key-password'],
+                  keystoreFileStream = fs.createReadStream(keystoreFilePath);
 
-              return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
+              return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
             })
             .fail(function(err) {
               return Utils.fail(err);
@@ -98,11 +94,30 @@ IonicTask.prototype.run = function(ionic, argv) {
               return Utils.fail(ex);
             });
         }
-      } catch (ex) {
-        q.reject(ex);
+      } else if (platform === 'ios') {
+        return Prompt.prompt([
+            { name: 'cert', description: 'Certificate File:'.prompt, required: true },
+            { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
+            { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
+        ], argv)
+          .then(function(result) {
+            var certificateFilePath = result['cert'],
+                certificatePassword = result['cert-password'],
+                provisioningProfileFilePath = result['provisioning-profile'],
+                certificateFileStream = fs.createReadStream(certificateFilePath),
+                provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+
+            return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
+          })
+          .fail(function(err) {
+            return Utils.fail(err);
+          })
+          .catch(function(ex) {
+            return Utils.fail(ex);
+          });
       }
 
-      return q.promise;
+      throw new Error('Unrecognized platform/build mode.');
     })
     .catch(function(ex) {
       return Utils.fail(ex, 'package');
@@ -110,4 +125,36 @@ IonicTask.prototype.run = function(ionic, argv) {
 
 };
 
+function packageList(ionic, argv) {
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(jar) {
+      console.log('list!');
+    });
+
+}
+
+function packageDownload(ionic, argv) {
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(jar) {
+      console.log('download!');
+    });
+
+}
+
 exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 04aeaa7772..7814626d65 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -302,21 +302,37 @@ var TASKS = [
     module: './ionic/push'
   },
   {
-    title: 'package',
+    title: 'package build',
     name: 'package',
     summary: 'Package up your app into .apk or .ipa files with Ionic Package ' + '(alpha)'.red,
     args: {
       '<platform>': 'android'.yellow + ' or ' + 'ios'.yellow,
+      '[options]': ''
     },
     options: {
       '--release': 'Mark this build as a release',
-      '--keystore': 'For Android release builds, specify the location of your keystore file',
-      '--keystore-password': 'For Android release builds, specify your keystore password (exclude for prompt)',
-      '--key-alias': 'For Android release builds, specify your key alias for this app',
-      '--key-password': 'For Android release builds, specify your key password for this app (exclude for prompt)',
-      '--cert': 'For iOS builds, specify the location of your .p12 file',
-      '--cert-password': 'For iOS builds, specify your certificate password (exclude for prompt)',
-      '--provisioning-profile': 'For iOS builds, specify the location of your .mobileprovision file'
+      '--keystore <path>': 'For Android release builds, specify the location of your keystore file',
+      '--keystore-password <password>': 'For Android release builds, specify your keystore password (exclude for prompt)',
+      '--key-alias <alias>': 'For Android release builds, specify your key alias for this app',
+      '--key-password <password>': 'For Android release builds, specify your key password for this app (exclude for prompt)',
+      '--cert <path>': 'For iOS builds, specify the location of your .p12 file',
+      '--cert-password <password>': 'For iOS builds, specify your certificate password (exclude for prompt)',
+      '--provisioning-profile <path>': 'For iOS builds, specify the location of your .mobileprovision file'
+    },
+    module: './ionic/package'
+  },
+  {
+    title: 'package list',
+    name: 'package',
+    summary: 'List the latest builds of your app in Ionic Package ' + '(alpha)'.red,
+    module: './ionic/package'
+  },
+  {
+    title: 'package download',
+    name: 'package',
+    summary: 'Download a packaged build of your app (.apk/.ipa) from Ionic Package ' + '(alpha)'.red,
+    args: {
+      '<build-id>': 'The ID of the build to download'
     },
     module: './ionic/package'
   },

From 5328b8b8b381fbb547702b82871e2243a6efd823 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 24 Aug 2015 11:00:52 -0500
Subject: [PATCH 0769/1100] refactor package on help page into one command

---
 lib/tasks/cliTasks.js | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7814626d65..b43a4fe245 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -302,37 +302,22 @@ var TASKS = [
     module: './ionic/push'
   },
   {
-    title: 'package build',
+    title: 'package',
     name: 'package',
-    summary: 'Package up your app into .apk or .ipa files with Ionic Package ' + '(alpha)'.red,
+    summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
     args: {
-      '<platform>': 'android'.yellow + ' or ' + 'ios'.yellow,
+      '<command>': 'build'.yellow + ', ' + 'list'.yellow + ', or ' + 'download'.yellow,
       '[options]': ''
     },
     options: {
-      '--release': 'Mark this build as a release',
-      '--keystore <path>': 'For Android release builds, specify the location of your keystore file',
-      '--keystore-password <password>': 'For Android release builds, specify your keystore password (exclude for prompt)',
-      '--key-alias <alias>': 'For Android release builds, specify your key alias for this app',
-      '--key-password <password>': 'For Android release builds, specify your key password for this app (exclude for prompt)',
-      '--cert <path>': 'For iOS builds, specify the location of your .p12 file',
-      '--cert-password <password>': 'For iOS builds, specify your certificate password (exclude for prompt)',
-      '--provisioning-profile <path>': 'For iOS builds, specify the location of your .mobileprovision file'
-    },
-    module: './ionic/package'
-  },
-  {
-    title: 'package list',
-    name: 'package',
-    summary: 'List the latest builds of your app in Ionic Package ' + '(alpha)'.red,
-    module: './ionic/package'
-  },
-  {
-    title: 'package download',
-    name: 'package',
-    summary: 'Download a packaged build of your app (.apk/.ipa) from Ionic Package ' + '(alpha)'.red,
-    args: {
-      '<build-id>': 'The ID of the build to download'
+      '--release': '(' + 'build'.yellow + ') Mark this build as a release',
+      '--keystore <path>': '(' + 'build android'.yellow + ') Specify the location of your keystore file',
+      '--keystore-password <password>': '(' + 'build android'.yellow + ') Specify your keystore password (exclude for prompt)',
+      '--key-alias <alias>': '(' + 'build android'.yellow + ') Specify your key alias for this app',
+      '--key-password <password>': '(' + 'build android'.yellow + ') Specify your key password for this app (exclude for prompt)',
+      '--cert <path>': '(' + 'build ios'.yellow + ') Specify the location of your .p12 file',
+      '--cert-password <password>': '(' + 'build ios'.yellow + ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile <path>': '(' + 'build ios'.yellow + ') Specify the location of your .mobileprovision file'
     },
     module: './ionic/package'
   },

From 2edecf6711962784d13a8d206583ea18c732f90b Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 24 Aug 2015 14:37:49 -0500
Subject: [PATCH 0770/1100] package list

---
 lib/ionic/package.js | 88 ++++++++++++++++++++++++++++++++------------
 lib/ionic/table.js   | 33 +++++++++++++++++
 2 files changed, 98 insertions(+), 23 deletions(-)
 create mode 100644 lib/ionic/table.js

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 523a7a58bf..ac8dfaa4b6 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -7,6 +7,7 @@ var fs = require('fs'),
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
     Prompt = require('./prompt'),
+    Table = require('./table'),
     Task = require('./task').Task;
 
 var Project = IonicAppLib.project;
@@ -20,45 +21,45 @@ IonicTask.prototype.run = function(ionic, argv) {
     return Utils.fail("Specify a subcommand (build, list, or download).", 'package');
   }
 
-  var cmd = argv._[1];
+  var cmd = argv._[1],
+      dir = null,
+      project = null,
+      appId = null;
+
+  try {
+    dir = process.cwd();
+    project = Project.load(dir);
+    appId = project.get('app_id');
+  } catch (ex) {
+    return Utils.fail(ex, 'package');
+  }
 
   switch (cmd) {
     case 'build':
-      return packageBuild(ionic, argv);
+      return packageBuild(ionic, argv, dir, project, appId);
     case 'list':
-      return packageList(ionic, argv);
+      return packageList(ionic, argv, dir, project, appId);
     case 'download':
-      return packageDownload(ionic, argv);
+      return packageDownload(ionic, argv, dir, project, appId);
   }
 
   return Utils.fail("Unknown subcommand '" + cmd + "'.", 'package')
 
 };
 
-function packageBuild(ionic, argv) {
+function packageBuild(ionic, argv, dir, project, appId) {
 
   if (argv._.length < 3) {
     return Utils.fail("Specify a valid platform (android or ios).", 'package');
   }
 
-  var dir = null,
-      project = null,
-      appId = null,
-      platform = argv._[2],
+  var platform = argv._[2],
       buildMode = argv.release ? 'release' : 'debug';
 
   if (!_.contains(['android', 'ios'], platform)) {
     return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'package');
   }
 
-  try {
-    dir = process.cwd();
-    project = Project.load(dir);
-    appId = project.get('app_id');
-  } catch (ex) {
-    return Utils.fail(ex, 'package');
-  }
-
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
@@ -70,7 +71,7 @@ function packageBuild(ionic, argv) {
     .then(function(jar) {
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          return Package.packageAndroidDebug(appId, dir, jar);
+          return Package.buildAndroidDebug(appId, dir, jar);
         } else if (buildMode === 'release') {
           return Prompt.prompt([
               { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
@@ -85,7 +86,7 @@ function packageBuild(ionic, argv) {
                   keyPassword = result['key-password'],
                   keystoreFileStream = fs.createReadStream(keystoreFilePath);
 
-              return q.resolve(Package.packageAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+              return q.resolve(Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
             })
             .fail(function(err) {
               return Utils.fail(err);
@@ -107,7 +108,7 @@ function packageBuild(ionic, argv) {
                 certificateFileStream = fs.createReadStream(certificateFilePath),
                 provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
-            return q.resolve(Package.packageIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
+            return q.resolve(Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
           })
           .fail(function(err) {
             return Utils.fail(err);
@@ -125,7 +126,26 @@ function packageBuild(ionic, argv) {
 
 };
 
-function packageList(ionic, argv) {
+function formatStatus(status) {
+  switch (status) {
+    case 'SUCCESS':
+      return status.green;
+    case 'FAILED':
+      return status.red;
+  }
+
+  return status;
+}
+
+function formatDate(date) {
+  var d = new Date(date);
+
+  return d.toLocaleDateString() + ' at ' + d.toLocaleTimeString();
+}
+
+function packageList(ionic, argv, dir, project, appId) {
+
+  var limit = 25;
 
   return Login.retrieveLogin()
     .then(function(jar) {
@@ -136,12 +156,34 @@ function packageList(ionic, argv) {
       return jar;
     })
     .then(function(jar) {
-      console.log('list!');
+      return Package.listBuilds(appId, jar);
+    })
+    .then(function(body) {
+      var count = 0,
+          table = new Table({ head: ['id', 'status', 'platform', 'mode', 'created', 'completed'] });
+
+      _.each(body.data.slice(0, limit), function(build) {
+        count++;
+
+        table.push([
+          build.id,
+          formatStatus(build.status),
+          build.platform,
+          build.mode,
+          formatDate(build.created),
+          build.completed ? formatDate(build.completed) : ''
+        ]);
+      });
+
+      console.log('');
+      console.log(table.toString());
+      console.log('\nShowing', String(count).yellow, 'of your latest builds.');
+      console.log('');
     });
 
 }
 
-function packageDownload(ionic, argv) {
+function packageDownload(ionic, argv, dir, project, appId) {
 
   return Login.retrieveLogin()
     .then(function(jar) {
diff --git a/lib/ionic/table.js b/lib/ionic/table.js
new file mode 100644
index 0000000000..92c38db85a
--- /dev/null
+++ b/lib/ionic/table.js
@@ -0,0 +1,33 @@
+var _ = require('underscore'),
+    cliTable = require('cli-table');
+
+function Table(options) {
+  if (!options) {
+    options = {};
+  }
+
+  cliTable.call(this, _.extend({
+    chars: {
+      'top': '',
+      'top-mid': '',
+      'top-left': '',
+      'top-right': '',
+      'bottom': '',
+      'bottom-mid': '',
+      'bottom-left': '',
+      'bottom-right': '',
+      'left': ' ',
+      'left-mid': '',
+      'right': '',
+      'right-mid': ''
+    },
+    style: {
+      compact: true,
+      head: ['yellow']
+    }
+  }, options));
+}
+
+Table.prototype = Object.create(cliTable.prototype);
+
+module.exports = Table;

From e6ca4a96f74b1d7c3a0394b3e422dbea0d8e6193 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 25 Aug 2015 11:38:12 -0500
Subject: [PATCH 0771/1100] download command for package

---
 lib/ionic/package.js | 73 ++++++++++++++++++++++++++++++++++++++++++--
 package.json         |  1 +
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index ac8dfaa4b6..803052b601 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,6 +1,9 @@
 var fs = require('fs'),
     _ = require('underscore'),
     Q = require('q'),
+    request = require('request'),
+    requestProcess = require('request-progress'),
+    ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
@@ -126,6 +129,17 @@ function packageBuild(ionic, argv, dir, project, appId) {
 
 };
 
+function determineFileExtension(platform) {
+  switch (platform) {
+    case 'android':
+      return 'apk';
+    case 'ios':
+      return 'ipa';
+  }
+
+  throw new Error('Unknown platform: ' + platform);
+}
+
 function formatStatus(status) {
   switch (status) {
     case 'SUCCESS':
@@ -185,6 +199,8 @@ function packageList(ionic, argv, dir, project, appId) {
 
 function packageDownload(ionic, argv, dir, project, appId) {
 
+  var jar;
+
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
@@ -193,8 +209,61 @@ function packageDownload(ionic, argv, dir, project, appId) {
       }
       return jar;
     })
-    .then(function(jar) {
-      console.log('download!');
+    .then(function(j) {
+      jar = j;
+
+      if (argv._.length < 3) {
+        return Package.listBuilds(appId, jar);
+      }
+
+      return { data: [ { id: argv._[2] } ] };
+    })
+    .then(function(body) {
+      return Package.getBuild(appId, jar, body.data[0].id);
+    })
+    .then(function(body) {
+      var q = Q.defer(),
+          build = body.data,
+          bar;
+
+      if (build.status != 'SUCCESS' || !build.url) {
+        return Q.reject(new Error('Cannot download! Build did not finish.'));
+      }
+
+      var filename = build.name + '.' + determineFileExtension(build.platform);
+
+      requestProcess(request({ url: build.url }))
+        .on('progress', function(state) {
+          if (typeof bar === 'undefined') {
+            bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
+              complete: '=',
+              incomplete: ' ',
+              width: 30,
+              total: state.total
+            });
+          }
+
+          bar.tick(state.received);
+        })
+        .on('error', function(err) {
+          q.reject(err);
+        })
+        .pipe(fs.createWriteStream(filename))
+        .on('error', function(err) {
+          q.reject(err);
+        })
+        .on('close', function() {
+          console.log('Wrote:', filename);
+          q.resolve(filename);
+        });
+
+      return q.promise;
+    })
+    .then(function(filename) {
+      console.log('Done!'.green);
+    })
+    .catch(function(ex) {
+      Utils.fail(ex);
     });
 
 }
diff --git a/package.json b/package.json
index d49306b936..dbe7c31d78 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
     "request": "2.51.0",
+    "request-progress": "^0.3.1",
     "semver": "^4.2.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",

From caa34746ea0282ea4ad621732c16200a75af8f78 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 25 Aug 2015 13:12:46 -0500
Subject: [PATCH 0772/1100] promise refactor

---
 lib/ionic/package.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 803052b601..c4834855fa 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -72,6 +72,8 @@ function packageBuild(ionic, argv, dir, project, appId) {
       return jar;
     })
     .then(function(jar) {
+      var q = Q.defer();
+
       if (platform === 'android') {
         if (buildMode === 'debug') {
           return Package.buildAndroidDebug(appId, dir, jar);
@@ -89,13 +91,10 @@ function packageBuild(ionic, argv, dir, project, appId) {
                   keyPassword = result['key-password'],
                   keystoreFileStream = fs.createReadStream(keystoreFilePath);
 
-              return q.resolve(Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
-            })
-            .fail(function(err) {
-              return Utils.fail(err);
+              q.resolve(Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
             })
             .catch(function(ex) {
-              return Utils.fail(ex);
+              q.reject(ex);
             });
         }
       } else if (platform === 'ios') {
@@ -111,20 +110,19 @@ function packageBuild(ionic, argv, dir, project, appId) {
                 certificateFileStream = fs.createReadStream(certificateFilePath),
                 provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
-            return q.resolve(Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
-          })
-          .fail(function(err) {
-            return Utils.fail(err);
+            q.resolve(Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
           })
           .catch(function(ex) {
-            return Utils.fail(ex);
+            q.reject(ex);
           });
       }
 
-      throw new Error('Unrecognized platform/build mode.');
+      q.reject('Unrecognized platform/build mode.');
+
+      return q.promise;
     })
     .catch(function(ex) {
-      return Utils.fail(ex, 'package');
+      Utils.fail(ex, 'package');
     });
 
 };

From eaa85e04d29b74ad96a350d8cd961cec472f138f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 25 Aug 2015 13:36:22 -0500
Subject: [PATCH 0773/1100] more promise refactor

---
 lib/ionic/package.js | 62 ++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index c4834855fa..42af378b6f 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -56,7 +56,8 @@ function packageBuild(ionic, argv, dir, project, appId) {
     return Utils.fail("Specify a valid platform (android or ios).", 'package');
   }
 
-  var platform = argv._[2],
+  var jar,
+      platform = argv._[2],
       buildMode = argv.release ? 'release' : 'debug';
 
   if (!_.contains(['android', 'ios'], platform)) {
@@ -71,56 +72,73 @@ function packageBuild(ionic, argv, dir, project, appId) {
       }
       return jar;
     })
-    .then(function(jar) {
+    .then(function(j) {
       var q = Q.defer();
 
+      jar = j;
+
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          return Package.buildAndroidDebug(appId, dir, jar);
+          q.resolve({});
         } else if (buildMode === 'release') {
-          return Prompt.prompt([
+          Prompt.prompt([
               { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
               { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
               { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
               { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
           ], argv)
             .then(function(result) {
-              var keystoreFilePath = result['keystore'],
-                  keystorePassword = result['keystore-password'],
-                  keyAlias = result['key-alias'],
-                  keyPassword = result['key-password'],
-                  keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-              q.resolve(Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword));
+              q.resolve(result);
             })
             .catch(function(ex) {
               q.reject(ex);
             });
+        } else {
+          q.reject('Unrecognized build mode: ' + buildMode);
         }
       } else if (platform === 'ios') {
-        return Prompt.prompt([
+        Prompt.prompt([
             { name: 'cert', description: 'Certificate File:'.prompt, required: true },
             { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
             { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
         ], argv)
           .then(function(result) {
-            var certificateFilePath = result['cert'],
-                certificatePassword = result['cert-password'],
-                provisioningProfileFilePath = result['provisioning-profile'],
-                certificateFileStream = fs.createReadStream(certificateFilePath),
-                provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
-
-            q.resolve(Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream));
+            q.resolve(result);
           })
           .catch(function(ex) {
             q.reject(ex);
           });
+      } else {
+        q.reject('Unrecognized platform: ' + platform);
       }
 
-      q.reject('Unrecognized platform/build mode.');
-
       return q.promise;
     })
+    .then(function(result) {
+      if (platform === 'android') {
+        if (buildMode === 'debug') {
+          return Package.buildAndroidDebug(appId, dir, jar);
+        } else if (buildMode === 'release') {
+          var keystoreFilePath = result['keystore'],
+              keystorePassword = result['keystore-password'],
+              keyAlias = result['key-alias'],
+              keyPassword = result['key-password'],
+              keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+          return Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
+        }
+      } else if (platform === 'ios') {
+        var certificateFilePath = result['cert'],
+            certificatePassword = result['cert-password'],
+            provisioningProfileFilePath = result['provisioning-profile'],
+            certificateFileStream = fs.createReadStream(certificateFilePath),
+            provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+
+        return Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+      }
+
+      return Q.reject('Unrecognized platform/build mode.');
+    })
     .catch(function(ex) {
       Utils.fail(ex, 'package');
     });
@@ -251,7 +269,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
           q.reject(err);
         })
         .on('close', function() {
-          console.log('Wrote:', filename);
+          console.log('\nWrote:', filename);
           q.resolve(filename);
         });
 

From d100485a9eccf18d0ecc2621aa7b40fe899da484 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 25 Aug 2015 16:32:10 -0500
Subject: [PATCH 0774/1100] default to list command

---
 lib/ionic/package.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 42af378b6f..c8127807a3 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -20,12 +20,15 @@ IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
 
+  var cmd;
+
   if (argv._.length < 2) {
-    return Utils.fail("Specify a subcommand (build, list, or download).", 'package');
+    cmd = 'list';
+  } else {
+    cmd = argv._[1];
   }
 
-  var cmd = argv._[1],
-      dir = null,
+  var dir = null,
       project = null,
       appId = null;
 

From 02d9827353f488da6d4d248090e89d674b0de093 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 25 Aug 2015 16:46:48 -0500
Subject: [PATCH 0775/1100] helpful message if no builds found, instead of
 empty table

---
 lib/ionic/package.js | 45 ++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index c8127807a3..3906922cba 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -192,26 +192,31 @@ function packageList(ionic, argv, dir, project, appId) {
       return Package.listBuilds(appId, jar);
     })
     .then(function(body) {
-      var count = 0,
-          table = new Table({ head: ['id', 'status', 'platform', 'mode', 'created', 'completed'] });
-
-      _.each(body.data.slice(0, limit), function(build) {
-        count++;
-
-        table.push([
-          build.id,
-          formatStatus(build.status),
-          build.platform,
-          build.mode,
-          formatDate(build.created),
-          build.completed ? formatDate(build.completed) : ''
-        ]);
-      });
-
-      console.log('');
-      console.log(table.toString());
-      console.log('\nShowing', String(count).yellow, 'of your latest builds.');
-      console.log('');
+      if (body.data.length === 0) {
+        console.log('You don\'t have any builds yet!');
+        console.log('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
+      } else {
+        var count = 0,
+            table = new Table({ head: ['id', 'status', 'platform', 'mode', 'started', 'finished'] });
+
+        _.each(body.data.slice(0, limit), function(build) {
+          count++;
+
+          table.push([
+            build.id,
+            formatStatus(build.status),
+            build.platform,
+            build.mode,
+            formatDate(build.created),
+            build.completed ? formatDate(build.completed) : ''
+          ]);
+        });
+
+        console.log('');
+        console.log(table.toString());
+        console.log('\nShowing', String(count).yellow, 'of your latest builds.');
+        console.log('');
+      }
     });
 
 }

From c412717f223f80baeca4f6c123a4a533fa690567 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 26 Aug 2015 13:23:02 -0500
Subject: [PATCH 0776/1100] combine resources into one file

---
 lib/ionic/cordova.js                          |   7 +-
 .../{resources/generate.js => resources.js}   | 172 ++++++++++++++----
 lib/ionic/resources/settings.js               | 113 ------------
 lib/tasks/cliTasks.js                         |   2 +-
 4 files changed, 144 insertions(+), 150 deletions(-)
 rename lib/ionic/{resources/generate.js => resources.js} (78%)
 delete mode 100644 lib/ionic/resources/settings.js

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 63b5dd8c19..2766aa1367 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -7,8 +7,7 @@ var Task = require('./task').Task,
     exec = require('child_process').exec,
     colors = require('colors'),
     shelljs = require('shelljs'),
-    generate = require('./resources/generate'),
-    settings = require('./resources/settings'),
+    resources = require('./resources'),
     IonicAppLib = require('ionic-app-lib'),
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
@@ -60,9 +59,9 @@ IonicTask.prototype.run = function(ionic, argv) {
         self.options = serveOptions;
       }
       if(addDefaultResources && self.addIcons) {
-        return generate.copyIconFilesIntoResources()
+        return resources.copyIconFilesIntoResources()
         .then(function() {
-          return generate.addIonicIcons(argv._[2]);
+          return resources.addIonicIcons(argv._[2]);
         })
       } else {
         return false;
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources.js
similarity index 78%
rename from lib/ionic/resources/generate.js
rename to lib/ionic/resources.js
index c8fea33be4..b346685103 100644
--- a/lib/ionic/resources/generate.js
+++ b/lib/ionic/resources.js
@@ -7,23 +7,132 @@ var fs = require('fs'),
     xml2js = require('xml2js'),
     _ = require('underscore'),
     crc = require('crc'),
-    resSettings = require('./settings.js'),
-    Task = require('../task').Task,
+    Task = require('./task').Task,
     shelljs = require('shelljs'),
-    moduleSettings = require('../../../package.json'),
+    moduleSettings = require('../../package.json'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
-    IonicStats = require('../stats').IonicStats;
+    IonicStats = require('./stats').IonicStats;
 
 var IonicResources = function() {};
 IonicResources.prototype = new Task();
 
-var settings = resSettings.ResSettings;
-var platformConfigs = resSettings.ResPlatforms;
 var tmpDir = os.tmpdir();
 var configData, buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
 var generateLandscape, generatePortrait, orientation;
 
+var ResSettings = {
+  apiUrl: 'http://res.ionic.io',
+  apiUploadPath: '/api/v1/upload',
+  apiTransformPath: '/api/v1/transform',
+  resourceDir: 'resources',
+  iconDir: 'icon',
+  splashDir: 'splash',
+  iconSourceFile: 'icon',
+  splashSourceFile: 'splash',
+  sourceExtensions: ['psd', 'ai', 'png'],
+  configFile: 'config.xml',
+  generateThrottle: 4,
+  defaultMaxIconSize: 96,
+  cacheImages: true
+};
+
+var ResPlatforms = {
+
+  android: {
+    icon: {
+      images: [
+        { name: 'drawable-ldpi-icon.png',    width: 36,   height: 36,   density: "ldpi" },
+        { name: 'drawable-mdpi-icon.png',    width: 48,   height: 48,   density: "mdpi" },
+        { name: 'drawable-hdpi-icon.png',    width: 72,   height: 72,   density: "hdpi" },
+        { name: 'drawable-xhdpi-icon.png',   width: 96,   height: 96,   density: "xhdpi" },
+        { name: 'drawable-xxhdpi-icon.png',  width: 144,  height: 144,  density: "xxhdpi" },
+        { name: 'drawable-xxxhdpi-icon.png', width: 192,  height: 192,  density: "xxxhdpi" }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'density']
+    },
+    splash: {
+      images: [
+        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 240,   density: 'land-ldpi' },
+        { name: 'drawable-land-mdpi-screen.png',    width: 480,   height: 320,   density: 'land-mdpi' },
+        { name: 'drawable-land-hdpi-screen.png',    width: 800,   height: 480,   density: 'land-hdpi' },
+        { name: 'drawable-land-xhdpi-screen.png',   width: 1280,  height: 720,   density: 'land-xhdpi' },
+        { name: 'drawable-land-xxhdpi-screen.png',  width: 1600,  height: 960,   density: 'land-xxhdpi' },
+        { name: 'drawable-land-xxxhdpi-screen.png', width: 1920,  height: 1280,  density: 'land-xxxhdpi' },
+        { name: 'drawable-port-ldpi-screen.png',    width: 240,   height: 320,   density: 'port-ldpi' },
+        { name: 'drawable-port-mdpi-screen.png',    width: 320,   height: 480,   density: 'port-mdpi' },
+        { name: 'drawable-port-hdpi-screen.png',    width: 480,   height: 800,   density: 'port-hdpi' },
+        { name: 'drawable-port-xhdpi-screen.png',   width: 720,   height: 1280,  density: 'port-xhdpi' },
+        { name: 'drawable-port-xxhdpi-screen.png',  width: 960,   height: 1600,  density: 'port-xxhdpi' },
+        { name: 'drawable-port-xxxhdpi-screen.png', width: 1280,  height: 1920,  density: 'port-xxxhdpi' }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'density']
+    }
+  },
+
+  ios: {
+    icon: {
+      images: [
+        { name: 'icon.png',             width: 57,    height: 57 },
+        { name: 'icon@2x.png',          width: 114,   height: 114 },
+        { name: 'icon-40.png',          width: 40,    height: 40 },
+        { name: 'icon-40@2x.png',       width: 80,    height: 80 },
+        { name: 'icon-50.png',          width: 50,    height: 50 },
+        { name: 'icon-50@2x.png',       width: 100,   height: 100 },
+        { name: 'icon-60.png',          width: 60,    height: 60 },
+        { name: 'icon-60@2x.png',       width: 120,   height: 120 },
+        { name: 'icon-60@3x.png',       width: 180,   height: 180 },
+        { name: 'icon-72.png',          width: 72,    height: 72 },
+        { name: 'icon-72@2x.png',       width: 144,   height: 144 },
+        { name: 'icon-76.png',          width: 76,    height: 76 },
+        { name: 'icon-76@2x.png',       width: 152,   height: 152 },
+        { name: 'icon-small.png',       width: 29,    height: 29 },
+        { name: 'icon-small@2x.png',    width: 58,    height: 58 },
+        { name: 'icon-small@3x.png',    width: 87,    height: 87 }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'width', 'height']
+    },
+    splash: {
+      images: [
+        { name: 'Default-568h@2x~iphone.png',     width: 640,   height: 1136 },
+        { name: 'Default-667h.png',               width: 750,   height: 1334 },
+        { name: 'Default-736h.png',               width: 1242,  height: 2208 },
+        { name: 'Default-Landscape-736h.png',     width: 2208,  height: 1242 },
+        { name: 'Default-Landscape@2x~ipad.png',  width: 2048,  height: 1536 },
+        { name: 'Default-Landscape~ipad.png',     width: 1024,  height: 768 },
+        { name: 'Default-Portrait@2x~ipad.png',   width: 1536,  height: 2048 },
+        { name: 'Default-Portrait~ipad.png',      width: 768,   height: 1024 },
+        { name: 'Default@2x~iphone.png',          width: 640,   height: 960 },
+        { name: 'Default~iphone.png',             width: 320,   height: 480 }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'width', 'height']
+    }
+  },
+
+  wp8: {
+    icon: {
+      images: [
+        { name: 'ApplicationIcon.png',  width: 99,   height: 99 },
+        { name: 'Background.png',       width: 159,  height: 159 }
+      ],
+      nodeName: 'icon',
+      nodeAttributes: ['src', 'width', 'height']
+    },
+    splash: {
+      images: [
+        { name: 'SplashScreenImage.png',  width: 768,   height: 1280 }
+      ],
+      nodeName: 'splash',
+      nodeAttributes: ['src', 'width', 'height']
+    }
+  }
+
+};
+
 IonicResources.prototype.run = function() {
   buildPlatforms = [];
   images = [];
@@ -34,8 +143,8 @@ IonicResources.prototype.run = function() {
   generatePortrait = false;
   orientation = 'default';
 
-  if (!fs.existsSync(settings.configFile)) {
-    console.error('Invalid ' + settings.configFile + ' file. Make sure the working directory is a Cordova project.');
+  if (!fs.existsSync(ResSettings.configFile)) {
+    console.error('Invalid ' + ResSettings.configFile + ' file. Make sure the working directory is a Cordova project.');
     return;
   }
 
@@ -58,8 +167,8 @@ IonicResources.prototype.run = function() {
     return
   }
 
-  if (!fs.existsSync(settings.resourceDir)) {
-    fs.mkdirSync(settings.resourceDir);
+  if (!fs.existsSync(ResSettings.resourceDir)) {
+    fs.mkdirSync(ResSettings.resourceDir);
   }
 
   var hasPlatforms = true;
@@ -109,7 +218,7 @@ IonicResources.prototype.run = function() {
     }
 
     if (argv['api']) {
-      settings.apiUrl = argv['api'];
+      ResSettings.apiUrl = argv['api'];
     }
 
     var promises = [];
@@ -153,10 +262,10 @@ function queueResTypeImages(resType) {
     var deferred = Q.defer();
 
     buildPlatforms.forEach(function(platform) {
-      if (!platformConfigs[platform]) return;
+      if (!ResPlatforms[platform]) return;
 
-      var platformResourceDir = path.join(settings.resourceDir, platform);
-      var resTypeDir = path.join(platformResourceDir, settings[resType + 'Dir']);
+      var platformResourceDir = path.join(ResSettings.resourceDir, platform);
+      var resTypeDir = path.join(platformResourceDir, ResSettings[resType + 'Dir']);
 
       if (!fs.existsSync(platformResourceDir)) {
         fs.mkdirSync(platformResourceDir);
@@ -166,13 +275,13 @@ function queueResTypeImages(resType) {
         fs.mkdirSync(resTypeDir);
       }
 
-      _.forEach(platformConfigs[platform][resType].images, function(image) {
+      _.forEach(ResPlatforms[platform][resType].images, function(image) {
         var data = _.clone(image);
         _.extend(data, {
           platform: platform,
           src: path.join(resTypeDir, image.name),
-          nodeName: platformConfigs[platform][resType].nodeName,
-          nodeAttributes: platformConfigs[platform][resType].nodeAttributes,
+          nodeName: ResPlatforms[platform][resType].nodeName,
+          nodeAttributes: ResPlatforms[platform][resType].nodeAttributes,
           resType: resType
         });
         images.push(data);
@@ -186,8 +295,8 @@ function queueResTypeImages(resType) {
   function validateSourceImages() {
     var deferred = Q.defer();
 
-    var validSourceFiles = _.map(settings.sourceExtensions, function(ext) {
-      return settings[resType + 'SourceFile'] + '.' + ext;
+    var validSourceFiles = _.map(ResSettings.sourceExtensions, function(ext) {
+      return ResSettings[resType + 'SourceFile'] + '.' + ext;
     });
 
     images.forEach(function(image) {
@@ -197,8 +306,8 @@ function queueResTypeImages(resType) {
 
     _.each(resTypePlatforms, function(resTypePlatform) {
       for (var x = 0; x < validSourceFiles.length; x++) {
-        globalSourceFile = path.join(settings.resourceDir, validSourceFiles[x]);
-        platformSourceFile = path.join(settings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
+        globalSourceFile = path.join(ResSettings.resourceDir, validSourceFiles[x]);
+        platformSourceFile = path.join(ResSettings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
 
         if (fs.existsSync(platformSourceFile)) {
           resTypePlatform.sourceFilePath = platformSourceFile;
@@ -285,7 +394,7 @@ function queueResTypeImages(resType) {
                   }
                 }
 
-                if (settings.cacheImages && fs.existsSync(image.tmpPath)) {
+                if (ResSettings.cacheImages && fs.existsSync(image.tmpPath)) {
                   console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
 
                 } else {
@@ -327,7 +436,7 @@ function loadSourceImages() {
     console.log(' uploading ' + sourceFile.filename + '...');
 
     var postData = {
-      url: settings.apiUrl + settings.apiUploadPath,
+      url: ResSettings.apiUrl + ResSettings.apiUploadPath,
       formData: {
         image_id: sourceFile.imageId,
         src: fs.createReadStream(sourceFile.filePath),
@@ -411,7 +520,7 @@ function cacheSourceImageData(sourceFile) {
 }
 
 function loadCachedSourceImageData(sourceFile) {
-  if (settings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
+  if (ResSettings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
     try {
       var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
       sourceFile.cachedData = JSON.parse(fs.readFileSync(cachedImagePath));
@@ -426,7 +535,7 @@ function generateResourceImages() {
   var deferred = Q.defer();
 
   // https://github.com/ferentchak/QThrottle
-  var max = settings.generateThrottle - 1;
+  var max = ResSettings.generateThrottle - 1;
   var outstanding = 0;
 
   function catchingFunction(value) {
@@ -477,7 +586,7 @@ function generateResourceImage(image) {
     generatingImages[image.tmpPath] = true;
 
     var postData = {
-      url: settings.apiUrl + settings.apiTransformPath,
+      url: ResSettings.apiUrl + ResSettings.apiTransformPath,
       formData: {
         image_id: image.imageId,
         name: image.name,
@@ -571,7 +680,7 @@ function getConfigData() {
   var deferred = Q.defer();
 
   try {
-    fs.readFile(resSettings.ResSettings.configFile, onConfigRead);
+    fs.readFile(ResSettings.configFile, onConfigRead);
   } catch (err) {
     console.error('Error saveConfigData: ' + err);
     deferred.reject();
@@ -614,7 +723,6 @@ function updateConfigData() {
 
   if (!images.length || !configData) return;
 
-  var settings = resSettings.ResSettings;
   var madeChanges = false;
 
   clearResourcesNodes();
@@ -669,7 +777,7 @@ function updateConfigData() {
     var defaultIcon;
 
     images.forEach(function(image) {
-      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= settings.defaultMaxIconSize) {
+      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= ResSettings.defaultMaxIconSize) {
         currentSize = image.width;
         defaultIcon = image;
       }
@@ -747,7 +855,7 @@ function writeConfigData(configData) {
     var builder = new xml2js.Builder();
     var xmlString = builder.buildObject(configData);
 
-    fs.writeFile(settings.configFile, xmlString, function(err) {
+    fs.writeFile(ResSettings.configFile, xmlString, function(err) {
       if (err) console.error('Error writing config data: ' + err);
     });
   } catch (e) {
@@ -839,7 +947,7 @@ function addPlatformIcons(platform, configData) {
 
   configData.widget.platform.push(platElem);
 
-  resSettings.ResPlatforms[platform].icon.images.forEach(function(image) {
+  ResPlatforms[platform].icon.images.forEach(function(image) {
     var iconDir = ['resources/', platform, '/icon/', image.name].join('');
     if(platform == 'android') {
       platElem.icon.push({'$': { src: iconDir, density: image.density }})
@@ -848,7 +956,7 @@ function addPlatformIcons(platform, configData) {
     }
   });
 
-  resSettings.ResPlatforms[platform].splash.images.forEach(function(image) {
+  ResPlatforms[platform].splash.images.forEach(function(image) {
     //resources/ios/splash/
     var splashDir = ['resources/', platform, '/splash/', image.name].join('');
     if(platform == 'android') {
diff --git a/lib/ionic/resources/settings.js b/lib/ionic/resources/settings.js
deleted file mode 100644
index 88eea64d86..0000000000
--- a/lib/ionic/resources/settings.js
+++ /dev/null
@@ -1,113 +0,0 @@
-
-exports.ResSettings = {
-  apiUrl: 'http://res.ionic.io',
-  apiUploadPath: '/api/v1/upload',
-  apiTransformPath: '/api/v1/transform',
-  resourceDir: 'resources',
-  iconDir: 'icon',
-  splashDir: 'splash',
-  iconSourceFile: 'icon',
-  splashSourceFile: 'splash',
-  sourceExtensions: ['psd', 'ai', 'png'],
-  configFile: 'config.xml',
-  generateThrottle: 4,
-  defaultMaxIconSize: 96,
-  cacheImages: true
-};
-
-
-exports.ResPlatforms = {
-
-  android: {
-    icon: {
-      images: [
-        { name: 'drawable-ldpi-icon.png',    width: 36,   height: 36,   density: "ldpi" },
-        { name: 'drawable-mdpi-icon.png',    width: 48,   height: 48,   density: "mdpi" },
-        { name: 'drawable-hdpi-icon.png',    width: 72,   height: 72,   density: "hdpi" },
-        { name: 'drawable-xhdpi-icon.png',   width: 96,   height: 96,   density: "xhdpi" },
-        { name: 'drawable-xxhdpi-icon.png',  width: 144,  height: 144,  density: "xxhdpi" },
-        { name: 'drawable-xxxhdpi-icon.png', width: 192,  height: 192,  density: "xxxhdpi" }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'density']
-    },
-    splash: {
-      images: [
-        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 240,   density: 'land-ldpi' },
-        { name: 'drawable-land-mdpi-screen.png',    width: 480,   height: 320,   density: 'land-mdpi' },
-        { name: 'drawable-land-hdpi-screen.png',    width: 800,   height: 480,   density: 'land-hdpi' },
-        { name: 'drawable-land-xhdpi-screen.png',   width: 1280,  height: 720,   density: 'land-xhdpi' },
-        { name: 'drawable-land-xxhdpi-screen.png',  width: 1600,  height: 960,   density: 'land-xxhdpi' },
-        { name: 'drawable-land-xxxhdpi-screen.png', width: 1920,  height: 1280,  density: 'land-xxxhdpi' },
-        { name: 'drawable-port-ldpi-screen.png',    width: 240,   height: 320,   density: 'port-ldpi' },
-        { name: 'drawable-port-mdpi-screen.png',    width: 320,   height: 480,   density: 'port-mdpi' },
-        { name: 'drawable-port-hdpi-screen.png',    width: 480,   height: 800,   density: 'port-hdpi' },
-        { name: 'drawable-port-xhdpi-screen.png',   width: 720,   height: 1280,  density: 'port-xhdpi' },
-        { name: 'drawable-port-xxhdpi-screen.png',  width: 960,   height: 1600,  density: 'port-xxhdpi' },
-        { name: 'drawable-port-xxxhdpi-screen.png', width: 1280,  height: 1920,  density: 'port-xxxhdpi' }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'density']
-    }
-  },
-
-  ios: {
-    icon: {
-      images: [
-        { name: 'icon.png',             width: 57,    height: 57 },
-        { name: 'icon@2x.png',          width: 114,   height: 114 },
-        { name: 'icon-40.png',          width: 40,    height: 40 },
-        { name: 'icon-40@2x.png',       width: 80,    height: 80 },
-        { name: 'icon-50.png',          width: 50,    height: 50 },
-        { name: 'icon-50@2x.png',       width: 100,   height: 100 },
-        { name: 'icon-60.png',          width: 60,    height: 60 },
-        { name: 'icon-60@2x.png',       width: 120,   height: 120 },
-        { name: 'icon-60@3x.png',       width: 180,   height: 180 },
-        { name: 'icon-72.png',          width: 72,    height: 72 },
-        { name: 'icon-72@2x.png',       width: 144,   height: 144 },
-        { name: 'icon-76.png',          width: 76,    height: 76 },
-        { name: 'icon-76@2x.png',       width: 152,   height: 152 },
-        { name: 'icon-small.png',       width: 29,    height: 29 },
-        { name: 'icon-small@2x.png',    width: 58,    height: 58 },
-        { name: 'icon-small@3x.png',    width: 87,    height: 87 }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'width', 'height']
-    },
-    splash: {
-      images: [
-        { name: 'Default-568h@2x~iphone.png',     width: 640,   height: 1136 },
-        { name: 'Default-667h.png',               width: 750,   height: 1334 },
-        { name: 'Default-736h.png',               width: 1242,  height: 2208 },
-        { name: 'Default-Landscape-736h.png',     width: 2208,  height: 1242 },
-        { name: 'Default-Landscape@2x~ipad.png',  width: 2048,  height: 1536 },
-        { name: 'Default-Landscape~ipad.png',     width: 1024,  height: 768 },
-        { name: 'Default-Portrait@2x~ipad.png',   width: 1536,  height: 2048 },
-        { name: 'Default-Portrait~ipad.png',      width: 768,   height: 1024 },
-        { name: 'Default@2x~iphone.png',          width: 640,   height: 960 },
-        { name: 'Default~iphone.png',             width: 320,   height: 480 }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'width', 'height']
-    }
-  },
-
-  wp8: {
-    icon: {
-      images: [
-        { name: 'ApplicationIcon.png',  width: 99,   height: 99 },
-        { name: 'Background.png',       width: 159,  height: 159 }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'width', 'height']
-    },
-    splash: {
-      images: [
-        { name: 'SplashScreenImage.png',  width: 768,   height: 1280 }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'width', 'height']
-    }
-  }
-
-};
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index b43a4fe245..58b0793aed 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -212,7 +212,7 @@ var TASKS = [
         boolean: true
       }
     },
-    module: './ionic/resources/generate'
+    module: './ionic/resources'
   },
   {
     title: 'upload',

From 6d7b791cdde2e175a26f8f5f85af8f71d70bb619 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 26 Aug 2015 13:41:33 -0500
Subject: [PATCH 0777/1100] port resources to app lib

---
 lib/ionic/resources.js | 1011 +---------------------------------------
 1 file changed, 13 insertions(+), 998 deletions(-)

diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index b346685103..e4f4d4c2d9 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,1008 +1,23 @@
-var fs = require('fs'),
-    os = require('os'),
-    path = require('path'),
-    Q = require('q'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    xml2js = require('xml2js'),
-    _ = require('underscore'),
-    crc = require('crc'),
-    Task = require('./task').Task,
-    shelljs = require('shelljs'),
+var argv = require('optimist').argv,
     moduleSettings = require('../../package.json'),
     IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
+    IonicResources = IonicAppLib.resources,
     IonicStats = require('./stats').IonicStats;
 
-var IonicResources = function() {};
-IonicResources.prototype = new Task();
+var IonicTask = function() {};
+IonicTask.prototype = new Task();
 
-var tmpDir = os.tmpdir();
-var configData, buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
-var generateLandscape, generatePortrait, orientation;
+IonicTask.prototype.run = function() {
+  IonicResources.generate(argv, moduleSettings.version);
 
-var ResSettings = {
-  apiUrl: 'http://res.ionic.io',
-  apiUploadPath: '/api/v1/upload',
-  apiTransformPath: '/api/v1/transform',
-  resourceDir: 'resources',
-  iconDir: 'icon',
-  splashDir: 'splash',
-  iconSourceFile: 'icon',
-  splashSourceFile: 'splash',
-  sourceExtensions: ['psd', 'ai', 'png'],
-  configFile: 'config.xml',
-  generateThrottle: 4,
-  defaultMaxIconSize: 96,
-  cacheImages: true
+  IonicStats.t();
 };
 
-var ResPlatforms = {
-
-  android: {
-    icon: {
-      images: [
-        { name: 'drawable-ldpi-icon.png',    width: 36,   height: 36,   density: "ldpi" },
-        { name: 'drawable-mdpi-icon.png',    width: 48,   height: 48,   density: "mdpi" },
-        { name: 'drawable-hdpi-icon.png',    width: 72,   height: 72,   density: "hdpi" },
-        { name: 'drawable-xhdpi-icon.png',   width: 96,   height: 96,   density: "xhdpi" },
-        { name: 'drawable-xxhdpi-icon.png',  width: 144,  height: 144,  density: "xxhdpi" },
-        { name: 'drawable-xxxhdpi-icon.png', width: 192,  height: 192,  density: "xxxhdpi" }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'density']
-    },
-    splash: {
-      images: [
-        { name: 'drawable-land-ldpi-screen.png',    width: 320,   height: 240,   density: 'land-ldpi' },
-        { name: 'drawable-land-mdpi-screen.png',    width: 480,   height: 320,   density: 'land-mdpi' },
-        { name: 'drawable-land-hdpi-screen.png',    width: 800,   height: 480,   density: 'land-hdpi' },
-        { name: 'drawable-land-xhdpi-screen.png',   width: 1280,  height: 720,   density: 'land-xhdpi' },
-        { name: 'drawable-land-xxhdpi-screen.png',  width: 1600,  height: 960,   density: 'land-xxhdpi' },
-        { name: 'drawable-land-xxxhdpi-screen.png', width: 1920,  height: 1280,  density: 'land-xxxhdpi' },
-        { name: 'drawable-port-ldpi-screen.png',    width: 240,   height: 320,   density: 'port-ldpi' },
-        { name: 'drawable-port-mdpi-screen.png',    width: 320,   height: 480,   density: 'port-mdpi' },
-        { name: 'drawable-port-hdpi-screen.png',    width: 480,   height: 800,   density: 'port-hdpi' },
-        { name: 'drawable-port-xhdpi-screen.png',   width: 720,   height: 1280,  density: 'port-xhdpi' },
-        { name: 'drawable-port-xxhdpi-screen.png',  width: 960,   height: 1600,  density: 'port-xxhdpi' },
-        { name: 'drawable-port-xxxhdpi-screen.png', width: 1280,  height: 1920,  density: 'port-xxxhdpi' }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'density']
-    }
-  },
-
-  ios: {
-    icon: {
-      images: [
-        { name: 'icon.png',             width: 57,    height: 57 },
-        { name: 'icon@2x.png',          width: 114,   height: 114 },
-        { name: 'icon-40.png',          width: 40,    height: 40 },
-        { name: 'icon-40@2x.png',       width: 80,    height: 80 },
-        { name: 'icon-50.png',          width: 50,    height: 50 },
-        { name: 'icon-50@2x.png',       width: 100,   height: 100 },
-        { name: 'icon-60.png',          width: 60,    height: 60 },
-        { name: 'icon-60@2x.png',       width: 120,   height: 120 },
-        { name: 'icon-60@3x.png',       width: 180,   height: 180 },
-        { name: 'icon-72.png',          width: 72,    height: 72 },
-        { name: 'icon-72@2x.png',       width: 144,   height: 144 },
-        { name: 'icon-76.png',          width: 76,    height: 76 },
-        { name: 'icon-76@2x.png',       width: 152,   height: 152 },
-        { name: 'icon-small.png',       width: 29,    height: 29 },
-        { name: 'icon-small@2x.png',    width: 58,    height: 58 },
-        { name: 'icon-small@3x.png',    width: 87,    height: 87 }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'width', 'height']
-    },
-    splash: {
-      images: [
-        { name: 'Default-568h@2x~iphone.png',     width: 640,   height: 1136 },
-        { name: 'Default-667h.png',               width: 750,   height: 1334 },
-        { name: 'Default-736h.png',               width: 1242,  height: 2208 },
-        { name: 'Default-Landscape-736h.png',     width: 2208,  height: 1242 },
-        { name: 'Default-Landscape@2x~ipad.png',  width: 2048,  height: 1536 },
-        { name: 'Default-Landscape~ipad.png',     width: 1024,  height: 768 },
-        { name: 'Default-Portrait@2x~ipad.png',   width: 1536,  height: 2048 },
-        { name: 'Default-Portrait~ipad.png',      width: 768,   height: 1024 },
-        { name: 'Default@2x~iphone.png',          width: 640,   height: 960 },
-        { name: 'Default~iphone.png',             width: 320,   height: 480 }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'width', 'height']
-    }
-  },
-
-  wp8: {
-    icon: {
-      images: [
-        { name: 'ApplicationIcon.png',  width: 99,   height: 99 },
-        { name: 'Background.png',       width: 159,  height: 159 }
-      ],
-      nodeName: 'icon',
-      nodeAttributes: ['src', 'width', 'height']
-    },
-    splash: {
-      images: [
-        { name: 'SplashScreenImage.png',  width: 768,   height: 1280 }
-      ],
-      nodeName: 'splash',
-      nodeAttributes: ['src', 'width', 'height']
-    }
-  }
-
-};
-
-IonicResources.prototype.run = function() {
-  buildPlatforms = [];
-  images = [];
-  generateQueue = [];
-  sourceFiles = {};
-  generatingImages = {};
-  generateLandscape = false;
-  generatePortrait = false;
-  orientation = 'default';
-
-  if (!fs.existsSync(ResSettings.configFile)) {
-    console.error('Invalid ' + ResSettings.configFile + ' file. Make sure the working directory is a Cordova project.');
-    return;
-  }
-
-  if(argv.default) {
-    if(hasExistingResources() && !argv.force) {
-      console.log('The resources folder already exists. We will not overwrite your files unless you pass the --force argument.'.red.bold);
-      console.log('Running with the force flag will overwrite your resources directory and modify your config.xml file'.red.bold)
-      return;
-    }
-    copyIconFilesIntoResources(argv.force)
-    .then(function() {
-      return addIonicIcons('ios')
-    })
-    .then(function() {
-      return addIonicIcons('android');
-    })
-    .catch(function(error) {
-      console.error('An error with adding default resources happened:', error);
-    })
-    return
-  }
-
-  if (!fs.existsSync(ResSettings.resourceDir)) {
-    fs.mkdirSync(ResSettings.resourceDir);
-  }
-
-  var hasPlatforms = true;
-  if (_.contains(argv._, 'ios')) {
-    buildPlatforms.push('ios');
-
-  } else if (_.contains(argv._, 'android')) {
-    buildPlatforms.push('android');
-
-  } else if (_.contains(argv._, 'wp8')) {
-    buildPlatforms.push('wp8');
-
-  } else if (!fs.existsSync('platforms')) {
-    hasPlatforms = false;
-
-  } else {
-    buildPlatforms = fs.readdirSync('platforms');
-    hasPlatforms = buildPlatforms.length;
-  }
-
-  if (!hasPlatforms) {
-    console.error('No platforms have been added.');
-    console.error('Please add a platform, for example: ionic platform add ios');
-    console.error('Or provide a platform name, for example: ionic resources android');
-    return;
-  }
-
-  getConfigData().then(function() {
-
-    if (argv.landscape || argv.l) {
-      generateLandscape = true;
-    }
-    if (argv.portrait || argv.p) {
-      generatePortrait = true;
-    }
-    if (!argv.landscape && !argv.l && !argv.portrait && !argv.p) {
-
-      orientation = getOrientationConfigData();
-      if (orientation == 'landscape') {
-        generateLandscape = true;
-      } else if (orientation == 'portrait') {
-        generatePortrait = true;
-      } else {
-        generateLandscape = true;
-        generatePortrait = true;
-      }
-    }
-
-    if (argv['api']) {
-      ResSettings.apiUrl = argv['api'];
-    }
-
-    var promises = [];
-
-    if (argv.icon || argv.i) {
-      console.info('Ionic icon resources generator');
-      promises.push(queueResTypeImages('icon'));
-
-    } else if (argv.splash || argv.s) {
-      console.info('Ionic splash screen resources generator');
-      promises.push(queueResTypeImages('splash'));
-
-    } else {
-      console.info('Ionic icon and splash screen resources generator');
-      promises.push(queueResTypeImages('icon'));
-      promises.push(queueResTypeImages('splash'));
-    }
-
-    Q.all(promises)
-      .then(loadSourceImages)
-      .then(generateResourceImages)
-      .then(loadResourceImages)
-      .then(updateConfigData)
-      .catch(console.error);
-
-    IonicStats.t();
-
-  });
-
-};
-
-function queueResTypeImages(resType) {
-  var resTypePlatforms = {};
-
-  return buildImagesData()
-    .then(validateSourceImages)
-    .then(queueResourceImages)
-    .catch(console.error);
-
-  function buildImagesData() {
-    var deferred = Q.defer();
-
-    buildPlatforms.forEach(function(platform) {
-      if (!ResPlatforms[platform]) return;
-
-      var platformResourceDir = path.join(ResSettings.resourceDir, platform);
-      var resTypeDir = path.join(platformResourceDir, ResSettings[resType + 'Dir']);
-
-      if (!fs.existsSync(platformResourceDir)) {
-        fs.mkdirSync(platformResourceDir);
-      }
-
-      if (!fs.existsSync(resTypeDir)) {
-        fs.mkdirSync(resTypeDir);
-      }
-
-      _.forEach(ResPlatforms[platform][resType].images, function(image) {
-        var data = _.clone(image);
-        _.extend(data, {
-          platform: platform,
-          src: path.join(resTypeDir, image.name),
-          nodeName: ResPlatforms[platform][resType].nodeName,
-          nodeAttributes: ResPlatforms[platform][resType].nodeAttributes,
-          resType: resType
-        });
-        images.push(data);
-      });
-    });
-
-    deferred.resolve();
-    return deferred.promise;
-  }
-
-  function validateSourceImages() {
-    var deferred = Q.defer();
-
-    var validSourceFiles = _.map(ResSettings.sourceExtensions, function(ext) {
-      return ResSettings[resType + 'SourceFile'] + '.' + ext;
-    });
-
-    images.forEach(function(image) {
-      if (resTypePlatforms[image.platform]) return;
-      resTypePlatforms[image.platform] = { platform: image.platform };
-    });
-
-    _.each(resTypePlatforms, function(resTypePlatform) {
-      for (var x = 0; x < validSourceFiles.length; x++) {
-        globalSourceFile = path.join(ResSettings.resourceDir, validSourceFiles[x]);
-        platformSourceFile = path.join(ResSettings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
-
-        if (fs.existsSync(platformSourceFile)) {
-          resTypePlatform.sourceFilePath = platformSourceFile;
-          resTypePlatform.sourceFilename = resTypePlatform.platform + '/' + validSourceFiles[x];
-          break;
-
-        } else if (fs.existsSync(globalSourceFile)) {
-          resTypePlatform.sourceFilePath = globalSourceFile;
-          resTypePlatform.sourceFilename = validSourceFiles[x];
-          break;
-        }
-      }
-
-      if (!resTypePlatform.sourceFilePath || sourceFiles[resTypePlatform.sourceFilePath]) return;
-
-      sourceFiles[resTypePlatform.sourceFilePath] = {
-        filePath: resTypePlatform.sourceFilePath,
-        filename: resTypePlatform.sourceFilename
-      };
-    });
-
-    var missingPlatformSources = _.filter(resTypePlatforms, function(resTypePlatform) {
-      return !resTypePlatform.sourceFilePath;
-    });
-
-    if (missingPlatformSources.length) {
-      var notFoundDirs = ['resources'];
-      missingPlatformSources.forEach(function(missingPlatformSource) {
-        notFoundDirs.push('resources/' + missingPlatformSource.platform);
-      });
-
-      var msg = resType + ' source file not found in ';
-      if (notFoundDirs.length > 1) {
-        msg += 'any of these directories: ' + notFoundDirs.join(', ');
-      } else {
-        msg += 'the resources directory';
-      }
-
-      console.error(msg);
-      console.error('valid ' + resType + ' source files: ' + validSourceFiles.join(', '));
-    }
-
-    deferred.resolve();
-
-    return deferred.promise;
-  }
-
-  function queueResourceImages() {
-    var promises = [];
-
-    _.each(resTypePlatforms, function(resTypePlatform) {
-
-      if (!resTypePlatform.sourceFilePath) return;
-
-      var deferred = Q.defer();
-      promises.push(deferred.promise);
-
-      fs.readFile(resTypePlatform.sourceFilePath, function(err, buf) {
-        if (err) {
-          deferred.reject('Error reading ' + resTypePlatform.sourceFilePath);
-
-        } else {
-          try {
-            sourceFiles[resTypePlatform.sourceFilePath].imageId = crc.crc32(buf).toString(16);
-
-            var resImages = _.filter(images, function(image) {
-              return image.resType == resType;
-            });
-
-            resImages.forEach(function(image) {
-              if (image.platform == resTypePlatform.platform) {
-                image.sourceFilePath = resTypePlatform.sourceFilePath;
-
-                var sourceFile = sourceFiles[image.sourceFilePath];
-                var tmpFilename = sourceFile.imageId + '-' + image.width + 'x' + image.height + '.png';
-
-                image.imageId = sourceFile.imageId;
-                image.tmpPath = path.join(tmpDir, tmpFilename);
-
-                if (resType == 'splash') {
-                  if (!((image.width >= image.height && generateLandscape) || (image.height >= image.width && generatePortrait))) {
-                    image.skip = true;
-                    return;
-                  }
-                }
-
-                if (ResSettings.cacheImages && fs.existsSync(image.tmpPath)) {
-                  console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
-
-                } else {
-                  loadCachedSourceImageData(sourceFile);
-
-                  if (sourceFile.cachedData && !sourceFile.cachedData.vector && (sourceFile.cachedData.width < image.width || sourceFile.cachedData.height < image.height)) {
-                    image.skip = true;
-                    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.cachedData.width + 'x' + sourceFile.cachedData.height + ') too small');
-
-                  } else {
-                    sourceFile.upload = true;
-                    generateQueue.push(image);
-                  }
-                }
-              }
-            });
-            deferred.resolve();
-
-          } catch (e) {
-            deferred.reject('Error loading ' + resTypePlatform.sourceFilePath + ' md5: ' + e);
-          }
-        }
-      });
-    });
-
-    return Q.all(promises);
-  }
-
-}
-
-function loadSourceImages() {
-  var promises = [];
-
-  _.each(sourceFiles, function(sourceFile) {
-    if (!sourceFile.upload) return;
-
-    var deferred = Q.defer();
-
-    console.log(' uploading ' + sourceFile.filename + '...');
-
-    var postData = {
-      url: ResSettings.apiUrl + ResSettings.apiUploadPath,
-      formData: {
-        image_id: sourceFile.imageId,
-        src: fs.createReadStream(sourceFile.filePath),
-        cli_version: moduleSettings.version
-      },
-      proxy: process.env.PROXY || null
-    };
-
-    request.post(postData, function(err, httpResponse, body) {
-      function reject(msg) {
-        try {
-          msg += JSON.parse(body).Error;
-        } catch (e) {
-          msg += body || '';
-        }
-        deferred.reject(msg);
-      }
-
-      if (err) {
-        var msg = 'Failed to upload source image: ';
-        if (err.code == 'ENOTFOUND') {
-          msg += 'requires network connection';
-        } else {
-          msg += err;
-        }
-        deferred.reject(msg);
-
-      } else if (!httpResponse) {
-        reject('Invalid http response');
-
-      } else if (httpResponse.statusCode >= 500) {
-        reject('Image server temporarily unavailable: ');
-
-      } else if (httpResponse.statusCode == 404) {
-        reject('Image server unavailable: ');
-
-      } else if (httpResponse.statusCode > 200) {
-        reject('Invalid upload: ');
-
-      } else {
-        try {
-          var d = JSON.parse(body);
-          sourceFile.width = d.Width;
-          sourceFile.height = d.Height;
-          sourceFile.vector = d.Vector;
-          if (sourceFile.vector) {
-            console.success(sourceFile.filename + ' (vector image) upload complete');
-          } else {
-            console.success(sourceFile.filename + ' (' + d.Width + 'x' + d.Height + ') upload complete');
-          }
-
-          cacheSourceImageData(sourceFile);
-          deferred.resolve();
-
-        } catch (e) {
-          reject('Error parsing upload response: ');
-        }
-      }
-    });
-    promises.push(deferred.promise);
-  });
-
-  return Q.all(promises);
-}
-
-function cacheSourceImageData(sourceFile) {
-  try {
-    var data = JSON.stringify({
-      width: sourceFile.width,
-      height: sourceFile.height,
-      vector: sourceFile.vector,
-      version: 1
-    });
-    var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
-    fs.writeFile(cachedImagePath, data, function(err) {
-      if (err) console.error('Error writing cacheSourceImageData: ' + err);
-    });
-  } catch (e) {
-    console.error('Error cacheSourceImageData: ' + e);
-  }
-}
-
-function loadCachedSourceImageData(sourceFile) {
-  if (ResSettings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
-    try {
-      var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
-      sourceFile.cachedData = JSON.parse(fs.readFileSync(cachedImagePath));
-    } catch (e) {
-      sourceFile.cachedData = false;
-    }
-  }
-}
-
-
-function generateResourceImages() {
-  var deferred = Q.defer();
-
-  // https://github.com/ferentchak/QThrottle
-  var max = ResSettings.generateThrottle - 1;
-  var outstanding = 0;
-
-  function catchingFunction(value) {
-    deferred.notify(value);
-    outstanding--;
-
-    if (generateQueue.length) {
-      outstanding++;
-      generateResourceImage(generateQueue.pop())
-        .then(catchingFunction)
-        .fail(deferred.reject);
-
-    } else if (outstanding === 0) {
-      deferred.resolve();
-    }
-  }
-
-  if (generateQueue.length) {
-    while (max-- && generateQueue.length) {
-      generateResourceImage(generateQueue.pop())
-        .then(catchingFunction)
-        .fail(deferred.reject);
-      outstanding++;
-    }
-  } else {
-    deferred.resolve();
-  }
-
-  return deferred.promise;
-}
-
-function generateResourceImage(image) {
-  var deferred = Q.defer();
-
-  var sourceFile = sourceFiles[image.sourceFilePath];
-
-  if (!sourceFile.vector && (sourceFile.width < image.width || sourceFile.height < image.height)) {
-    image.skip = true;
-    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.width + 'x' + sourceFile.height + ') too small');
-    deferred.resolve();
-
-  } else if (generatingImages[image.tmpPath]) {
-    console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
-    deferred.resolve();
-
-  } else {
-    console.log(' generating ' + image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ')...');
-    generatingImages[image.tmpPath] = true;
-
-    var postData = {
-      url: ResSettings.apiUrl + ResSettings.apiTransformPath,
-      formData: {
-        image_id: image.imageId,
-        name: image.name,
-        platform: image.platform,
-        width: image.width,
-        height: image.height,
-        res_type: image.resType,
-        crop: 'center',
-        encoding: 'png',
-        cli_version: moduleSettings.version
-      },
-      proxy: process.env.PROXY || null
-    };
-
-    var wr = fs.createWriteStream(image.tmpPath, { flags: 'w' });
-    wr.on("error", function(err) {
-      console.error('Error copying to ' + image.tmpPath + ': ' + err);
-      deferred.resolve();
-    });
-    wr.on("finish", function() {
-      if (!image.skip) {
-        console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
-        deferred.resolve();
-      }
-    });
-
-    request.post(postData, function(err, httpResponse, body) {
-
-      function reject(msg) {
-        image.skip = true;
-        try {
-          delete generatingImages[image.tmpPath];
-          wr.close();
-          fs.unlink(image.tmpPath);
-        } catch (err) {}
-
-        try {
-          msg += JSON.parse(body).Error;
-        } catch (e) {
-          msg += body || '';
-        }
-        deferred.reject(msg);
-      }
-
-      if (err || !httpResponse) {
-        reject('Failed to generate image: ' + err);
-
-      } else if (httpResponse.statusCode >= 500) {
-        reject('Image transformation server temporarily unavailable: ');
-
-      } else if (httpResponse.statusCode > 200) {
-        reject('Invalid transformation: ');
-      }
-    })
-    .pipe(wr);
-  }
-
-  return deferred.promise;
-}
-
-function loadResourceImages() {
-  var promises = [];
-
-  images.forEach(function(image) {
-    if (!image.tmpPath || !fs.existsSync(image.tmpPath)) return;
-
-    var deferred = Q.defer();
-    promises.push(deferred.promise);
-
-    var rd = fs.createReadStream(image.tmpPath);
-    rd.on('error', function(err) {
-      deferred.reject('Unable to read generated image: ' + err);
-    });
-
-    var wr = fs.createWriteStream(image.src, {flags: 'w'});
-    wr.on('error', function(err) {
-      deferred.reject('Unable to copy to ' + image.src + ': ' + err);
-    });
-    wr.on('finish', function() {
-      image.isValid = true;
-      deferred.resolve();
-    });
-    rd.pipe(wr);
-  });
-
-  return Q.all(promises);
-}
-
-
-function getConfigData() {
-  var deferred = Q.defer();
-
-  try {
-    fs.readFile(ResSettings.configFile, onConfigRead);
-  } catch (err) {
-    console.error('Error saveConfigData: ' + err);
-    deferred.reject();
-  }
-
-  function onConfigRead(err, data) {
-    if (err) {
-      console.error('Error reading config file: ' + err);
-      deferred.reject();
-      return;
-    }
-
-    try {
-      var parser = new xml2js.Parser();
-      parser.parseString(data, onXmlParse);
-    } catch (e) {
-      console.error('Error xml2js parseString: ' + e);
-      deferred.reject();
-    }
-  }
-
-  function onXmlParse(err, parsedData) {
-    if (err) {
-      console.error('Error parsing config file: ' + err);
-      deferred.reject();
-      return;
-    }
-    configData = parsedData;
-    deferred.resolve(configData);
-  }
-
-  return deferred.promise;
-}
-
-
-function updateConfigData() {
-  images = _.filter(images, function(image) {
-    return image.isValid && !image.skip;
-  });
-
-  if (!images.length || !configData) return;
-
-  var madeChanges = false;
-
-  clearResourcesNodes();
-  images.forEach(updateImageNode);
-  buildDefaultIconNode();
-  buildPreferenceSplashNodes();
-  writeConfigData(configData);
-
-  function clearResourcesNodes() {
-    images.forEach(function(image) {
-      if (!image) return;
-      var platformConfigData = getPlatformConfigData(image.platform);
-      if (platformConfigData && platformConfigData[image.resType]) {
-        delete platformConfigData[image.resType];
-        madeChanges = true;
-      }
-    });
-  }
-
-  function updateImageNode(image) {
-    if (!image) return;
-
-    if (!configData.widget.platform) {
-      configData.widget.platform = [];
-    }
-
-    var platformConfigData = getPlatformConfigData(image.platform);
-
-    if (!platformConfigData) {
-      configData.widget.platform.push({ '$': { name: image.platform } });
-      platformConfigData = getPlatformConfigData(image.platform);
-    }
-
-    if (!platformConfigData[image.nodeName]) {
-      platformConfigData[image.nodeName] = [];
-    }
-
-    var node = getResourceConfigNode(platformConfigData, image.nodeName, image.src);
-    if (!node) {
-      node = { '$': {} };
-      platformConfigData[image.nodeName].push(node);
-      madeChanges = true;
-    }
-
-    image.nodeAttributes.forEach(function(nodeAttribute) {
-      node.$[nodeAttribute] = image[nodeAttribute];
-    });
-  }
-
-  function buildDefaultIconNode() {
-    var currentSize = 0;
-    var defaultIcon;
-
-    images.forEach(function(image) {
-      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= ResSettings.defaultMaxIconSize) {
-        currentSize = image.width;
-        defaultIcon = image;
-      }
-    });
-
-    if (defaultIcon) {
-      configData.widget.icon = [{ '$': { src: defaultIcon.src } }];
-      madeChanges = true;
-    }
-  }
-
-  function buildPreferenceSplashNodes() {
-    var hasAndroidSplash = _.find(images, function(image) {
-      return image.platform == 'android' && image.resType == 'splash';
-    });
-
-    if (hasAndroidSplash) {
-      if (!configData.widget.preference) {
-        configData.widget.preference = [];
-      }
-
-      var hasScreenPref = _.find(configData.widget.preference, function(d) {
-        return d && d.$ && d.$.name == 'SplashScreen';
-      });
-      if (!hasScreenPref) {
-        configData.widget.preference.push({ '$': { name: 'SplashScreen', value: 'screen' } });
-        madeChanges = true;
-      }
-
-      var hasDelayPref = _.find(configData.widget.preference, function(d) {
-        return d && d.$ && d.$.name == 'SplashScreenDelay';
-      });
-      if (!hasDelayPref) {
-        configData.widget.preference.push({ '$': { name: 'SplashScreenDelay', value: '3000' } });
-        madeChanges = true;
-      }
-    }
-
-  }
-
-}
-
-function getOrientationConfigData(platform) {
-  if (configData.widget && configData.widget.preference) {
-    var n = _.find(configData.widget.preference, function(d) {
-      return d && d.$ && d.$.name && d.$.name.toLowerCase() == 'orientation';
-    });
-    if (n && n.$ && n.$.value) {
-      return n.$.value.toLowerCase();
-    }
-  }
-  return 'default';
-}
-
-function getPlatformConfigData(platform) {
-  if (configData.widget && configData.widget.platform) {
-    return _.find(configData.widget.platform, function(d) {
-      return d && d.$ && d.$.name == platform;
-    });
-  }
-}
-
-function getResourceConfigNode(platformData, nodeName, src) {
-  if (platformData[nodeName]) {
-    return _.find(platformData[nodeName], function(d) {
-      return d && d.$ && d.$.src == src;
-    });
-  }
-}
-
-function writeConfigData(configData) {
-  // if (!madeChanges) return;
-
-  try {
-    var builder = new xml2js.Builder();
-    var xmlString = builder.buildObject(configData);
-
-    fs.writeFile(ResSettings.configFile, xmlString, function(err) {
-      if (err) console.error('Error writing config data: ' + err);
-    });
-  } catch (e) {
-    console.error('Error writeConfigData: ' + e);
-  }
-}
-
-function addIonicIcons(platform, forceAddResources) {
-
-  switch(platform) {
-    case 'android':
-    case 'ios':
-      break;
-    default:
-      platform = 'android';//most likely crosswalk `cordova platform add ./engine/cordova-android`
-  }
-
-  try {
-    var promise = null;
-
-    if(forceAddResources) {
-      console.log('forceAddResources')
-      promise = copyIconFilesIntoResources(forceAddResources);
-    } else {
-      promise = Q();
-    }
-
-    return promise
-    .then(getConfigData)
-    .then(function(data) {
-      if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
-        console.log('Adding icons for platform:'.blue.bold, platform.green)
-        addPlatformIcons(platform, data)
-        addSplashScreenPreferences(data)
-        writeConfigData(data)
-      }
-    })
-    .catch(function(error) {
-      console.log('Error happened:', error)
-      throw error;
-    })
-  } catch(ex) {
-    Utils.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
-  }
-}
-
-function hasExistingResources() {
-  //Check resources
-  // resources/icon.png
-  // resources/splash.png
-  // resources/ios/
-  // resources/android
-  var hasResources = fs.existsSync(path.join('./', 'resources')),
-      hasAndroidResources = fs.existsSync(path.join('./', 'resources', 'android')),
-      hasIosResources = fs.existsSync(path.join('./', 'resources', 'ios')),
-      hasIconResource = fs.existsSync(path.join('./', 'resources', 'icon.png')),
-      hasSplashResource = fs.existsSync(path.join('./', 'resources', 'splash.png'));
-
-  var hasAnyResources = hasResources || hasAndroidResources || hasIosResources || hasIconResource || hasSplashResource;
-
-  return hasAnyResources;
-}
-
-function copyIconFilesIntoResources(forceAddResources) {
-  var unzipPath = path.join('resources');
-
-  if(hasExistingResources() && !forceAddResources) {
-    // console.log('Not copying over default resources, the resources directory already exist. Please pass the --force argument to overwrite that folder'.red.bold);
-    return Q();
-  }
-
-  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
-  // console.log('uzip to: ', unzipPath)
-  console.log('Downloading Default Ionic Resources'.yellow);
-  return Utils.fetchArchive(unzipPath, ionicResourcesUrl)
-  .then(function() {
-    shelljs.config.silent = true
-    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
-    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
-    console.log('Done adding default Ionic resources'.yellow)
-  })
-}
-
-function addPlatformIcons(platform, configData) {
-  var platElem = { '$': { name: platform }, icon: [], splash: [] };
-  if(!configData.widget.platform) {
-    configData.widget.platform = [];
-  }
-
-  configData.widget.platform.push(platElem);
-
-  ResPlatforms[platform].icon.images.forEach(function(image) {
-    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
-    if(platform == 'android') {
-      platElem.icon.push({'$': { src: iconDir, density: image.density }})
-    } else {
-      platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
-    }
-  });
-
-  ResPlatforms[platform].splash.images.forEach(function(image) {
-    //resources/ios/splash/
-    var splashDir = ['resources/', platform, '/splash/', image.name].join('');
-    if(platform == 'android') {
-      platElem.splash.push({'$': { src: splashDir, density: image.density }})
-    } else {
-      platElem.splash.push({'$': { src: splashDir, height: image.height, width: image.width }})
-    }
-  })
-
-  // generate.writeConfigData(configData);
-}
-
-function addSplashScreenPreferences(configData) {
-  //Check for splash screen stuff
-  //<preference name="SplashScreen" value="screen"/>
-  //<preference name="SplashScreenDelay" value="3000"/>
-  var preferences = configData.widget.preference;
-
-  if(!configData.widget.preference) {
-    configData.widget.preference = []
-  }
-
-  var hasSplashScreen = false, hasSplashScreenDelay = false;
-
-  configData.widget.preference.forEach(function(pref) {
-    if(pref.$.name == 'SplashScreen') {
-      hasSplashScreen = true;
-    }
-    if(pref.$.name == 'SplashScreenDelay') {
-      hasSplashScreenDelay = true;
-    }
-  })
-
-  if(!hasSplashScreen) {
-    configData.widget.preference.push({'$': { name: 'SplashScreen', value: 'screen'}});
-  }
-  if(!hasSplashScreenDelay) {
-    configData.widget.preference.push({'$': { name: 'SplashScreenDelay', value: '3000'}});
-  }
-}
-
 module.exports = {
-  IonicTask: IonicResources,
-  addIonicIcons: addIonicIcons,
-  copyIconFilesIntoResources: copyIconFilesIntoResources,
-  getConfigData: getConfigData,
-  hasExistingResources: hasExistingResources,
-  writeConfigData: writeConfigData
+  IonicTask: IonicTask,
+  addIonicIcons: IonicResources.addIonicIcons,
+  copyIconFilesIntoResources: IonicResources.copyIconFilesIntoResources,
+  getConfigData: IonicResources.getConfigData,
+  hasExistingResources: IonicResources.hasExistingResources,
+  writeConfigData: IonicResources.writeConfigData
 }

From 0013e095b55b867bad1ebc19f9ea0a65bc9b46e8 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 26 Aug 2015 13:43:30 -0500
Subject: [PATCH 0778/1100] remove cross dependency

---
 lib/ionic/cordova.js   | 6 +++---
 lib/ionic/resources.js | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 2766aa1367..5af44a9fd9 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -7,8 +7,8 @@ var Task = require('./task').Task,
     exec = require('child_process').exec,
     colors = require('colors'),
     shelljs = require('shelljs'),
-    resources = require('./resources'),
     IonicAppLib = require('ionic-app-lib'),
+    IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
     Hooks = IonicAppLib.hooks,
@@ -59,9 +59,9 @@ IonicTask.prototype.run = function(ionic, argv) {
         self.options = serveOptions;
       }
       if(addDefaultResources && self.addIcons) {
-        return resources.copyIconFilesIntoResources()
+        return IonicResources.copyIconFilesIntoResources()
         .then(function() {
-          return resources.addIonicIcons(argv._[2]);
+          return IonicResources.addIonicIcons(argv._[2]);
         })
       } else {
         return false;
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index e4f4d4c2d9..66d8c8958d 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -14,10 +14,5 @@ IonicTask.prototype.run = function() {
 };
 
 module.exports = {
-  IonicTask: IonicTask,
-  addIonicIcons: IonicResources.addIonicIcons,
-  copyIconFilesIntoResources: IonicResources.copyIconFilesIntoResources,
-  getConfigData: IonicResources.getConfigData,
-  hasExistingResources: IonicResources.hasExistingResources,
-  writeConfigData: IonicResources.writeConfigData
+  IonicTask: IonicTask
 }

From 28c09d5ecc52b0e2ea7a94134a1264ef05765c7b Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 26 Aug 2015 13:50:28 -0500
Subject: [PATCH 0779/1100] catch errors in promise returned from generate()

---
 lib/ionic/resources.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 66d8c8958d..a062eea000 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -8,7 +8,8 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function() {
-  IonicResources.generate(argv, moduleSettings.version);
+  IonicResources.generate(argv, moduleSettings.version)
+    .catch(console.error);
 
   IonicStats.t();
 };

From 0e740655fb4197db33befb813a32e52ecccabb30 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 27 Aug 2015 11:03:12 -0500
Subject: [PATCH 0780/1100] fix parameter order

---
 lib/ionic/package.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 3906922cba..73a0861686 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -120,7 +120,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
     .then(function(result) {
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          return Package.buildAndroidDebug(appId, dir, jar);
+          return Package.buildAndroidDebug(dir, jar, appId);
         } else if (buildMode === 'release') {
           var keystoreFilePath = result['keystore'],
               keystorePassword = result['keystore-password'],
@@ -128,7 +128,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
               keyPassword = result['key-password'],
               keystoreFileStream = fs.createReadStream(keystoreFilePath);
 
-          return Package.buildAndroidRelease(appId, dir, jar, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
+          return Package.buildAndroidRelease(dir, jar, appId, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
         }
       } else if (platform === 'ios') {
         var certificateFilePath = result['cert'],
@@ -137,7 +137,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
             certificateFileStream = fs.createReadStream(certificateFilePath),
             provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
-        return Package.buildIOS(appId, dir, jar, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+        return Package.buildIOS(dir, jar, appId, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream)
       }
 
       return Q.reject('Unrecognized platform/build mode.');

From 8b9682204c24bc6c61eb2012ac420b324336871d Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 27 Aug 2015 11:03:31 -0500
Subject: [PATCH 0781/1100] pass in app directory to resources lib

---
 lib/ionic/resources.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index a062eea000..84b6c0c234 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,14 +1,28 @@
 var argv = require('optimist').argv,
-    moduleSettings = require('../../package.json'),
     IonicAppLib = require('ionic-app-lib'),
     IonicResources = IonicAppLib.resources,
     IonicStats = require('./stats').IonicStats;
 
+var Project = IonicAppLib.project;
 var IonicTask = function() {};
+
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function() {
-  IonicResources.generate(argv, moduleSettings.version)
+  var dir = null,
+      project = null;
+
+  try {
+    dir = process.cwd();
+    project = Project.load(dir);
+  } catch (ex) {
+    return Utils.fail(ex, 'package');
+  }
+
+  var options = argv;
+  options.platforms = argv._;
+
+  IonicResources.generate(dir, options)
     .catch(console.error);
 
   IonicStats.t();

From 49376b354f826c52053f7c24a94c3d42a2109188 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 27 Aug 2015 14:30:16 -0500
Subject: [PATCH 0782/1100] offload actual download to app lib, subscribe to
 promise notify

---
 lib/ionic/package.js | 66 ++++++++++----------------------------------
 package.json         |  1 -
 2 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 73a0861686..f51c561990 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -2,7 +2,6 @@ var fs = require('fs'),
     _ = require('underscore'),
     Q = require('q'),
     request = require('request'),
-    requestProcess = require('request-progress'),
     ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
@@ -148,17 +147,6 @@ function packageBuild(ionic, argv, dir, project, appId) {
 
 };
 
-function determineFileExtension(platform) {
-  switch (platform) {
-    case 'android':
-      return 'apk';
-    case 'ios':
-      return 'ipa';
-  }
-
-  throw new Error('Unknown platform: ' + platform);
-}
-
 function formatStatus(status) {
   switch (status) {
     case 'SUCCESS':
@@ -223,7 +211,8 @@ function packageList(ionic, argv, dir, project, appId) {
 
 function packageDownload(ionic, argv, dir, project, appId) {
 
-  var jar;
+  var jar,
+      bar;
 
   return Login.retrieveLogin()
     .then(function(jar) {
@@ -243,48 +232,21 @@ function packageDownload(ionic, argv, dir, project, appId) {
       return { data: [ { id: argv._[2] } ] };
     })
     .then(function(body) {
-      return Package.getBuild(appId, jar, body.data[0].id);
-    })
-    .then(function(body) {
-      var q = Q.defer(),
-          build = body.data,
-          bar;
-
-      if (build.status != 'SUCCESS' || !build.url) {
-        return Q.reject(new Error('Cannot download! Build did not finish.'));
-      }
-
-      var filename = build.name + '.' + determineFileExtension(build.platform);
-
-      requestProcess(request({ url: build.url }))
-        .on('progress', function(state) {
-          if (typeof bar === 'undefined') {
-            bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
-              complete: '=',
-              incomplete: ' ',
-              width: 30,
-              total: state.total
-            });
-          }
-
-          bar.tick(state.received);
-        })
-        .on('error', function(err) {
-          q.reject(err);
-        })
-        .pipe(fs.createWriteStream(filename))
-        .on('error', function(err) {
-          q.reject(err);
-        })
-        .on('close', function() {
-          console.log('\nWrote:', filename);
-          q.resolve(filename);
-        });
-
-      return q.promise;
+      return Package.downloadBuild(appId, jar, body.data[0].id);
     })
     .then(function(filename) {
       console.log('Done!'.green);
+    }, null, function(state) {
+      if (typeof bar === 'undefined') {
+        bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
+          complete: '=',
+          incomplete: ' ',
+          width: 30,
+          total: state.total
+        });
+      }
+
+      bar.tick(state.received);
     })
     .catch(function(ex) {
       Utils.fail(ex);
diff --git a/package.json b/package.json
index dbe7c31d78..d49306b936 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
     "proxy-middleware": "^0.7.0",
     "q": "1.0.1",
     "request": "2.51.0",
-    "request-progress": "^0.3.1",
     "semver": "^4.2.0",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",

From 98117e3983b02712559d045b26299438dca94a0f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 27 Aug 2015 19:54:20 -0500
Subject: [PATCH 0783/1100] passing in appDirectory into resources functions

---
 lib/ionic/cordova.js   |  5 +++--
 lib/ionic/resources.js | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5af44a9fd9..907a51bf31 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -22,6 +22,7 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.run = function(ionic, argv) {
   this.ionic = ionic;
   var self = this;
+  var appDirectory = process.cwd();
   var cmdName = process.argv[2].toLowerCase();
   var q;
 
@@ -59,9 +60,9 @@ IonicTask.prototype.run = function(ionic, argv) {
         self.options = serveOptions;
       }
       if(addDefaultResources && self.addIcons) {
-        return IonicResources.copyIconFilesIntoResources()
+        return IonicResources.copyIconFilesIntoResources(appDirectory)
         .then(function() {
-          return IonicResources.addIonicIcons(argv._[2]);
+          return IonicResources.addIonicIcons(appDirectory, argv._[2]);
         })
       } else {
         return false;
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 84b6c0c234..0e3c85c14a 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,7 +1,8 @@
 var argv = require('optimist').argv,
     IonicAppLib = require('ionic-app-lib'),
     IonicResources = IonicAppLib.resources,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
+    Utils = IonicAppLib.utils;
 
 var Project = IonicAppLib.project;
 var IonicTask = function() {};
@@ -16,14 +17,18 @@ IonicTask.prototype.run = function() {
     dir = process.cwd();
     project = Project.load(dir);
   } catch (ex) {
-    return Utils.fail(ex, 'package');
+    return Utils.fail(ex, 'resources');
   }
 
   var options = argv;
   options.platforms = argv._;
 
   IonicResources.generate(dir, options)
-    .catch(console.error);
+    .catch(function(ex) {
+      if (ex instanceof Error) {
+        Utils.fail(ex, 'resources');
+      }
+    });
 
   IonicStats.t();
 };

From 1b191d5ef3328685426a2373d8b3371e4e00c771 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 31 Aug 2015 12:59:38 -0500
Subject: [PATCH 0784/1100] error if app_id is not found

---
 lib/ionic/package.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index f51c561990..10f65b69c0 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -35,6 +35,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     dir = process.cwd();
     project = Project.load(dir);
     appId = project.get('app_id');
+
+    if (!appId) {
+      throw new Error('Missing Ionic App ID.');
+    }
   } catch (ex) {
     return Utils.fail(ex, 'package');
   }

From 8580feecb9083a289854faa4667ae0826fc7fa04 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 31 Aug 2015 15:51:15 -0500
Subject: [PATCH 0785/1100] add info command for showing build output

---
 lib/ionic/package.js  | 57 +++++++++++++++++++++++++++++++++++++++++++
 lib/tasks/cliTasks.js |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 10f65b69c0..f72ff1100a 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -48,6 +48,8 @@ IonicTask.prototype.run = function(ionic, argv) {
       return packageBuild(ionic, argv, dir, project, appId);
     case 'list':
       return packageList(ionic, argv, dir, project, appId);
+    case 'info':
+      return packageInfo(ionic, argv, dir, project, appId);
     case 'download':
       return packageDownload(ionic, argv, dir, project, appId);
   }
@@ -213,6 +215,61 @@ function packageList(ionic, argv, dir, project, appId) {
 
 }
 
+function packageInfo(ionic, argv, dir, project, appId) {
+
+  var jar;
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(j) {
+      jar = j;
+
+      if (argv._.length < 3) {
+        return Package.listBuilds(appId, jar);
+      }
+
+      return { data: [ { id: argv._[2] } ] };
+    })
+    .then(function(body) {
+      return Package.getBuild(appId, jar, body.data[0].id, { fields: ['output'] });
+    })
+    .then(function(body) {
+      var table = new Table(),
+          build = body.data;
+
+      table.push(
+        ['id'.yellow, build.id],
+        ['status'.yellow, formatStatus(build.status)],
+        ['platform'.yellow, build.platform],
+        ['mode'.yellow, build.mode],
+        ['started'.yellow, formatDate(build.created)]
+      );
+
+      if (build.completed) {
+        table.push(['completed'.yellow, formatDate(build.completed)]);
+      }
+
+      console.log('');
+      console.log(table.toString());
+      console.log('');
+
+      if (build.output) {
+        console.log('output'.yellow + ':');
+        console.log('');
+        console.log(build.output);
+        console.log('');
+      }
+
+    });
+
+}
+
 function packageDownload(ionic, argv, dir, project, appId) {
 
   var jar,
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 58b0793aed..6a615146ec 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -306,7 +306,7 @@ var TASKS = [
     name: 'package',
     summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
     args: {
-      '<command>': 'build'.yellow + ', ' + 'list'.yellow + ', or ' + 'download'.yellow,
+      '<command>': 'build'.yellow + ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
       '[options]': ''
     },
     options: {

From fda3dcea6385b7532bbbea16fa0a9f5aa74bf770 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 10:47:14 -0500
Subject: [PATCH 0786/1100] fix
 https://github.com/driftyco/backend-tasks/issues/25

---
 lib/ionic/package.js | 10 ++++++----
 package.json         |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index f72ff1100a..9915b6e485 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,4 +1,6 @@
 var fs = require('fs'),
+    path = require('path'),
+    expandTilde = require('expand-tilde'),
     _ = require('underscore'),
     Q = require('q'),
     request = require('request'),
@@ -127,8 +129,8 @@ function packageBuild(ionic, argv, dir, project, appId) {
         if (buildMode === 'debug') {
           return Package.buildAndroidDebug(dir, jar, appId);
         } else if (buildMode === 'release') {
-          var keystoreFilePath = result['keystore'],
-              keystorePassword = result['keystore-password'],
+          var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
+              keystorePassword = path.resolve(expandTilde(result['keystore-password'])),
               keyAlias = result['key-alias'],
               keyPassword = result['key-password'],
               keystoreFileStream = fs.createReadStream(keystoreFilePath);
@@ -136,9 +138,9 @@ function packageBuild(ionic, argv, dir, project, appId) {
           return Package.buildAndroidRelease(dir, jar, appId, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
         }
       } else if (platform === 'ios') {
-        var certificateFilePath = result['cert'],
+        var certificateFilePath = path.resolve(expandTilde(result['cert'])),
             certificatePassword = result['cert-password'],
-            provisioningProfileFilePath = result['provisioning-profile'],
+            provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
             certificateFileStream = fs.createReadStream(certificateFilePath),
             provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
diff --git a/package.json b/package.json
index d49306b936..f8f895b348 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "crc": "3.2.1",
     "cross-spawn": "0.2.3",
     "event-stream": "3.0.x",
+    "expand-tilde": "^1.2.0",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",

From 9813ad23b518329c10b28b3778a3ad6702d1cc92 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 11:02:19 -0500
Subject: [PATCH 0787/1100] fix
 https://github.com/driftyco/backend-tasks/issues/36

---
 lib/ionic/package.js  | 28 ++++++++++++++++++++++++++++
 lib/tasks/cliTasks.js | 14 +++++++-------
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 9915b6e485..540ccc6a63 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -91,6 +91,22 @@ function packageBuild(ionic, argv, dir, project, appId) {
         if (buildMode === 'debug') {
           q.resolve({});
         } else if (buildMode === 'release') {
+          if (typeof argv.s !== 'undefined') {
+            argv['keystore'] = argv.s;
+          }
+
+          if (typeof argv.p !== 'undefined') {
+            argv['keystore-password'] = argv.p;
+          }
+
+          if (typeof argv.k !== 'undefined') {
+            argv['key-alias'] = argv.k;
+          }
+
+          if (typeof argv.w !== 'undefined') {
+            argv['key-password'] = argv.w;
+          }
+
           Prompt.prompt([
               { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
               { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
@@ -107,6 +123,18 @@ function packageBuild(ionic, argv, dir, project, appId) {
           q.reject('Unrecognized build mode: ' + buildMode);
         }
       } else if (platform === 'ios') {
+        if (typeof argv.c !== 'undefined') {
+          argv['cert'] = argv.c;
+        }
+
+        if (typeof argv.p !== 'undefined') {
+          argv['cert-password'] = argv.p;
+        }
+
+        if (typeof argv.r !== 'undefined') {
+          argv['provisioning-profile'] = argv.r;
+        }
+
         Prompt.prompt([
             { name: 'cert', description: 'Certificate File:'.prompt, required: true },
             { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 6a615146ec..328ed4a8bc 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -311,13 +311,13 @@ var TASKS = [
     },
     options: {
       '--release': '(' + 'build'.yellow + ') Mark this build as a release',
-      '--keystore <path>': '(' + 'build android'.yellow + ') Specify the location of your keystore file',
-      '--keystore-password <password>': '(' + 'build android'.yellow + ') Specify your keystore password (exclude for prompt)',
-      '--key-alias <alias>': '(' + 'build android'.yellow + ') Specify your key alias for this app',
-      '--key-password <password>': '(' + 'build android'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert <path>': '(' + 'build ios'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password <password>': '(' + 'build ios'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile <path>': '(' + 'build ios'.yellow + ') Specify the location of your .mobileprovision file'
+      '--keystore|-s <path>': '(' + 'build android'.yellow + ') Specify the location of your keystore file',
+      '--keystore-password|-p <password>': '(' + 'build android'.yellow + ') Specify your keystore password (exclude for prompt)',
+      '--key-alias|-k <alias>': '(' + 'build android'.yellow + ') Specify your key alias for this app',
+      '--key-password|-w <password>': '(' + 'build android'.yellow + ') Specify your key password for this app (exclude for prompt)',
+      '--cert|-c <path>': '(' + 'build ios'.yellow + ') Specify the location of your .p12 file',
+      '--cert-password|-p <password>': '(' + 'build ios'.yellow + ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile|-r <path>': '(' + 'build ios'.yellow + ') Specify the location of your .mobileprovision file'
     },
     module: './ionic/package'
   },

From bd3234d2ad94a2eeb8742a195942383f5f92e523 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 11:05:05 -0500
Subject: [PATCH 0788/1100] clearer options

---
 lib/tasks/cliTasks.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 328ed4a8bc..6ef907eb00 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -306,18 +306,18 @@ var TASKS = [
     name: 'package',
     summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
     args: {
-      '<command>': 'build'.yellow + ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
+      '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow + ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
       '[options]': ''
     },
     options: {
       '--release': '(' + 'build'.yellow + ') Mark this build as a release',
-      '--keystore|-s <path>': '(' + 'build android'.yellow + ') Specify the location of your keystore file',
-      '--keystore-password|-p <password>': '(' + 'build android'.yellow + ') Specify your keystore password (exclude for prompt)',
-      '--key-alias|-k <alias>': '(' + 'build android'.yellow + ') Specify your key alias for this app',
-      '--key-password|-w <password>': '(' + 'build android'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'build ios'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'build ios'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'build ios'.yellow + ') Specify the location of your .mobileprovision file'
+      '--keystore|-s <path>': '(' + 'build android --release'.yellow + ') Specify the location of your keystore file',
+      '--keystore-password|-p <password>': '(' + 'build android --release'.yellow + ') Specify your keystore password (exclude for prompt)',
+      '--key-alias|-k <alias>': '(' + 'build android --release'.yellow + ') Specify your key alias for this app',
+      '--key-password|-w <password>': '(' + 'build android --release'.yellow + ') Specify your key password for this app (exclude for prompt)',
+      '--cert|-c <path>': '(' + 'build ios (--release)'.yellow + ') Specify the location of your .p12 file',
+      '--cert-password|-p <password>': '(' + 'build ios (--release)'.yellow + ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile|-r <path>': '(' + 'build ios (--release)'.yellow + ') Specify the location of your .mobileprovision file'
     },
     module: './ionic/package'
   },

From b17cc8a8566542ba14b872ff0c544c0b31bc9577 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 11:48:35 -0500
Subject: [PATCH 0789/1100] fix
 https://github.com/driftyco/backend-tasks/issues/20

---
 lib/ionic/package.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 540ccc6a63..eacc7e92e9 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -326,6 +326,11 @@ function packageDownload(ionic, argv, dir, project, appId) {
       return Package.downloadBuild(appId, jar, body.data[0].id);
     })
     .then(function(filename) {
+      if (typeof bar !== 'undefined') {
+        bar.tick(bar.total);
+      }
+
+      console.log('Wrote:', filename);
       console.log('Done!'.green);
     }, null, function(state) {
       if (typeof bar === 'undefined') {

From 03441cf1467ef428da5d386c880463c227925366 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 14:37:57 -0500
Subject: [PATCH 0790/1100] use momentjs for dealing with dates

---
 lib/ionic/package.js | 3 ++-
 package.json         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index eacc7e92e9..a42e39bbd5 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -3,6 +3,7 @@ var fs = require('fs'),
     expandTilde = require('expand-tilde'),
     _ = require('underscore'),
     Q = require('q'),
+    moment = require('moment'),
     request = require('request'),
     ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
@@ -197,7 +198,7 @@ function formatStatus(status) {
 function formatDate(date) {
   var d = new Date(date);
 
-  return d.toLocaleDateString() + ' at ' + d.toLocaleTimeString();
+  return moment(d).format('MMM Do, YYYY H:mm:ss');
 }
 
 function packageList(ionic, argv, dir, project, appId) {
diff --git a/package.json b/package.json
index f8f895b348..849f43b7ff 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "ionic-app-lib": "0.3.9-beta.2",
+    "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 1af41a34076e4eef0220157544b86362f407a839 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 14:38:25 -0500
Subject: [PATCH 0791/1100] fix
 https://github.com/driftyco/backend-tasks/issues/24

---
 lib/ionic/package.js | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index a42e39bbd5..22308c98d8 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -222,19 +222,39 @@ function packageList(ionic, argv, dir, project, appId) {
         console.log('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
       } else {
         var count = 0,
-            table = new Table({ head: ['id', 'status', 'platform', 'mode', 'started', 'finished'] });
+            headers = ['id', 'status', 'platform', 'mode'],
+            table,
+            screenWidth = process.stdout.getWindowSize()[0];
+
+        if (screenWidth > 100) {
+          headers.push('created');
+        }
+
+        if (screenWidth > 125) {
+          headers.push('finished');
+        }
+
+        table = new Table({ head: headers });
 
         _.each(body.data.slice(0, limit), function(build) {
           count++;
 
-          table.push([
+          var row = [
             build.id,
             formatStatus(build.status),
             build.platform,
-            build.mode,
-            formatDate(build.created),
-            build.completed ? formatDate(build.completed) : ''
-          ]);
+            build.mode
+          ];
+
+          if (screenWidth > 100) {
+            row.push(formatDate(build.created));
+          }
+
+          if (screenWidth > 125) {
+            row.push(build.completed ? formatDate(build.completed) : '');
+          }
+
+          table.push(row);
         });
 
         console.log('');
@@ -242,6 +262,9 @@ function packageList(ionic, argv, dir, project, appId) {
         console.log('\nShowing', String(count).yellow, 'of your latest builds.');
         console.log('');
       }
+    })
+    .catch(function(ex) {
+      Utils.fail(ex, 'package');
     });
 
 }
@@ -297,6 +320,9 @@ function packageInfo(ionic, argv, dir, project, appId) {
         console.log('');
       }
 
+    })
+    .catch(function(ex) {
+      Utils.fail(ex, 'package');
     });
 
 }

From 6b3e67168ee39e829bba2f9e2a23be135d97e65e Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 14:44:56 -0500
Subject: [PATCH 0792/1100] increase column width of usage output

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 11c7acda26..2d080f2ab9 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -314,7 +314,7 @@ Cli.printUsage = function printUsage(d) {
 
   w('\n');
 
-  var rightColumn = 41;
+  var rightColumn = 43;
   var dots = '';
   var indent = '';
   var x, arg;

From 064b0f2bfe7ef2d54b2391bf9c2041edbb280c61 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 8 Sep 2015 15:04:58 -0500
Subject: [PATCH 0793/1100] fix
 https://github.com/driftyco/backend-tasks/issues/26

---
 lib/ionic/package.js  | 15 +++++++++++++--
 lib/tasks/cliTasks.js |  9 +++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 22308c98d8..d67e24e12e 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -330,7 +330,18 @@ function packageInfo(ionic, argv, dir, project, appId) {
 function packageDownload(ionic, argv, dir, project, appId) {
 
   var jar,
-      bar;
+      bar,
+      downloadDirectory;
+
+  if (typeof argv.d !== 'undefined') {
+    argv['destination'] = argv.d;
+  }
+
+  if (typeof argv['destination'] === 'undefined') {
+    downloadDirectory = dir;
+  } else {
+    downloadDirectory = path.resolve(expandTilde(argv['destination']));
+  }
 
   return Login.retrieveLogin()
     .then(function(jar) {
@@ -350,7 +361,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
       return { data: [ { id: argv._[2] } ] };
     })
     .then(function(body) {
-      return Package.downloadBuild(appId, jar, body.data[0].id);
+      return Package.downloadBuild(appId, jar, body.data[0].id, downloadDirectory);
     })
     .then(function(filename) {
       if (typeof bar !== 'undefined') {
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 6ef907eb00..24d5e893ca 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -310,14 +310,15 @@ var TASKS = [
       '[options]': ''
     },
     options: {
-      '--release': '(' + 'build'.yellow + ') Mark this build as a release',
+      '--release': '(' + 'build <platform>'.yellow + ') Mark this build as a release',
       '--keystore|-s <path>': '(' + 'build android --release'.yellow + ') Specify the location of your keystore file',
       '--keystore-password|-p <password>': '(' + 'build android --release'.yellow + ') Specify your keystore password (exclude for prompt)',
       '--key-alias|-k <alias>': '(' + 'build android --release'.yellow + ') Specify your key alias for this app',
       '--key-password|-w <password>': '(' + 'build android --release'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'build ios (--release)'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'build ios (--release)'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'build ios (--release)'.yellow + ') Specify the location of your .mobileprovision file'
+      '--cert|-c <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .p12 file',
+      '--cert-password|-p <password>': '(' + 'build ios [--release]'.yellow + ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile|-r <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .mobileprovision file',
+      '--destination|-d <path>': '(' + 'download'.yellow + ') Specify the destination directory to download your packaged app.'
     },
     module: './ionic/package'
   },

From 095be965161075bc29b7b8b1e15ca19bf68b7e04 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 15 Sep 2015 13:17:20 -0600
Subject: [PATCH 0794/1100] Update README file for information about the
 ionic.project file

---
 README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/README.md b/README.md
index e126dc6719..668de34297 100644
--- a/README.md
+++ b/README.md
@@ -567,3 +567,22 @@ The `ionic state clear` method will clear out your platforms and plugins directo
 The `ionic state reset` method will first remove your platforms and plugins folders. Then it will look at your `package.json` file to re-install the platforms and plugins as specified there.
 
 This command can be helpful for you to reinstall your plugins and platforms to get a fresh start.
+
+
+# ionic.project file
+
+The ionic.project is a configuration for an ionic project that stores the following:
+
+* `app_id` - the associated app ID in ionic.io.  
+* `browsers` - the installed browsers (CrossWalk).  
+* `createDocumentRoot` - boolean setting stating to create the designated.document root upon serve (for CI, using `app` folder, and compiling)  
+* `defaultBrowser` - the browser they prefer to use with `ionic serve`. Chrome, Firefox, etc.  
+* `documentRoot` - the associated document root with HTML/JS/CSS files.  
+* `gulpDependentTasks` - gulp tasks that are run before `ionic serve` launches. Think of `gulp build`, `gulp sass`, etc.  
+* `gulpStartupTasks` - gulp tasks that are run and kept alive during `ionic serve`.  
+* `imagePaths` - paths relative to document root that specify the release feature to compress images.  
+* `proxies` - designated proxies to use during `ionic serve`.  
+* `name` - the name of the application.  
+* `sass` - the setting to watch sass during `ionic serve`.  
+* `watchPatterns` - the patterns to watch and live reload during `ionic.serve`.  
+

From 543f9a8b3861ebbb40dd2fa15d37eee3e176f7f3 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 23 Sep 2015 16:46:42 -0500
Subject: [PATCH 0795/1100] rename column

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index d67e24e12e..28631f07ab 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -227,7 +227,7 @@ function packageList(ionic, argv, dir, project, appId) {
             screenWidth = process.stdout.getWindowSize()[0];
 
         if (screenWidth > 100) {
-          headers.push('created');
+          headers.push('started');
         }
 
         if (screenWidth > 125) {

From c5fd5adfaee674f2aee9d718d0da8011fe299e85 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 24 Sep 2015 14:19:41 -0500
Subject: [PATCH 0796/1100] add security profiles/credentials command

---
 lib/cli.js            |   2 +-
 lib/ionic/package.js  |   1 -
 lib/ionic/security.js | 282 ++++++++++++++++++++++++++++++++++++++++++
 lib/tasks/cliTasks.js |  20 +++
 4 files changed, 303 insertions(+), 2 deletions(-)
 create mode 100644 lib/ionic/security.js

diff --git a/lib/cli.js b/lib/cli.js
index 2d080f2ab9..3dc7f8589e 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -314,7 +314,7 @@ Cli.printUsage = function printUsage(d) {
 
   w('\n');
 
-  var rightColumn = 43;
+  var rightColumn = 45;
   var dots = '';
   var indent = '';
   var x, arg;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 28631f07ab..f4c959028e 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     _ = require('underscore'),
     Q = require('q'),
     moment = require('moment'),
-    request = require('request'),
     ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
new file mode 100644
index 0000000000..2363130ade
--- /dev/null
+++ b/lib/ionic/security.js
@@ -0,0 +1,282 @@
+var fs = require('fs'),
+    path = require('path'),
+    Q = require('q'),
+    expandTilde = require('expand-tilde'),
+    _ = require('underscore'),
+    moment = require('moment'),
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
+    Login = IonicAppLib.login,
+    Security = IonicAppLib.security,
+    LoginTask = require('./login'),
+    Prompt = require('./prompt'),
+    Table = require('./table'),
+    Task = require('./task').Task;
+
+var Project = IonicAppLib.project;
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic, argv) {
+
+  var cmd,
+      subcmd;
+
+  if (argv._.length < 2) {
+    cmd = 'profiles';
+  } else {
+    cmd = argv._[1];
+  }
+
+  var dir = null,
+      project = null,
+      appId = null;
+
+  try {
+    dir = process.cwd();
+    project = Project.load(dir);
+    appId = project.get('app_id');
+
+    if (!appId) {
+      throw new Error('Missing Ionic App ID.');
+    }
+  } catch (ex) {
+    return Utils.fail(ex, 'security');
+  }
+
+  switch (cmd) {
+    case 'profiles':
+      if (argv._.length < 3) {
+        subcmd = 'list';
+      } else {
+        subcmd = argv._[2];
+      }
+
+      switch (subcmd) {
+        case 'add':
+          return addSecurityProfile(ionic, argv, dir, appId);
+        case 'list':
+          return listSecurityProfiles(ionic, argv, dir, appId);
+        default:
+          return Utils.fail("Unknown subcommand 'profiles " + subcmd + "'.", 'security')
+      }
+    case 'credentials':
+      return addSecurityCredentials(ionic, argv, dir, appId);
+  }
+
+  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'security')
+
+};
+
+function addSecurityProfile(ionic, argv, dir, appId) {
+
+  if (argv._.length < 4) {
+    return Utils.fail("Specify a name for this Security Profile. Example: 'ionic security profile add \"My New Profile\"'.", 'security');
+  }
+
+  var jar,
+      name = argv._[3];
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(j) {
+      jar = j;
+
+      return Security.addProfile(appId, jar, name);
+    })
+    .then(function(body) {
+      console.success('Added "' + name + '".');
+    }, function(err) {
+      if (typeof err === 'object') {
+        if (err.type == 'ProfileExists') {
+          console.error(err.title);
+        } else {
+          return Q.reject(new Error(err.title));
+        }
+      }
+    })
+    .catch(function(ex) {
+      Utils.fail(ex, 'package');
+    });
+
+}
+
+function listSecurityProfiles(ionic, argv, dir, appId) {
+
+  var jar;
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(j) {
+      jar = j;
+
+      return Security.listProfiles(appId, jar);
+    })
+    .then(function(body) {
+      if (body.data.length === 0) {
+        console.log('You don\'t have any Security Profiles yet!');
+        console.log('Type ' + 'ionic help security'.yellow + ' to learn how to use Security Profiles.');
+      } else {
+        var table = new Table({ head: ['name', 'tag', 'android', 'ios'] });
+
+        _.each(body.data, function(profile) {
+          table.push([
+            profile.name,
+            profile.tag,
+            typeof profile.credentials.android === 'undefined' ? '✗'.red.bold : '✓'.green.bold,
+            typeof profile.credentials.ios === 'undefined' ? '✗'.red.bold : '✓'.green.bold
+          ]);
+        });
+
+        console.log('');
+        console.log(table.toString());
+        console.log('');
+      }
+    })
+    .catch(function(ex) {
+      Utils.fail(ex, 'security');
+    });
+}
+
+function addSecurityCredentials(ionic, argv, dir, appId) {
+
+  if (argv._.length < 3) {
+    return Utils.fail("Specify a valid platform (android or ios).", 'security');
+  }
+
+  if (typeof argv.profile === 'undefined') {
+    return Utils.fail("Specify the Security Profile on which these credentials are saved (--profile <tag>).", 'security');
+  }
+
+  var jar,
+      platform = argv._[2],
+      profile = argv.profile;
+
+  if (!_.contains(['android', 'ios'], platform)) {
+    return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'security');
+  }
+
+  return Login.retrieveLogin()
+    .then(function(jar) {
+      if (!jar) {
+        console.log('No previous login existed. Attempting to log in now.');
+        return LoginTask.login(argv);
+      }
+      return jar;
+    })
+    .then(function(j) {
+      var q = Q.defer();
+
+      jar = j;
+
+      if (platform === 'android') {
+        if (typeof argv.s !== 'undefined') {
+          argv['keystore'] = argv.s;
+        }
+
+        if (typeof argv.p !== 'undefined') {
+          argv['keystore-password'] = argv.p;
+        }
+
+        if (typeof argv.k !== 'undefined') {
+          argv['key-alias'] = argv.k;
+        }
+
+        if (typeof argv.w !== 'undefined') {
+          argv['key-password'] = argv.w;
+        }
+
+        Prompt.prompt([
+            { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
+            { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
+            { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
+            { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
+        ], argv)
+          .then(function(result) {
+            q.resolve(result);
+          })
+        .catch(function(ex) {
+          q.reject(ex);
+        });
+      } else if (platform === 'ios') {
+        if (typeof argv.c !== 'undefined') {
+          argv['cert'] = argv.c;
+        }
+
+        if (typeof argv.p !== 'undefined') {
+          argv['cert-password'] = argv.p;
+        }
+
+        if (typeof argv.r !== 'undefined') {
+          argv['provisioning-profile'] = argv.r;
+        }
+
+        Prompt.prompt([
+            { name: 'cert', description: 'Certificate File:'.prompt, required: true },
+            { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
+            { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
+        ], argv)
+          .then(function(result) {
+            q.resolve(result);
+          })
+        .catch(function(ex) {
+          q.reject(ex);
+        });
+      } else {
+        q.reject('Unrecognized platform: ' + platform);
+      }
+
+      return q.promise;
+    })
+    .then(function(result) {
+      if (platform === 'android') {
+        var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
+          keystorePassword = path.resolve(expandTilde(result['keystore-password'])),
+          keyAlias = result['key-alias'],
+          keyPassword = result['key-password'],
+          keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+        return Security.addAndroidCredentials(appId, jar, profile, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
+      } else if (platform === 'ios') {
+        var certificateFilePath = path.resolve(expandTilde(result['cert'])),
+          certificatePassword = result['cert-password'],
+          provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
+          certificateFileStream = fs.createReadStream(certificateFilePath),
+          provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+
+        return Security.addIOSCredentials(appId, jar, profile, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+      }
+
+      return Q.reject('Unrecognized platform.');
+    })
+    .then(function(body) {
+      console.success('Added ' + platform + ' credentials to your Security Profile.');
+    }, function(err) {
+      if (typeof err === 'object') {
+        if (err.type == 'CredentialsExist') {
+          console.error(err.title);
+        } else {
+          return Q.reject(new Error(err.title));
+        }
+      }
+    })
+    .catch(function(ex) {
+      Utils.fail(ex, 'package');
+    });
+
+};
+
+exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 24d5e893ca..7337736192 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -289,6 +289,26 @@ var TASKS = [
     },
     module: './ionic/io-init'
   },
+  {
+    title: 'security',
+    name: 'security',
+    summary: 'Store your app\'s credentials for the Ionic Platform ' + '(alpha)'.red,
+    args: {
+      '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' + 'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
+      '[options]': ''
+    },
+    options: {
+      '--profile <tag>': '(' + 'credentials <platform>'.yellow + ') Specify the profile on which these credentials are saved',
+      '--keystore|-s <path>': '(' + 'credentials android'.yellow + ') Specify the location of your keystore file',
+      '--keystore-password|-p <password>': '(' + 'credentials android'.yellow + ') Specify your keystore password (exclude for prompt)',
+      '--key-alias|-k <alias>': '(' + 'credentials android'.yellow + ') Specify your key alias for this app',
+      '--key-password|-w <password>': '(' + 'credentials android'.yellow + ') Specify your key password for this app (exclude for prompt)',
+      '--cert|-c <path>': '(' + 'credentials ios'.yellow + ') Specify the location of your .p12 file',
+      '--cert-password|-p <password>': '(' + 'credentials ios'.yellow + ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow + ') Specify the location of your .mobileprovision file',
+    },
+    module: './ionic/security'
+  },
   {
     title: 'push',
     name: 'push',

From 63b2854adb32d3079ae5b0bb00f20244ba745af5 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 24 Sep 2015 15:06:13 -0500
Subject: [PATCH 0797/1100] use security profiles for package

---
 lib/ionic/package.js  | 91 ++++---------------------------------------
 lib/tasks/cliTasks.js |  8 +---
 2 files changed, 9 insertions(+), 90 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index f4c959028e..dafaceb665 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,16 +1,13 @@
 var fs = require('fs'),
     path = require('path'),
-    expandTilde = require('expand-tilde'),
     _ = require('underscore'),
     Q = require('q'),
     moment = require('moment'),
-    ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
-    Prompt = require('./prompt'),
     Table = require('./table'),
     Task = require('./task').Task;
 
@@ -83,96 +80,24 @@ function packageBuild(ionic, argv, dir, project, appId) {
       return jar;
     })
     .then(function(j) {
-      var q = Q.defer();
-
       jar = j;
 
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          q.resolve({});
+          return Package.buildAndroidDebug(dir, jar, appId);
         } else if (buildMode === 'release') {
-          if (typeof argv.s !== 'undefined') {
-            argv['keystore'] = argv.s;
-          }
-
-          if (typeof argv.p !== 'undefined') {
-            argv['keystore-password'] = argv.p;
-          }
-
-          if (typeof argv.k !== 'undefined') {
-            argv['key-alias'] = argv.k;
+          if (typeof argv.profile === 'undefined') {
+            return Utils.fail("Must specify security profile for android release builds (--profile <tag>).", 'package');
           }
 
-          if (typeof argv.w !== 'undefined') {
-            argv['key-password'] = argv.w;
-          }
-
-          Prompt.prompt([
-              { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
-              { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
-              { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
-              { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
-          ], argv)
-            .then(function(result) {
-              q.resolve(result);
-            })
-            .catch(function(ex) {
-              q.reject(ex);
-            });
-        } else {
-          q.reject('Unrecognized build mode: ' + buildMode);
+          return Package.buildAndroidRelease(dir, jar, appId, argv.profile)
         }
       } else if (platform === 'ios') {
-        if (typeof argv.c !== 'undefined') {
-          argv['cert'] = argv.c;
-        }
-
-        if (typeof argv.p !== 'undefined') {
-          argv['cert-password'] = argv.p;
-        }
-
-        if (typeof argv.r !== 'undefined') {
-          argv['provisioning-profile'] = argv.r;
+        if (typeof argv.profile === 'undefined') {
+          return Utils.fail("Must specify security profile for ios builds (--profile <tag>).", 'package');
         }
 
-        Prompt.prompt([
-            { name: 'cert', description: 'Certificate File:'.prompt, required: true },
-            { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
-            { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
-        ], argv)
-          .then(function(result) {
-            q.resolve(result);
-          })
-          .catch(function(ex) {
-            q.reject(ex);
-          });
-      } else {
-        q.reject('Unrecognized platform: ' + platform);
-      }
-
-      return q.promise;
-    })
-    .then(function(result) {
-      if (platform === 'android') {
-        if (buildMode === 'debug') {
-          return Package.buildAndroidDebug(dir, jar, appId);
-        } else if (buildMode === 'release') {
-          var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
-              keystorePassword = path.resolve(expandTilde(result['keystore-password'])),
-              keyAlias = result['key-alias'],
-              keyPassword = result['key-password'],
-              keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-          return Package.buildAndroidRelease(dir, jar, appId, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
-        }
-      } else if (platform === 'ios') {
-        var certificateFilePath = path.resolve(expandTilde(result['cert'])),
-            certificatePassword = result['cert-password'],
-            provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
-            certificateFileStream = fs.createReadStream(certificateFilePath),
-            provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
-
-        return Package.buildIOS(dir, jar, appId, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+        return Package.buildIOS(dir, jar, appId, argv.profile, buildMode)
       }
 
       return Q.reject('Unrecognized platform/build mode.');
@@ -368,7 +293,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
       }
 
       console.log('Wrote:', filename);
-      console.log('Done!'.green);
+      console.success('Done!'.green);
     }, null, function(state) {
       if (typeof bar === 'undefined') {
         bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7337736192..c02c643dba 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -331,13 +331,7 @@ var TASKS = [
     },
     options: {
       '--release': '(' + 'build <platform>'.yellow + ') Mark this build as a release',
-      '--keystore|-s <path>': '(' + 'build android --release'.yellow + ') Specify the location of your keystore file',
-      '--keystore-password|-p <password>': '(' + 'build android --release'.yellow + ') Specify your keystore password (exclude for prompt)',
-      '--key-alias|-k <alias>': '(' + 'build android --release'.yellow + ') Specify your key alias for this app',
-      '--key-password|-w <password>': '(' + 'build android --release'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'build ios [--release]'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .mobileprovision file',
+      '--profile|-p <tag>': '(' + 'build <platform>'.yellow + ') Specify the Security Profile to use with this build',
       '--destination|-d <path>': '(' + 'download'.yellow + ') Specify the destination directory to download your packaged app.'
     },
     module: './ionic/package'

From eac87e0714e06379982766931ab25a017b0535ef Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Tue, 29 Sep 2015 09:46:29 -0500
Subject: [PATCH 0798/1100] bumping versions

---
 npm-shrinkwrap.json | 569 +++++++++++++++++++++++++++-----------------
 package.json        |   4 +-
 2 files changed, 358 insertions(+), 215 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3c32e430a5..e7550a272f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.4",
+  "version": "1.6.5-testing.0",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -118,9 +118,9 @@
           }
         },
         "lodash": {
-          "version": "3.10.0",
+          "version": "3.10.1",
           "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
         }
       }
     },
@@ -198,9 +198,9 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.6.5",
+          "version": "2.7.0",
           "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
         }
       }
     },
@@ -376,9 +376,9 @@
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
-              "version": "1.1.0",
+              "version": "1.1.1",
               "from": "chalk@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.1.0",
@@ -427,9 +427,9 @@
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
-                  "version": "4.0.1",
+                  "version": "5.0.0",
                   "from": "get-stdin@*",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
                 },
                 "meow": {
                   "version": "3.3.0",
@@ -442,9 +442,9 @@
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "camelcase@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
@@ -458,6 +458,11 @@
                       "from": "indent-string@>=1.1.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz",
                       "dependencies": {
+                        "get-stdin": {
+                          "version": "4.0.1",
+                          "from": "get-stdin@>=4.0.1 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                        },
                         "repeating": {
                           "version": "1.1.3",
                           "from": "repeating@>=1.1.0 <2.0.0",
@@ -639,9 +644,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.2",
+                      "version": "1.0.3",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -663,9 +668,9 @@
               }
             },
             "vinyl": {
-              "version": "0.5.0",
+              "version": "0.5.3",
               "from": "vinyl@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
               "dependencies": {
                 "clone": {
                   "version": "1.0.2",
@@ -712,9 +717,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.5",
+                          "version": "2.7.0",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -750,9 +755,9 @@
           }
         },
         "minimist": {
-          "version": "1.1.2",
+          "version": "1.2.0",
           "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
@@ -766,7 +771,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -801,9 +806,9 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "from": "tildify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.1.tgz",
           "dependencies": {
             "os-homedir": {
               "version": "1.0.1",
@@ -815,9 +820,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.8",
-      "from": "ionic-app-lib@0.3.8",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.8.tgz",
+      "version": "0.3.9-testing.0",
+      "from": "ionic-app-lib@0.3.9-testing.0",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.0.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -933,9 +938,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.5",
+                          "version": "2.7.0",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -952,9 +957,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.5",
+                      "version": "2.7.0",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -1015,14 +1020,14 @@
                   "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
                   "dependencies": {
                     "JSONStream": {
-                      "version": "1.0.4",
+                      "version": "1.0.6",
                       "from": "JSONStream@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.6.tgz",
                       "dependencies": {
                         "jsonparse": {
-                          "version": "1.0.0",
-                          "from": "jsonparse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
+                          "version": "1.1.0",
+                          "from": "jsonparse@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.1.0.tgz"
                         }
                       }
                     },
@@ -1111,9 +1116,9 @@
                       }
                     },
                     "browser-resolve": {
-                      "version": "1.9.0",
+                      "version": "1.9.1",
                       "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.0.tgz"
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.1.tgz"
                     },
                     "browserify-zlib": {
                       "version": "0.1.4",
@@ -1121,16 +1126,16 @@
                       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
                       "dependencies": {
                         "pako": {
-                          "version": "0.2.7",
+                          "version": "0.2.8",
                           "from": "pako@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.7.tgz"
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
                         }
                       }
                     },
                     "buffer": {
-                      "version": "3.3.1",
+                      "version": "3.5.0",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.0.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1189,26 +1194,67 @@
                       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
                     },
                     "crypto-browserify": {
-                      "version": "3.9.14",
+                      "version": "3.10.0",
                       "from": "crypto-browserify@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.10.0.tgz",
                       "dependencies": {
-                        "browserify-aes": {
-                          "version": "1.0.2",
-                          "from": "browserify-aes@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.2.tgz",
+                        "browserify-cipher": {
+                          "version": "1.0.0",
+                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
                           "dependencies": {
-                            "buffer-xor": {
-                              "version": "1.0.2",
-                              "from": "buffer-xor@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.2.tgz"
+                            "browserify-aes": {
+                              "version": "1.0.5",
+                              "from": "browserify-aes@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                              "dependencies": {
+                                "buffer-xor": {
+                                  "version": "1.0.3",
+                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                },
+                                "cipher-base": {
+                                  "version": "1.0.1",
+                                  "from": "cipher-base@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "browserify-des": {
+                              "version": "1.0.0",
+                              "from": "browserify-des@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+                              "dependencies": {
+                                "cipher-base": {
+                                  "version": "1.0.1",
+                                  "from": "cipher-base@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                },
+                                "des.js": {
+                                  "version": "1.0.0",
+                                  "from": "des.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "evp_bytestokey": {
+                              "version": "1.0.0",
+                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
                             }
                           }
                         },
                         "browserify-sign": {
-                          "version": "3.0.2",
+                          "version": "3.0.8",
                           "from": "browserify-sign@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.8.tgz",
                           "dependencies": {
                             "bn.js": {
                               "version": "2.2.0",
@@ -1238,14 +1284,14 @@
                               }
                             },
                             "parse-asn1": {
-                              "version": "3.0.1",
+                              "version": "3.0.2",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.3",
+                                  "version": "2.2.1",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.3.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1253,6 +1299,28 @@
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
                                     }
                                   }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.1",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
                                 }
                               }
                             }
@@ -1288,26 +1356,31 @@
                           }
                         },
                         "create-hash": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "create-hash@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
                           "dependencies": {
+                            "cipher-base": {
+                              "version": "1.0.1",
+                              "from": "cipher-base@>=1.0.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                            },
                             "ripemd160": {
                               "version": "1.0.1",
                               "from": "ripemd160@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
                             },
                             "sha.js": {
-                              "version": "2.4.2",
+                              "version": "2.4.4",
                               "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.2.tgz"
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
                             }
                           }
                         },
                         "create-hmac": {
-                          "version": "1.1.3",
+                          "version": "1.1.4",
                           "from": "create-hmac@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"
+                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
                         },
                         "diffie-hellman": {
                           "version": "3.0.2",
@@ -1320,15 +1393,10 @@
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
                             },
                             "miller-rabin": {
-                              "version": "2.1.0",
+                              "version": "2.0.1",
                               "from": "miller-rabin@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
                               "dependencies": {
-                                "bn.js": {
-                                  "version": "3.1.1",
-                                  "from": "bn.js@>=3.1.1 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-3.1.1.tgz"
-                                },
                                 "brorand": {
                                   "version": "1.0.5",
                                   "from": "brorand@>=1.0.1 <2.0.0",
@@ -1359,14 +1427,14 @@
                               "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
                             },
                             "parse-asn1": {
-                              "version": "3.0.1",
+                              "version": "3.0.2",
                               "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.1.3",
+                                  "version": "2.2.1",
                                   "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.1.3.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1374,6 +1442,28 @@
                                       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
                                     }
                                   }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.1",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
                                 }
                               }
                             }
@@ -1387,9 +1477,9 @@
                       }
                     },
                     "deep-equal": {
-                      "version": "1.0.0",
+                      "version": "1.0.1",
                       "from": "deep-equal@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
                     },
                     "defined": {
                       "version": "1.0.0",
@@ -1446,9 +1536,9 @@
                       }
                     },
                     "https-browserify": {
-                      "version": "0.0.0",
+                      "version": "0.0.1",
                       "from": "https-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
@@ -1456,9 +1546,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.5.2",
+                      "version": "6.6.0",
                       "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.5.2.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.0.tgz",
                       "dependencies": {
                         "combine-source-map": {
                           "version": "0.6.1",
@@ -1494,10 +1584,15 @@
                             }
                           }
                         },
+                        "is-buffer": {
+                          "version": "1.1.0",
+                          "from": "is-buffer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                        },
                         "lexical-scope": {
-                          "version": "1.1.1",
-                          "from": "lexical-scope@>=1.1.0 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.1.tgz",
+                          "version": "1.2.0",
+                          "from": "lexical-scope@>=1.2.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
                           "dependencies": {
                             "astw": {
                               "version": "2.0.0",
@@ -1545,14 +1640,14 @@
                       }
                     },
                     "module-deps": {
-                      "version": "3.9.0",
+                      "version": "3.9.1",
                       "from": "module-deps@>=3.7.11 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.0.tgz",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
                       "dependencies": {
                         "detective": {
-                          "version": "4.1.1",
+                          "version": "4.2.0",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.2.0.tgz",
                           "dependencies": {
                             "acorn": {
                               "version": "1.2.2",
@@ -1560,9 +1655,9 @@
                               "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
                             },
                             "escodegen": {
-                              "version": "1.6.1",
+                              "version": "1.7.0",
                               "from": "escodegen@>=1.4.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz",
+                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.0.tgz",
                               "dependencies": {
                                 "estraverse": {
                                   "version": "1.9.3",
@@ -1570,9 +1665,9 @@
                                   "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
                                 },
                                 "esutils": {
-                                  "version": "1.1.6",
-                                  "from": "esutils@>=1.1.6 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
+                                  "version": "2.0.2",
+                                  "from": "esutils@>=2.0.2 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
                                 },
                                 "esprima": {
                                   "version": "1.2.5",
@@ -1610,16 +1705,16 @@
                                       "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
                                     },
                                     "fast-levenshtein": {
-                                      "version": "1.0.6",
+                                      "version": "1.0.7",
                                       "from": "fast-levenshtein@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"
+                                      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
                                     }
                                   }
                                 },
                                 "source-map": {
-                                  "version": "0.1.43",
-                                  "from": "source-map@>=0.1.40 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                                  "version": "0.2.0",
+                                  "from": "source-map@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
                                   "dependencies": {
                                     "amdefine": {
                                       "version": "1.0.0",
@@ -1688,9 +1783,9 @@
                       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
                     },
                     "process": {
-                      "version": "0.11.1",
+                      "version": "0.11.2",
                       "from": "process@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.1.tgz"
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
                     },
                     "punycode": {
                       "version": "1.3.2",
@@ -1781,9 +1876,9 @@
                       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
                       "dependencies": {
                         "minimist": {
-                          "version": "1.1.2",
+                          "version": "1.2.0",
                           "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.2.tgz"
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
                         }
                       }
                     },
@@ -1888,9 +1983,9 @@
                       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "decamelize": {
                           "version": "1.0.0",
@@ -1914,9 +2009,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.9",
+              "version": "1.1.12",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.9.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.12.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -1944,9 +2039,9 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.6.5",
+                              "version": "2.7.0",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
@@ -2038,9 +2133,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.6.5",
+                      "version": "2.7.0",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -2064,14 +2159,14 @@
               }
             },
             "init-package-json": {
-              "version": "1.7.1",
+              "version": "1.9.1",
               "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.7.1.tgz",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.14",
+                  "version": "5.0.15",
                   "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -2091,14 +2186,14 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.0",
+                          "version": "1.1.1",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
@@ -2144,9 +2239,9 @@
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "semver": {
-                      "version": "5.0.1",
+                      "version": "5.0.3",
                       "from": "semver@>=4.0.0 <5.0.0||>=5.0.0 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
                     }
                   }
                 },
@@ -2156,9 +2251,9 @@
                   "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
                 },
                 "read": {
-                  "version": "1.0.6",
+                  "version": "1.0.7",
                   "from": "read@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
                   "dependencies": {
                     "mute-stream": {
                       "version": "0.0.5",
@@ -2168,9 +2263,9 @@
                   }
                 },
                 "read-package-json": {
-                  "version": "2.0.0",
+                  "version": "2.0.1",
                   "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
                   "dependencies": {
                     "json-parse-helpfulerror": {
                       "version": "1.0.3",
@@ -2178,52 +2273,76 @@
                       "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
                       "dependencies": {
                         "jju": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
                         }
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.3.1",
+                      "version": "2.3.4",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.1.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
                           "from": "hosted-git-info@>=2.0.2 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
                         }
                       }
                     },
                     "graceful-fs": {
-                      "version": "3.0.8",
-                      "from": "graceful-fs@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                     }
                   }
                 },
                 "validate-npm-package-license": {
-                  "version": "2.0.0",
-                  "from": "validate-npm-package-license@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                   "dependencies": {
-                    "spdx": {
-                      "version": "0.4.1",
-                      "from": "spdx@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
+                    "spdx-correct": {
+                      "version": "1.0.1",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
                     },
-                    "spdx-correct": {
+                    "spdx-expression-parse": {
                       "version": "1.0.0",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.2",
+                          "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
+                        },
+                        "spdx-license-ids": {
+                          "version": "1.0.2",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                        }
+                      }
                     }
                   }
                 },
@@ -2593,36 +2712,60 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.3.1",
+                  "version": "2.3.4",
                   "from": "normalize-package-data@*",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
                       "from": "hosted-git-info@>=2.0.2 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    },
                     "validate-npm-package-license": {
-                      "version": "2.0.0",
-                      "from": "validate-npm-package-license@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
+                      "version": "3.0.1",
+                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                       "dependencies": {
-                        "spdx": {
-                          "version": "0.4.1",
-                          "from": "spdx@>=0.4.0 <0.5.0",
-                          "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
+                        "spdx-correct": {
+                          "version": "1.0.1",
+                          "from": "spdx-correct@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
                         },
-                        "spdx-correct": {
+                        "spdx-expression-parse": {
                           "version": "1.0.0",
-                          "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
+                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                          "dependencies": {
+                            "spdx-exceptions": {
+                              "version": "1.0.2",
+                              "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
+                            },
+                            "spdx-license-ids": {
+                              "version": "1.0.2",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                            }
+                          }
                         }
                       }
                     }
@@ -2942,14 +3085,14 @@
                   "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
                 },
                 "fstream": {
-                  "version": "1.0.7",
+                  "version": "1.0.8",
                   "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.7.tgz",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
                   "dependencies": {
                     "graceful-fs": {
-                      "version": "3.0.8",
-                      "from": "graceful-fs@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                     },
                     "mkdirp": {
                       "version": "0.5.1",
@@ -2964,14 +3107,14 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.4.2",
+                      "version": "2.4.3",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
                       "dependencies": {
                         "glob": {
-                          "version": "5.0.14",
+                          "version": "5.0.15",
                           "from": "glob@>=5.0.14 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                           "dependencies": {
                             "inflight": {
                               "version": "1.0.4",
@@ -2986,14 +3129,14 @@
                               }
                             },
                             "minimatch": {
-                              "version": "2.0.10",
-                              "from": "minimatch@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                               "dependencies": {
                                 "brace-expansion": {
-                                  "version": "1.1.0",
+                                  "version": "1.1.1",
                                   "from": "brace-expansion@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                                   "dependencies": {
                                     "balanced-match": {
                                       "version": "0.2.0",
@@ -3157,9 +3300,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.2",
+                      "version": "1.0.3",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -3222,9 +3365,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
                     "brace-expansion": {
-                      "version": "1.1.0",
+                      "version": "1.1.1",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                       "dependencies": {
                         "balanced-match": {
                           "version": "0.2.0",
@@ -3293,9 +3436,9 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "process-nextick-args": {
-                                  "version": "1.0.2",
+                                  "version": "1.0.3",
                                   "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                                 },
                                 "string_decoder": {
                                   "version": "0.10.31",
@@ -3353,9 +3496,9 @@
                               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                             },
                             "inherits": {
-                              "version": "1.0.0",
+                              "version": "1.0.2",
                               "from": "inherits@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
                             }
                           }
                         },
@@ -3365,9 +3508,9 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.6.5",
+                              "version": "2.7.0",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
@@ -3433,7 +3576,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.24 <1.1.0",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -4080,9 +4223,9 @@
           }
         },
         "console-log-level": {
-          "version": "1.1.0",
+          "version": "1.1.2",
           "from": "console-log-level@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.1.0.tgz"
+          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.1.2.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.1",
@@ -4141,9 +4284,9 @@
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
         },
         "read": {
-          "version": "1.0.6",
+          "version": "1.0.7",
           "from": "read@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.5",
@@ -4168,9 +4311,9 @@
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
-              "version": "1.0.0",
+              "version": "1.0.1",
               "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
             },
             "i": {
               "version": "0.3.3",
@@ -4190,14 +4333,14 @@
               }
             },
             "rimraf": {
-              "version": "2.4.2",
+              "version": "2.4.3",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.14",
+                  "version": "5.0.15",
                   "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -4217,14 +4360,14 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.0",
+                          "version": "1.1.1",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
@@ -4665,14 +4808,14 @@
               }
             },
             "rimraf": {
-              "version": "2.4.2",
+              "version": "2.4.3",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "5.0.14",
+                  "version": "5.0.15",
                   "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -4687,14 +4830,14 @@
                       }
                     },
                     "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.0",
+                          "version": "1.1.1",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.0",
@@ -4872,9 +5015,9 @@
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
-                  "version": "1.1.0",
+                  "version": "1.1.1",
                   "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.0",
@@ -4945,9 +5088,9 @@
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
-                          "version": "1.0.0",
+                          "version": "1.0.2",
                           "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
                         }
                       }
                     },
@@ -4957,9 +5100,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.6.5",
+                          "version": "2.7.0",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -5082,14 +5225,14 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "2.6.4",
+          "version": "3.1.0",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.4.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
           "dependencies": {
             "lodash": {
-              "version": "3.10.0",
+              "version": "3.10.1",
               "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.0.tgz"
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
             }
           }
         }
diff --git a/package.json b/package.json
index 59a5dc8962..126ce15c8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.4",
+  "version": "1.6.5-testing.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.8",
+    "ionic-app-lib": "0.3.9-testing.0",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 58c9884f180ee0fcd2242afdb8fe722ca89bbd27 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Tue, 29 Sep 2015 10:10:10 -0500
Subject: [PATCH 0799/1100] bumping versions

---
 npm-shrinkwrap.json | 10 +++++-----
 package.json        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e7550a272f..253852b30e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.0",
+  "version": "1.6.5-testing.1",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -820,9 +820,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.9-testing.0",
-      "from": "ionic-app-lib@0.3.9-testing.0",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.0.tgz",
+      "version": "0.3.9-testing.1",
+      "from": "ionic-app-lib@0.3.9-testing.1",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.1.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -4792,7 +4792,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "inherits@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
diff --git a/package.json b/package.json
index 126ce15c8d..fd4004fd40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.0",
+  "version": "1.6.5-testing.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.9-testing.0",
+    "ionic-app-lib": "0.3.9-testing.1",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From 08373bcbfbb295016f6f14e1116f3f1a6a5c3041 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Tue, 29 Sep 2015 10:20:43 -0500
Subject: [PATCH 0800/1100] bumping versions

---
 npm-shrinkwrap.json | 14 +++++++-------
 package.json        |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 253852b30e..632ea142d1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.1",
+  "version": "1.6.5-testing.2",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -820,9 +820,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.9-testing.1",
-      "from": "ionic-app-lib@0.3.9-testing.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.1.tgz",
+      "version": "0.3.9-testing.2",
+      "from": "ionic-app-lib@0.3.9-testing.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -3347,7 +3347,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -4210,7 +4210,7 @@
           "dependencies": {
             "once": {
               "version": "1.3.2",
-              "from": "once@>=1.3.0 <2.0.0",
+              "from": "once@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
@@ -4792,7 +4792,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
diff --git a/package.json b/package.json
index fd4004fd40..46bee12f0b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.1",
+  "version": "1.6.5-testing.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.9-testing.1",
+    "ionic-app-lib": "0.3.9-testing.2",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From ea821f5418b991d1f878f7210e2027cf732dd131 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Tue, 29 Sep 2015 21:31:03 -0500
Subject: [PATCH 0801/1100] bumping versions

---
 npm-shrinkwrap.json | 16 ++++++++--------
 package.json        |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 632ea142d1..d7c30d7c84 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.2",
+  "version": "1.6.5-testing.3",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -820,9 +820,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.9-testing.2",
-      "from": "ionic-app-lib@0.3.9-testing.2",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.2.tgz",
+      "version": "0.3.9-testing.3",
+      "from": "ionic-app-lib@0.3.9-testing.3",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.3.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -2339,7 +2339,7 @@
                         },
                         "spdx-license-ids": {
                           "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
@@ -3347,7 +3347,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -4210,7 +4210,7 @@
           "dependencies": {
             "once": {
               "version": "1.3.2",
-              "from": "once@>=1.3.0 <1.4.0",
+              "from": "once@>=1.3.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
               "dependencies": {
                 "wrappy": {
@@ -4525,7 +4525,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
diff --git a/package.json b/package.json
index 46bee12f0b..a01b78d158 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.2",
+  "version": "1.6.5-testing.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.9-testing.2",
+    "ionic-app-lib": "0.3.9-testing.3",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From a7b7619fb170621554d1755f261865fdd2413969 Mon Sep 17 00:00:00 2001
From: ericb <eric@hellouser.net>
Date: Wed, 30 Sep 2015 11:42:41 -0500
Subject: [PATCH 0802/1100] bumping version

---
 npm-shrinkwrap.json | 20 ++++++++++----------
 package.json        |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d7c30d7c84..8750b1cc4c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.3",
+  "version": "1.6.5",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -326,7 +326,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -338,7 +338,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -820,9 +820,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.3.9-testing.3",
-      "from": "ionic-app-lib@0.3.9-testing.3",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9-testing.3.tgz",
+      "version": "0.3.9",
+      "from": "ionic-app-lib@0.3.9",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.3.9.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -2745,7 +2745,7 @@
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
@@ -2762,7 +2762,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
@@ -3576,7 +3576,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -4525,7 +4525,7 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
diff --git a/package.json b/package.json
index a01b78d158..cbf3e41408 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5-testing.3",
+  "version": "1.6.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -66,7 +66,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.3.9-testing.3",
+    "ionic-app-lib": "0.3.9",
     "ncp": "0.4.2",
     "npm": "2.1.3",
     "opbeat-ionic": "^1.1.3",

From ce33bcc26336538d86f16b2fcd400dfbce5c73a7 Mon Sep 17 00:00:00 2001
From: Eric Bobbitt <eric@hellouser.net>
Date: Wed, 30 Sep 2015 15:54:59 -0500
Subject: [PATCH 0803/1100] update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9864c66b73..2f36cd56ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.5
+
+* Updating app-lib dependency
+
 ### 1.6.4
 
 * Updating app-lib dependency

From 80658ef3dd4ef4dd77d86ddd98053082451476a6 Mon Sep 17 00:00:00 2001
From: Eric Bobbitt <eric@hellouser.net>
Date: Wed, 30 Sep 2015 15:54:59 -0500
Subject: [PATCH 0804/1100] update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9864c66b73..2f36cd56ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.5
+
+* Updating app-lib dependency
+
 ### 1.6.4
 
 * Updating app-lib dependency

From cbaf6186e95da177cf9117989b32769aac27a22f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 1 Oct 2015 16:11:47 -0500
Subject: [PATCH 0805/1100] these were removed for some reason

---
 lib/ionic/package.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index dafaceb665..46ee80e937 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -3,6 +3,8 @@ var fs = require('fs'),
     _ = require('underscore'),
     Q = require('q'),
     moment = require('moment'),
+    expandTilde = require('expand-tilde'),
+    ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,

From 4130a36bb7e1b036e662f2b9261883f4fccf7bfb Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 1 Oct 2015 16:19:15 -0500
Subject: [PATCH 0806/1100] allow -p

---
 lib/ionic/package.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 46ee80e937..55e7855d22 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -84,6 +84,10 @@ function packageBuild(ionic, argv, dir, project, appId) {
     .then(function(j) {
       jar = j;
 
+      if (typeof argv.p !== 'undefined') {
+        argv.profile = argv.p;
+      }
+
       if (platform === 'android') {
         if (buildMode === 'debug') {
           return Package.buildAndroidDebug(dir, jar, appId);

From 575a5a023e4ad95ca9320afb9cd4027434340f9f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 7 Oct 2015 16:05:19 -0500
Subject: [PATCH 0807/1100] version bump and shrinkwrap

---
 npm-shrinkwrap.json | 7683 +++++++++++++++++++++++++++++++++++++++++++
 package.json        |    2 +-
 2 files changed, 7684 insertions(+), 1 deletion(-)
 create mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 0000000000..76e13c6d9f
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,7683 @@
+{
+  "name": "ionic",
+  "version": "1.7.0-beta.5",
+  "dependencies": {
+    "async": {
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+    },
+    "cheerio": {
+      "version": "0.19.0",
+      "from": "cheerio@>=0.19.0 <0.20.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "dependencies": {
+        "css-select": {
+          "version": "1.0.0",
+          "from": "css-select@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "dependencies": {
+            "css-what": {
+              "version": "1.0.0",
+              "from": "css-what@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "from": "domutils@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.3.0",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+                }
+              }
+            },
+            "boolbase": {
+              "version": "1.0.0",
+              "from": "boolbase@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+            },
+            "nth-check": {
+              "version": "1.0.1",
+              "from": "nth-check@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1",
+          "from": "entities@>=1.1.1 <1.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+        },
+        "htmlparser2": {
+          "version": "3.8.3",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.3.0",
+              "from": "domhandler@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+            },
+            "domutils": {
+              "version": "1.5.1",
+              "from": "domutils@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+            },
+            "domelementtype": {
+              "version": "1.3.0",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0",
+              "from": "entities@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.1.0",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.3",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        }
+      }
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "from": "cli-table@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "from": "colors@1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+        }
+      }
+    },
+    "colors": {
+      "version": "0.6.2",
+      "from": "colors@0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+    },
+    "connect": {
+      "version": "3.1.1",
+      "from": "connect@3.1.1",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "1.0.4",
+          "from": "debug@1.0.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "finalhandler": {
+          "version": "0.1.0",
+          "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+            }
+          }
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "connect-livereload": {
+      "version": "0.5.2",
+      "from": "connect-livereload@0.5.2",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
+    },
+    "crc": {
+      "version": "3.2.1",
+      "from": "crc@3.2.1",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+    },
+    "cross-spawn": {
+      "version": "0.2.3",
+      "from": "cross-spawn@0.2.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.7.0",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+        }
+      }
+    },
+    "event-stream": {
+      "version": "3.0.20",
+      "from": "event-stream@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "dependencies": {
+        "through": {
+          "version": "2.3.8",
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+        },
+        "duplexer": {
+          "version": "0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+        },
+        "from": {
+          "version": "0.1.3",
+          "from": "from@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+        },
+        "map-stream": {
+          "version": "0.0.6",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
+        },
+        "pause-stream": {
+          "version": "0.0.11",
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+        },
+        "split": {
+          "version": "0.2.10",
+          "from": "split@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+        },
+        "stream-combiner": {
+          "version": "0.0.4",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "1.2.0",
+      "from": "expand-tilde@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
+      "dependencies": {
+        "user-home": {
+          "version": "1.1.1",
+          "from": "user-home@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "0.2.0",
+      "from": "finalhandler@0.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        }
+      }
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "from": "form-data@0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "dependencies": {
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "from": "mime@>=1.2.11 <1.3.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+        }
+      }
+    },
+    "gulp": {
+      "version": "3.8.8",
+      "from": "gulp@3.8.8",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "dependencies": {
+        "archy": {
+          "version": "0.0.2",
+          "from": "archy@>=0.0.2 <0.0.3",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "from": "chalk@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "from": "supports-color@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+            }
+          }
+        },
+        "deprecated": {
+          "version": "0.0.1",
+          "from": "deprecated@>=0.0.1 <0.0.2",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+        },
+        "gulp-util": {
+          "version": "3.0.6",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz",
+          "dependencies": {
+            "array-differ": {
+              "version": "1.0.0",
+              "from": "array-differ@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+            },
+            "array-uniq": {
+              "version": "1.0.2",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+            },
+            "beeper": {
+              "version": "1.1.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "dateformat": {
+              "version": "1.0.11",
+              "from": "dateformat@>=1.0.11 <2.0.0",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "5.0.0",
+                  "from": "get-stdin@*",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
+                },
+                "meow": {
+                  "version": "3.4.2",
+                  "from": "meow@*",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "1.0.0",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.2.1",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.1",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "loud-rejection": {
+                      "version": "1.0.0",
+                      "from": "loud-rejection@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.4",
+                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "validate-npm-package-license": {
+                          "version": "3.0.1",
+                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                          "dependencies": {
+                            "spdx-correct": {
+                              "version": "1.0.1",
+                              "from": "spdx-correct@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                              "dependencies": {
+                                "spdx-license-ids": {
+                                  "version": "1.0.2",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "spdx-expression-parse": {
+                              "version": "1.0.0",
+                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                              "dependencies": {
+                                "spdx-exceptions": {
+                                  "version": "1.0.3",
+                                  "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                                },
+                                "spdx-license-ids": {
+                                  "version": "1.0.2",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "object-assign": {
+                      "version": "4.0.1",
+                      "from": "object-assign@>=4.0.1 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                    },
+                    "read-pkg-up": {
+                      "version": "1.0.1",
+                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                      "dependencies": {
+                        "find-up": {
+                          "version": "1.0.0",
+                          "from": "find-up@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
+                          "dependencies": {
+                            "path-exists": {
+                              "version": "2.0.0",
+                              "from": "path-exists@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "1.0.0",
+                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "1.0.0",
+                                  "from": "pinkie@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "read-pkg": {
+                          "version": "1.1.0",
+                          "from": "read-pkg@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                          "dependencies": {
+                            "load-json-file": {
+                              "version": "1.0.1",
+                              "from": "load-json-file@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "parse-json": {
+                                  "version": "2.2.0",
+                                  "from": "parse-json@>=2.2.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                                  "dependencies": {
+                                    "error-ex": {
+                                      "version": "1.2.0",
+                                      "from": "error-ex@>=1.2.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz"
+                                    }
+                                  }
+                                },
+                                "pify": {
+                                  "version": "2.2.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "1.0.0",
+                                  "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "1.0.0",
+                                      "from": "pinkie@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "strip-bom": {
+                                  "version": "2.0.0",
+                                  "from": "strip-bom@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                                  "dependencies": {
+                                    "is-utf8": {
+                                      "version": "0.2.0",
+                                      "from": "is-utf8@>=0.2.0 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "path-type": {
+                              "version": "1.0.0",
+                              "from": "path-type@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "pify": {
+                                  "version": "2.2.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "1.0.0",
+                                  "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "1.0.0",
+                                      "from": "pinkie@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "redent": {
+                      "version": "1.0.0",
+                      "from": "redent@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                      "dependencies": {
+                        "indent-string": {
+                          "version": "2.1.0",
+                          "from": "indent-string@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                          "dependencies": {
+                            "repeating": {
+                              "version": "2.0.0",
+                              "from": "repeating@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                              "dependencies": {
+                                "is-finite": {
+                                  "version": "1.0.1",
+                                  "from": "is-finite@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                                  "dependencies": {
+                                    "number-is-nan": {
+                                      "version": "1.0.0",
+                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "strip-indent": {
+                          "version": "1.0.1",
+                          "from": "strip-indent@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+                          "dependencies": {
+                            "get-stdin": {
+                              "version": "4.0.1",
+                              "from": "get-stdin@>=4.0.1 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "trim-newlines": {
+                      "version": "1.0.0",
+                      "from": "trim-newlines@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash._reescape": {
+              "version": "3.0.0",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+            },
+            "lodash._reevaluate": {
+              "version": "3.0.0",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+            },
+            "lodash._reinterpolate": {
+              "version": "3.0.0",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+            },
+            "lodash.template": {
+              "version": "3.6.2",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+              "dependencies": {
+                "lodash._basecopy": {
+                  "version": "3.0.1",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+                },
+                "lodash._basetostring": {
+                  "version": "3.0.1",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                },
+                "lodash._basevalues": {
+                  "version": "3.0.0",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+                },
+                "lodash._isiterateecall": {
+                  "version": "3.0.9",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+                },
+                "lodash.escape": {
+                  "version": "3.0.0",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                },
+                "lodash.keys": {
+                  "version": "3.1.2",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                  "dependencies": {
+                    "lodash._getnative": {
+                      "version": "3.9.1",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+                    },
+                    "lodash.isarguments": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
+                    },
+                    "lodash.isarray": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+                    }
+                  }
+                },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+                },
+                "lodash.templatesettings": {
+                  "version": "3.1.0",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
+                }
+              }
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "from": "multipipe@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "from": "duplexer2@0.0.2",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "object-assign": {
+              "version": "3.0.0",
+              "from": "object-assign@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+            },
+            "replace-ext": {
+              "version": "0.0.1",
+              "from": "replace-ext@0.0.1",
+              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+            },
+            "through2": {
+              "version": "2.0.0",
+              "from": "through2@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "2.0.2",
+                  "from": "readable-stream@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.3",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.5.3",
+              "from": "vinyl@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "1.0.2",
+                  "from": "clone@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "interpret": {
+          "version": "0.3.10",
+          "from": "interpret@>=0.3.2 <0.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
+        },
+        "liftoff": {
+          "version": "0.12.1",
+          "from": "liftoff@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "dependencies": {
+            "findup-sync": {
+              "version": "0.1.3",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.9 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash": {
+                  "version": "2.4.2",
+                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                }
+              }
+            },
+            "resolve": {
+              "version": "0.7.4",
+              "from": "resolve@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+            },
+            "minimist": {
+              "version": "0.2.0",
+              "from": "minimist@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+            },
+            "extend": {
+              "version": "1.3.0",
+              "from": "extend@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "from": "minimist@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+        },
+        "orchestrator": {
+          "version": "0.3.7",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "dependencies": {
+            "end-of-stream": {
+              "version": "0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "sequencify": {
+              "version": "0.0.7",
+              "from": "sequencify@>=0.0.7 <0.1.0",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+            },
+            "stream-consume": {
+              "version": "0.1.0",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+            }
+          }
+        },
+        "pretty-hrtime": {
+          "version": "0.2.2",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
+        },
+        "semver": {
+          "version": "3.0.1",
+          "from": "semver@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
+        },
+        "tildify": {
+          "version": "1.1.2",
+          "from": "tildify@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
+          "dependencies": {
+            "os-homedir": {
+              "version": "1.0.1",
+              "from": "os-homedir@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "ionic-app-lib": {
+      "version": "0.5.1-beta.0",
+      "from": "ionic-app-lib@0.5.1-beta.0",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.1-beta.0.tgz",
+      "dependencies": {
+        "archiver": {
+          "version": "0.5.2",
+          "from": "archiver@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "zip-stream": {
+              "version": "0.1.4",
+              "from": "zip-stream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "from": "lodash.keys@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash.isobject": {
+                          "version": "2.4.1",
+                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1",
+                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lazystream": {
+              "version": "0.1.0",
+              "from": "lazystream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
+            },
+            "file-utils": {
+              "version": "0.1.5",
+              "from": "file-utils@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+              "dependencies": {
+                "lodash": {
+                  "version": "2.1.0",
+                  "from": "lodash@>=2.1.0 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+                },
+                "iconv-lite": {
+                  "version": "0.2.11",
+                  "from": "iconv-lite@>=0.2.11 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+                },
+                "rimraf": {
+                  "version": "2.2.8",
+                  "from": "rimraf@>=2.2.2 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                },
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "0.2.14",
+                  "from": "minimatch@>=0.2.12 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.0",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "findup-sync": {
+                  "version": "0.1.3",
+                  "from": "findup-sync@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "2.4.2",
+                      "from": "lodash@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                    }
+                  }
+                },
+                "isbinaryfile": {
+                  "version": "0.1.9",
+                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
+                }
+              }
+            },
+            "lodash": {
+              "version": "2.4.2",
+              "from": "lodash@>=2.4.1 <2.5.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+            }
+          }
+        },
+        "cross-spawn": {
+          "version": "2.0.0",
+          "from": "cross-spawn@2.0.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
+          "dependencies": {
+            "cross-spawn-async": {
+              "version": "2.0.0",
+              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.0.tgz",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.7.0",
+                  "from": "lru-cache@>=2.6.5 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "spawn-sync": {
+              "version": "1.0.13",
+              "from": "spawn-sync@>=1.0.13 <2.0.0",
+              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.13.tgz",
+              "dependencies": {
+                "concat-stream": {
+                  "version": "1.5.0",
+                  "from": "concat-stream@>=1.4.7 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "typedarray": {
+                      "version": "0.0.6",
+                      "from": "typedarray@>=0.0.5 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                    },
+                    "readable-stream": {
+                      "version": "2.0.2",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.3",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "os-shim": {
+                  "version": "0.1.3",
+                  "from": "os-shim@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "ionic-cordova-lib": {
+          "version": "5.1.10",
+          "from": "ionic-cordova-lib@5.1.10",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
+          "dependencies": {
+            "bplist-parser": {
+              "version": "0.0.6",
+              "from": "bplist-parser@0.0.6",
+              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
+            },
+            "cordova-app-hello-world": {
+              "version": "3.9.0",
+              "from": "cordova-app-hello-world@3.9.0",
+              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
+            },
+            "cordova-js": {
+              "version": "4.0.0",
+              "from": "cordova-js@4.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
+              "dependencies": {
+                "browserify": {
+                  "version": "10.1.3",
+                  "from": "browserify@10.1.3",
+                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
+                  "dependencies": {
+                    "JSONStream": {
+                      "version": "1.0.6",
+                      "from": "JSONStream@>=1.0.3 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.6.tgz",
+                      "dependencies": {
+                        "jsonparse": {
+                          "version": "1.1.0",
+                          "from": "jsonparse@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "assert": {
+                      "version": "1.3.0",
+                      "from": "assert@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
+                    },
+                    "browser-pack": {
+                      "version": "4.0.4",
+                      "from": "browser-pack@>=4.0.3 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.3.0",
+                          "from": "combine-source-map@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "inline-source-map": {
+                              "version": "0.3.1",
+                              "from": "inline-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.3.0",
+                                  "from": "source-map@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "1.0.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "convert-source-map": {
+                              "version": "0.3.5",
+                              "from": "convert-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.1.43",
+                              "from": "source-map@>=0.1.31 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "through2": {
+                          "version": "0.5.1",
+                          "from": "through2@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@>=1.0.17 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "xtend": {
+                              "version": "3.0.0",
+                              "from": "xtend@>=3.0.0 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                            }
+                          }
+                        },
+                        "umd": {
+                          "version": "3.0.1",
+                          "from": "umd@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
+                        }
+                      }
+                    },
+                    "browser-resolve": {
+                      "version": "1.9.1",
+                      "from": "browser-resolve@>=1.7.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.1.tgz"
+                    },
+                    "browserify-zlib": {
+                      "version": "0.1.4",
+                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                      "dependencies": {
+                        "pako": {
+                          "version": "0.2.8",
+                          "from": "pako@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
+                        }
+                      }
+                    },
+                    "buffer": {
+                      "version": "3.5.1",
+                      "from": "buffer@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.1.tgz",
+                      "dependencies": {
+                        "base64-js": {
+                          "version": "0.0.8",
+                          "from": "base64-js@0.0.8",
+                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                        },
+                        "ieee754": {
+                          "version": "1.1.6",
+                          "from": "ieee754@>=1.1.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
+                        },
+                        "is-array": {
+                          "version": "1.0.1",
+                          "from": "is-array@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@>=0.0.3 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    },
+                    "commondir": {
+                      "version": "0.0.1",
+                      "from": "commondir@0.0.1",
+                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+                    },
+                    "concat-stream": {
+                      "version": "1.4.10",
+                      "from": "concat-stream@>=1.4.1 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        }
+                      }
+                    },
+                    "console-browserify": {
+                      "version": "1.1.0",
+                      "from": "console-browserify@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                      "dependencies": {
+                        "date-now": {
+                          "version": "0.1.4",
+                          "from": "date-now@>=0.1.4 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                        }
+                      }
+                    },
+                    "constants-browserify": {
+                      "version": "0.0.1",
+                      "from": "constants-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                    },
+                    "crypto-browserify": {
+                      "version": "3.10.0",
+                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.10.0.tgz",
+                      "dependencies": {
+                        "browserify-cipher": {
+                          "version": "1.0.0",
+                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+                          "dependencies": {
+                            "browserify-aes": {
+                              "version": "1.0.5",
+                              "from": "browserify-aes@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                              "dependencies": {
+                                "buffer-xor": {
+                                  "version": "1.0.3",
+                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                },
+                                "cipher-base": {
+                                  "version": "1.0.1",
+                                  "from": "cipher-base@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "browserify-des": {
+                              "version": "1.0.0",
+                              "from": "browserify-des@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+                              "dependencies": {
+                                "cipher-base": {
+                                  "version": "1.0.1",
+                                  "from": "cipher-base@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                },
+                                "des.js": {
+                                  "version": "1.0.0",
+                                  "from": "des.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "evp_bytestokey": {
+                              "version": "1.0.0",
+                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "browserify-sign": {
+                          "version": "3.0.8",
+                          "from": "browserify-sign@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.8.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "2.2.0",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "2.0.1",
+                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
+                            },
+                            "elliptic": {
+                              "version": "3.1.0",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            },
+                            "parse-asn1": {
+                              "version": "3.0.2",
+                              "from": "parse-asn1@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "2.2.1",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.1",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-ecdh": {
+                          "version": "2.0.2",
+                          "from": "create-ecdh@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.2.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "2.2.0",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "3.1.0",
+                              "from": "elliptic@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-hash": {
+                          "version": "1.1.2",
+                          "from": "create-hash@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
+                          "dependencies": {
+                            "cipher-base": {
+                              "version": "1.0.1",
+                              "from": "cipher-base@>=1.0.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                            },
+                            "ripemd160": {
+                              "version": "1.0.1",
+                              "from": "ripemd160@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
+                            },
+                            "sha.js": {
+                              "version": "2.4.4",
+                              "from": "sha.js@>=2.3.6 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                            }
+                          }
+                        },
+                        "create-hmac": {
+                          "version": "1.1.4",
+                          "from": "create-hmac@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
+                        },
+                        "diffie-hellman": {
+                          "version": "3.0.2",
+                          "from": "diffie-hellman@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "2.2.0",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                            },
+                            "miller-rabin": {
+                              "version": "2.0.1",
+                              "from": "miller-rabin@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "pbkdf2": {
+                          "version": "3.0.4",
+                          "from": "pbkdf2@>=3.0.3 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
+                        },
+                        "public-encrypt": {
+                          "version": "2.0.1",
+                          "from": "public-encrypt@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "2.2.0",
+                              "from": "bn.js@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "2.0.1",
+                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
+                            },
+                            "parse-asn1": {
+                              "version": "3.0.2",
+                              "from": "parse-asn1@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "2.2.1",
+                                  "from": "asn1.js@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.1",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "randombytes": {
+                          "version": "2.0.1",
+                          "from": "randombytes@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
+                        }
+                      }
+                    },
+                    "deep-equal": {
+                      "version": "1.0.1",
+                      "from": "deep-equal@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+                    },
+                    "defined": {
+                      "version": "1.0.0",
+                      "from": "defined@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
+                    },
+                    "deps-sort": {
+                      "version": "1.3.9",
+                      "from": "deps-sort@>=1.3.7 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
+                    },
+                    "domain-browser": {
+                      "version": "1.1.4",
+                      "from": "domain-browser@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                    },
+                    "duplexer2": {
+                      "version": "0.0.2",
+                      "from": "duplexer2@>=0.0.2 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
+                    },
+                    "events": {
+                      "version": "1.0.2",
+                      "from": "events@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
+                    },
+                    "has": {
+                      "version": "1.0.1",
+                      "from": "has@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+                      "dependencies": {
+                        "function-bind": {
+                          "version": "1.0.2",
+                          "from": "function-bind@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "htmlescape": {
+                      "version": "1.1.0",
+                      "from": "htmlescape@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
+                    },
+                    "http-browserify": {
+                      "version": "1.7.0",
+                      "from": "http-browserify@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                      "dependencies": {
+                        "Base64": {
+                          "version": "0.2.1",
+                          "from": "Base64@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                        }
+                      }
+                    },
+                    "https-browserify": {
+                      "version": "0.0.1",
+                      "from": "https-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "insert-module-globals": {
+                      "version": "6.6.0",
+                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.0.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.6.1",
+                          "from": "combine-source-map@>=0.6.1 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+                          "dependencies": {
+                            "convert-source-map": {
+                              "version": "1.1.1",
+                              "from": "convert-source-map@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.1.tgz"
+                            },
+                            "inline-source-map": {
+                              "version": "0.5.0",
+                              "from": "inline-source-map@>=0.5.0 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
+                            },
+                            "lodash.memoize": {
+                              "version": "3.0.4",
+                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.4.4",
+                              "from": "source-map@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "is-buffer": {
+                          "version": "1.1.0",
+                          "from": "is-buffer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                        },
+                        "lexical-scope": {
+                          "version": "1.2.0",
+                          "from": "lexical-scope@>=1.2.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+                          "dependencies": {
+                            "astw": {
+                              "version": "2.0.0",
+                              "from": "astw@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
+                              "dependencies": {
+                                "acorn": {
+                                  "version": "1.2.2",
+                                  "from": "acorn@>=1.0.3 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "labeled-stream-splicer": {
+                      "version": "1.0.2",
+                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+                      "dependencies": {
+                        "stream-splicer": {
+                          "version": "1.3.2",
+                          "from": "stream-splicer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+                          "dependencies": {
+                            "readable-wrap": {
+                              "version": "1.0.0",
+                              "from": "readable-wrap@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                            },
+                            "indexof": {
+                              "version": "0.0.1",
+                              "from": "indexof@0.0.1",
+                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "module-deps": {
+                      "version": "3.9.1",
+                      "from": "module-deps@>=3.7.11 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+                      "dependencies": {
+                        "detective": {
+                          "version": "4.2.0",
+                          "from": "detective@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.2.0.tgz",
+                          "dependencies": {
+                            "acorn": {
+                              "version": "1.2.2",
+                              "from": "acorn@>=1.0.3 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                            },
+                            "escodegen": {
+                              "version": "1.7.0",
+                              "from": "escodegen@>=1.4.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.0.tgz",
+                              "dependencies": {
+                                "estraverse": {
+                                  "version": "1.9.3",
+                                  "from": "estraverse@>=1.9.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
+                                },
+                                "esutils": {
+                                  "version": "2.0.2",
+                                  "from": "esutils@>=2.0.2 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
+                                },
+                                "esprima": {
+                                  "version": "1.2.5",
+                                  "from": "esprima@>=1.2.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
+                                },
+                                "optionator": {
+                                  "version": "0.5.0",
+                                  "from": "optionator@>=0.5.0 <0.6.0",
+                                  "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+                                  "dependencies": {
+                                    "prelude-ls": {
+                                      "version": "1.1.2",
+                                      "from": "prelude-ls@>=1.1.1 <1.2.0",
+                                      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+                                    },
+                                    "deep-is": {
+                                      "version": "0.1.3",
+                                      "from": "deep-is@>=0.1.2 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
+                                    },
+                                    "wordwrap": {
+                                      "version": "0.0.3",
+                                      "from": "wordwrap@>=0.0.2 <0.1.0",
+                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+                                    },
+                                    "type-check": {
+                                      "version": "0.3.1",
+                                      "from": "type-check@>=0.3.1 <0.4.0",
+                                      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"
+                                    },
+                                    "levn": {
+                                      "version": "0.2.5",
+                                      "from": "levn@>=0.2.5 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
+                                    },
+                                    "fast-levenshtein": {
+                                      "version": "1.0.7",
+                                      "from": "fast-levenshtein@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
+                                    }
+                                  }
+                                },
+                                "source-map": {
+                                  "version": "0.2.0",
+                                  "from": "source-map@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "1.0.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "stream-combiner2": {
+                          "version": "1.0.2",
+                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                          "dependencies": {
+                            "through2": {
+                              "version": "0.5.1",
+                              "from": "through2@>=0.5.1 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@>=1.0.17 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "xtend": {
+                                  "version": "3.0.0",
+                                  "from": "xtend@>=3.0.0 <3.1.0",
+                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "os-browserify": {
+                      "version": "0.1.2",
+                      "from": "os-browserify@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                    },
+                    "parents": {
+                      "version": "1.0.1",
+                      "from": "parents@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                      "dependencies": {
+                        "path-platform": {
+                          "version": "0.11.15",
+                          "from": "path-platform@>=0.11.15 <0.12.0",
+                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+                        }
+                      }
+                    },
+                    "path-browserify": {
+                      "version": "0.0.0",
+                      "from": "path-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                    },
+                    "process": {
+                      "version": "0.11.2",
+                      "from": "process@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
+                    },
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "punycode@>=1.3.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    },
+                    "querystring-es3": {
+                      "version": "0.2.1",
+                      "from": "querystring-es3@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                    },
+                    "read-only-stream": {
+                      "version": "1.1.1",
+                      "from": "read-only-stream@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
+                      "dependencies": {
+                        "readable-wrap": {
+                          "version": "1.0.0",
+                          "from": "readable-wrap@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.13 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "resolve": {
+                      "version": "1.1.6",
+                      "from": "resolve@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                    },
+                    "shallow-copy": {
+                      "version": "0.0.1",
+                      "from": "shallow-copy@0.0.1",
+                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+                    },
+                    "shasum": {
+                      "version": "1.0.2",
+                      "from": "shasum@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+                      "dependencies": {
+                        "json-stable-stringify": {
+                          "version": "0.0.1",
+                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "from": "jsonify@>=0.0.0 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+                            }
+                          }
+                        },
+                        "sha.js": {
+                          "version": "2.4.4",
+                          "from": "sha.js@>=2.4.4 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                        }
+                      }
+                    },
+                    "shell-quote": {
+                      "version": "0.0.1",
+                      "from": "shell-quote@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
+                    },
+                    "stream-browserify": {
+                      "version": "1.0.0",
+                      "from": "stream-browserify@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "subarg": {
+                      "version": "1.0.0",
+                      "from": "subarg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "1.2.0",
+                          "from": "minimist@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "syntax-error": {
+                      "version": "1.1.4",
+                      "from": "syntax-error@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
+                      "dependencies": {
+                        "acorn": {
+                          "version": "1.2.2",
+                          "from": "acorn@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                        }
+                      }
+                    },
+                    "through2": {
+                      "version": "1.1.1",
+                      "from": "through2@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
+                    },
+                    "timers-browserify": {
+                      "version": "1.4.1",
+                      "from": "timers-browserify@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                    },
+                    "tty-browserify": {
+                      "version": "0.0.0",
+                      "from": "tty-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                    },
+                    "url": {
+                      "version": "0.10.3",
+                      "from": "url@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                      "dependencies": {
+                        "querystring": {
+                          "version": "0.2.0",
+                          "from": "querystring@0.2.0",
+                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                        }
+                      }
+                    },
+                    "util": {
+                      "version": "0.10.3",
+                      "from": "util@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+                    },
+                    "vm-browserify": {
+                      "version": "0.0.4",
+                      "from": "vm-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                      "dependencies": {
+                        "indexof": {
+                          "version": "0.0.1",
+                          "from": "indexof@0.0.1",
+                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "xtend": {
+                      "version": "4.0.0",
+                      "from": "xtend@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.4",
+                  "from": "through@2.3.4",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+                },
+                "uglify-js": {
+                  "version": "2.4.24",
+                  "from": "uglify-js@>=2.4.15 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10",
+                      "from": "async@>=0.2.6 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.1.34",
+                      "from": "source-map@0.1.34",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+                      "dependencies": {
+                        "amdefine": {
+                          "version": "1.0.0",
+                          "from": "amdefine@>=0.0.4",
+                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    },
+                    "yargs": {
+                      "version": "3.5.4",
+                      "from": "yargs@>=3.5.4 <3.6.0",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.2.1",
+                          "from": "camelcase@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                        },
+                        "decamelize": {
+                          "version": "1.0.0",
+                          "from": "decamelize@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                        },
+                        "window-size": {
+                          "version": "0.1.0",
+                          "from": "window-size@0.1.0",
+                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "wordwrap@0.0.2",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-registry-mapper": {
+              "version": "1.1.12",
+              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.12.tgz",
+              "dependencies": {
+                "tape": {
+                  "version": "3.5.0",
+                  "from": "tape@>=3.5.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
+                  "dependencies": {
+                    "deep-equal": {
+                      "version": "0.2.2",
+                      "from": "deep-equal@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                    },
+                    "defined": {
+                      "version": "0.0.0",
+                      "from": "defined@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                    },
+                    "glob": {
+                      "version": "3.2.11",
+                      "from": "glob@>=3.2.9 <3.3.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "0.3.0",
+                          "from": "minimatch@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.0",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "object-inspect": {
+                      "version": "0.4.0",
+                      "from": "object-inspect@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
+                    },
+                    "resumer": {
+                      "version": "0.0.0",
+                      "from": "resumer@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
+                    },
+                    "through": {
+                      "version": "2.3.8",
+                      "from": "through@>=2.3.4 <2.4.0",
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-serve": {
+              "version": "0.1.3",
+              "from": "cordova-serve@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
+              "dependencies": {
+                "chalk": {
+                  "version": "1.1.1",
+                  "from": "chalk@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                  "dependencies": {
+                    "ansi-styles": {
+                      "version": "2.1.0",
+                      "from": "ansi-styles@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                    },
+                    "escape-string-regexp": {
+                      "version": "1.0.3",
+                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                    },
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "supports-color": {
+                      "version": "2.0.0",
+                      "from": "supports-color@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                    }
+                  }
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "d8": {
+                  "version": "0.4.4",
+                  "from": "d8@>=0.4.4 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+                  "dependencies": {
+                    "m8": {
+                      "version": "0.4.4",
+                      "from": "m8@>=0.4.3",
+                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.3.4",
+                  "from": "mime@>=1.2.11 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+                },
+                "q": {
+                  "version": "1.4.1",
+                  "from": "q@>=1.4.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+                },
+                "shelljs": {
+                  "version": "0.5.3",
+                  "from": "shelljs@>=0.5.3 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
+                }
+              }
+            },
+            "dep-graph": {
+              "version": "1.1.0",
+              "from": "dep-graph@1.1.0",
+              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.2.1",
+                  "from": "underscore@1.2.1",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
+                }
+              }
+            },
+            "elementtree": {
+              "version": "0.1.6",
+              "from": "elementtree@0.1.6",
+              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+              "dependencies": {
+                "sax": {
+                  "version": "0.3.5",
+                  "from": "sax@0.3.5",
+                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
+                }
+              }
+            },
+            "glob": {
+              "version": "4.0.6",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.0",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "init-package-json": {
+              "version": "1.9.1",
+              "from": "init-package-json@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.3 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.0.2",
+                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    }
+                  }
+                },
+                "promzard": {
+                  "version": "0.3.0",
+                  "from": "promzard@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.1",
+                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.1",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.4",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    }
+                  }
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.1",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.0.2",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.0",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.3",
+                          "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                        },
+                        "spdx-license-ids": {
+                          "version": "1.0.2",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "npm": {
+              "version": "2.14.7",
+              "from": "npm@>=2.10.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.7.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.7 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                },
+                "ansi": {
+                  "version": "0.3.0",
+                  "from": "ansi@latest",
+                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                },
+                "ansicolors": {
+                  "version": "0.3.2",
+                  "from": "ansicolors@latest"
+                },
+                "ansistyles": {
+                  "version": "0.1.3",
+                  "from": "ansistyles@0.1.3",
+                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+                },
+                "archy": {
+                  "version": "1.0.0",
+                  "from": "archy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+                },
+                "async-some": {
+                  "version": "1.0.2",
+                  "from": "async-some@>=1.0.2 <1.1.0"
+                },
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@0.0.8",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "char-spinner": {
+                  "version": "1.0.1",
+                  "from": "char-spinner@latest",
+                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+                },
+                "chmodr": {
+                  "version": "1.0.1",
+                  "from": "chmodr@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.1.tgz"
+                },
+                "chownr": {
+                  "version": "1.0.1",
+                  "from": "chownr@1.0.1",
+                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
+                },
+                "cmd-shim": {
+                  "version": "2.0.1",
+                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "columnify": {
+                  "version": "1.5.2",
+                  "from": "columnify@1.5.2",
+                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+                  "dependencies": {
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "wcwidth": {
+                      "version": "1.0.0",
+                      "from": "wcwidth@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+                      "dependencies": {
+                        "defaults": {
+                          "version": "1.0.2",
+                          "from": "defaults@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+                          "dependencies": {
+                            "clone": {
+                              "version": "0.1.19",
+                              "from": "clone@>=0.1.5 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.9 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "dezalgo": {
+                  "version": "1.0.3",
+                  "from": "dezalgo@>=1.0.3 <1.1.0",
+                  "dependencies": {
+                    "asap": {
+                      "version": "2.0.3",
+                      "from": "asap@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+                    }
+                  }
+                },
+                "editor": {
+                  "version": "1.0.0",
+                  "from": "editor@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
+                },
+                "fs-vacuum": {
+                  "version": "1.2.7",
+                  "from": "fs-vacuum@1.2.7"
+                },
+                "fs-write-stream-atomic": {
+                  "version": "1.0.4",
+                  "from": "fs-write-stream-atomic@1.0.4"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@1.0.8"
+                },
+                "fstream-npm": {
+                  "version": "1.0.5",
+                  "from": "fstream-npm@>=1.0.5 <1.1.0",
+                  "dependencies": {
+                    "fstream-ignore": {
+                      "version": "1.0.2",
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
+                    }
+                  }
+                },
+                "github-url-from-git": {
+                  "version": "1.4.0",
+                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
+                },
+                "github-url-from-username-repo": {
+                  "version": "1.0.2",
+                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
+                },
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@5.0.15",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=3.0.8 <3.1.0"
+                },
+                "hosted-git-info": {
+                  "version": "2.1.4",
+                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                },
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <1.1.0"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@latest",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@latest",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "init-package-json": {
+                  "version": "1.9.1",
+                  "from": "init-package-json@1.9.1",
+                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+                  "dependencies": {
+                    "promzard": {
+                      "version": "0.3.0",
+                      "from": "promzard@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                    }
+                  }
+                },
+                "lockfile": {
+                  "version": "1.0.1",
+                  "from": "lockfile@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+                },
+                "lru-cache": {
+                  "version": "2.7.0",
+                  "from": "lru-cache@2.7.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                },
+                "minimatch": {
+                  "version": "2.0.10",
+                  "from": "minimatch@2.0.10",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.0",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registrytwo.npmjs.com/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "node-gyp": {
+                  "version": "3.0.3",
+                  "from": "node-gyp@3.0.3",
+                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.10",
+                          "from": "minimatch@>=2.0.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.0",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.0",
+                                  "from": "balanced-match@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "1.0.0",
+                      "from": "minimatch@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                      "dependencies": {
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-array": {
+                      "version": "1.0.0",
+                      "from": "path-array@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                      "dependencies": {
+                        "array-index": {
+                          "version": "0.1.1",
+                          "from": "array-index@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                          "dependencies": {
+                            "debug": {
+                              "version": "2.2.0",
+                              "from": "debug@*",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                              "dependencies": {
+                                "ms": {
+                                  "version": "0.7.1",
+                                  "from": "ms@0.7.1",
+                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "tar": {
+                      "version": "1.0.3",
+                      "from": "tar@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.4",
+                  "from": "nopt@3.0.4"
+                },
+                "normalize-git-url": {
+                  "version": "3.0.1",
+                  "from": "normalize-git-url@latest"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.4",
+                  "from": "normalize-package-data@2.3.4",
+                  "dependencies": {
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-cache-filename": {
+                  "version": "1.0.2",
+                  "from": "npm-cache-filename@1.0.2",
+                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
+                },
+                "npm-install-checks": {
+                  "version": "1.0.6",
+                  "from": "npm-install-checks@>=1.0.6 <1.1.0"
+                },
+                "npm-package-arg": {
+                  "version": "4.0.2",
+                  "from": "npm-package-arg@>=4.0.2 <4.1.0"
+                },
+                "npm-registry-client": {
+                  "version": "7.0.7",
+                  "from": "npm-registry-client@7.0.7",
+                  "dependencies": {
+                    "concat-stream": {
+                      "version": "1.5.0",
+                      "from": "concat-stream@>=1.4.6 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "2.0.2",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.1",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-user-validate": {
+                  "version": "0.1.2",
+                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
+                },
+                "npmlog": {
+                  "version": "1.2.1",
+                  "from": "npmlog@>=1.2.1 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "dependencies": {
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.0",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.0",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.0",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+                        },
+                        "lodash._basetostring": {
+                          "version": "3.0.0",
+                          "from": "lodash._basetostring@3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+                        },
+                        "lodash._createpadding": {
+                          "version": "3.6.0",
+                          "from": "lodash._createpadding@3.6.0",
+                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
+                          "dependencies": {
+                            "lodash.repeat": {
+                              "version": "3.0.0",
+                              "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.2 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                },
+                "opener": {
+                  "version": "1.4.1",
+                  "from": "opener@>=1.4.1 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@0.1.3",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.0",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-inside": {
+                  "version": "1.0.1",
+                  "from": "path-is-inside@1.0.1",
+                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@1.0.7",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-installed": {
+                  "version": "4.0.3",
+                  "from": "read-installed@4.0.3",
+                  "dependencies": {
+                    "debuglog": {
+                      "version": "1.0.1",
+                      "from": "debuglog@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+                    },
+                    "readdir-scoped-modules": {
+                      "version": "1.0.2",
+                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
+                    },
+                    "util-extend": {
+                      "version": "1.0.1",
+                      "from": "util-extend@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.1",
+                  "from": "read-package-json@2.0.1",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.0",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    }
+                  }
+                },
+                "realize-package-specifier": {
+                  "version": "3.0.1",
+                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
+                },
+                "request": {
+                  "version": "2.64.0",
+                  "from": "request@2.64.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
+                  "dependencies": {
+                    "bl": {
+                      "version": "1.0.0",
+                      "from": "bl@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.2",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.1",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                    },
+                    "forever-agent": {
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.0 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
+                    "form-data": {
+                      "version": "1.0.0-rc3",
+                      "from": "form-data@>=1.0.0-rc1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                      "dependencies": {
+                        "async": {
+                          "version": "1.4.2",
+                          "from": "async@>=1.4.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+                        }
+                      }
+                    },
+                    "json-stringify-safe": {
+                      "version": "5.0.1",
+                      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                    },
+                    "mime-types": {
+                      "version": "2.1.7",
+                      "from": "mime-types@>=2.1.2 <2.2.0",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.19.0",
+                          "from": "mime-db@>=1.19.0 <1.20.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                        }
+                      }
+                    },
+                    "node-uuid": {
+                      "version": "1.4.3",
+                      "from": "node-uuid@>=1.4.0 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                    },
+                    "qs": {
+                      "version": "5.1.0",
+                      "from": "qs@>=5.1.0 <5.2.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+                    },
+                    "tunnel-agent": {
+                      "version": "0.4.1",
+                      "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                    },
+                    "tough-cookie": {
+                      "version": "2.0.0",
+                      "from": "tough-cookie@>=0.12.0",
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                    },
+                    "http-signature": {
+                      "version": "0.11.0",
+                      "from": "http-signature@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "0.1.5",
+                          "from": "assert-plus@>=0.1.5 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                        },
+                        "ctype": {
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        }
+                      }
+                    },
+                    "oauth-sign": {
+                      "version": "0.8.0",
+                      "from": "oauth-sign@>=0.8.0 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                    },
+                    "hawk": {
+                      "version": "3.1.0",
+                      "from": "hawk@>=3.1.0 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                      "dependencies": {
+                        "hoek": {
+                          "version": "2.16.3",
+                          "from": "hoek@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                        },
+                        "boom": {
+                          "version": "2.9.0",
+                          "from": "boom@>=2.8.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        }
+                      }
+                    },
+                    "aws-sign2": {
+                      "version": "0.5.0",
+                      "from": "aws-sign2@>=0.5.0 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                    },
+                    "stringstream": {
+                      "version": "0.0.4",
+                      "from": "stringstream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                    },
+                    "combined-stream": {
+                      "version": "1.0.5",
+                      "from": "combined-stream@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "isstream": {
+                      "version": "0.1.2",
+                      "from": "isstream@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                    },
+                    "har-validator": {
+                      "version": "1.8.0",
+                      "from": "har-validator@>=1.6.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+                      "dependencies": {
+                        "bluebird": {
+                          "version": "2.10.1",
+                          "from": "bluebird@>=2.9.30 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+                        },
+                        "chalk": {
+                          "version": "1.1.1",
+                          "from": "chalk@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                          "dependencies": {
+                            "ansi-styles": {
+                              "version": "2.1.0",
+                              "from": "ansi-styles@>=2.1.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                            },
+                            "escape-string-regexp": {
+                              "version": "1.0.3",
+                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                            },
+                            "has-ansi": {
+                              "version": "2.0.0",
+                              "from": "has-ansi@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                              "dependencies": {
+                                "ansi-regex": {
+                                  "version": "2.0.0",
+                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                }
+                              }
+                            },
+                            "strip-ansi": {
+                              "version": "3.0.0",
+                              "from": "strip-ansi@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                              "dependencies": {
+                                "ansi-regex": {
+                                  "version": "2.0.0",
+                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                }
+                              }
+                            },
+                            "supports-color": {
+                              "version": "2.0.0",
+                              "from": "supports-color@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "commander": {
+                          "version": "2.8.1",
+                          "from": "commander@>=2.8.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+                          "dependencies": {
+                            "graceful-readlink": {
+                              "version": "1.0.1",
+                              "from": "graceful-readlink@>=1.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.2",
+                          "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                          "dependencies": {
+                            "generate-function": {
+                              "version": "2.0.0",
+                              "from": "generate-function@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                            },
+                            "generate-object-property": {
+                              "version": "1.2.0",
+                              "from": "generate-object-property@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                              "dependencies": {
+                                "is-property": {
+                                  "version": "1.0.2",
+                                  "from": "is-property@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "jsonpointer": {
+                              "version": "2.0.0",
+                              "from": "jsonpointer@2.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                            },
+                            "xtend": {
+                              "version": "4.0.0",
+                              "from": "xtend@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "retry": {
+                  "version": "0.8.0",
+                  "from": "retry@0.8.0",
+                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+                },
+                "rimraf": {
+                  "version": "2.4.3",
+                  "from": "rimraf@2.4.3",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+                },
+                "semver": {
+                  "version": "5.0.3",
+                  "from": "semver@5.0.3",
+                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                },
+                "sha": {
+                  "version": "2.0.1",
+                  "from": "sha@2.0.1",
+                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.2",
+                      "from": "readable-stream@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.3",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.1",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "slide": {
+                  "version": "1.1.6",
+                  "from": "slide@>=1.1.6 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+                },
+                "sorted-object": {
+                  "version": "1.0.0",
+                  "from": "sorted-object@"
+                },
+                "spdx": {
+                  "version": "0.4.1",
+                  "from": "spdx@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
+                  "dependencies": {
+                    "spdx-license-ids": {
+                      "version": "1.0.1",
+                      "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
+                    }
+                  }
+                },
+                "tar": {
+                  "version": "2.2.1",
+                  "from": "tar@2.2.1"
+                },
+                "text-table": {
+                  "version": "0.2.0",
+                  "from": "text-table@~0.2.0"
+                },
+                "uid-number": {
+                  "version": "0.0.6",
+                  "from": "uid-number@>=0.0.6 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+                },
+                "umask": {
+                  "version": "1.1.0",
+                  "from": "umask@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@3.0.1",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.1",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.0.2",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.0",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.2",
+                          "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
+                        },
+                        "spdx-license-ids": {
+                          "version": "1.0.2",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@2.2.2",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.1.2",
+                  "from": "which@1.1.2",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@1.0.1",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                },
+                "write-file-atomic": {
+                  "version": "1.1.3",
+                  "from": "write-file-atomic@1.1.3",
+                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
+                }
+              }
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.4",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.1.0",
+              "from": "osenv@0.1.0",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
+            },
+            "plist": {
+              "version": "1.1.0",
+              "from": "plist@1.1.0",
+              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.6",
+                  "from": "base64-js@0.0.6",
+                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
+                },
+                "xmlbuilder": {
+                  "version": "2.2.1",
+                  "from": "xmlbuilder@2.2.1",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
+                  "dependencies": {
+                    "lodash-node": {
+                      "version": "2.4.1",
+                      "from": "lodash-node@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+                    }
+                  }
+                },
+                "xmldom": {
+                  "version": "0.1.19",
+                  "from": "xmldom@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
+                },
+                "util-deprecate": {
+                  "version": "1.0.0",
+                  "from": "util-deprecate@1.0.0",
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
+                }
+              }
+            },
+            "properties-parser": {
+              "version": "0.2.3",
+              "from": "properties-parser@0.2.3",
+              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
+            },
+            "rc": {
+              "version": "0.5.2",
+              "from": "rc@0.5.2",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "minimist@>=0.0.7 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                },
+                "deep-extend": {
+                  "version": "0.2.11",
+                  "from": "deep-extend@>=0.2.5 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                },
+                "strip-json-comments": {
+                  "version": "0.1.3",
+                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                }
+              }
+            },
+            "request": {
+              "version": "2.47.0",
+              "from": "request@2.47.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "bl@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.26 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.6.0",
+                  "from": "caseless@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "from": "forever-agent@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "mime-types@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.3",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                },
+                "qs": {
+                  "version": "2.3.3",
+                  "from": "qs@>=2.3.1 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.0",
+                  "from": "tough-cookie@>=0.12.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "from": "http-signature@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "asn1@0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "ctype@0.5.3",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.4.0",
+                  "from": "oauth-sign@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "from": "hawk@1.1.1",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1",
+                      "from": "hoek@>=0.9.0 <0.10.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "boom": {
+                      "version": "0.4.2",
+                      "from": "boom@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "from": "cryptiles@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "from": "sntp@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "aws-sign2@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.4",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@>=0.0.5 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "shelljs": {
+              "version": "0.3.0",
+              "from": "shelljs@0.3.0",
+              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+            },
+            "tar": {
+              "version": "1.0.2",
+              "from": "tar@1.0.2",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+              "dependencies": {
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@*",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    },
+                    "mkdirp": {
+                      "version": "0.5.1",
+                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        }
+                      }
+                    },
+                    "rimraf": {
+                      "version": "2.4.3",
+                      "from": "rimraf@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                      "dependencies": {
+                        "glob": {
+                          "version": "5.0.15",
+                          "from": "glob@>=5.0.14 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                          "dependencies": {
+                            "inflight": {
+                              "version": "1.0.4",
+                              "from": "inflight@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                              "dependencies": {
+                                "brace-expansion": {
+                                  "version": "1.1.1",
+                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                                  "dependencies": {
+                                    "balanced-match": {
+                                      "version": "0.2.0",
+                                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                    },
+                                    "concat-map": {
+                                      "version": "0.0.1",
+                                      "from": "concat-map@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "once": {
+                              "version": "1.3.2",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "path-is-absolute": {
+                              "version": "1.0.0",
+                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "from": "through2@0.6.3",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "unorm": {
+              "version": "1.3.3",
+              "from": "unorm@1.3.3",
+              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
+            },
+            "valid-identifier": {
+              "version": "0.0.1",
+              "from": "valid-identifier@0.0.1",
+              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
+            },
+            "ionic-xcode": {
+              "version": "0.8.3",
+              "from": "ionic-xcode@0.8.3",
+              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
+              "dependencies": {
+                "pegjs": {
+                  "version": "0.6.2",
+                  "from": "pegjs@0.6.2",
+                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.3.3",
+                  "from": "node-uuid@1.3.3",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "node-sass": {
+          "version": "3.3.3",
+          "from": "node-sass@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.3.3.tgz",
+          "dependencies": {
+            "async-foreach": {
+              "version": "0.1.3",
+              "from": "async-foreach@>=0.1.3 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "get-stdin": {
+              "version": "4.0.1",
+              "from": "get-stdin@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+            },
+            "glob": {
+              "version": "5.0.15",
+              "from": "glob@>=5.0.14 <6.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.0",
+                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.1",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            },
+            "meow": {
+              "version": "3.4.2",
+              "from": "meow@>=3.3.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz",
+              "dependencies": {
+                "camelcase-keys": {
+                  "version": "1.0.0",
+                  "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.2.1",
+                      "from": "camelcase@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                    },
+                    "map-obj": {
+                      "version": "1.0.1",
+                      "from": "map-obj@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                    }
+                  }
+                },
+                "loud-rejection": {
+                  "version": "1.0.0",
+                  "from": "loud-rejection@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
+                },
+                "minimist": {
+                  "version": "1.2.0",
+                  "from": "minimist@>=1.1.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.4",
+                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    },
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "validate-npm-package-license": {
+                      "version": "3.0.1",
+                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                      "dependencies": {
+                        "spdx-correct": {
+                          "version": "1.0.1",
+                          "from": "spdx-correct@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                          "dependencies": {
+                            "spdx-license-ids": {
+                              "version": "1.0.2",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "spdx-expression-parse": {
+                          "version": "1.0.0",
+                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                          "dependencies": {
+                            "spdx-exceptions": {
+                              "version": "1.0.3",
+                              "from": "spdx-exceptions@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                            },
+                            "spdx-license-ids": {
+                              "version": "1.0.2",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "object-assign": {
+                  "version": "4.0.1",
+                  "from": "object-assign@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                },
+                "read-pkg-up": {
+                  "version": "1.0.1",
+                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                  "dependencies": {
+                    "find-up": {
+                      "version": "1.0.0",
+                      "from": "find-up@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
+                      "dependencies": {
+                        "path-exists": {
+                          "version": "2.0.0",
+                          "from": "path-exists@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "1.0.0",
+                              "from": "pinkie@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "read-pkg": {
+                      "version": "1.1.0",
+                      "from": "read-pkg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                      "dependencies": {
+                        "load-json-file": {
+                          "version": "1.0.1",
+                          "from": "load-json-file@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "parse-json": {
+                              "version": "2.2.0",
+                              "from": "parse-json@>=2.2.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                              "dependencies": {
+                                "error-ex": {
+                                  "version": "1.2.0",
+                                  "from": "error-ex@>=1.2.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz"
+                                }
+                              }
+                            },
+                            "pify": {
+                              "version": "2.2.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "1.0.0",
+                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "1.0.0",
+                                  "from": "pinkie@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                }
+                              }
+                            },
+                            "strip-bom": {
+                              "version": "2.0.0",
+                              "from": "strip-bom@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                              "dependencies": {
+                                "is-utf8": {
+                                  "version": "0.2.0",
+                                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "path-type": {
+                          "version": "1.0.0",
+                          "from": "path-type@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "pify": {
+                              "version": "2.2.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "1.0.0",
+                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "1.0.0",
+                                  "from": "pinkie@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "redent": {
+                  "version": "1.0.0",
+                  "from": "redent@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                  "dependencies": {
+                    "indent-string": {
+                      "version": "2.1.0",
+                      "from": "indent-string@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "2.0.0",
+                          "from": "repeating@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.1",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "strip-indent": {
+                      "version": "1.0.1",
+                      "from": "strip-indent@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+                    }
+                  }
+                },
+                "trim-newlines": {
+                  "version": "1.0.0",
+                  "from": "trim-newlines@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "nan": {
+              "version": "2.0.9",
+              "from": "nan@>=2.0.8 <3.0.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz"
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.2 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "nopt": {
+                  "version": "3.0.4",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "node-gyp": {
+              "version": "3.0.3",
+              "from": "node-gyp@>=3.0.1 <4.0.0",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+              "dependencies": {
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.10",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.0",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.4",
+                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "npmlog": {
+                  "version": "1.2.1",
+                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "dependencies": {
+                    "ansi": {
+                      "version": "0.3.0",
+                      "from": "ansi@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                    },
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.2",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.0",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.0.0 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-array": {
+                  "version": "1.0.0",
+                  "from": "path-array@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                  "dependencies": {
+                    "array-index": {
+                      "version": "0.1.1",
+                      "from": "array-index@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                      "dependencies": {
+                        "debug": {
+                          "version": "2.2.0",
+                          "from": "debug@*",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                          "dependencies": {
+                            "ms": {
+                              "version": "0.7.1",
+                              "from": "ms@0.7.1",
+                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.3",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.1",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.0",
+                                  "from": "balanced-match@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.2",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "tar": {
+                  "version": "1.0.3",
+                  "from": "tar@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+                  "dependencies": {
+                    "block-stream": {
+                      "version": "0.0.8",
+                      "from": "block-stream@*",
+                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "request": {
+              "version": "2.64.0",
+              "from": "request@>=2.61.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "1.0.0",
+                  "from": "bl@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.2",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.3",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.11.0",
+                  "from": "caseless@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                },
+                "extend": {
+                  "version": "3.0.0",
+                  "from": "extend@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.6.1",
+                  "from": "forever-agent@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                },
+                "form-data": {
+                  "version": "1.0.0-rc3",
+                  "from": "form-data@>=1.0.0-rc1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "1.4.2",
+                      "from": "async@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "2.1.7",
+                  "from": "mime-types@>=2.1.2 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.19.0",
+                      "from": "mime-db@>=1.19.0 <1.20.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                    }
+                  }
+                },
+                "node-uuid": {
+                  "version": "1.4.3",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                },
+                "qs": {
+                  "version": "5.1.0",
+                  "from": "qs@>=5.1.0 <5.2.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.0",
+                  "from": "tough-cookie@>=0.12.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                },
+                "http-signature": {
+                  "version": "0.11.0",
+                  "from": "http-signature@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "asn1@0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "ctype@0.5.3",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.8.0",
+                  "from": "oauth-sign@>=0.8.0 <0.9.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                },
+                "hawk": {
+                  "version": "3.1.0",
+                  "from": "hawk@>=3.1.0 <3.2.0",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "2.16.3",
+                      "from": "hoek@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                    },
+                    "boom": {
+                      "version": "2.9.0",
+                      "from": "boom@>=2.8.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "2.0.5",
+                      "from": "cryptiles@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                    },
+                    "sntp": {
+                      "version": "1.0.9",
+                      "from": "sntp@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "aws-sign2@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.4",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "isstream": {
+                  "version": "0.1.2",
+                  "from": "isstream@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                },
+                "har-validator": {
+                  "version": "1.8.0",
+                  "from": "har-validator@>=1.6.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+                  "dependencies": {
+                    "bluebird": {
+                      "version": "2.10.2",
+                      "from": "bluebird@>=2.9.30 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
+                    },
+                    "commander": {
+                      "version": "2.8.1",
+                      "from": "commander@>=2.8.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+                      "dependencies": {
+                        "graceful-readlink": {
+                          "version": "1.0.1",
+                          "from": "graceful-readlink@>=1.0.0",
+                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "is-my-json-valid": {
+                      "version": "2.12.2",
+                      "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                      "dependencies": {
+                        "generate-function": {
+                          "version": "2.0.0",
+                          "from": "generate-function@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                        },
+                        "generate-object-property": {
+                          "version": "1.2.0",
+                          "from": "generate-object-property@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                          "dependencies": {
+                            "is-property": {
+                              "version": "1.0.2",
+                              "from": "is-property@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "jsonpointer": {
+                          "version": "2.0.0",
+                          "from": "jsonpointer@2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                        },
+                        "xtend": {
+                          "version": "4.0.0",
+                          "from": "xtend@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "sass-graph": {
+              "version": "2.0.1",
+              "from": "sass-graph@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
+              "dependencies": {
+                "lodash": {
+                  "version": "3.10.1",
+                  "from": "lodash@>=3.8.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+                },
+                "yargs": {
+                  "version": "3.26.0",
+                  "from": "yargs@>=3.8.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.26.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.2.1",
+                      "from": "camelcase@>=1.2.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                    },
+                    "cliui": {
+                      "version": "2.1.0",
+                      "from": "cliui@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                      "dependencies": {
+                        "center-align": {
+                          "version": "0.1.1",
+                          "from": "center-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.1.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "right-align": {
+                          "version": "0.1.3",
+                          "from": "right-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "wordwrap@0.0.2",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    },
+                    "decamelize": {
+                      "version": "1.0.0",
+                      "from": "decamelize@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                    },
+                    "os-locale": {
+                      "version": "1.4.0",
+                      "from": "os-locale@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+                      "dependencies": {
+                        "lcid": {
+                          "version": "1.0.0",
+                          "from": "lcid@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+                          "dependencies": {
+                            "invert-kv": {
+                              "version": "1.0.0",
+                              "from": "invert-kv@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "window-size": {
+                      "version": "0.1.2",
+                      "from": "window-size@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.2.tgz"
+                    },
+                    "y18n": {
+                      "version": "3.2.0",
+                      "from": "y18n@>=3.2.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "request-progress": {
+          "version": "0.3.1",
+          "from": "request-progress@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2",
+              "from": "throttleit@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            }
+          }
+        },
+        "vinyl-fs": {
+          "version": "1.0.0",
+          "from": "vinyl-fs@1.0.0",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
+          "dependencies": {
+            "duplexify": {
+              "version": "3.4.2",
+              "from": "duplexify@>=3.2.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
+              "dependencies": {
+                "end-of-stream": {
+                  "version": "1.0.0",
+                  "from": "end-of-stream@1.0.0",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.2",
+                  "from": "readable-stream@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.3",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "glob-stream": {
+              "version": "4.1.1",
+              "from": "glob-stream@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=4.3.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.10",
+                  "from": "minimatch@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.1",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.0",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ordered-read-streams": {
+                  "version": "0.1.0",
+                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+                },
+                "glob2base": {
+                  "version": "0.0.12",
+                  "from": "glob2base@>=0.0.12 <0.0.13",
+                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1",
+                      "from": "find-index@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "2.2.0",
+                  "from": "unique-stream@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
+                  "dependencies": {
+                    "through2-filter": {
+                      "version": "2.0.0",
+                      "from": "through2-filter@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+                      "dependencies": {
+                        "through2": {
+                          "version": "2.0.0",
+                          "from": "through2@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.2",
+                              "from": "readable-stream@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.3",
+                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.0",
+                          "from": "xtend@>=4.0.0 <4.1.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "glob-watcher": {
+              "version": "0.0.8",
+              "from": "glob-watcher@>=0.0.8 <0.0.9",
+              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
+              "dependencies": {
+                "gaze": {
+                  "version": "0.5.2",
+                  "from": "gaze@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+                  "dependencies": {
+                    "globule": {
+                      "version": "0.1.0",
+                      "from": "globule@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "1.0.2",
+                          "from": "lodash@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                        },
+                        "glob": {
+                          "version": "3.1.21",
+                          "from": "glob@>=3.1.21 <3.2.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@>=1.2.0 <1.3.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            },
+                            "inherits": {
+                              "version": "1.0.2",
+                              "from": "inherits@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "from": "minimatch@>=0.2.11 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.0",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "merge-stream": {
+              "version": "0.1.8",
+              "from": "merge-stream@>=0.1.7 <0.2.0",
+              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "2.1.1",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "from": "strip-bom@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0",
+                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+                },
+                "is-utf8": {
+                  "version": "0.2.0",
+                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "from": "through2@>=0.6.1 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.0",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "from": "vinyl@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "1.0.2",
+          "from": "winston@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.0.0",
+              "from": "async@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
+            },
+            "colors": {
+              "version": "1.0.3",
+              "from": "colors@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "from": "isstream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+            },
+            "pkginfo": {
+              "version": "0.3.0",
+              "from": "pkginfo@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        }
+      }
+    },
+    "moment": {
+      "version": "2.10.6",
+      "from": "moment@>=2.10.6 <3.0.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+    },
+    "npm": {
+      "version": "2.1.3",
+      "from": "npm@2.1.3",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.5",
+          "from": "abbrev@latest",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+        },
+        "ansi": {
+          "version": "0.3.0",
+          "from": "ansi@latest",
+          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+        },
+        "ansicolors": {
+          "version": "0.3.2",
+          "from": "ansicolors@latest"
+        },
+        "ansistyles": {
+          "version": "0.1.3",
+          "from": "ansistyles@0.1.3",
+          "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+        },
+        "archy": {
+          "version": "0.0.2",
+          "from": "archy@0.0.2"
+        },
+        "async-some": {
+          "version": "1.0.1",
+          "from": "async-some@>=1.0.1-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz"
+        },
+        "block-stream": {
+          "version": "0.0.7",
+          "from": "block-stream@latest"
+        },
+        "char-spinner": {
+          "version": "1.0.1",
+          "from": "char-spinner@latest",
+          "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+        },
+        "child-process-close": {
+          "version": "0.1.1",
+          "from": "child-process-close@",
+          "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
+        },
+        "chmodr": {
+          "version": "0.1.0",
+          "from": "chmodr@latest"
+        },
+        "chownr": {
+          "version": "0.0.1",
+          "from": "../chownr"
+        },
+        "cmd-shim": {
+          "version": "2.0.1",
+          "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+          "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
+        },
+        "columnify": {
+          "version": "1.2.1",
+          "from": "columnify@>=1.2.1-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz",
+          "dependencies": {
+            "strip-ansi": {
+              "version": "1.0.0",
+              "from": "strip-ansi@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@0.2.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "wcwidth": {
+              "version": "1.0.0",
+              "from": "wcwidth@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+              "dependencies": {
+                "defaults": {
+                  "version": "1.0.0",
+                  "from": "defaults@>=1.0.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz",
+                  "dependencies": {
+                    "clone": {
+                      "version": "0.1.18",
+                      "from": "clone@>=0.1.5-0 <0.2.0-0",
+                      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.18.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "dezalgo": {
+          "version": "1.0.1",
+          "from": "dezalgo@latest",
+          "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz",
+          "dependencies": {
+            "asap": {
+              "version": "1.0.0",
+              "from": "asap@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
+            }
+          }
+        },
+        "editor": {
+          "version": "0.1.0",
+          "from": "editor@latest",
+          "resolved": "https://registry.npmjs.org/editor/-/editor-0.1.0.tgz"
+        },
+        "fs-vacuum": {
+          "version": "1.2.1",
+          "from": "fs-vacuum@>=1.2.1-0 <1.3.0-0"
+        },
+        "fs-write-stream-atomic": {
+          "version": "1.0.2",
+          "from": "fs-write-stream-atomic@>=1.0.2 <1.1.0",
+          "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz"
+        },
+        "fstream": {
+          "version": "1.0.2",
+          "from": "fstream@1.0.2",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz"
+        },
+        "fstream-npm": {
+          "version": "1.0.0",
+          "from": "fstream-npm@latest",
+          "dependencies": {
+            "fstream-ignore": {
+              "version": "1.0.1",
+              "from": "fstream-ignore@^1.0.0"
+            }
+          }
+        },
+        "github-url-from-git": {
+          "version": "1.4.0",
+          "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+          "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
+        },
+        "github-url-from-username-repo": {
+          "version": "1.0.2",
+          "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
+        },
+        "glob": {
+          "version": "4.0.5",
+          "from": "glob@latest",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz"
+        },
+        "graceful-fs": {
+          "version": "3.0.2",
+          "from": "graceful-fs@~3.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+        },
+        "inflight": {
+          "version": "1.0.3",
+          "from": "inflight@>=1.0.3 <1.1.0"
+        },
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@latest",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+        },
+        "ini": {
+          "version": "1.2.1",
+          "from": "ini@latest",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.2.1.tgz"
+        },
+        "init-package-json": {
+          "version": "1.1.0",
+          "from": "init-package-json@>=1.1.0 <1.2.0",
+          "dependencies": {
+            "promzard": {
+              "version": "0.2.2",
+              "from": "promzard@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"
+            }
+          }
+        },
+        "lockfile": {
+          "version": "1.0.0",
+          "from": "lockfile@1.0.0",
+          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"
+        },
+        "lru-cache": {
+          "version": "2.5.0",
+          "from": "lru-cache@latest"
+        },
+        "minimatch": {
+          "version": "1.0.0",
+          "from": "minimatch@latest",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+          "dependencies": {
+            "sigmund": {
+              "version": "1.0.0",
+              "from": "sigmund@~1.0.0",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+            }
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "from": "mkdirp@latest",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
+        },
+        "node-gyp": {
+          "version": "1.0.2",
+          "from": "node-gyp@>=1.0.1-0 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"
+        },
+        "nopt": {
+          "version": "3.0.1",
+          "from": "nopt@latest"
+        },
+        "normalize-package-data": {
+          "version": "1.0.3",
+          "from": "normalize-package-data@>=1.0.3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
+        },
+        "npm-cache-filename": {
+          "version": "1.0.1",
+          "from": "npm-cache-filename@latest",
+          "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
+        },
+        "npm-install-checks": {
+          "version": "1.0.4",
+          "from": "npm-install-checks@>=1.0.2-0 <1.1.0-0",
+          "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz"
+        },
+        "npm-package-arg": {
+          "version": "2.1.3",
+          "from": "npm-package-arg@~2.1.3"
+        },
+        "npm-registry-client": {
+          "version": "3.2.2",
+          "from": "npm-registry-client@>=3.2.2 <3.3.0"
+        },
+        "npm-user-validate": {
+          "version": "0.1.0",
+          "from": "npm-user-validate@latest"
+        },
+        "npmconf": {
+          "version": "2.1.0",
+          "from": "npmconf@>=2.1.0 <2.2.0",
+          "dependencies": {
+            "config-chain": {
+              "version": "1.1.8",
+              "from": "config-chain@>=1.1.8 <1.2.0",
+              "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
+              "dependencies": {
+                "proto-list": {
+                  "version": "1.2.3",
+                  "from": "proto-list@>=1.2.1 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "npmlog": {
+          "version": "0.1.1",
+          "from": "npmlog@latest"
+        },
+        "once": {
+          "version": "1.3.0",
+          "from": "once@latest"
+        },
+        "opener": {
+          "version": "1.3.0",
+          "from": "opener@latest"
+        },
+        "osenv": {
+          "version": "0.1.0",
+          "from": "osenv@~0.1.0"
+        },
+        "path-is-inside": {
+          "version": "1.0.1",
+          "from": "path-is-inside@1.0.1",
+          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+        },
+        "read": {
+          "version": "1.0.5",
+          "from": "read@latest",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.4",
+              "from": "mute-stream@~0.0.4"
+            }
+          }
+        },
+        "read-installed": {
+          "version": "3.1.3",
+          "from": "read-installed@>=3.1.2-0 <3.2.0-0",
+          "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.3.tgz",
+          "dependencies": {
+            "debuglog": {
+              "version": "1.0.1",
+              "from": "debuglog@>=1.0.1-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+            },
+            "readdir-scoped-modules": {
+              "version": "1.0.0",
+              "from": "readdir-scoped-modules@>=1.0.0-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.0.tgz"
+            },
+            "util-extend": {
+              "version": "1.0.1",
+              "from": "util-extend@>=1.0.1-0 <2.0.0-0",
+              "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+            }
+          }
+        },
+        "read-package-json": {
+          "version": "1.2.7",
+          "from": "read-package-json@>=1.2.7-0 <1.3.0-0",
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.32",
+          "from": "readable-stream@*",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            }
+          }
+        },
+        "realize-package-specifier": {
+          "version": "1.1.0",
+          "from": "realize-package-specifier@1.1.0"
+        },
+        "request": {
+          "version": "2.44.0",
+          "from": "request@>=2.44.0 <2.45.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.44.0.tgz",
+          "dependencies": {
+            "bl": {
+              "version": "0.9.3",
+              "from": "bl@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz"
+            },
+            "caseless": {
+              "version": "0.6.0",
+              "from": "caseless@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+            },
+            "forever-agent": {
+              "version": "0.5.2",
+              "from": "forever-agent@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+            },
+            "qs": {
+              "version": "1.2.2",
+              "from": "qs@>=1.2.0 <1.3.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
+            },
+            "json-stringify-safe": {
+              "version": "5.0.0",
+              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+            },
+            "mime-types": {
+              "version": "1.0.2",
+              "from": "mime-types@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+            },
+            "node-uuid": {
+              "version": "1.4.1",
+              "from": "node-uuid@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+            },
+            "tunnel-agent": {
+              "version": "0.4.0",
+              "from": "tunnel-agent@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+            },
+            "tough-cookie": {
+              "version": "0.12.1",
+              "from": "tough-cookie@>=0.12.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+              "dependencies": {
+                "punycode": {
+                  "version": "1.3.1",
+                  "from": "punycode@>=0.2.0",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
+                }
+              }
+            },
+            "form-data": {
+              "version": "0.1.4",
+              "from": "form-data@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+              "dependencies": {
+                "combined-stream": {
+                  "version": "0.0.5",
+                  "from": "combined-stream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.2.11",
+                  "from": "mime@>=1.2.11 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                },
+                "async": {
+                  "version": "0.9.0",
+                  "from": "async@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                }
+              }
+            },
+            "http-signature": {
+              "version": "0.10.0",
+              "from": "http-signature@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+              "dependencies": {
+                "assert-plus": {
+                  "version": "0.1.2",
+                  "from": "assert-plus@0.1.2",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+                },
+                "asn1": {
+                  "version": "0.1.11",
+                  "from": "asn1@0.1.11",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                },
+                "ctype": {
+                  "version": "0.5.2",
+                  "from": "ctype@0.5.2",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+                }
+              }
+            },
+            "oauth-sign": {
+              "version": "0.4.0",
+              "from": "oauth-sign@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+            },
+            "hawk": {
+              "version": "1.1.1",
+              "from": "hawk@1.1.1",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+              "dependencies": {
+                "hoek": {
+                  "version": "0.9.1",
+                  "from": "hoek@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                },
+                "boom": {
+                  "version": "0.4.2",
+                  "from": "boom@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                },
+                "cryptiles": {
+                  "version": "0.2.2",
+                  "from": "cryptiles@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                },
+                "sntp": {
+                  "version": "0.2.4",
+                  "from": "sntp@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                }
+              }
+            },
+            "aws-sign2": {
+              "version": "0.5.0",
+              "from": "aws-sign2@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+            },
+            "stringstream": {
+              "version": "0.0.4",
+              "from": "stringstream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+            }
+          }
+        },
+        "retry": {
+          "version": "0.6.0",
+          "from": "retry"
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "from": "rimraf@latest",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+        },
+        "semver": {
+          "version": "4.0.0",
+          "from": "semver@>=4.0.0-0 <5.0.0-0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.0.0.tgz"
+        },
+        "sha": {
+          "version": "1.2.4",
+          "from": "sha@>=1.2.1 <1.3.0",
+          "resolved": "https://registry.npmjs.org/sha/-/sha-1.2.4.tgz"
+        },
+        "slide": {
+          "version": "1.1.6",
+          "from": "slide@>=1.1.6 <1.2.0",
+          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+        },
+        "sorted-object": {
+          "version": "1.0.0",
+          "from": "sorted-object@"
+        },
+        "tar": {
+          "version": "1.0.1",
+          "from": "tar@1.0.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz"
+        },
+        "text-table": {
+          "version": "0.2.0",
+          "from": "text-table@~0.2.0"
+        },
+        "uid-number": {
+          "version": "0.0.5",
+          "from": "uid-number@latest",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+        },
+        "which": {
+          "version": "1.0.5",
+          "from": "which@1"
+        },
+        "wrappy": {
+          "version": "1.0.1",
+          "from": "wrappy@1.0.1",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+        },
+        "write-file-atomic": {
+          "version": "1.1.0",
+          "from": "write-file-atomic@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz"
+        }
+      }
+    },
+    "opbeat-ionic": {
+      "version": "1.1.3",
+      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
+      "dependencies": {
+        "after-all": {
+          "version": "2.0.2",
+          "from": "after-all@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
+          "dependencies": {
+            "once": {
+              "version": "1.3.2",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+              "dependencies": {
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "console-log-level": {
+          "version": "1.2.0",
+          "from": "console-log-level@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.0.tgz"
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "stackman": {
+          "version": "0.2.3",
+          "from": "stackman@>=0.2.2 <0.3.0",
+          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.3.tgz",
+          "dependencies": {
+            "stackback": {
+              "version": "0.0.2",
+              "from": "stackback@0.0.2",
+              "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
+            }
+          }
+        }
+      }
+    },
+    "open": {
+      "version": "0.0.5",
+      "from": "open@0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+    },
+    "optimist": {
+      "version": "0.6.0",
+      "from": "optimist@0.6.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "from": "minimist@>=0.0.1 <0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+        }
+      }
+    },
+    "progress": {
+      "version": "1.1.7",
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+    },
+    "prompt": {
+      "version": "0.2.12",
+      "from": "prompt@0.2.12",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "dependencies": {
+        "pkginfo": {
+          "version": "0.3.0",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+        },
+        "read": {
+          "version": "1.0.7",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.5",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "revalidator": {
+          "version": "0.1.8",
+          "from": "revalidator@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+        },
+        "utile": {
+          "version": "0.2.1",
+          "from": "utile@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "from": "async@>=0.2.9 <0.3.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+            },
+            "deep-equal": {
+              "version": "1.0.1",
+              "from": "deep-equal@*",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+            },
+            "i": {
+              "version": "0.3.3",
+              "from": "i@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.3",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "0.6.2",
+          "from": "winston@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.1.22",
+              "from": "async@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "pkginfo": {
+              "version": "0.2.3",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+            },
+            "request": {
+              "version": "2.9.203",
+              "from": "request@>=2.9.0 <2.10.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        }
+      }
+    },
+    "proxy-middleware": {
+      "version": "0.7.0",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+    },
+    "q": {
+      "version": "1.0.1",
+      "from": "q@1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
+    },
+    "request": {
+      "version": "2.51.0",
+      "from": "request@2.51.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "dependencies": {
+        "bl": {
+          "version": "0.9.4",
+          "from": "bl@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "caseless": {
+          "version": "0.8.0",
+          "from": "caseless@>=0.8.0 <0.9.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "from": "form-data@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "dependencies": {
+            "mime-types": {
+              "version": "2.0.14",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.12.0",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "from": "mime-types@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+        },
+        "node-uuid": {
+          "version": "1.4.3",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+        },
+        "qs": {
+          "version": "2.3.3",
+          "from": "qs@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.4.1",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.2.0",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "from": "http-signature@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "0.1.5",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+            },
+            "asn1": {
+              "version": "0.1.11",
+              "from": "asn1@0.1.11",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+            },
+            "ctype": {
+              "version": "0.5.3",
+              "from": "ctype@0.5.3",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+            }
+          }
+        },
+        "oauth-sign": {
+          "version": "0.5.0",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+        },
+        "hawk": {
+          "version": "1.1.1",
+          "from": "hawk@1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "from": "hoek@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+            },
+            "boom": {
+              "version": "0.4.2",
+              "from": "boom@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+            },
+            "cryptiles": {
+              "version": "0.2.2",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+            },
+            "sntp": {
+              "version": "0.2.4",
+              "from": "sntp@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+            }
+          }
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.4",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "4.3.6",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+    },
+    "serve-static": {
+      "version": "1.7.1",
+      "from": "serve-static@1.7.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "dependencies": {
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "send": {
+          "version": "0.10.1",
+          "from": "send@0.10.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "2.1.3",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.7.0",
+                  "from": "ms@0.7.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                }
+              }
+            },
+            "depd": {
+              "version": "1.0.1",
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
+            },
+            "destroy": {
+              "version": "1.0.3",
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+            },
+            "etag": {
+              "version": "1.5.1",
+              "from": "etag@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
+            },
+            "fresh": {
+              "version": "0.2.4",
+              "from": "fresh@0.2.4",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            },
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            },
+            "on-finished": {
+              "version": "2.1.1",
+              "from": "on-finished@>=2.1.1 <2.2.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "dependencies": {
+                "ee-first": {
+                  "version": "1.1.0",
+                  "from": "ee-first@1.1.0",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
+                }
+              }
+            },
+            "range-parser": {
+              "version": "1.0.2",
+              "from": "range-parser@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
+            }
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "shelljs": {
+      "version": "0.2.6",
+      "from": "shelljs@0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+    },
+    "tiny-lr-fork": {
+      "version": "0.0.5",
+      "from": "tiny-lr-fork@0.0.5",
+      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "0.5.6",
+          "from": "qs@>=0.5.2 <0.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+        },
+        "faye-websocket": {
+          "version": "0.4.4",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+        },
+        "noptify": {
+          "version": "0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "dependencies": {
+            "nopt": {
+              "version": "2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                }
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+        }
+      }
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+    },
+    "unzip": {
+      "version": "0.1.9",
+      "from": "unzip@0.1.9",
+      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "dependencies": {
+        "fstream": {
+          "version": "0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.3",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.2.0",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.2",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "pullstream": {
+          "version": "0.4.1",
+          "from": "pullstream@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "dependencies": {
+            "over": {
+              "version": "0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+            },
+            "slice-stream": {
+              "version": "1.0.0",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "binary": {
+          "version": "0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "dependencies": {
+            "chainsaw": {
+              "version": "0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "dependencies": {
+                "traverse": {
+                  "version": "0.3.9",
+                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                }
+              }
+            },
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.1",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            }
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.2",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
+        },
+        "match-stream": {
+          "version": "0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "dependencies": {
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.7",
+      "from": "vinyl-fs@0.3.7",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "dependencies": {
+        "glob-stream": {
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "4.5.3",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "2.0.10",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+              "dependencies": {
+                "brace-expansion": {
+                  "version": "1.1.1",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.2.0",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "ordered-read-streams": {
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+            },
+            "glob2base": {
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
+            },
+            "unique-stream": {
+              "version": "1.0.0",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "glob-watcher": {
+          "version": "0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "dependencies": {
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.0",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+            },
+            "is-utf8": {
+              "version": "0.2.0",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
+            "clone-stats": {
+              "version": "0.0.1",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "xml2js": {
+      "version": "0.4.4",
+      "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "dependencies": {
+        "sax": {
+          "version": "0.6.1",
+          "from": "sax@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+        },
+        "xmlbuilder": {
+          "version": "3.1.0",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "from": "lodash@>=3.5.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 889d020634..a1c16ced0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.6.5",
+  "version": "1.7.0-beta.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From acb39b0190c13939d34820772ae4e537477faaab Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 8 Oct 2015 14:48:17 -0500
Subject: [PATCH 0808/1100] eslint on undefined vars

---
 lib/ionic/app.js       |  2 +-
 lib/ionic/cordova.js   |  1 +
 lib/ionic/help.js      |  2 +-
 lib/ionic/hooks.js     |  2 +-
 lib/ionic/io-init.js   |  3 ++-
 lib/ionic/lib.js       |  1 +
 lib/ionic/prompt.js    |  2 +-
 lib/ionic/push.js      |  4 +++-
 lib/ionic/resources.js |  1 +
 lib/ionic/serve.js     |  4 +++-
 lib/ionic/service.js   |  2 +-
 lib/ionic/stats.js     | 22 +++++++++++-----------
 12 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 9550679ffa..23fd8ad77d 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -6,7 +6,7 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
     Task = require('./task').Task,
     IonicLoginTask = require('./login').IonicTask,
     IonicUploadTask = require('./upload').IonicTask,
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 907a51bf31..47f8379df8 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -8,6 +8,7 @@ var Task = require('./task').Task,
     colors = require('colors'),
     shelljs = require('shelljs'),
     IonicAppLib = require('ionic-app-lib'),
+    IonicProject = require('./project'),
     IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 29aa80ebc6..051c7179bb 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,6 +1,6 @@
 var IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
     argv = require('optimist').argv,
     Task = require('./task').Task;
 
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 4907a3e13c..77ee2498dc 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -7,7 +7,7 @@ var fs = require('fs'),
     IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
-    IonicInfo = require('./info').IonicTask
+    IonicInfo = require('./info').IonicTask,
     IonicAppLib = require('ionic-app-lib'),
     Hooks = IonicAppLib.hooks;
 
diff --git a/lib/ionic/io-init.js b/lib/ionic/io-init.js
index 24c10ccbe2..327ab79719 100644
--- a/lib/ionic/io-init.js
+++ b/lib/ionic/io-init.js
@@ -5,7 +5,8 @@ var ioLib = require('ionic-app-lib').ioConfig,
     IonicTask = require('./task').IonicTask,
     Task = require('./task').Task,
     Login = require('ionic-app-lib').login,
-    LoginTask = require('./login');
+    LoginTask = require('./login'),
+    Utils = require('./utils');
 
 var IonicTask = function() {};
 
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index d08b0b8519..30490f8626 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -1,5 +1,6 @@
 var fs = require('fs'),
     os = require('os'),
+    shelljs = require('shelljs/global'),
     request = require('request'),
     path = require('path'),
     unzip = require('unzip'),
diff --git a/lib/ionic/prompt.js b/lib/ionic/prompt.js
index c4306a477c..101e140935 100644
--- a/lib/ionic/prompt.js
+++ b/lib/ionic/prompt.js
@@ -1,4 +1,4 @@
-var prompt = require('prompt')
+var prompt = require('prompt'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Q = require('q');
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 096cc78a61..8c23fc9e2d 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -7,7 +7,7 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats;
+    IonicStats = require('./stats').IonicStats,
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
     Login = IonicAppLib.login,
@@ -361,6 +361,8 @@ IonicTask.prototype.upload_cert = function(self) {
     var form = new FormData();
     form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
 
+    var inputFile;
+
     try {
       inputFile = promptResult['ios-push-cert'].replace(/\\ /g, ' ').trim();
       form.append('ios_push_cert', fs.createReadStream( resolvePath(inputFile) ) );
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 0e3c85c14a..7d80d8a254 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,4 +1,5 @@
 var argv = require('optimist').argv,
+    Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
     IonicResources = IonicAppLib.resources,
     IonicStats = require('./stats').IonicStats,
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index be87da3629..41f9e14549 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,9 +1,11 @@
 var IonicAppLib = require('ionic-app-lib'),
     IonicStats = require('./stats').IonicStats,
+    IonicProject = require('./project'),
     events = IonicAppLib.events,
     Q = require('q'),
     Serve = IonicAppLib.serve,
-    Task = require('./task').Task;
+    Task = require('./task').Task,
+    Utils = require('./utils');
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 64b129ae57..22854a5de4 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -5,7 +5,7 @@ var Task = require('./task').Task,
     IonicStats = require('./stats').IonicStats,
     argv = require('optimist').argv,
     fs = require('fs'),
-    path = require('path')
+    path = require('path'),
     _ = require('underscore'),
     bower = require('./bower');
 
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 0113116145..41d643da75 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -2,16 +2,16 @@ var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, os, IonicCon
 var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
         __slice = Array.prototype.slice;
 
-path = require('path'),
-http = require('http');
-querystring = require('querystring');
-crypto = require('crypto');
-Buffer          = require('buffer').Buffer,
-util = require('util');
-es = require('event-stream');
-fs = require('fs');
-os = require('os');
-IonicConfig = require('./config');
+var path = require('path'),
+    http = require('http'),
+    querystring = require('querystring'),
+    crypto = require('crypto'),
+    Buffer = require('buffer').Buffer,
+    util = require('util'),
+    es = require('event-stream'),
+    fs = require('fs'),
+    os = require('os'),
+    IonicConfig = require('./config');
 
 /*
     Heavily inspired by the original js library copyright Mixpanel, Inc.
@@ -463,7 +463,7 @@ var create_client = function(token, config) {
                 return;
             }
 
-            data = {
+            var data = {
                 '$unset': $unset,
                 '$token': metrics.token,
                 '$distinct_id': distinct_id

From fa5aa41b070b61d3d0b2d1bf1d0bd666e9553ec3 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 8 Oct 2015 14:53:24 -0500
Subject: [PATCH 0809/1100] shrinkwrap

---
 npm-shrinkwrap.json | 34 +++++++++++++++++-----------------
 package.json        |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 76e13c6d9f..141e8f3f4b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.0-beta.5",
+  "version": "1.7.0-beta.6",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -504,7 +504,7 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -992,7 +992,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -1072,7 +1072,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1263,7 +1263,7 @@
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "typedarray": {
@@ -3842,7 +3842,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "ini": {
@@ -4756,9 +4756,9 @@
               }
             },
             "nan": {
-              "version": "2.0.9",
+              "version": "2.1.0",
               "from": "nan@>=2.0.8 <3.0.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz"
+              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
             },
             "npmconf": {
               "version": "2.1.2",
@@ -5001,9 +5001,9 @@
                       "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
                       "dependencies": {
                         "has-unicode": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
                         },
                         "lodash.pad": {
                           "version": "3.1.1",
@@ -5499,9 +5499,9 @@
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
                 },
                 "yargs": {
-                  "version": "3.26.0",
+                  "version": "3.27.0",
                   "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.26.0.tgz",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
                   "dependencies": {
                     "camelcase": {
                       "version": "1.2.1",
@@ -5520,7 +5520,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "from": "align-text@>=0.1.0 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5556,7 +5556,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "from": "align-text@>=0.1.0 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5736,7 +5736,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
@@ -5990,7 +5990,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -6763,7 +6763,7 @@
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
diff --git a/package.json b/package.json
index a1c16ced0c..1d4003a9fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.0-beta.5",
+  "version": "1.7.0-beta.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 3a0a805597a71de0524b811a9772cbd9643ca18a Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 12 Oct 2015 14:49:38 -0500
Subject: [PATCH 0810/1100] update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f36cd56ab..a738c45e4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.7.0
+
+* Added security command for managing Security Profiles.
+* Added package command for Ionic Package.
+
 ### 1.6.5
 
 * Updating app-lib dependency

From 88fb95c8f9c3ab47ab34c6c6b4e38942620a9230 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 12 Oct 2015 14:49:55 -0500
Subject: [PATCH 0811/1100] bump to 1.7.0, update app-lib dep

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1d4003a9fd..a37049790e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.0-beta.6",
+  "version": "1.7.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.5.1-beta.0",
+    "ionic-app-lib": "0.5.1",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From dd3e9660c5718f1d3228ea6b6cddb1442789886c Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 14 Oct 2015 16:20:07 -0500
Subject: [PATCH 0812/1100] passwords actually don't need paths resolved,
 believe it or not

---
 lib/ionic/security.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 2363130ade..c41e61904d 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -244,18 +244,18 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
     .then(function(result) {
       if (platform === 'android') {
         var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
-          keystorePassword = path.resolve(expandTilde(result['keystore-password'])),
-          keyAlias = result['key-alias'],
-          keyPassword = result['key-password'],
-          keystoreFileStream = fs.createReadStream(keystoreFilePath);
+            keystorePassword = result['keystore-password'],
+            keyAlias = result['key-alias'],
+            keyPassword = result['key-password'],
+            keystoreFileStream = fs.createReadStream(keystoreFilePath);
 
         return Security.addAndroidCredentials(appId, jar, profile, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
       } else if (platform === 'ios') {
         var certificateFilePath = path.resolve(expandTilde(result['cert'])),
-          certificatePassword = result['cert-password'],
-          provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
-          certificateFileStream = fs.createReadStream(certificateFilePath),
-          provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+            certificatePassword = result['cert-password'],
+            provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
+            certificateFileStream = fs.createReadStream(certificateFilePath),
+            provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
 
         return Security.addIOSCredentials(appId, jar, profile, certificateFileStream, certificatePassword, provisioningProfileFileStream)
       }

From 5f3d69c4c7bcc2b1109692fb5d1b7bc49e328d6f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 14 Oct 2015 16:23:54 -0500
Subject: [PATCH 0813/1100] Update changelog 1.7.1

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a738c45e4f..6aef518979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.1
+
+* Fix incorrect passwords being sent in Android Credentials for security command.
+
 ### 1.7.0
 
 * Added security command for managing Security Profiles.

From 493ee7b3586f1140e2b6bb927d7b11e0f395fad9 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Wed, 14 Oct 2015 16:24:59 -0500
Subject: [PATCH 0814/1100] bump to 1.7.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a37049790e..59867889f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 2faf138aa32d3b0f69e54c3b8a672f98c0cac791 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 15 Oct 2015 17:04:10 -0500
Subject: [PATCH 0815/1100] bump to 1.7.2

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aef518979..428c5110f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.2
+
+* Updating app-lib dependency
+
 ### 1.7.1
 
 * Fix incorrect passwords being sent in Android Credentials for security command.
diff --git a/package.json b/package.json
index 59867889f5..74f33b8922 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.5.1",
+    "ionic-app-lib": "0.5.2",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 98b8915bc8864c847a91f74c4722fe9374229ce6 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 15 Oct 2015 17:18:54 -0500
Subject: [PATCH 0816/1100] shrinkwrap

---
 npm-shrinkwrap.json | 116 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 141e8f3f4b..4a0b377503 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.0-beta.6",
+  "version": "1.7.2",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -1041,9 +1041,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.5.1-beta.0",
-      "from": "ionic-app-lib@0.5.1-beta.0",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.1-beta.0.tgz",
+      "version": "0.5.2",
+      "from": "ionic-app-lib@0.5.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1052,7 +1052,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -1072,7 +1072,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -1345,9 +1345,9 @@
                       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.6.tgz",
                       "dependencies": {
                         "jsonparse": {
-                          "version": "1.1.0",
+                          "version": "1.2.0",
                           "from": "jsonparse@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
                         }
                       }
                     },
@@ -1436,9 +1436,9 @@
                       }
                     },
                     "browser-resolve": {
-                      "version": "1.9.1",
+                      "version": "1.10.0",
                       "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.9.1.tgz"
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.0.tgz"
                     },
                     "browserify-zlib": {
                       "version": "0.1.4",
@@ -2271,9 +2271,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.4.24",
+                  "version": "2.5.0",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.5.0.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -2281,16 +2281,9 @@
                       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
                     },
                     "source-map": {
-                      "version": "0.1.34",
-                      "from": "source-map@0.1.34",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
-                      "dependencies": {
-                        "amdefine": {
-                          "version": "1.0.0",
-                          "from": "amdefine@>=0.0.4",
-                          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                        }
-                      }
+                      "version": "0.5.1",
+                      "from": "source-map@>=0.5.1 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.1.tgz"
                     },
                     "uglify-to-browserify": {
                       "version": "1.0.2",
@@ -2756,9 +2749,9 @@
               }
             },
             "npm": {
-              "version": "2.14.7",
+              "version": "2.14.8",
               "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.7.tgz",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.8.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
@@ -4520,7 +4513,7 @@
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "is-builtin-module": {
@@ -4564,7 +4557,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
@@ -5235,9 +5228,9 @@
               }
             },
             "request": {
-              "version": "2.64.0",
+              "version": "2.65.0",
               "from": "request@>=2.61.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
               "dependencies": {
                 "bl": {
                   "version": "1.0.0",
@@ -5295,12 +5288,12 @@
                 },
                 "forever-agent": {
                   "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.0 <0.7.0",
+                  "from": "forever-agent@>=0.6.1 <0.7.0",
                   "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                 },
                 "form-data": {
                   "version": "1.0.0-rc3",
-                  "from": "form-data@>=1.0.0-rc1 <1.1.0",
+                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
                   "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
                   "dependencies": {
                     "async": {
@@ -5312,12 +5305,12 @@
                 },
                 "json-stringify-safe": {
                   "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
                   "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                 },
                 "mime-types": {
                   "version": "2.1.7",
-                  "from": "mime-types@>=2.1.2 <2.2.0",
+                  "from": "mime-types@>=2.1.7 <2.2.0",
                   "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
                   "dependencies": {
                     "mime-db": {
@@ -5329,22 +5322,22 @@
                 },
                 "node-uuid": {
                   "version": "1.4.3",
-                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "from": "node-uuid@>=1.4.3 <1.5.0",
                   "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                 },
                 "qs": {
-                  "version": "5.1.0",
-                  "from": "qs@>=5.1.0 <5.2.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+                  "version": "5.2.0",
+                  "from": "qs@>=5.2.0 <5.3.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
                 },
                 "tunnel-agent": {
                   "version": "0.4.1",
-                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                 },
                 "tough-cookie": {
                   "version": "2.2.0",
-                  "from": "tough-cookie@>=0.12.0",
+                  "from": "tough-cookie@>=2.2.0 <2.3.0",
                   "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
                 },
                 "http-signature": {
@@ -5402,9 +5395,9 @@
                   }
                 },
                 "aws-sign2": {
-                  "version": "0.5.0",
-                  "from": "aws-sign2@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                  "version": "0.6.0",
+                  "from": "aws-sign2@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                 },
                 "stringstream": {
                   "version": "0.0.4",
@@ -5413,7 +5406,7 @@
                 },
                 "combined-stream": {
                   "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.1 <1.1.0",
+                  "from": "combined-stream@>=1.0.5 <1.1.0",
                   "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                   "dependencies": {
                     "delayed-stream": {
@@ -5425,23 +5418,18 @@
                 },
                 "isstream": {
                   "version": "0.1.2",
-                  "from": "isstream@>=0.1.1 <0.2.0",
+                  "from": "isstream@>=0.1.2 <0.2.0",
                   "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                 },
                 "har-validator": {
-                  "version": "1.8.0",
-                  "from": "har-validator@>=1.6.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+                  "version": "2.0.2",
+                  "from": "har-validator@>=2.0.2 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
                   "dependencies": {
-                    "bluebird": {
-                      "version": "2.10.2",
-                      "from": "bluebird@>=2.9.30 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
-                    },
                     "commander": {
-                      "version": "2.8.1",
+                      "version": "2.9.0",
                       "from": "commander@>=2.8.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                       "dependencies": {
                         "graceful-readlink": {
                           "version": "1.0.1",
@@ -5452,7 +5440,7 @@
                     },
                     "is-my-json-valid": {
                       "version": "2.12.2",
-                      "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                      "from": "is-my-json-valid@>=2.12.2 <3.0.0",
                       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
                       "dependencies": {
                         "generate-function": {
@@ -5483,6 +5471,18 @@
                           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                         }
                       }
+                    },
+                    "pinkie-promise": {
+                      "version": "1.0.0",
+                      "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                      "dependencies": {
+                        "pinkie": {
+                          "version": "1.0.0",
+                          "from": "pinkie@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 }
@@ -5736,7 +5736,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
@@ -6022,9 +6022,9 @@
           }
         },
         "winston": {
-          "version": "1.0.2",
+          "version": "1.1.0",
           "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.0.tgz",
           "dependencies": {
             "async": {
               "version": "1.0.0",
@@ -6763,7 +6763,7 @@
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {

From e705796c19e660fc81ea414f4ea35470adf9a0fa Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 15 Oct 2015 19:15:55 -0500
Subject: [PATCH 0817/1100] bump to 1.7.3

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428c5110f5..8822c61f8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.3
+
+* Updating app-lib dependency
+
 ### 1.7.2
 
 * Updating app-lib dependency
diff --git a/package.json b/package.json
index 74f33b8922..26be5e0b3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.5.2",
+    "ionic-app-lib": "0.5.3",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From aeb0eb0f38e77192446fb41be1ab4e5018c63610 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Thu, 15 Oct 2015 19:17:49 -0500
Subject: [PATCH 0818/1100] shrinkwrap

---
 npm-shrinkwrap.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4a0b377503..cd20c308c0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -521,7 +521,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -1041,9 +1041,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.5.2",
-      "from": "ionic-app-lib@0.5.2",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.2.tgz",
+      "version": "0.5.3",
+      "from": "ionic-app-lib@0.5.3",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.3.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1052,7 +1052,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -4513,7 +4513,7 @@
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "is-builtin-module": {
@@ -5970,7 +5970,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -5990,7 +5990,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -6797,7 +6797,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {

From bada81034a6263d9a2b793a349cb9fe0b52a5f4a Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 11:23:10 -0500
Subject: [PATCH 0819/1100] bump to 1.7.4

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8822c61f8c..79e5921f48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.4
+
+* app-lib @0.6.0
+
 ### 1.7.3
 
 * Updating app-lib dependency
diff --git a/package.json b/package.json
index 26be5e0b3e..ea2757956d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.5.3",
+    "ionic-app-lib": "0.6.0",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 55fd02742afe4049d0bc64feb7c078e53ff45b04 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 11:25:50 -0500
Subject: [PATCH 0820/1100] shrinkwrap

---
 npm-shrinkwrap.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cd20c308c0..e1dc04c4c5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -820,7 +820,7 @@
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "inherits@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -1041,9 +1041,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.5.3",
-      "from": "ionic-app-lib@0.5.3",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.5.3.tgz",
+      "version": "0.6.0",
+      "from": "ionic-app-lib@0.6.0",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.0.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -2710,7 +2710,7 @@
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
@@ -4557,7 +4557,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
@@ -5520,7 +5520,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.0 <0.2.0",
+                              "from": "align-text@>=0.1.1 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5556,7 +5556,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.0 <0.2.0",
+                              "from": "align-text@>=0.1.1 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5661,7 +5661,7 @@
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -5741,7 +5741,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -5970,7 +5970,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.24 <1.1.0",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -6797,7 +6797,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {

From 86ee52bb7000bb467a4cc1ae319ec3d81df34d09 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 12:01:53 -0500
Subject: [PATCH 0821/1100] bump to 1.7.5

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79e5921f48..37efd5a2e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.5
+
+* `ionic-app-lib` updated to `0.6.1`
+
 ### 1.7.4
 
 * app-lib @0.6.0
diff --git a/package.json b/package.json
index ea2757956d..7aca274794 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.0",
+    "ionic-app-lib": "0.6.1",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 55864e0a41f8afd9596753f6b52370c3d1358f10 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 12:03:33 -0500
Subject: [PATCH 0822/1100] shrinkwrap

---
 npm-shrinkwrap.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e1dc04c4c5..0f35bd346f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -504,7 +504,7 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -521,7 +521,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -820,7 +820,7 @@
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -1041,9 +1041,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.6.0",
-      "from": "ionic-app-lib@0.6.0",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.0.tgz",
+      "version": "0.6.1",
+      "from": "ionic-app-lib@0.6.1",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.1.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1072,7 +1072,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -2710,7 +2710,7 @@
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
@@ -4557,7 +4557,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.0.2",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                             }
                           }
@@ -5520,7 +5520,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "from": "align-text@>=0.1.0 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5556,7 +5556,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "from": "align-text@>=0.1.0 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5661,7 +5661,7 @@
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -5736,7 +5736,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
@@ -5990,7 +5990,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -7433,7 +7433,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {

From b3f2f8ba84df1e8e8c7e84deefc892b5bc15c74c Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 15:38:46 -0500
Subject: [PATCH 0823/1100] bump to 1.7.6

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37efd5a2e2..1fa483eb39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.6
+
+* `ionic-app-lib` updated to `0.6.2`
+
 ### 1.7.5
 
 * `ionic-app-lib` updated to `0.6.1`
diff --git a/package.json b/package.json
index 7aca274794..5d9ab43e57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.1",
+    "ionic-app-lib": "0.6.2",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From d3acf444917dc59eaeec145a6d1ac3d7695616d1 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 16 Oct 2015 15:40:31 -0500
Subject: [PATCH 0824/1100] shrinkwrap

---
 npm-shrinkwrap.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0f35bd346f..ea97d925c5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -338,7 +338,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -350,7 +350,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "ansi-regex@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -504,7 +504,7 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -521,7 +521,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                                 }
                               }
@@ -992,7 +992,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -1041,9 +1041,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.6.1",
-      "from": "ionic-app-lib@0.6.1",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.1.tgz",
+      "version": "0.6.2",
+      "from": "ionic-app-lib@0.6.2",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.2.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1866,9 +1866,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.6.0",
+                      "version": "6.6.1",
                       "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.0.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.1.tgz",
                       "dependencies": {
                         "combine-source-map": {
                           "version": "0.6.1",
@@ -2727,7 +2727,7 @@
                         },
                         "spdx-license-ids": {
                           "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
@@ -5520,7 +5520,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.0 <0.2.0",
+                              "from": "align-text@>=0.1.1 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5556,7 +5556,7 @@
                           "dependencies": {
                             "align-text": {
                               "version": "0.1.3",
-                              "from": "align-text@>=0.1.0 <0.2.0",
+                              "from": "align-text@>=0.1.1 <0.2.0",
                               "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                               "dependencies": {
                                 "kind-of": {
@@ -5736,12 +5736,12 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -7433,7 +7433,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {

From b1519b6a977a44fffc73026a22d305588e211ef2 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 20 Oct 2015 16:32:50 -0500
Subject: [PATCH 0825/1100] bump to 1.7.7

---
 CHANGELOG.md | 4 ++++
 package.json | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fa483eb39..cf05d242ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.7.7
+
+* `ionic-app-lib` updated to `0.6.3`
+
 ### 1.7.6
 
 * `ionic-app-lib` updated to `0.6.2`
diff --git a/package.json b/package.json
index 5d9ab43e57..18e220b3f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.2",
+    "ionic-app-lib": "0.6.3",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 8e042652786ab277f2428245b90edaa934d62ac2 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 20 Oct 2015 16:37:27 -0500
Subject: [PATCH 0826/1100] shrinkwrap

---
 npm-shrinkwrap.json | 112 +++++++++++++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 38 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ea97d925c5..e4ab4f2807 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -338,7 +338,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -350,7 +350,7 @@
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.0 <0.3.0",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
@@ -368,9 +368,9 @@
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
-          "version": "3.0.6",
+          "version": "3.0.7",
           "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
@@ -503,9 +503,9 @@
                               "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
                               "dependencies": {
                                 "spdx-license-ids": {
-                                  "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
                             },
@@ -520,9 +520,9 @@
                                   "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
                                 },
                                 "spdx-license-ids": {
-                                  "version": "1.0.2",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
                             }
@@ -709,6 +709,42 @@
                 }
               }
             },
+            "fancy-log": {
+              "version": "1.1.0",
+              "from": "fancy-log@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
+            },
+            "gulplog": {
+              "version": "1.0.0",
+              "from": "gulplog@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+              "dependencies": {
+                "glogg": {
+                  "version": "1.0.0",
+                  "from": "glogg@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+                  "dependencies": {
+                    "sparkles": {
+                      "version": "1.0.0",
+                      "from": "sparkles@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "has-gulplog": {
+              "version": "0.1.0",
+              "from": "has-gulplog@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+              "dependencies": {
+                "sparkles": {
+                  "version": "1.0.0",
+                  "from": "sparkles@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                }
+              }
+            },
             "lodash._reescape": {
               "version": "3.0.0",
               "from": "lodash._reescape@>=3.0.0 <4.0.0",
@@ -992,7 +1028,7 @@
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "once@>=1.3.0 <1.4.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
@@ -1041,9 +1077,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.6.2",
-      "from": "ionic-app-lib@0.6.2",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.2.tgz",
+      "version": "0.6.3",
+      "from": "ionic-app-lib@0.6.3",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.3.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1257,9 +1293,9 @@
               "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.13.tgz",
               "dependencies": {
                 "concat-stream": {
-                  "version": "1.5.0",
+                  "version": "1.5.1",
                   "from": "concat-stream@>=1.4.7 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
@@ -1862,13 +1898,13 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
-                      "version": "6.6.1",
+                      "version": "6.6.3",
                       "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.1.tgz",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
                       "dependencies": {
                         "combine-source-map": {
                           "version": "0.6.1",
@@ -2709,9 +2745,9 @@
                       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
-                          "version": "1.0.2",
+                          "version": "1.1.0",
                           "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                         }
                       }
                     },
@@ -2726,9 +2762,9 @@
                           "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
                         },
                         "spdx-license-ids": {
-                          "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                          "version": "1.1.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                         }
                       }
                     }
@@ -4539,9 +4575,9 @@
                           "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
-                              "version": "1.0.2",
+                              "version": "1.1.0",
                               "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
                         },
@@ -4556,9 +4592,9 @@
                               "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
                             },
                             "spdx-license-ids": {
-                              "version": "1.0.2",
+                              "version": "1.1.0",
                               "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
                         }
@@ -5970,7 +6006,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -6022,9 +6058,9 @@
           }
         },
         "winston": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.1.tgz",
           "dependencies": {
             "async": {
               "version": "1.0.0",
@@ -6052,9 +6088,9 @@
               "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
             },
             "pkginfo": {
-              "version": "0.3.0",
+              "version": "0.3.1",
               "from": "pkginfo@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
@@ -6720,9 +6756,9 @@
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
-          "version": "0.3.0",
+          "version": "0.3.1",
           "from": "pkginfo@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
         },
         "read": {
           "version": "1.0.7",
@@ -7386,9 +7422,9 @@
           }
         },
         "setimmediate": {
-          "version": "1.0.2",
+          "version": "1.0.4",
           "from": "setimmediate@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
         },
         "match-stream": {
           "version": "0.0.2",

From 60f4adcf235ca5eb077dab93cdfe1bc1d55ba54a Mon Sep 17 00:00:00 2001
From: Mirko Nasato <mirko@encoded.io>
Date: Sat, 24 Oct 2015 16:30:27 +0100
Subject: [PATCH 0827/1100] [issue #605] accept --address option for emulate
 command

---
 lib/ionic/cordova.js  | 3 +++
 lib/tasks/cliTasks.js | 1 +
 spec/cli.spec.js      | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 47f8379df8..96c611af99 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -254,6 +254,9 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     promise = Q();
     console.log('Defaulting address to 0.0.0.0');
     options.address = '0.0.0.0';
+  } else if (argv.address) {
+    options.address = argv.address;
+    promise = Q();
   } else {
     promise = Serve.getAddress(options);
   }
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index c02c643dba..2a16ada6f6 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -8,6 +8,7 @@ var resourcesSummary = [
 
 var cordovaRunEmulateOptions = {
   '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--address': 'Use specific address (livereload req.)',
   '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
   '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
   '--consolelogs|-c': {
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 6d3990789c..07b240f7cb 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -237,7 +237,7 @@ describe('Cli', function() {
     });
 
     it('should parse emulate options correctly', function() {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
+      var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
 
       IonicCli.run(processArgs);
 
@@ -250,6 +250,7 @@ describe('Cli', function() {
       expect(taskArgv._.length).toBe(2);
       expect(taskArgv._[1]).toBe('android');
       expect(taskArgv.r).toBe(35730);
+      expect(taskArgv.address).toBe('localhost');
       expect(taskArgv.port).toBe(5000);
       expect(taskArgv.consolelogs).toBe(true);
       expect(taskArgv.serverlogs).toBe(true);

From f1f15d5a7c711f69fd5ff98a8e1aaa772b3a9a75 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Nov 2015 10:26:15 -0700
Subject: [PATCH 0828/1100] Chore(opbeat): Remove the last artifacts of opbeat

---
 lib/cli.js   | 12 ------------
 package.json |  1 -
 2 files changed, 13 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 3dc7f8589e..94a6b2c0f1 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -4,7 +4,6 @@ var Cli = module.exports,
     ConfigXml = IonicAppLib.configXml,
     IonicStore = require('./ionic/store').IonicStore,
     IonicConfig = new IonicStore('ionic.config'),
-    IonicOpbeat = IonicAppLib.opbeat,
     Info = IonicAppLib.info,
     Ionitron = require('./ionic/ionitron'),
     optimist = require('optimist'),
@@ -485,12 +484,6 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 //not the node_module/ionic-app-lib directory
 Cli.reportExtras = function reportExtras(err) {
   var commandLineInfo = process.argv;
-
-  // if (Cli.dev()) {
-  //   console.log('An error occurred and was reported to Opbeat', err);
-  //   console.log(err.stack);
-  // }
-
   var info = Cli.gatherInfo();
   info.command = commandLineInfo;
   return info;
@@ -534,11 +527,6 @@ Cli.attachErrorHandling = function attachErrorHandling() {
       console.log(ex.stack);
     }
   };
-
-  var options = IonicOpbeat.cliClientOptions;
-  options.prerequestMethod = Cli.reportExtras;
-  var opbeat = IonicOpbeat.createCliClient(options);
-  opbeat.handleUncaughtExceptions(Cli.handleUncaughtExceptions);
 };
 
 //Backwards compatability for those commands that havent been
diff --git a/package.json b/package.json
index 18e220b3f6..5e81337163 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,6 @@
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",
-    "opbeat-ionic": "^1.1.3",
     "open": "0.0.5",
     "optimist": "0.6.0",
     "progress": "1.1.7",

From 85f23f78011fb111859e71dcce1cc873fc1d7475 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Nov 2015 12:38:04 -0700
Subject: [PATCH 0829/1100] Bump to 1.7.8, pull in PR. Fix emulate with address
 command

---
 npm-shrinkwrap.json | 830 ++++++++++++++++++++------------------------
 package.json        |   2 +-
 2 files changed, 376 insertions(+), 456 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e4ab4f2807..4fe277fa31 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.7",
+  "version": "1.7.8-beta.0",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -444,9 +444,9 @@
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
                 },
                 "meow": {
-                  "version": "3.4.2",
+                  "version": "3.5.0",
                   "from": "meow@*",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
@@ -471,13 +471,13 @@
                       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
                     },
                     "normalize-package-data": {
-                      "version": "2.3.4",
+                      "version": "2.3.5",
                       "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "is-builtin-module": {
@@ -498,9 +498,9 @@
                           "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                           "dependencies": {
                             "spdx-correct": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "spdx-correct@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
@@ -510,14 +510,14 @@
                               }
                             },
                             "spdx-expression-parse": {
-                              "version": "1.0.0",
+                              "version": "1.0.1",
                               "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                               "dependencies": {
                                 "spdx-exceptions": {
-                                  "version": "1.0.3",
-                                  "from": "spdx-exceptions@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                                  "version": "1.0.4",
+                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
@@ -585,16 +585,23 @@
                                   "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
                                   "dependencies": {
                                     "error-ex": {
-                                      "version": "1.2.0",
+                                      "version": "1.3.0",
                                       "from": "error-ex@>=1.2.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                      "dependencies": {
+                                        "is-arrayish": {
+                                          "version": "0.2.1",
+                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                        }
+                                      }
                                     }
                                   }
                                 },
                                 "pify": {
-                                  "version": "2.2.0",
+                                  "version": "2.3.0",
                                   "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
                                   "version": "1.0.0",
@@ -633,9 +640,9 @@
                                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                                 },
                                 "pify": {
-                                  "version": "2.2.0",
+                                  "version": "2.3.0",
                                   "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
                                   "version": "1.0.0",
@@ -881,9 +888,9 @@
               "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "2.0.2",
+                  "version": "2.0.4",
                   "from": "readable-stream@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
@@ -918,9 +925,9 @@
                   }
                 },
                 "xtend": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "xtend@>=4.0.0 <4.1.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                 }
               }
             },
@@ -1088,7 +1095,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -1288,9 +1295,9 @@
               }
             },
             "spawn-sync": {
-              "version": "1.0.13",
+              "version": "1.0.14",
               "from": "spawn-sync@>=1.0.13 <2.0.0",
-              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.13.tgz",
+              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
               "dependencies": {
                 "concat-stream": {
                   "version": "1.5.1",
@@ -1308,9 +1315,9 @@
                       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
                     },
                     "readable-stream": {
-                      "version": "2.0.2",
+                      "version": "2.0.4",
                       "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
@@ -1472,9 +1479,9 @@
                       }
                     },
                     "browser-resolve": {
-                      "version": "1.10.0",
+                      "version": "1.10.1",
                       "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.0.tgz"
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
                     },
                     "browserify-zlib": {
                       "version": "0.1.4",
@@ -1550,9 +1557,9 @@
                       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
                     },
                     "crypto-browserify": {
-                      "version": "3.10.0",
+                      "version": "3.11.0",
                       "from": "crypto-browserify@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.10.0.tgz",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
                       "dependencies": {
                         "browserify-cipher": {
                           "version": "1.0.0",
@@ -1570,9 +1577,9 @@
                                   "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
                                 },
                                 "cipher-base": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "cipher-base@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
                                 }
                               }
                             },
@@ -1582,9 +1589,9 @@
                               "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
                               "dependencies": {
                                 "cipher-base": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "cipher-base@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
                                 },
                                 "des.js": {
                                   "version": "1.0.0",
@@ -1608,24 +1615,24 @@
                           }
                         },
                         "browserify-sign": {
-                          "version": "3.0.8",
-                          "from": "browserify-sign@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.8.tgz",
+                          "version": "4.0.0",
+                          "from": "browserify-sign@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.2.0",
-                              "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                              "version": "4.1.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.1",
-                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
                             },
                             "elliptic": {
-                              "version": "3.1.0",
-                              "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
+                              "version": "6.0.1",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.1.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1640,14 +1647,14 @@
                               }
                             },
                             "parse-asn1": {
-                              "version": "3.0.2",
-                              "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.2.1",
-                                  "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
+                                  "version": "4.0.0",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.0.0.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1667,9 +1674,9 @@
                                       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
                                     },
                                     "cipher-base": {
-                                      "version": "1.0.1",
+                                      "version": "1.0.2",
                                       "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
                                     }
                                   }
                                 },
@@ -1683,19 +1690,19 @@
                           }
                         },
                         "create-ecdh": {
-                          "version": "2.0.2",
-                          "from": "create-ecdh@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.2.tgz",
+                          "version": "4.0.0",
+                          "from": "create-ecdh@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.2.0",
-                              "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                              "version": "4.1.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
                             },
                             "elliptic": {
-                              "version": "3.1.0",
-                              "from": "elliptic@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.1.0.tgz",
+                              "version": "6.0.1",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.1.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1717,9 +1724,9 @@
                           "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
                           "dependencies": {
                             "cipher-base": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "cipher-base@>=1.0.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
                             },
                             "ripemd160": {
                               "version": "1.0.1",
@@ -1739,19 +1746,19 @@
                           "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
                         },
                         "diffie-hellman": {
-                          "version": "3.0.2",
-                          "from": "diffie-hellman@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.2.tgz",
+                          "version": "5.0.0",
+                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.2.0",
-                              "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                              "version": "4.1.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
                             },
                             "miller-rabin": {
-                              "version": "2.0.1",
-                              "from": "miller-rabin@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-2.0.1.tgz",
+                              "version": "4.0.0",
+                              "from": "miller-rabin@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1768,29 +1775,29 @@
                           "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
                         },
                         "public-encrypt": {
-                          "version": "2.0.1",
-                          "from": "public-encrypt@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.1.tgz",
+                          "version": "4.0.0",
+                          "from": "public-encrypt@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "2.2.0",
-                              "from": "bn.js@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz"
+                              "version": "4.1.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
                             },
                             "browserify-rsa": {
-                              "version": "2.0.1",
-                              "from": "browserify-rsa@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.1.tgz"
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
                             },
                             "parse-asn1": {
-                              "version": "3.0.2",
-                              "from": "parse-asn1@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.2.tgz",
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "2.2.1",
-                                  "from": "asn1.js@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz",
+                                  "version": "4.0.0",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.0.0.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1810,9 +1817,9 @@
                                       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
                                     },
                                     "cipher-base": {
-                                      "version": "1.0.1",
+                                      "version": "1.0.2",
                                       "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
                                     }
                                   }
                                 },
@@ -1898,7 +1905,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "insert-module-globals": {
@@ -2001,85 +2008,14 @@
                       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
                       "dependencies": {
                         "detective": {
-                          "version": "4.2.0",
+                          "version": "4.3.1",
                           "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.2.0.tgz",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
                           "dependencies": {
                             "acorn": {
                               "version": "1.2.2",
                               "from": "acorn@>=1.0.3 <2.0.0",
                               "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                            },
-                            "escodegen": {
-                              "version": "1.7.0",
-                              "from": "escodegen@>=1.4.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.0.tgz",
-                              "dependencies": {
-                                "estraverse": {
-                                  "version": "1.9.3",
-                                  "from": "estraverse@>=1.9.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
-                                },
-                                "esutils": {
-                                  "version": "2.0.2",
-                                  "from": "esutils@>=2.0.2 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
-                                },
-                                "esprima": {
-                                  "version": "1.2.5",
-                                  "from": "esprima@>=1.2.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"
-                                },
-                                "optionator": {
-                                  "version": "0.5.0",
-                                  "from": "optionator@>=0.5.0 <0.6.0",
-                                  "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
-                                  "dependencies": {
-                                    "prelude-ls": {
-                                      "version": "1.1.2",
-                                      "from": "prelude-ls@>=1.1.1 <1.2.0",
-                                      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
-                                    },
-                                    "deep-is": {
-                                      "version": "0.1.3",
-                                      "from": "deep-is@>=0.1.2 <0.2.0",
-                                      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
-                                    },
-                                    "wordwrap": {
-                                      "version": "0.0.3",
-                                      "from": "wordwrap@>=0.0.2 <0.1.0",
-                                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-                                    },
-                                    "type-check": {
-                                      "version": "0.3.1",
-                                      "from": "type-check@>=0.3.1 <0.4.0",
-                                      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"
-                                    },
-                                    "levn": {
-                                      "version": "0.2.5",
-                                      "from": "levn@>=0.2.5 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
-                                    },
-                                    "fast-levenshtein": {
-                                      "version": "1.0.7",
-                                      "from": "fast-levenshtein@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
-                                    }
-                                  }
-                                },
-                                "source-map": {
-                                  "version": "0.2.0",
-                                  "from": "source-map@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "1.0.0",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
                             }
                           }
                         },
@@ -2295,9 +2231,9 @@
                       }
                     },
                     "xtend": {
-                      "version": "4.0.0",
+                      "version": "4.0.1",
                       "from": "xtend@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                     }
                   }
                 },
@@ -2317,9 +2253,9 @@
                       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
                     },
                     "source-map": {
-                      "version": "0.5.1",
+                      "version": "0.5.3",
                       "from": "source-map@>=0.5.1 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.1.tgz"
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
                     },
                     "uglify-to-browserify": {
                       "version": "1.0.2",
@@ -2337,9 +2273,9 @@
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "decamelize": {
-                          "version": "1.0.0",
+                          "version": "1.1.1",
                           "from": "decamelize@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
                         },
                         "window-size": {
                           "version": "0.1.0",
@@ -2358,9 +2294,9 @@
               }
             },
             "cordova-registry-mapper": {
-              "version": "1.1.12",
+              "version": "1.1.13",
               "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.12.tgz",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
               "dependencies": {
                 "tape": {
                   "version": "3.5.0",
@@ -2625,9 +2561,9 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0",
+                              "version": "0.2.1",
                               "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -2687,9 +2623,9 @@
                   }
                 },
                 "read-package-json": {
-                  "version": "2.0.1",
+                  "version": "2.0.2",
                   "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
                   "dependencies": {
                     "json-parse-helpfulerror": {
                       "version": "1.0.3",
@@ -2704,13 +2640,13 @@
                       }
                     },
                     "normalize-package-data": {
-                      "version": "2.3.4",
+                      "version": "2.3.5",
                       "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "is-builtin-module": {
@@ -2740,9 +2676,9 @@
                   "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                   "dependencies": {
                     "spdx-correct": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                       "dependencies": {
                         "spdx-license-ids": {
                           "version": "1.1.0",
@@ -2752,18 +2688,18 @@
                       }
                     },
                     "spdx-expression-parse": {
-                      "version": "1.0.0",
+                      "version": "1.0.1",
                       "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                       "dependencies": {
                         "spdx-exceptions": {
-                          "version": "1.0.3",
-                          "from": "spdx-exceptions@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                         },
                         "spdx-license-ids": {
                           "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                         }
                       }
@@ -2785,9 +2721,9 @@
               }
             },
             "npm": {
-              "version": "2.14.8",
+              "version": "2.14.9",
               "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.8.tgz",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.9.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
@@ -2828,9 +2764,9 @@
                   "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
                 },
                 "chmodr": {
-                  "version": "1.0.1",
-                  "from": "chmodr@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.1.tgz"
+                  "version": "1.0.2",
+                  "from": "chmodr@>=1.0.2 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
                 },
                 "chownr": {
                   "version": "1.0.1",
@@ -2932,9 +2868,8 @@
                   "from": "fstream-npm@>=1.0.5 <1.1.0",
                   "dependencies": {
                     "fstream-ignore": {
-                      "version": "1.0.2",
-                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
+                      "version": "1.0.3",
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0"
                     }
                   }
                 },
@@ -3005,24 +2940,24 @@
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                 },
                 "minimatch": {
-                  "version": "2.0.10",
-                  "from": "minimatch@2.0.10",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                  "version": "3.0.0",
+                  "from": "minimatch@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                   "dependencies": {
                     "brace-expansion": {
-                      "version": "1.1.0",
+                      "version": "1.1.1",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                       "dependencies": {
                         "balanced-match": {
-                          "version": "0.2.0",
+                          "version": "0.2.1",
                           "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                         },
                         "concat-map": {
                           "version": "0.0.1",
                           "from": "concat-map@0.0.1",
-                          "resolved": "https://registrytwo.npmjs.com/concat-map/-/concat-map-0.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                         }
                       }
                     }
@@ -3388,9 +3323,9 @@
                   "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
                 },
                 "request": {
-                  "version": "2.64.0",
-                  "from": "request@2.64.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
+                  "version": "2.65.0",
+                  "from": "request@>=2.65.0 <2.66.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
                   "dependencies": {
                     "bl": {
                       "version": "1.0.0",
@@ -3398,9 +3333,9 @@
                       "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
                       "dependencies": {
                         "readable-stream": {
-                          "version": "2.0.2",
+                          "version": "2.0.3",
                           "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
                           "dependencies": {
                             "core-util-is": {
                               "version": "1.0.1",
@@ -3423,9 +3358,9 @@
                               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                             },
                             "util-deprecate": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                             }
                           }
                         }
@@ -3443,29 +3378,29 @@
                     },
                     "forever-agent": {
                       "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.0 <0.7.0",
+                      "from": "forever-agent@>=0.6.1 <0.7.0",
                       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                     },
                     "form-data": {
                       "version": "1.0.0-rc3",
-                      "from": "form-data@>=1.0.0-rc1 <1.1.0",
+                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
                       "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
                       "dependencies": {
                         "async": {
-                          "version": "1.4.2",
+                          "version": "1.5.0",
                           "from": "async@>=1.4.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
                         }
                       }
                     },
                     "json-stringify-safe": {
                       "version": "5.0.1",
-                      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
                       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                     },
                     "mime-types": {
                       "version": "2.1.7",
-                      "from": "mime-types@>=2.1.2 <2.2.0",
+                      "from": "mime-types@>=2.1.7 <2.2.0",
                       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
                       "dependencies": {
                         "mime-db": {
@@ -3477,23 +3412,23 @@
                     },
                     "node-uuid": {
                       "version": "1.4.3",
-                      "from": "node-uuid@>=1.4.0 <1.5.0",
+                      "from": "node-uuid@>=1.4.3 <1.5.0",
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                     },
                     "qs": {
-                      "version": "5.1.0",
-                      "from": "qs@>=5.1.0 <5.2.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+                      "version": "5.2.0",
+                      "from": "qs@>=5.2.0 <5.3.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
                     },
                     "tunnel-agent": {
                       "version": "0.4.1",
-                      "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
                       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                     },
                     "tough-cookie": {
-                      "version": "2.0.0",
-                      "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                      "version": "2.2.0",
+                      "from": "tough-cookie@>=2.2.0 <2.3.0",
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
                     },
                     "http-signature": {
                       "version": "0.11.0",
@@ -3533,9 +3468,9 @@
                           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                         },
                         "boom": {
-                          "version": "2.9.0",
+                          "version": "2.10.0",
                           "from": "boom@>=2.8.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
                         },
                         "cryptiles": {
                           "version": "2.0.5",
@@ -3550,18 +3485,18 @@
                       }
                     },
                     "aws-sign2": {
-                      "version": "0.5.0",
-                      "from": "aws-sign2@>=0.5.0 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                      "version": "0.6.0",
+                      "from": "aws-sign2@>=0.6.0 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                     },
                     "stringstream": {
-                      "version": "0.0.4",
+                      "version": "0.0.5",
                       "from": "stringstream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
                     },
                     "combined-stream": {
                       "version": "1.0.5",
-                      "from": "combined-stream@>=1.0.1 <1.1.0",
+                      "from": "combined-stream@>=1.0.5 <1.1.0",
                       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                       "dependencies": {
                         "delayed-stream": {
@@ -3573,22 +3508,17 @@
                     },
                     "isstream": {
                       "version": "0.1.2",
-                      "from": "isstream@>=0.1.1 <0.2.0",
+                      "from": "isstream@>=0.1.2 <0.2.0",
                       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                     },
                     "har-validator": {
-                      "version": "1.8.0",
-                      "from": "har-validator@>=1.6.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+                      "version": "2.0.2",
+                      "from": "har-validator@>=2.0.2 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
                       "dependencies": {
-                        "bluebird": {
-                          "version": "2.10.1",
-                          "from": "bluebird@>=2.9.30 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
-                        },
                         "chalk": {
                           "version": "1.1.1",
-                          "from": "chalk@>=1.0.0 <2.0.0",
+                          "from": "chalk@>=1.1.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
                           "dependencies": {
                             "ansi-styles": {
@@ -3633,9 +3563,9 @@
                           }
                         },
                         "commander": {
-                          "version": "2.8.1",
+                          "version": "2.9.0",
                           "from": "commander@>=2.8.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                           "dependencies": {
                             "graceful-readlink": {
                               "version": "1.0.1",
@@ -3646,7 +3576,7 @@
                         },
                         "is-my-json-valid": {
                           "version": "2.12.2",
-                          "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
                           "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
                           "dependencies": {
                             "generate-function": {
@@ -3677,6 +3607,18 @@
                               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
                             }
                           }
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "1.0.0",
+                              "from": "pinkie@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                            }
+                          }
                         }
                       }
                     }
@@ -3822,9 +3764,9 @@
                   }
                 },
                 "which": {
-                  "version": "1.1.2",
-                  "from": "which@1.1.2",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
+                  "version": "1.2.0",
+                  "from": "which@>=1.2.0 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
                   "dependencies": {
                     "is-absolute": {
                       "version": "0.1.7",
@@ -4132,9 +4074,9 @@
                   "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
                 },
                 "stringstream": {
-                  "version": "0.0.4",
+                  "version": "0.0.5",
                   "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
                 },
                 "combined-stream": {
                   "version": "0.0.7",
@@ -4220,9 +4162,9 @@
                                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                                   "dependencies": {
                                     "balanced-match": {
-                                      "version": "0.2.0",
+                                      "version": "0.2.1",
                                       "from": "balanced-match@>=0.2.0 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                                     },
                                     "concat-map": {
                                       "version": "0.0.1",
@@ -4290,15 +4232,15 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
                 },
                 "xtend": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                 }
               }
             },
@@ -4332,9 +4274,9 @@
           }
         },
         "node-sass": {
-          "version": "3.3.3",
+          "version": "3.4.1",
           "from": "node-sass@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.3.3.tgz",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.1.tgz",
           "dependencies": {
             "async-foreach": {
               "version": "0.1.3",
@@ -4478,9 +4420,9 @@
                       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                       "dependencies": {
                         "balanced-match": {
-                          "version": "0.2.0",
+                          "version": "0.2.1",
                           "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                         },
                         "concat-map": {
                           "version": "0.0.1",
@@ -4511,9 +4453,9 @@
               }
             },
             "meow": {
-              "version": "3.4.2",
+              "version": "3.5.0",
               "from": "meow@>=3.3.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
               "dependencies": {
                 "camelcase-keys": {
                   "version": "1.0.0",
@@ -4543,13 +4485,13 @@
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
                 },
                 "normalize-package-data": {
-                  "version": "2.3.4",
+                  "version": "2.3.5",
                   "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.0.2 <3.0.0",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                     },
                     "is-builtin-module": {
@@ -4570,9 +4512,9 @@
                       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                       "dependencies": {
                         "spdx-correct": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.1.0",
@@ -4582,18 +4524,18 @@
                           }
                         },
                         "spdx-expression-parse": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                           "dependencies": {
                             "spdx-exceptions": {
-                              "version": "1.0.3",
-                              "from": "spdx-exceptions@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+                              "version": "1.0.4",
+                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                             },
                             "spdx-license-ids": {
                               "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
@@ -4657,16 +4599,23 @@
                               "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
                               "dependencies": {
                                 "error-ex": {
-                                  "version": "1.2.0",
+                                  "version": "1.3.0",
                                   "from": "error-ex@>=1.2.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                  "dependencies": {
+                                    "is-arrayish": {
+                                      "version": "0.2.1",
+                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                    }
+                                  }
                                 }
                               }
                             },
                             "pify": {
-                              "version": "2.2.0",
+                              "version": "2.3.0",
                               "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                             },
                             "pinkie-promise": {
                               "version": "1.0.0",
@@ -4705,9 +4654,9 @@
                               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                             },
                             "pify": {
-                              "version": "2.2.0",
+                              "version": "2.3.0",
                               "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                             },
                             "pinkie-promise": {
                               "version": "1.0.0",
@@ -4774,7 +4723,7 @@
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
+              "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
@@ -4914,9 +4863,9 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0",
+                              "version": "0.2.1",
                               "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -5191,9 +5140,9 @@
                               "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                               "dependencies": {
                                 "balanced-match": {
-                                  "version": "0.2.0",
+                                  "version": "0.2.1",
                                   "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                                 },
                                 "concat-map": {
                                   "version": "0.0.1",
@@ -5237,7 +5186,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -5274,9 +5223,9 @@
                   "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
                   "dependencies": {
                     "readable-stream": {
-                      "version": "2.0.2",
+                      "version": "2.0.4",
                       "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
@@ -5333,9 +5282,9 @@
                   "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
                   "dependencies": {
                     "async": {
-                      "version": "1.4.2",
+                      "version": "1.5.0",
                       "from": "async@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz"
+                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
                     }
                   }
                 },
@@ -5414,9 +5363,9 @@
                       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                     },
                     "boom": {
-                      "version": "2.9.0",
+                      "version": "2.10.1",
                       "from": "boom@>=2.8.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                     },
                     "cryptiles": {
                       "version": "2.0.5",
@@ -5436,9 +5385,9 @@
                   "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                 },
                 "stringstream": {
-                  "version": "0.0.4",
+                  "version": "0.0.5",
                   "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
                 },
                 "combined-stream": {
                   "version": "1.0.5",
@@ -5502,9 +5451,9 @@
                           "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
                         },
                         "xtend": {
-                          "version": "4.0.0",
+                          "version": "4.0.1",
                           "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                         }
                       }
                     },
@@ -5535,9 +5484,9 @@
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
                 },
                 "yargs": {
-                  "version": "3.27.0",
+                  "version": "3.29.0",
                   "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz",
                   "dependencies": {
                     "camelcase": {
                       "version": "1.2.1",
@@ -5545,93 +5494,64 @@
                       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                     },
                     "cliui": {
-                      "version": "2.1.0",
-                      "from": "cliui@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                      "version": "3.0.3",
+                      "from": "cliui@>=3.0.3 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.0.3.tgz",
                       "dependencies": {
-                        "center-align": {
-                          "version": "0.1.1",
-                          "from": "center-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.1.tgz",
+                        "string-width": {
+                          "version": "1.0.1",
+                          "from": "string-width@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
                           "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                            "code-point-at": {
+                              "version": "1.0.0",
+                              "from": "code-point-at@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
                               "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            },
+                            "is-fullwidth-code-point": {
+                              "version": "1.0.0",
+                              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
                                 }
                               }
                             }
                           }
                         },
-                        "right-align": {
-                          "version": "0.1.3",
-                          "from": "right-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                           "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                              "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                }
-                              }
+                            "ansi-regex": {
+                              "version": "2.0.0",
+                              "from": "ansi-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                             }
                           }
                         },
-                        "wordwrap": {
-                          "version": "0.0.2",
-                          "from": "wordwrap@0.0.2",
-                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        "wrap-ansi": {
+                          "version": "1.0.0",
+                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
                         }
                       }
                     },
                     "decamelize": {
-                      "version": "1.0.0",
+                      "version": "1.1.1",
                       "from": "decamelize@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
                     },
                     "os-locale": {
                       "version": "1.4.0",
@@ -5668,15 +5588,51 @@
             }
           }
         },
-        "request-progress": {
-          "version": "0.3.1",
-          "from": "request-progress@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+        "opbeat-ionic": {
+          "version": "1.1.3",
+          "from": "opbeat-ionic@>=1.1.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
           "dependencies": {
-            "throttleit": {
-              "version": "0.0.2",
-              "from": "throttleit@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            "after-all": {
+              "version": "2.0.2",
+              "from": "after-all@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "console-log-level": {
+              "version": "1.2.0",
+              "from": "console-log-level@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.0.tgz"
+            },
+            "json-stringify-safe": {
+              "version": "5.0.1",
+              "from": "json-stringify-safe@>=5.0.0 <6.0.0",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+            },
+            "stackman": {
+              "version": "0.2.3",
+              "from": "stackman@>=0.2.2 <0.3.0",
+              "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.3.tgz",
+              "dependencies": {
+                "stackback": {
+                  "version": "0.0.2",
+                  "from": "stackback@0.0.2",
+                  "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
+                }
+              }
             }
           }
         },
@@ -5710,9 +5666,9 @@
                   }
                 },
                 "readable-stream": {
-                  "version": "2.0.2",
+                  "version": "2.0.4",
                   "from": "readable-stream@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
@@ -5777,7 +5733,7 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -5800,9 +5756,9 @@
                       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                       "dependencies": {
                         "balanced-match": {
-                          "version": "0.2.0",
+                          "version": "0.2.1",
                           "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                         },
                         "concat-map": {
                           "version": "0.0.1",
@@ -5846,9 +5802,9 @@
                           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
                           "dependencies": {
                             "readable-stream": {
-                              "version": "2.0.2",
+                              "version": "2.0.4",
                               "from": "readable-stream@>=2.0.0 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
@@ -5885,9 +5841,9 @@
                           }
                         },
                         "xtend": {
-                          "version": "4.0.0",
+                          "version": "4.0.1",
                           "from": "xtend@>=4.0.0 <4.1.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                         }
                       }
                     }
@@ -6006,7 +5962,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.24 <1.1.0",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -6032,9 +5988,9 @@
                   }
                 },
                 "xtend": {
-                  "version": "4.0.0",
+                  "version": "4.0.1",
                   "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                 }
               }
             },
@@ -6058,9 +6014,9 @@
           }
         },
         "winston": {
-          "version": "1.1.1",
+          "version": "1.1.2",
           "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
           "dependencies": {
             "async": {
               "version": "1.0.0",
@@ -6675,54 +6631,6 @@
         }
       }
     },
-    "opbeat-ionic": {
-      "version": "1.1.3",
-      "from": "opbeat-ionic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
-      "dependencies": {
-        "after-all": {
-          "version": "2.0.2",
-          "from": "after-all@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
-          "dependencies": {
-            "once": {
-              "version": "1.3.2",
-              "from": "once@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-              "dependencies": {
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "console-log-level": {
-          "version": "1.2.0",
-          "from": "console-log-level@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.0.tgz"
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-        },
-        "stackman": {
-          "version": "0.2.3",
-          "from": "stackman@>=0.2.2 <0.3.0",
-          "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.3.tgz",
-          "dependencies": {
-            "stackback": {
-              "version": "0.0.2",
-              "from": "stackback@0.0.2",
-              "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
-            }
-          }
-        }
-      }
-    },
     "open": {
       "version": "0.0.5",
       "from": "open@0.0.5",
@@ -6767,7 +6675,7 @@
           "dependencies": {
             "mute-stream": {
               "version": "0.0.5",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "from": "mute-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
             }
           }
@@ -6847,9 +6755,9 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0",
+                              "version": "0.2.1",
                               "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -7090,9 +6998,9 @@
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
-          "version": "0.0.4",
+          "version": "0.0.5",
           "from": "stringstream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
@@ -7108,6 +7016,18 @@
         }
       }
     },
+    "request-progress": {
+      "version": "0.3.1",
+      "from": "request-progress@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+      "dependencies": {
+        "throttleit": {
+          "version": "0.0.2",
+          "from": "throttleit@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+        }
+      }
+    },
     "semver": {
       "version": "4.3.6",
       "from": "semver@>=4.2.0 <5.0.0",
@@ -7188,9 +7108,9 @@
               }
             },
             "range-parser": {
-              "version": "1.0.2",
+              "version": "1.0.3",
               "from": "range-parser@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
             }
           }
         },
@@ -7317,9 +7237,9 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0",
+                              "version": "0.2.1",
                               "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -7497,9 +7417,9 @@
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                   "dependencies": {
                     "balanced-match": {
-                      "version": "0.2.0",
+                      "version": "0.2.1",
                       "from": "balanced-match@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
@@ -7640,7 +7560,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -7666,9 +7586,9 @@
               }
             },
             "xtend": {
-              "version": "4.0.0",
+              "version": "4.0.1",
               "from": "xtend@>=4.0.0 <4.1.0-0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
             }
           }
         },
@@ -7702,9 +7622,9 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "3.1.0",
+          "version": "4.0.0",
           "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.10.1",
diff --git a/package.json b/package.json
index 5e81337163..6b55c46da3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 9cf0ae258a2ec64b23138f407b9e07703db25d3a Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Nov 2015 13:48:24 -0700
Subject: [PATCH 0830/1100] Fix(emulate/run): Update cordova run method to
 respect address for ionic emulate --address localhost - it will remove the
 --address arg as well as the following IP address to use for passing to
 cordova CLI.

---
 lib/ionic/cordova.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 96c611af99..70b3587702 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -136,8 +136,9 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   var cleanArgs = [];
   var port = argv.port || argv.p || '';
   var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.r || '';
-  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i -r'.split(' ');
-  var isValdCmd;
+  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i -r --address'.split(' ');
+  var isValdCmd,
+      foundAddressCmd = false;
   for(x=0; x<cmdArgs.length; x++) {
     cmdArg = cmdArgs[x];
     if(port && cmdArg == port) continue;
@@ -146,6 +147,14 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
     for(y=0; y<ignoreCmds.length; y++) {
       if(cmdArg == ignoreCmds[y]) {
         isValdCmd = false;
+        //if address is passed, the arg after it will need to be taken out as well.
+        //also note, if they use --address="localhost", this will not happen
+        if (cmdArg === 'address') {
+          foundAddressCmd = true;
+        }
+        break;
+      } else if (foundAddressCmd) {
+        foundAddressCmd = false;
         break;
       }
     }

From acddd466b1ac5ba9910df497769e7129e309a17c Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Thu, 5 Nov 2015 16:04:09 -0700
Subject: [PATCH 0831/1100] Publish 1.7.8

---
 lib/ionic/cordova.js |  11 +-
 npm-shrinkwrap.json  | 755 +++++++++++++++++++++----------------------
 package.json         |   2 +-
 3 files changed, 383 insertions(+), 385 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 70b3587702..94c9b5389a 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -149,22 +149,21 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
         isValdCmd = false;
         //if address is passed, the arg after it will need to be taken out as well.
         //also note, if they use --address="localhost", this will not happen
-        if (cmdArg === 'address') {
+        if (cmdArg === '--address') {
           foundAddressCmd = true;
         }
         break;
-      } else if (foundAddressCmd) {
-        foundAddressCmd = false;
-        break;
-      }
+      } 
     }
-    if(isValdCmd) {
+    if(isValdCmd && !foundAddressCmd) {
       // make sure --target= has double quotes around it (process.argv removes them)
       if(cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
         cmdArg = cmdArg.replace('--target=', '--target="') + '"';
       }
 
       cleanArgs.push(cmdArg);
+    } else {
+      foundAddressCmd = true;
     }
   }
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4fe277fa31..9985b0b92f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,527 +1,527 @@
 {
   "name": "ionic",
-  "version": "1.7.8-beta.0",
+  "version": "1.7.8",
   "dependencies": {
     "async": {
       "version": "0.9.2",
-      "from": "async@>=0.9.0 <0.10.0",
+      "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "cheerio@>=0.19.0 <0.20.0",
+      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "css-select@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "css-what@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "domutils@>=1.4.0 <1.5.0",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "boolbase@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "nth-check@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "entities@>=1.1.1 <1.2.0",
+          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.3",
-          "from": "htmlparser2@>=3.8.1 <3.9.0",
+          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "domhandler@>=2.3.0 <2.4.0",
+              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "domutils@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "entities@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "dom-serializer@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "domelementtype@>=1.1.1 <1.2.0",
+              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
           "version": "3.10.1",
-          "from": "lodash@>=3.2.0 <4.0.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "cli-table@>=0.3.1 <0.4.0",
+      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "colors@1.0.3",
+          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "colors@0.6.2",
+      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "connect@3.1.1",
+      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "debug@1.0.4",
+          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
+          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "escape-html@1.0.1",
+              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
+      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "crc@3.2.1",
+      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
+      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.7.0",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
+      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
+          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.6",
-          "from": "map-stream@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
+          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "expand-tilde": {
       "version": "1.2.0",
-      "from": "expand-tilde@>=1.2.0 <2.0.0",
+      "from": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
       "dependencies": {
         "user-home": {
           "version": "1.1.1",
-          "from": "user-home@>=1.1.1 <2.0.0",
+          "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
+      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "form-data@0.1.4",
+      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
+          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "gulp@3.8.8",
+      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
+          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
+          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.7",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.1.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
               "version": "1.1.1",
-              "from": "chalk@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "dateformat@>=1.0.11 <2.0.0",
+              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "5.0.0",
-                  "from": "get-stdin@*",
+                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
                 },
                 "meow": {
                   "version": "3.5.0",
-                  "from": "meow@*",
+                  "from": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.2.1",
-                          "from": "camelcase@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
                     "loud-rejection": {
                       "version": "1.0.0",
-                      "from": "loud-rejection@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
                     },
                     "normalize-package-data": {
                       "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                      "from": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                          "from": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "is-builtin-module": {
                           "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
                           "dependencies": {
                             "builtin-modules": {
                               "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz",
                               "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
                             }
                           }
                         },
                         "validate-npm-package-license": {
                           "version": "3.0.1",
-                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                          "from": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                           "dependencies": {
                             "spdx-correct": {
                               "version": "1.0.2",
-                              "from": "spdx-correct@>=1.0.0 <1.1.0",
+                              "from": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                               "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
                             },
                             "spdx-expression-parse": {
                               "version": "1.0.1",
-                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                              "from": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                               "dependencies": {
                                 "spdx-exceptions": {
                                   "version": "1.0.4",
-                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                                  "from": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz",
                                   "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -532,32 +532,32 @@
                     },
                     "object-assign": {
                       "version": "4.0.1",
-                      "from": "object-assign@>=4.0.1 <5.0.0",
+                      "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
                     },
                     "read-pkg-up": {
                       "version": "1.0.1",
-                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                      "from": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
                       "dependencies": {
                         "find-up": {
                           "version": "1.0.0",
-                          "from": "find-up@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
                           "dependencies": {
                             "path-exists": {
                               "version": "2.0.0",
-                              "from": "path-exists@>=2.0.0 <3.0.0",
+                              "from": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
                             },
                             "pinkie-promise": {
                               "version": "1.0.0",
-                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                               "dependencies": {
                                 "pinkie": {
                                   "version": "1.0.0",
-                                  "from": "pinkie@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
                                   "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
                                 }
                               }
@@ -566,32 +566,32 @@
                         },
                         "read-pkg": {
                           "version": "1.1.0",
-                          "from": "read-pkg@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
                           "dependencies": {
                             "load-json-file": {
                               "version": "1.0.1",
-                              "from": "load-json-file@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
                               "dependencies": {
                                 "graceful-fs": {
                                   "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz",
                                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                                 },
                                 "parse-json": {
                                   "version": "2.2.0",
-                                  "from": "parse-json@>=2.2.0 <3.0.0",
+                                  "from": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
                                   "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
                                   "dependencies": {
                                     "error-ex": {
                                       "version": "1.3.0",
-                                      "from": "error-ex@>=1.2.0 <2.0.0",
+                                      "from": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
                                       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
                                       "dependencies": {
                                         "is-arrayish": {
                                           "version": "0.2.1",
-                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                          "from": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
                                           "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
                                         }
                                       }
@@ -600,29 +600,29 @@
                                 },
                                 "pify": {
                                   "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "from": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                                   "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
                                   "version": "1.0.0",
-                                  "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                                   "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                                   "dependencies": {
                                     "pinkie": {
                                       "version": "1.0.0",
-                                      "from": "pinkie@>=1.0.0 <2.0.0",
+                                      "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
                                       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
                                     }
                                   }
                                 },
                                 "strip-bom": {
                                   "version": "2.0.0",
-                                  "from": "strip-bom@>=2.0.0 <3.0.0",
+                                  "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
                                   "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
                                   "dependencies": {
                                     "is-utf8": {
                                       "version": "0.2.0",
-                                      "from": "is-utf8@>=0.2.0 <0.3.0",
+                                      "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
                                       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
                                     }
                                   }
@@ -631,27 +631,27 @@
                             },
                             "path-type": {
                               "version": "1.0.0",
-                              "from": "path-type@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
                               "dependencies": {
                                 "graceful-fs": {
                                   "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz",
                                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                                 },
                                 "pify": {
                                   "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "from": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                                   "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
                                   "version": "1.0.0",
-                                  "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                                   "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
                                   "dependencies": {
                                     "pinkie": {
                                       "version": "1.0.0",
-                                      "from": "pinkie@>=1.0.0 <2.0.0",
+                                      "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
                                       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
                                     }
                                   }
@@ -664,27 +664,27 @@
                     },
                     "redent": {
                       "version": "1.0.0",
-                      "from": "redent@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
                       "dependencies": {
                         "indent-string": {
                           "version": "2.1.0",
-                          "from": "indent-string@>=2.1.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
                           "dependencies": {
                             "repeating": {
                               "version": "2.0.0",
-                              "from": "repeating@>=2.0.0 <3.0.0",
+                              "from": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
                               "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
                               "dependencies": {
                                 "is-finite": {
                                   "version": "1.0.1",
-                                  "from": "is-finite@>=1.0.0 <2.0.0",
+                                  "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
                                   "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
                                   "dependencies": {
                                     "number-is-nan": {
                                       "version": "1.0.0",
-                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                      "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz",
                                       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
                                     }
                                   }
@@ -695,12 +695,12 @@
                         },
                         "strip-indent": {
                           "version": "1.0.1",
-                          "from": "strip-indent@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
                           "dependencies": {
                             "get-stdin": {
                               "version": "4.0.1",
-                              "from": "get-stdin@>=4.0.1 <5.0.0",
+                              "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                             }
                           }
@@ -709,7 +709,7 @@
                     },
                     "trim-newlines": {
                       "version": "1.0.0",
-                      "from": "trim-newlines@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
                     }
                   }
@@ -718,22 +718,22 @@
             },
             "fancy-log": {
               "version": "1.1.0",
-              "from": "fancy-log@>=1.1.0 <2.0.0",
+              "from": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz",
               "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
             },
             "gulplog": {
               "version": "1.0.0",
-              "from": "gulplog@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
               "dependencies": {
                 "glogg": {
                   "version": "1.0.0",
-                  "from": "glogg@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
                   "dependencies": {
                     "sparkles": {
                       "version": "1.0.0",
-                      "from": "sparkles@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
                     }
                   }
@@ -742,128 +742,128 @@
             },
             "has-gulplog": {
               "version": "0.1.0",
-              "from": "has-gulplog@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
               "dependencies": {
                 "sparkles": {
                   "version": "1.0.0",
-                  "from": "sparkles@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
                 }
               }
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.6.2",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.1",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.9",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.1.2",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
                   "dependencies": {
                     "lodash._getnative": {
                       "version": "3.9.1",
-                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
                       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
                     },
                     "lodash.isarguments": {
                       "version": "3.0.4",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.4",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
+                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "isarray@0.0.1",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -874,76 +874,76 @@
             },
             "object-assign": {
               "version": "3.0.0",
-              "from": "object-assign@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
+              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "2.0.0",
-              "from": "through2@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <2.1.0",
+                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "isarray@0.0.1",
+                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
                       "version": "1.0.3",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
                       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "util-deprecate": {
                       "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0",
+                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.5.3",
-              "from": "vinyl@>=0.5.0 <0.6.0",
+              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
               "dependencies": {
                 "clone": {
                   "version": "1.0.2",
-                  "from": "clone@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -952,42 +952,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
+          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
+          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.7.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
@@ -996,51 +996,51 @@
                 },
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
+              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
+              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <1.4.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1049,34 +1049,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
+              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
+          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.1.2",
-          "from": "tildify@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
           "dependencies": {
             "os-homedir": {
               "version": "1.0.1",
-              "from": "os-homedir@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
             }
           }
@@ -1084,9 +1084,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.6.3",
-      "from": "ionic-app-lib@0.6.3",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.3.tgz",
+      "version": "0.6.4",
+      "from": "ionic-app-lib@0.6.4",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1095,7 +1094,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
@@ -4232,7 +4231,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -4518,7 +4517,7 @@
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
@@ -4535,7 +4534,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
@@ -4723,7 +4722,7 @@
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
+              "from": "mkdirp@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
@@ -5186,7 +5185,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -6059,17 +6058,17 @@
     },
     "moment": {
       "version": "2.10.6",
-      "from": "moment@>=2.10.6 <3.0.0",
+      "from": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "ncp@0.4.2",
+      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "npm@2.1.3",
+      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -6633,135 +6632,135 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "open@0.0.5",
+      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "optimist@0.6.0",
+      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
+          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "progress@1.1.7",
+      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "prompt@0.2.12",
+      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.1",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
         },
         "read": {
           "version": "1.0.7",
-          "from": "read@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.5",
-              "from": "mute-stream@0.0.5",
+              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
+          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.1",
-              "from": "deep-equal@*",
+              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "i@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.4.3",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.1",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -6770,19 +6769,19 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "path-is-absolute": {
                       "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
@@ -6793,37 +6792,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -6832,47 +6831,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "q@1.0.1",
+      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "request@2.51.0",
+      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
+          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -6881,27 +6880,27 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
+          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
+          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
               "version": "2.0.14",
-              "from": "mime-types@>=2.0.3 <2.1.0",
+              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.12.0",
-                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
                 }
               }
@@ -6910,106 +6909,106 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
           "version": "1.4.3",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.1",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
           "version": "2.2.0",
-          "from": "tough-cookie@>=0.12.0",
+          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
+          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "asn1@0.1.11",
+              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "ctype@0.5.3",
+              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "hawk@1.1.1",
+          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
+              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
+              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.5",
-          "from": "stringstream@>=0.0.4 <0.1.0",
+          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
+              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
@@ -7018,142 +7017,142 @@
     },
     "request-progress": {
       "version": "0.3.1",
-      "from": "request-progress@>=0.3.1 <0.4.0",
+      "from": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
       "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
       "dependencies": {
         "throttleit": {
           "version": "0.0.2",
-          "from": "throttleit@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
         }
       }
     },
     "semver": {
       "version": "4.3.6",
-      "from": "semver@>=4.2.0 <5.0.0",
+      "from": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "serve-static@1.7.1",
+      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "escape-html@1.0.1",
+          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
+          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "send@0.10.1",
+          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "debug@>=2.1.0 <2.2.0",
+              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "ms@0.7.0",
+                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "depd@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "destroy@1.0.3",
+              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
+              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "fresh@0.2.4",
+              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@1.2.11",
+              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "ms@0.6.2",
+              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
+              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
+                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.3",
-              "from": "range-parser@>=1.0.2 <1.1.0",
+              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
+          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "shelljs@0.2.6",
+      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
+      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
+          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
+          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                 }
               }
@@ -7162,88 +7161,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
+          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
+      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "unzip@0.1.9",
+      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
+          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "minimist@0.0.8",
+                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.4.3",
-              "from": "rimraf@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
+                  "from": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.1",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
+                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
+                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -7252,19 +7251,19 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "once@>=1.3.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "path-is-absolute": {
                       "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
@@ -7275,85 +7274,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
+              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
+          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1",
+              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.4",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
+          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
+              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -7362,44 +7361,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
+      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "glob@>=4.3.1 <5.0.0",
+              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -7408,22 +7407,22 @@
             },
             "minimatch": {
               "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.1",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.1",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -7432,78 +7431,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
+              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
+              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
+                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
+                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.7.0",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
@@ -7516,95 +7515,95 @@
         },
         "graceful-fs": {
           "version": "3.0.8",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <3.0.0",
+          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
           "version": "0.5.1",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "minimist@0.0.8",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
+          "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "isarray@0.0.1",
+                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.1",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
+          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
+              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -7613,22 +7612,22 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "xml2js@0.4.4",
+      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
           "version": "4.0.0",
-          "from": "xmlbuilder@>=1.0.0",
+          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.10.1",
-              "from": "lodash@>=3.5.0 <4.0.0",
+              "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
             }
           }
diff --git a/package.json b/package.json
index 6b55c46da3..c0042be17a 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.3",
+    "ionic-app-lib": "0.6.4",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 73f95f8b956046f68e029d1d6cfd6ff90cca2adc Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Sat, 7 Nov 2015 16:48:04 -0700
Subject: [PATCH 0832/1100] Fix(cordova): Update ionic build to build all
 installed platforms and ionic platform to list all available platforms

---
 lib/ionic/cordova.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 94c9b5389a..dcd1e0a495 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -29,7 +29,6 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   try {
     this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
-
     this.addIcons = !(argv.noresources || argv.r);
 
     if(this.isLiveReload) {
@@ -110,7 +109,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   var cmdArg, x, y;
 
   // backwards compatibility prior to fully wrapping cordova cmds
-  if(cmdName == 'platform') {
+  if(cmdName == 'platform' && cmdArgs.length > 0 ) {
     // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
     // if a cordova platform cmd isn't the cmd then automatically insert `add`
     var hasCordovaCmd = false;

From 99097f8a9d3e759f7a93adc7aee0cb396988cc46 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Nov 2015 08:19:51 -0700
Subject: [PATCH 0833/1100] Fix(readme): Adjust spelling on gulpDependantTasks
 in the README for ionic.project file to match what is code. The feature came
 as a PR that was following british spelling. Addresses issue #610

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 668de34297..51cf3f44d2 100644
--- a/README.md
+++ b/README.md
@@ -578,7 +578,7 @@ The ionic.project is a configuration for an ionic project that stores the follow
 * `createDocumentRoot` - boolean setting stating to create the designated.document root upon serve (for CI, using `app` folder, and compiling)  
 * `defaultBrowser` - the browser they prefer to use with `ionic serve`. Chrome, Firefox, etc.  
 * `documentRoot` - the associated document root with HTML/JS/CSS files.  
-* `gulpDependentTasks` - gulp tasks that are run before `ionic serve` launches. Think of `gulp build`, `gulp sass`, etc.  
+* `gulpDependantTasks` - gulp tasks that are run before `ionic serve` launches. Think of `gulp build`, `gulp sass`, etc.  
 * `gulpStartupTasks` - gulp tasks that are run and kept alive during `ionic serve`.  
 * `imagePaths` - paths relative to document root that specify the release feature to compress images.  
 * `proxies` - designated proxies to use during `ionic serve`.  

From ff1997ac003841cb35c03fb6e71b62c6a617fbf7 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Mon, 9 Nov 2015 21:09:59 -0700
Subject: [PATCH 0834/1100] fix(docs): Remove the tests starter

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 51cf3f44d2..7f7c84bf05 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ __Named template starters:__
 * [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
 * [maps](https://github.com/driftyco/ionic-starter-maps)
 * [salesforce](https://github.com/driftyco/ionic-starter-salesforce)
-* [tests](https://github.com/driftyco/ionic-starter-tests)
 * [complex-list](https://github.com/driftyco/ionic-starter-complex-list)
 * [blank](https://github.com/driftyco/ionic-starter-blank)
 

From 2c5c19b07c21806ffb43dd9d24ebcdd0e99099c0 Mon Sep 17 00:00:00 2001
From: jbavari <josh@drifty.com>
Date: Tue, 10 Nov 2015 17:57:54 -0700
Subject: [PATCH 0835/1100] Fix(state): Pass the proper variable array to the
 state save plugin command.

---
 lib/ionic/cordova.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index dcd1e0a495..9cf339e6df 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -86,7 +86,13 @@ IonicTask.prototype.run = function(ionic, argv) {
         return State.removePlatform(process.cwd(), argumentName);
       } else if (isPluginCmd && isAddCmd) {
         console.log('Saving plugin to package.json file'.blue)
-        return State.savePlugin(process.cwd(), argumentName, argv.variable);
+        var variables;
+        if (argv.variable && (typeof argv.variable == 'string')) {
+          variables = [argv.variable];
+        } else {
+          variables = argv.variable;
+        }
+        return State.savePlugin(process.cwd(), argumentName, variables);
       } else if (isPluginCmd && isRmCmd) {
         console.log('Removing plugin from package.json file'.blue)
         return State.removePlugin(process.cwd(), argumentName);

From c0e417103638f3f5c0521181665630320506618f Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Tue, 17 Nov 2015 10:05:48 -0600
Subject: [PATCH 0836/1100] Print error message from 'message' not 'title'

---
 lib/ionic/security.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index c41e61904d..99cbe483ed 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -96,9 +96,9 @@ function addSecurityProfile(ionic, argv, dir, appId) {
     }, function(err) {
       if (typeof err === 'object') {
         if (err.type == 'ProfileExists') {
-          console.error(err.title);
+          console.error(err.message);
         } else {
-          return Q.reject(new Error(err.title));
+          return Q.reject(new Error(err.message));
         }
       }
     })
@@ -267,9 +267,9 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
     }, function(err) {
       if (typeof err === 'object') {
         if (err.type == 'CredentialsExist') {
-          console.error(err.title);
+          console.error(err.message);
         } else {
-          return Q.reject(new Error(err.title));
+          return Q.reject(new Error(err.message));
         }
       }
     })

From 9ae25e806c341c02fb83f35d5ffdeec6e99e83b0 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 17 Nov 2015 14:35:30 -0600
Subject: [PATCH 0837/1100] fix(creator): creator start zip

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c0042be17a..a8776c6837 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.4",
+    "ionic-app-lib": "0.6.5",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 12d5964d4369c6b6146dc0f0ec9fa2f3e8806224 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 17 Nov 2015 15:25:17 -0600
Subject: [PATCH 0838/1100] bump with shrink

---
 npm-shrinkwrap.json | 1726 ++++++++++++++++++++++++++++---------------
 package.json        |    2 +-
 2 files changed, 1116 insertions(+), 612 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 9985b0b92f..f650289ada 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,527 +1,534 @@
 {
   "name": "ionic",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "dependencies": {
     "async": {
       "version": "0.9.2",
-      "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "from": "async@>=0.9.0 <0.10.0",
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
     },
     "cheerio": {
       "version": "0.19.0",
-      "from": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "from": "cheerio@>=0.19.0 <0.20.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
       "dependencies": {
         "css-select": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "from": "css-select@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
           "dependencies": {
             "css-what": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
+              "from": "css-what@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
             },
             "domutils": {
               "version": "1.4.3",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "from": "domutils@>=1.4.0 <1.5.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
               "dependencies": {
                 "domelementtype": {
                   "version": "1.3.0",
-                  "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
                 }
               }
             },
             "boolbase": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+              "from": "boolbase@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
             },
             "nth-check": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+              "from": "nth-check@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
             }
           }
         },
         "entities": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+          "from": "entities@>=1.1.1 <1.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
         },
         "htmlparser2": {
           "version": "3.8.3",
-          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
-              "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+              "from": "domhandler@>=2.3.0 <2.4.0",
               "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
             },
             "domutils": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+              "from": "domutils@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
             },
             "domelementtype": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
             },
             "readable-stream": {
               "version": "1.1.13",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "entities": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+              "from": "entities@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
             }
           }
         },
         "dom-serializer": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
           "dependencies": {
             "domelementtype": {
               "version": "1.1.3",
-              "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
               "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
             }
           }
         },
         "lodash": {
           "version": "3.10.1",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "from": "lodash@>=3.2.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
         }
       }
     },
     "cli-table": {
       "version": "0.3.1",
-      "from": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "from": "cli-table@>=0.3.1 <0.4.0",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
       "dependencies": {
         "colors": {
           "version": "1.0.3",
-          "from": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "from": "colors@1.0.3",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
         }
       }
     },
     "colors": {
       "version": "0.6.2",
-      "from": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "from": "colors@0.6.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "connect": {
       "version": "3.1.1",
-      "from": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "from": "connect@3.1.1",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
       "dependencies": {
         "debug": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "from": "debug@1.0.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "finalhandler": {
           "version": "0.1.0",
-          "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "from": "finalhandler@0.1.0",
           "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
           "dependencies": {
             "escape-html": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+              "from": "escape-html@1.0.1",
               "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
             }
           }
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "connect-livereload": {
       "version": "0.5.2",
-      "from": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz",
+      "from": "connect-livereload@0.5.2",
       "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
     },
     "crc": {
       "version": "3.2.1",
-      "from": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz",
+      "from": "crc@3.2.1",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
     },
     "cross-spawn": {
       "version": "0.2.3",
-      "from": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "from": "cross-spawn@0.2.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
           "version": "2.7.0",
-          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
         }
       }
     },
     "event-stream": {
       "version": "3.0.20",
-      "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "from": "event-stream@>=3.0.0 <3.1.0",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
       "dependencies": {
         "through": {
           "version": "2.3.8",
-          "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
         },
         "duplexer": {
           "version": "0.1.1",
-          "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "from": "duplexer@>=0.1.1 <0.2.0",
           "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
         },
         "from": {
           "version": "0.1.3",
-          "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz",
+          "from": "from@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
         },
         "map-stream": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz",
+          "from": "map-stream@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
         },
         "pause-stream": {
           "version": "0.0.11",
-          "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+          "from": "pause-stream@0.0.11",
           "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
         },
         "split": {
           "version": "0.2.10",
-          "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "from": "split@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
         },
         "stream-combiner": {
           "version": "0.0.4",
-          "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
         }
       }
     },
     "expand-tilde": {
       "version": "1.2.0",
-      "from": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
+      "from": "expand-tilde@>=1.2.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
       "dependencies": {
         "user-home": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+          "from": "user-home@>=1.1.1 <2.0.0",
           "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
         }
       }
     },
     "finalhandler": {
       "version": "0.2.0",
-      "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "from": "finalhandler@0.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
       "dependencies": {
         "debug": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "from": "debug@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
           "dependencies": {
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             }
           }
         },
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         }
       }
     },
     "form-data": {
       "version": "0.1.4",
-      "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "from": "form-data@0.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         },
         "mime": {
           "version": "1.2.11",
-          "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "from": "mime@>=1.2.11 <1.3.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
         }
       }
     },
     "gulp": {
       "version": "3.8.8",
-      "from": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "from": "gulp@3.8.8",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
       "dependencies": {
         "archy": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+          "from": "archy@>=0.0.2 <0.0.3",
           "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
         },
         "chalk": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "from": "chalk@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "0.3.0",
-              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "0.2.1",
-                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+              "from": "supports-color@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
             }
           }
         },
         "deprecated": {
           "version": "0.0.1",
-          "from": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+          "from": "deprecated@>=0.0.1 <0.0.2",
           "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
         },
         "gulp-util": {
           "version": "3.0.7",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz",
+              "from": "beeper@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "from": "chalk@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.1.0",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "2.0.0",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "2.0.0",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
-                  "version": "5.0.0",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
+                  "version": "5.0.1",
+                  "from": "get-stdin@*",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"
                 },
                 "meow": {
-                  "version": "3.5.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
+                  "version": "3.6.0",
+                  "from": "meow@*",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
-                      "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "version": "2.0.0",
+                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
-                          "version": "1.2.1",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                          "version": "2.0.1",
+                          "from": "camelcase@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
                     },
                     "loud-rejection": {
-                      "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz",
-                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
+                      "version": "1.2.0",
+                      "from": "loud-rejection@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                      "dependencies": {
+                        "signal-exit": {
+                          "version": "2.1.2",
+                          "from": "signal-exit@>=2.1.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                        }
+                      }
                     },
                     "normalize-package-data": {
                       "version": "2.3.5",
-                      "from": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                       "dependencies": {
                         "hosted-git-info": {
                           "version": "2.1.4",
-                          "from": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
                           "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
                         },
                         "is-builtin-module": {
                           "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
                           "dependencies": {
                             "builtin-modules": {
                               "version": "1.1.0",
-                              "from": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
                             }
                           }
                         },
                         "validate-npm-package-license": {
                           "version": "3.0.1",
-                          "from": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
                           "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                           "dependencies": {
                             "spdx-correct": {
                               "version": "1.0.2",
-                              "from": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                              "from": "spdx-correct@>=1.0.0 <1.1.0",
                               "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
                             },
                             "spdx-expression-parse": {
                               "version": "1.0.1",
-                              "from": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
+                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
                               "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
                               "dependencies": {
                                 "spdx-exceptions": {
                                   "version": "1.0.4",
-                                  "from": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz",
+                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -532,33 +539,33 @@
                     },
                     "object-assign": {
                       "version": "4.0.1",
-                      "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz",
+                      "from": "object-assign@>=4.0.1 <5.0.0",
                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
                     },
                     "read-pkg-up": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
                       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
                       "dependencies": {
                         "find-up": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
+                          "version": "1.1.0",
+                          "from": "find-up@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
                           "dependencies": {
                             "path-exists": {
-                              "version": "2.0.0",
-                              "from": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
+                              "version": "2.1.0",
+                              "from": "path-exists@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
                             },
                             "pinkie-promise": {
-                              "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                               "dependencies": {
                                 "pinkie": {
-                                  "version": "1.0.0",
-                                  "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                                 }
                               }
                             }
@@ -566,32 +573,32 @@
                         },
                         "read-pkg": {
                           "version": "1.1.0",
-                          "from": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                          "from": "read-pkg@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
                           "dependencies": {
                             "load-json-file": {
-                              "version": "1.0.1",
-                              "from": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
-                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
+                              "version": "1.1.0",
+                              "from": "load-json-file@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
                               "dependencies": {
                                 "graceful-fs": {
                                   "version": "4.1.2",
-                                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
                                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                                 },
                                 "parse-json": {
                                   "version": "2.2.0",
-                                  "from": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                                  "from": "parse-json@>=2.2.0 <3.0.0",
                                   "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
                                   "dependencies": {
                                     "error-ex": {
                                       "version": "1.3.0",
-                                      "from": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                      "from": "error-ex@>=1.2.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
                                       "dependencies": {
                                         "is-arrayish": {
                                           "version": "0.2.1",
-                                          "from": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
                                           "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
                                         }
                                       }
@@ -600,29 +607,29 @@
                                 },
                                 "pify": {
                                   "version": "2.3.0",
-                                  "from": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+                                  "from": "pify@>=2.0.0 <3.0.0",
                                   "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
-                                  "version": "1.0.0",
-                                  "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                                   "dependencies": {
                                     "pinkie": {
-                                      "version": "1.0.0",
-                                      "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                                     }
                                   }
                                 },
                                 "strip-bom": {
                                   "version": "2.0.0",
-                                  "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                                  "from": "strip-bom@>=2.0.0 <3.0.0",
                                   "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
                                   "dependencies": {
                                     "is-utf8": {
                                       "version": "0.2.0",
-                                      "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+                                      "from": "is-utf8@>=0.2.0 <0.3.0",
                                       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
                                     }
                                   }
@@ -630,29 +637,29 @@
                               }
                             },
                             "path-type": {
-                              "version": "1.0.0",
-                              "from": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
-                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
+                              "version": "1.1.0",
+                              "from": "path-type@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
                               "dependencies": {
                                 "graceful-fs": {
                                   "version": "4.1.2",
-                                  "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
                                   "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                                 },
                                 "pify": {
                                   "version": "2.3.0",
-                                  "from": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+                                  "from": "pify@>=2.0.0 <3.0.0",
                                   "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                                 },
                                 "pinkie-promise": {
-                                  "version": "1.0.0",
-                                  "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                                   "dependencies": {
                                     "pinkie": {
-                                      "version": "1.0.0",
-                                      "from": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                                     }
                                   }
                                 }
@@ -664,27 +671,27 @@
                     },
                     "redent": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                      "from": "redent@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
                       "dependencies": {
                         "indent-string": {
                           "version": "2.1.0",
-                          "from": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                          "from": "indent-string@>=2.1.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
                           "dependencies": {
                             "repeating": {
                               "version": "2.0.0",
-                              "from": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                              "from": "repeating@>=2.0.0 <3.0.0",
                               "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
                               "dependencies": {
                                 "is-finite": {
                                   "version": "1.0.1",
-                                  "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                                  "from": "is-finite@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
                                   "dependencies": {
                                     "number-is-nan": {
                                       "version": "1.0.0",
-                                      "from": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz",
+                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
                                       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
                                     }
                                   }
@@ -695,12 +702,12 @@
                         },
                         "strip-indent": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+                          "from": "strip-indent@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
                           "dependencies": {
                             "get-stdin": {
                               "version": "4.0.1",
-                              "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+                              "from": "get-stdin@>=4.0.1 <5.0.0",
                               "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                             }
                           }
@@ -709,7 +716,7 @@
                     },
                     "trim-newlines": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+                      "from": "trim-newlines@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
                     }
                   }
@@ -718,22 +725,22 @@
             },
             "fancy-log": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz",
+              "from": "fancy-log@>=1.1.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
             },
             "gulplog": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+              "from": "gulplog@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
               "dependencies": {
                 "glogg": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+                  "from": "glogg@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
                   "dependencies": {
                     "sparkles": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
+                      "from": "sparkles@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
                     }
                   }
@@ -742,128 +749,128 @@
             },
             "has-gulplog": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+              "from": "has-gulplog@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
               "dependencies": {
                 "sparkles": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
+                  "from": "sparkles@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
                 }
               }
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.6.2",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.9",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.1.2",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
                   "dependencies": {
                     "lodash._getnative": {
                       "version": "3.9.1",
-                      "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
                     },
                     "lodash.isarguments": {
                       "version": "3.0.4",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.4",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -874,76 +881,76 @@
             },
             "object-assign": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+              "from": "object-assign@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "through2": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+              "from": "through2@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "2.0.4",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "from": "readable-stream@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
                       "version": "1.0.3",
-                      "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "util-deprecate": {
                       "version": "1.0.2",
-                      "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                     }
                   }
                 },
                 "xtend": {
                   "version": "4.0.1",
-                  "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+                  "from": "xtend@>=4.0.0 <4.1.0",
                   "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                 }
               }
             },
             "vinyl": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+              "from": "vinyl@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
               "dependencies": {
                 "clone": {
                   "version": "1.0.2",
-                  "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+                  "from": "clone@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -952,42 +959,42 @@
         },
         "interpret": {
           "version": "0.3.10",
-          "from": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz",
+          "from": "interpret@>=0.3.2 <0.4.0",
           "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
         },
         "liftoff": {
           "version": "0.12.1",
-          "from": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "from": "liftoff@>=0.12.0 <0.13.0",
           "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
           "dependencies": {
             "findup-sync": {
               "version": "0.1.3",
-              "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "3.2.11",
-                  "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "from": "glob@>=3.2.9 <3.3.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "0.3.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.7.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
@@ -996,51 +1003,51 @@
                 },
                 "lodash": {
                   "version": "2.4.2",
-                  "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "from": "lodash@>=2.4.1 <2.5.0",
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
                 }
               }
             },
             "resolve": {
               "version": "0.7.4",
-              "from": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+              "from": "resolve@>=0.7.0 <0.8.0",
               "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
             },
             "minimist": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
+              "from": "minimist@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
             },
             "extend": {
               "version": "1.3.0",
-              "from": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz",
+              "from": "extend@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
             }
           }
         },
         "minimist": {
           "version": "1.2.0",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "from": "minimist@>=1.1.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
         },
         "orchestrator": {
           "version": "0.3.7",
-          "from": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
           "dependencies": {
             "end-of-stream": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -1049,34 +1056,34 @@
             },
             "sequencify": {
               "version": "0.0.7",
-              "from": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+              "from": "sequencify@>=0.0.7 <0.1.0",
               "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
             },
             "stream-consume": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
             }
           }
         },
         "pretty-hrtime": {
           "version": "0.2.2",
-          "from": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
         },
         "semver": {
           "version": "3.0.1",
-          "from": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz",
+          "from": "semver@>=3.0.1 <4.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
         },
         "tildify": {
           "version": "1.1.2",
-          "from": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
+          "from": "tildify@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
           "dependencies": {
             "os-homedir": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz",
+              "from": "os-homedir@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
             }
           }
@@ -1084,8 +1091,9 @@
       }
     },
     "ionic-app-lib": {
-      "version": "0.6.4",
-      "from": "ionic-app-lib@0.6.4",
+      "version": "0.6.5",
+      "from": "ionic-app-lib@0.6.5",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.5.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1495,9 +1503,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.5.1",
+                      "version": "3.5.2",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.1.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.2.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1629,9 +1637,9 @@
                               "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
                             },
                             "elliptic": {
-                              "version": "6.0.1",
+                              "version": "6.0.2",
                               "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1699,9 +1707,9 @@
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
                             },
                             "elliptic": {
-                              "version": "6.0.1",
+                              "version": "6.0.2",
                               "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
                               "dependencies": {
                                 "brorand": {
                                   "version": "1.0.5",
@@ -1918,9 +1926,9 @@
                           "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
                           "dependencies": {
                             "convert-source-map": {
-                              "version": "1.1.1",
+                              "version": "1.1.2",
                               "from": "convert-source-map@>=1.1.0 <1.2.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.1.tgz"
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
                             },
                             "inline-source-map": {
                               "version": "0.5.0",
@@ -1948,7 +1956,7 @@
                         },
                         "is-buffer": {
                           "version": "1.1.0",
-                          "from": "is-buffer@>=1.1.0 <2.0.0",
+                          "from": "is-buffer@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
                         },
                         "lexical-scope": {
@@ -2242,9 +2250,9 @@
                   "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
                 },
                 "uglify-js": {
-                  "version": "2.5.0",
+                  "version": "2.6.1",
                   "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.5.0.tgz",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
                   "dependencies": {
                     "async": {
                       "version": "0.2.10",
@@ -2262,15 +2270,104 @@
                       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
                     },
                     "yargs": {
-                      "version": "3.5.4",
-                      "from": "yargs@>=3.5.4 <3.6.0",
-                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+                      "version": "3.10.0",
+                      "from": "yargs@>=3.10.0 <3.11.0",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.2.1",
                           "from": "camelcase@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
+                        "cliui": {
+                          "version": "2.1.0",
+                          "from": "cliui@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                          "dependencies": {
+                            "center-align": {
+                              "version": "0.1.2",
+                              "from": "center-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.0 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                },
+                                "lazy-cache": {
+                                  "version": "0.2.4",
+                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                                }
+                              }
+                            },
+                            "right-align": {
+                              "version": "0.1.3",
+                              "from": "right-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.0 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "wordwrap": {
+                              "version": "0.0.2",
+                              "from": "wordwrap@0.0.2",
+                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                            }
+                          }
+                        },
                         "decamelize": {
                           "version": "1.1.1",
                           "from": "decamelize@>=1.0.0 <2.0.0",
@@ -2280,11 +2377,6 @@
                           "version": "0.1.0",
                           "from": "window-size@0.1.0",
                           "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                        },
-                        "wordwrap": {
-                          "version": "0.0.2",
-                          "from": "wordwrap@0.0.2",
-                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
                         }
                       }
                     }
@@ -2593,9 +2685,9 @@
                   }
                 },
                 "npm-package-arg": {
-                  "version": "4.0.2",
+                  "version": "4.1.0",
                   "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
                   "dependencies": {
                     "hosted-git-info": {
                       "version": "2.1.4",
@@ -2720,9 +2812,9 @@
               }
             },
             "npm": {
-              "version": "2.14.9",
+              "version": "2.14.11",
               "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.9.tgz",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.11.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
@@ -2789,18 +2881,6 @@
                   "from": "columnify@1.5.2",
                   "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
                   "dependencies": {
-                    "strip-ansi": {
-                      "version": "3.0.0",
-                      "from": "strip-ansi@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
                     "wcwidth": {
                       "version": "1.0.0",
                       "from": "wcwidth@>=1.0.0 <2.0.0",
@@ -2863,12 +2943,13 @@
                   "from": "fstream@1.0.8"
                 },
                 "fstream-npm": {
-                  "version": "1.0.5",
-                  "from": "fstream-npm@>=1.0.5 <1.1.0",
+                  "version": "1.0.7",
+                  "from": "fstream-npm@>=1.0.7 <1.1.0",
                   "dependencies": {
                     "fstream-ignore": {
                       "version": "1.0.3",
-                      "from": "fstream-ignore@>=1.0.0 <2.0.0"
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
                     }
                   }
                 },
@@ -2895,7 +2976,8 @@
                 },
                 "graceful-fs": {
                   "version": "4.1.2",
-                  "from": "graceful-fs@>=3.0.8 <3.1.0"
+                  "from": "graceful-fs@>=4.1.2 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
                 },
                 "hosted-git-info": {
                   "version": "2.1.4",
@@ -2990,14 +3072,14 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                           "dependencies": {
                             "brace-expansion": {
-                              "version": "1.1.0",
+                              "version": "1.1.1",
                               "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                               "dependencies": {
                                 "balanced-match": {
-                                  "version": "0.2.0",
+                                  "version": "0.2.1",
                                   "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                                 },
                                 "concat-map": {
                                   "version": "0.0.1",
@@ -3022,6 +3104,109 @@
                         }
                       }
                     },
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
                     "path-array": {
                       "version": "1.0.0",
                       "from": "path-array@>=1.0.0 <2.0.0",
@@ -3056,16 +3241,17 @@
                   }
                 },
                 "nopt": {
-                  "version": "3.0.4",
-                  "from": "nopt@3.0.4"
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.6 <3.1.0"
                 },
                 "normalize-git-url": {
                   "version": "3.0.1",
                   "from": "normalize-git-url@latest"
                 },
                 "normalize-package-data": {
-                  "version": "2.3.4",
-                  "from": "normalize-package-data@2.3.4",
+                  "version": "2.3.5",
+                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
                   "dependencies": {
                     "is-builtin-module": {
                       "version": "1.0.0",
@@ -3088,11 +3274,118 @@
                 },
                 "npm-install-checks": {
                   "version": "1.0.6",
-                  "from": "npm-install-checks@>=1.0.6 <1.1.0"
+                  "from": "npm-install-checks@1.0.6",
+                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
+                  "dependencies": {
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
                 },
                 "npm-package-arg": {
-                  "version": "4.0.2",
-                  "from": "npm-package-arg@>=4.0.2 <4.1.0"
+                  "version": "4.1.0",
+                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
                 },
                 "npm-registry-client": {
                   "version": "7.0.7",
@@ -3150,9 +3443,8 @@
                   "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
                 },
                 "npmlog": {
-                  "version": "1.2.1",
-                  "from": "npmlog@>=1.2.1 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "version": "2.0.0",
+                  "from": "npmlog@>=2.0.0 <2.1.0",
                   "dependencies": {
                     "are-we-there-yet": {
                       "version": "1.0.4",
@@ -3167,44 +3459,84 @@
                       }
                     },
                     "gauge": {
-                      "version": "1.2.0",
+                      "version": "1.2.2",
                       "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
                       "dependencies": {
                         "has-unicode": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
                         },
                         "lodash.pad": {
-                          "version": "3.1.0",
+                          "version": "3.1.1",
                           "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
                         },
                         "lodash.padleft": {
                           "version": "3.1.1",
                           "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
                         },
                         "lodash.padright": {
                           "version": "3.1.1",
                           "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
-                        },
-                        "lodash._basetostring": {
-                          "version": "3.0.0",
-                          "from": "lodash._basetostring@3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
-                        },
-                        "lodash._createpadding": {
-                          "version": "3.6.0",
-                          "from": "lodash._createpadding@3.6.0",
-                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
                           "dependencies": {
-                            "lodash.repeat": {
-                              "version": "3.0.0",
-                              "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
                             }
                           }
                         }
@@ -3277,8 +3609,8 @@
                   }
                 },
                 "read-package-json": {
-                  "version": "2.0.1",
-                  "from": "read-package-json@2.0.1",
+                  "version": "2.0.2",
+                  "from": "read-package-json@>=2.0.2 <2.1.0",
                   "dependencies": {
                     "json-parse-helpfulerror": {
                       "version": "1.0.3",
@@ -3286,9 +3618,9 @@
                       "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
                       "dependencies": {
                         "jju": {
-                          "version": "1.2.0",
+                          "version": "1.2.1",
                           "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
                         }
                       }
                     }
@@ -3533,26 +3865,7 @@
                             "has-ansi": {
                               "version": "2.0.0",
                               "from": "has-ansi@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                              "dependencies": {
-                                "ansi-regex": {
-                                  "version": "2.0.0",
-                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                                }
-                              }
-                            },
-                            "strip-ansi": {
-                              "version": "3.0.0",
-                              "from": "strip-ansi@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                              "dependencies": {
-                                "ansi-regex": {
-                                  "version": "2.0.0",
-                                  "from": "ansi-regex@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                                }
-                              }
+                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
                             },
                             "supports-color": {
                               "version": "2.0.0",
@@ -3689,14 +4002,7 @@
                 "spdx": {
                   "version": "0.4.1",
                   "from": "spdx@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
-                  "dependencies": {
-                    "spdx-license-ids": {
-                      "version": "1.0.1",
-                      "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
-                    }
-                  }
+                  "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz"
                 },
                 "tar": {
                   "version": "2.2.1",
@@ -3724,14 +4030,7 @@
                     "spdx-correct": {
                       "version": "1.0.1",
                       "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
-                      "dependencies": {
-                        "spdx-license-ids": {
-                          "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
-                        }
-                      }
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
                     },
                     "spdx-expression-parse": {
                       "version": "1.0.0",
@@ -3742,11 +4041,6 @@
                           "version": "1.0.2",
                           "from": "spdx-exceptions@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
-                        },
-                        "spdx-license-ids": {
-                          "version": "1.0.2",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
                         }
                       }
                     }
@@ -3786,10 +4080,25 @@
                   "from": "wrappy@1.0.1",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                 },
-                "write-file-atomic": {
-                  "version": "1.1.3",
-                  "from": "write-file-atomic@1.1.3",
-                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
+                "write-file-atomic": {
+                  "version": "1.1.3",
+                  "from": "write-file-atomic@1.1.3",
+                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
+                },
+                "ansi-regex": {
+                  "version": "2.0.0",
+                  "from": "ansi-regex@2.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                },
+                "spdx-license-ids": {
+                  "version": "1.1.0",
+                  "from": "spdx-license-ids@1.1.0",
+                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@3.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
                 }
               }
             },
@@ -3833,9 +4142,9 @@
                   }
                 },
                 "nopt": {
-                  "version": "3.0.4",
+                  "version": "3.0.6",
                   "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
                   "dependencies": {
                     "abbrev": {
                       "version": "1.0.7",
@@ -3994,9 +4303,9 @@
                   "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
                 },
                 "node-uuid": {
-                  "version": "1.4.3",
+                  "version": "1.4.7",
                   "from": "node-uuid@>=1.4.0 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                 },
                 "qs": {
                   "version": "2.3.3",
@@ -4009,9 +4318,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                 },
                 "tough-cookie": {
-                  "version": "2.2.0",
+                  "version": "2.2.1",
                   "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
                 },
                 "http-signature": {
                   "version": "0.10.1",
@@ -4273,9 +4582,9 @@
           }
         },
         "node-sass": {
-          "version": "3.4.1",
+          "version": "3.4.2",
           "from": "node-sass@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
           "dependencies": {
             "async-foreach": {
               "version": "0.1.3",
@@ -4452,19 +4761,19 @@
               }
             },
             "meow": {
-              "version": "3.5.0",
+              "version": "3.6.0",
               "from": "meow@>=3.3.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/meow/-/meow-3.5.0.tgz",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
               "dependencies": {
                 "camelcase-keys": {
-                  "version": "1.0.0",
-                  "from": "camelcase-keys@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                  "version": "2.0.0",
+                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
                   "dependencies": {
                     "camelcase": {
-                      "version": "1.2.1",
-                      "from": "camelcase@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                      "version": "2.0.1",
+                      "from": "camelcase@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
                     },
                     "map-obj": {
                       "version": "1.0.1",
@@ -4474,9 +4783,16 @@
                   }
                 },
                 "loud-rejection": {
-                  "version": "1.0.0",
+                  "version": "1.2.0",
                   "from": "loud-rejection@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz"
+                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                  "dependencies": {
+                    "signal-exit": {
+                      "version": "2.1.2",
+                      "from": "signal-exit@>=2.1.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                    }
+                  }
                 },
                 "minimist": {
                   "version": "1.2.0",
@@ -4517,7 +4833,7 @@
                           "dependencies": {
                             "spdx-license-ids": {
                               "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
@@ -4534,7 +4850,7 @@
                             },
                             "spdx-license-ids": {
                               "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                               "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                             }
                           }
@@ -4554,24 +4870,24 @@
                   "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
                   "dependencies": {
                     "find-up": {
-                      "version": "1.0.0",
+                      "version": "1.1.0",
                       "from": "find-up@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
                       "dependencies": {
                         "path-exists": {
-                          "version": "2.0.0",
+                          "version": "2.1.0",
                           "from": "path-exists@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
                         },
                         "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "version": "2.0.0",
+                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                           "dependencies": {
                             "pinkie": {
-                              "version": "1.0.0",
-                              "from": "pinkie@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                              "version": "2.0.1",
+                              "from": "pinkie@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                             }
                           }
                         }
@@ -4583,9 +4899,9 @@
                       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
                       "dependencies": {
                         "load-json-file": {
-                          "version": "1.0.1",
+                          "version": "1.1.0",
                           "from": "load-json-file@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
                           "dependencies": {
                             "graceful-fs": {
                               "version": "4.1.2",
@@ -4617,14 +4933,14 @@
                               "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                             },
                             "pinkie-promise": {
-                              "version": "1.0.0",
-                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                               "dependencies": {
                                 "pinkie": {
-                                  "version": "1.0.0",
-                                  "from": "pinkie@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                                 }
                               }
                             },
@@ -4643,9 +4959,9 @@
                           }
                         },
                         "path-type": {
-                          "version": "1.0.0",
+                          "version": "1.1.0",
                           "from": "path-type@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
                           "dependencies": {
                             "graceful-fs": {
                               "version": "4.1.2",
@@ -4658,14 +4974,14 @@
                               "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                             },
                             "pinkie-promise": {
-                              "version": "1.0.0",
-                              "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                               "dependencies": {
                                 "pinkie": {
-                                  "version": "1.0.0",
-                                  "from": "pinkie@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                                 }
                               }
                             }
@@ -4765,9 +5081,9 @@
                   "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
                 },
                 "nopt": {
-                  "version": "3.0.4",
+                  "version": "3.0.6",
                   "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
                   "dependencies": {
                     "abbrev": {
                       "version": "1.0.7",
@@ -4813,9 +5129,9 @@
               }
             },
             "node-gyp": {
-              "version": "3.0.3",
+              "version": "3.1.0",
               "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.1.0.tgz",
               "dependencies": {
                 "fstream": {
                   "version": "1.0.8",
@@ -4912,9 +5228,9 @@
                   }
                 },
                 "nopt": {
-                  "version": "3.0.4",
+                  "version": "3.0.6",
                   "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
                   "dependencies": {
                     "abbrev": {
                       "version": "1.0.7",
@@ -5174,9 +5490,9 @@
                   }
                 },
                 "tar": {
-                  "version": "1.0.3",
-                  "from": "tar@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+                  "version": "2.2.1",
+                  "from": "tar@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
                   "dependencies": {
                     "block-stream": {
                       "version": "0.0.8",
@@ -5305,9 +5621,9 @@
                   }
                 },
                 "node-uuid": {
-                  "version": "1.4.3",
+                  "version": "1.4.7",
                   "from": "node-uuid@>=1.4.3 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                 },
                 "qs": {
                   "version": "5.2.0",
@@ -5320,9 +5636,9 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                 },
                 "tough-cookie": {
-                  "version": "2.2.0",
+                  "version": "2.2.1",
                   "from": "tough-cookie@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
                 },
                 "http-signature": {
                   "version": "0.11.0",
@@ -5352,9 +5668,9 @@
                   "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
                 },
                 "hawk": {
-                  "version": "3.1.0",
+                  "version": "3.1.1",
                   "from": "hawk@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz",
                   "dependencies": {
                     "hoek": {
                       "version": "2.16.3",
@@ -5423,9 +5739,9 @@
                       }
                     },
                     "is-my-json-valid": {
-                      "version": "2.12.2",
+                      "version": "2.12.3",
                       "from": "is-my-json-valid@>=2.12.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
                       "dependencies": {
                         "generate-function": {
                           "version": "2.0.0",
@@ -5483,9 +5799,9 @@
                   "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
                 },
                 "yargs": {
-                  "version": "3.29.0",
+                  "version": "3.30.0",
                   "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz",
                   "dependencies": {
                     "camelcase": {
                       "version": "1.2.1",
@@ -5549,7 +5865,7 @@
                     },
                     "decamelize": {
                       "version": "1.1.1",
-                      "from": "decamelize@>=1.0.0 <2.0.0",
+                      "from": "decamelize@>=1.1.1 <2.0.0",
                       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
                     },
                     "os-locale": {
@@ -5572,9 +5888,9 @@
                       }
                     },
                     "window-size": {
-                      "version": "0.1.2",
+                      "version": "0.1.4",
                       "from": "window-size@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.2.tgz"
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
                     },
                     "y18n": {
                       "version": "3.2.0",
@@ -5612,9 +5928,9 @@
               }
             },
             "console-log-level": {
-              "version": "1.2.0",
+              "version": "1.2.1",
               "from": "console-log-level@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.0.tgz"
+              "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.1.tgz"
             },
             "json-stringify-safe": {
               "version": "5.0.1",
@@ -5635,6 +5951,206 @@
             }
           }
         },
+        "request-progress": {
+          "version": "0.3.1",
+          "from": "request-progress@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2",
+              "from": "throttleit@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            }
+          }
+        },
+        "unzip2": {
+          "version": "0.2.5",
+          "from": "unzip2@0.2.5",
+          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
+          "dependencies": {
+            "fstream": {
+              "version": "0.1.31",
+              "from": "fstream@>=0.1.21 <0.2.0",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.3",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.1",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.1",
+                                  "from": "balanced-match@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.2",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "pullstream": {
+              "version": "0.4.1",
+              "from": "pullstream@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+              "dependencies": {
+                "over": {
+                  "version": "0.0.5",
+                  "from": "over@>=0.0.5 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+                },
+                "slice-stream": {
+                  "version": "1.0.0",
+                  "from": "slice-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+                }
+              }
+            },
+            "binary": {
+              "version": "0.3.0",
+              "from": "binary@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "from": "chainsaw@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9",
+                      "from": "traverse@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "setimmediate": {
+              "version": "1.0.4",
+              "from": "setimmediate@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+            },
+            "match-stream": {
+              "version": "0.0.2",
+              "from": "match-stream@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+              "dependencies": {
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            }
+          }
+        },
         "vinyl-fs": {
           "version": "1.0.0",
           "from": "vinyl-fs@1.0.0",
@@ -6058,17 +6574,17 @@
     },
     "moment": {
       "version": "2.10.6",
-      "from": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz",
+      "from": "moment@>=2.10.6 <3.0.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
     },
     "ncp": {
       "version": "0.4.2",
-      "from": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "from": "ncp@0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
     },
     "npm": {
       "version": "2.1.3",
-      "from": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
+      "from": "npm@2.1.3",
       "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
       "dependencies": {
         "abbrev": {
@@ -6632,135 +7148,135 @@
     },
     "open": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "from": "open@0.0.5",
       "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
     },
     "optimist": {
       "version": "0.6.0",
-      "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "from": "optimist@0.6.0",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
         },
         "minimist": {
           "version": "0.0.10",
-          "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "from": "minimist@>=0.0.1 <0.1.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
         }
       }
     },
     "progress": {
       "version": "1.1.7",
-      "from": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz",
+      "from": "progress@1.1.7",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
     },
     "prompt": {
       "version": "0.2.12",
-      "from": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "from": "prompt@0.2.12",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
       "dependencies": {
         "pkginfo": {
           "version": "0.3.1",
-          "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
           "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
         },
         "read": {
           "version": "1.0.7",
-          "from": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+          "from": "read@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
           "dependencies": {
             "mute-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
               "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
             }
           }
         },
         "revalidator": {
           "version": "0.1.8",
-          "from": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+          "from": "revalidator@>=0.1.0 <0.2.0",
           "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
         },
         "utile": {
           "version": "0.2.1",
-          "from": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "from": "utile@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "from": "async@>=0.2.9 <0.3.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
             },
             "deep-equal": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+              "from": "deep-equal@*",
               "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
             },
             "i": {
               "version": "0.3.3",
-              "from": "https://registry.npmjs.org/i/-/i-0.3.3.tgz",
+              "from": "i@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.4.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
-                  "from": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "from": "glob@>=5.0.14 <6.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.1",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.1",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -6769,19 +7285,19 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "path-is-absolute": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
@@ -6792,37 +7308,37 @@
         },
         "winston": {
           "version": "0.6.2",
-          "from": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "from": "winston@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
           "dependencies": {
             "async": {
               "version": "0.1.22",
-              "from": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
+              "from": "async@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
             },
             "cycle": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+              "from": "cycle@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
             },
             "eyes": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+              "from": "eyes@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
             },
             "pkginfo": {
               "version": "0.2.3",
-              "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
             },
             "request": {
               "version": "2.9.203",
-              "from": "https://registry.npmjs.org/request/-/request-2.9.203.tgz",
+              "from": "request@>=2.9.0 <2.10.0",
               "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
             },
             "stack-trace": {
               "version": "0.0.9",
-              "from": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
@@ -6831,47 +7347,47 @@
     },
     "proxy-middleware": {
       "version": "0.7.0",
-      "from": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
     },
     "q": {
       "version": "1.0.1",
-      "from": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "from": "q@1.0.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
     },
     "request": {
       "version": "2.51.0",
-      "from": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "from": "request@2.51.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
       "dependencies": {
         "bl": {
           "version": "0.9.4",
-          "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "from": "bl@>=0.9.0 <0.10.0",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -6880,27 +7396,27 @@
         },
         "caseless": {
           "version": "0.8.0",
-          "from": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "from": "caseless@>=0.8.0 <0.9.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
         "forever-agent": {
           "version": "0.5.2",
-          "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
         },
         "form-data": {
           "version": "0.2.0",
-          "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "from": "form-data@>=0.2.0 <0.3.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
           "dependencies": {
             "mime-types": {
               "version": "2.0.14",
-              "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "from": "mime-types@>=2.0.3 <2.1.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
               "dependencies": {
                 "mime-db": {
                   "version": "1.12.0",
-                  "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
                   "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
                 }
               }
@@ -6909,250 +7425,238 @@
         },
         "json-stringify-safe": {
           "version": "5.0.1",
-          "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
           "version": "1.0.2",
-          "from": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "from": "mime-types@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
         },
         "node-uuid": {
-          "version": "1.4.3",
-          "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+          "version": "1.4.7",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
         },
         "qs": {
           "version": "2.3.3",
-          "from": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "from": "qs@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
-          "version": "2.2.0",
-          "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+          "version": "2.2.1",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
         },
         "http-signature": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "from": "http-signature@>=0.10.0 <0.11.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
           "dependencies": {
             "assert-plus": {
               "version": "0.1.5",
-              "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
             },
             "asn1": {
               "version": "0.1.11",
-              "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+              "from": "asn1@0.1.11",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
             },
             "ctype": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+              "from": "ctype@0.5.3",
               "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
             }
           }
         },
         "oauth-sign": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
         },
         "hawk": {
           "version": "1.1.1",
-          "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "from": "hawk@1.1.1",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
           "dependencies": {
             "hoek": {
               "version": "0.9.1",
-              "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+              "from": "hoek@>=0.9.0 <0.10.0",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
             },
             "boom": {
               "version": "0.4.2",
-              "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+              "from": "boom@>=0.4.0 <0.5.0",
               "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
             },
             "cryptiles": {
               "version": "0.2.2",
-              "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
             },
             "sntp": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+              "from": "sntp@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
             }
           }
         },
         "aws-sign2": {
           "version": "0.5.0",
-          "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
         },
         "stringstream": {
           "version": "0.0.5",
-          "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "from": "stringstream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+              "from": "delayed-stream@0.0.5",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
             }
           }
         }
       }
     },
-    "request-progress": {
-      "version": "0.3.1",
-      "from": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-      "dependencies": {
-        "throttleit": {
-          "version": "0.0.2",
-          "from": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-          "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-        }
-      }
-    },
     "semver": {
       "version": "4.3.6",
-      "from": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "from": "semver@>=4.2.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
     },
     "serve-static": {
       "version": "1.7.1",
-      "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "from": "serve-static@1.7.1",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
       "dependencies": {
         "escape-html": {
           "version": "1.0.1",
-          "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz",
+          "from": "escape-html@1.0.1",
           "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
         },
         "parseurl": {
           "version": "1.3.0",
-          "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz",
+          "from": "parseurl@>=1.3.0 <1.4.0",
           "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
         },
         "send": {
           "version": "0.10.1",
-          "from": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "from": "send@0.10.1",
           "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
           "dependencies": {
             "debug": {
               "version": "2.1.3",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "from": "debug@>=2.1.0 <2.2.0",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
               "dependencies": {
                 "ms": {
                   "version": "0.7.0",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz",
+                  "from": "ms@0.7.0",
                   "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
                 }
               }
             },
             "depd": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
+              "from": "depd@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
             },
             "destroy": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz",
+              "from": "destroy@1.0.3",
               "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
             },
             "etag": {
               "version": "1.5.1",
-              "from": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz",
+              "from": "etag@>=1.5.0 <1.6.0",
               "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
             },
             "fresh": {
               "version": "0.2.4",
-              "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz",
+              "from": "fresh@0.2.4",
               "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+              "from": "mime@1.2.11",
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "ms": {
               "version": "0.6.2",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+              "from": "ms@0.6.2",
               "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
             },
             "on-finished": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "from": "on-finished@>=2.1.1 <2.2.0",
               "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
               "dependencies": {
                 "ee-first": {
                   "version": "1.1.0",
-                  "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz",
+                  "from": "ee-first@1.1.0",
                   "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
                 }
               }
             },
             "range-parser": {
               "version": "1.0.3",
-              "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz",
+              "from": "range-parser@>=1.0.2 <1.1.0",
               "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
             }
           }
         },
         "utils-merge": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "from": "utils-merge@1.0.0",
           "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
         }
       }
     },
     "shelljs": {
       "version": "0.2.6",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "from": "shelljs@0.2.6",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
     },
     "tiny-lr-fork": {
       "version": "0.0.5",
-      "from": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "from": "tiny-lr-fork@0.0.5",
       "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
       "dependencies": {
         "qs": {
           "version": "0.5.6",
-          "from": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz",
+          "from": "qs@>=0.5.2 <0.6.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
         },
         "faye-websocket": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
         },
         "noptify": {
           "version": "0.0.3",
-          "from": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "from": "noptify@>=0.0.3 <0.1.0",
           "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
           "dependencies": {
             "nopt": {
               "version": "2.0.0",
-              "from": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "from": "nopt@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
-                  "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                 }
               }
@@ -7161,88 +7665,88 @@
         },
         "debug": {
           "version": "0.7.4",
-          "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+          "from": "debug@>=0.7.0 <0.8.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
         }
       }
     },
     "underscore": {
       "version": "1.7.0",
-      "from": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "from": "underscore@>=1.7.0 <1.8.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
     },
     "unzip": {
       "version": "0.1.9",
-      "from": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "from": "unzip@0.1.9",
       "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
       "dependencies": {
         "fstream": {
           "version": "0.1.31",
-          "from": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "from": "fstream@>=0.1.21 <0.2.0",
           "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
           "dependencies": {
             "graceful-fs": {
               "version": "3.0.8",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.4.3",
-              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "from": "rimraf@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
-                  "from": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "from": "glob@>=5.0.14 <6.0.0",
                   "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "3.0.0",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
                           "version": "1.1.1",
-                          "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                           "dependencies": {
                             "balanced-match": {
                               "version": "0.2.1",
-                              "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
+                              "from": "balanced-match@>=0.2.0 <0.3.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
-                              "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                              "from": "concat-map@0.0.1",
                               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                             }
                           }
@@ -7251,19 +7755,19 @@
                     },
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "path-is-absolute": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
@@ -7274,85 +7778,85 @@
         },
         "pullstream": {
           "version": "0.4.1",
-          "from": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "from": "pullstream@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
           "dependencies": {
             "over": {
               "version": "0.0.5",
-              "from": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
+              "from": "over@>=0.0.5 <1.0.0",
               "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
             },
             "slice-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
             }
           }
         },
         "binary": {
           "version": "0.3.0",
-          "from": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "from": "binary@>=0.3.0 <0.4.0",
           "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
           "dependencies": {
             "chainsaw": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
               "dependencies": {
                 "traverse": {
                   "version": "0.3.9",
-                  "from": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+                  "from": "traverse@>=0.3.0 <0.4.0",
                   "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
                 }
               }
             },
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
         },
         "readable-stream": {
           "version": "1.0.33",
-          "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "from": "isarray@0.0.1",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
         },
         "setimmediate": {
           "version": "1.0.4",
-          "from": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
           "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
         },
         "match-stream": {
           "version": "0.0.2",
-          "from": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "from": "match-stream@>=0.0.2 <0.1.0",
           "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
           "dependencies": {
             "buffers": {
               "version": "0.1.1",
-              "from": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+              "from": "buffers@>=0.1.1 <0.2.0",
               "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
             }
           }
@@ -7361,44 +7865,44 @@
     },
     "vinyl-fs": {
       "version": "0.3.7",
-      "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "from": "vinyl-fs@0.3.7",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
       "dependencies": {
         "glob-stream": {
           "version": "3.1.18",
-          "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
           "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
           "dependencies": {
             "glob": {
               "version": "4.5.3",
-              "from": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "from": "glob@>=4.3.1 <5.0.0",
               "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
               "dependencies": {
                 "inflight": {
                   "version": "1.0.4",
-                  "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "from": "inflight@>=1.0.4 <2.0.0",
                   "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
                   "version": "1.3.2",
-                  "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "from": "once@>=1.3.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                     }
                   }
@@ -7407,22 +7911,22 @@
             },
             "minimatch": {
               "version": "2.0.10",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+              "from": "minimatch@>=2.0.1 <3.0.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.1",
-                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.2.1",
-                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz",
+                      "from": "balanced-match@>=0.2.0 <0.3.0",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "from": "concat-map@0.0.1",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -7431,78 +7935,78 @@
             },
             "ordered-read-streams": {
               "version": "0.1.0",
-              "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
               "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
             },
             "glob2base": {
               "version": "0.0.12",
-              "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "from": "glob2base@>=0.0.12 <0.0.13",
               "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
               "dependencies": {
                 "find-index": {
                   "version": "0.1.1",
-                  "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                  "from": "find-index@>=0.1.1 <0.2.0",
                   "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                 }
               }
             },
             "unique-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
             }
           }
         },
         "glob-watcher": {
           "version": "0.0.6",
-          "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
           "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
           "dependencies": {
             "gaze": {
               "version": "0.5.2",
-              "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "from": "gaze@>=0.5.1 <0.6.0",
               "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
               "dependencies": {
                 "globule": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "from": "globule@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                   "dependencies": {
                     "lodash": {
                       "version": "1.0.2",
-                      "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+                      "from": "lodash@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                     },
                     "glob": {
                       "version": "3.1.21",
-                      "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "from": "glob@>=3.1.21 <3.2.0",
                       "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                       "dependencies": {
                         "graceful-fs": {
                           "version": "1.2.3",
-                          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
                           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                         },
                         "inherits": {
                           "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+                          "from": "inherits@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
                         }
                       }
                     },
                     "minimatch": {
                       "version": "0.2.14",
-                      "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
                           "version": "2.7.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
@@ -7515,95 +8019,95 @@
         },
         "graceful-fs": {
           "version": "3.0.8",
-          "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
         },
         "lodash": {
           "version": "2.4.2",
-          "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "from": "lodash@>=2.4.1 <3.0.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
         },
         "mkdirp": {
           "version": "0.5.1",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "from": "minimist@0.0.8",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
             }
           }
         },
         "strip-bom": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
           "dependencies": {
             "first-chunk-stream": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
             },
             "is-utf8": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
             }
           }
         },
         "through2": {
           "version": "0.6.5",
-          "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "from": "through2@>=0.6.1 <0.7.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
             },
             "xtend": {
               "version": "4.0.1",
-              "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
             }
           }
         },
         "vinyl": {
           "version": "0.4.6",
-          "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "from": "vinyl@>=0.4.0 <0.5.0",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
           "dependencies": {
             "clone": {
               "version": "0.2.0",
-              "from": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+              "from": "clone@>=0.2.0 <0.3.0",
               "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
             },
             "clone-stats": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
               "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
             }
           }
@@ -7612,22 +8116,22 @@
     },
     "xml2js": {
       "version": "0.4.4",
-      "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "from": "xml2js@0.4.4",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
       "dependencies": {
         "sax": {
           "version": "0.6.1",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
+          "from": "sax@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
         },
         "xmlbuilder": {
-          "version": "4.0.0",
-          "from": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
+          "version": "4.1.0",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
           "dependencies": {
             "lodash": {
               "version": "3.10.1",
-              "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "from": "lodash@>=3.5.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
             }
           }
diff --git a/package.json b/package.json
index a8776c6837..3626a94c9b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 2a3dc27e1f1be4ff0285eba251681f46ae543c6b Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 27 Nov 2015 19:58:33 -0600
Subject: [PATCH 0839/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f7c84bf05..3e5242f3b1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!) easy integration with the [Ionic Platform], a set of mobile services perfect for Ionic apps.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!)  integration with the [Ionic Platform](http://ionic.io/), a set of mobile services perfect for Ionic apps.
 
 Use the `ionic --help` command for more detailed task information.
 

From 4ef72d78f226d25a136269f94f583da4cbef6e83 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 15:06:25 -0600
Subject: [PATCH 0840/1100] Package

---
 npm-shrinkwrap.json | 618 ++++++++++++++++++++++++--------------------
 package.json        |   2 +-
 2 files changed, 338 insertions(+), 282 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f650289ada..0f601ee875 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -77,9 +77,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -198,9 +198,9 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "2.7.0",
+          "version": "2.7.3",
           "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
         }
       }
     },
@@ -289,7 +289,7 @@
       "dependencies": {
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -434,18 +434,18 @@
               }
             },
             "dateformat": {
-              "version": "1.0.11",
+              "version": "1.0.12",
               "from": "dateformat@>=1.0.11 <2.0.0",
-              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
               "dependencies": {
                 "get-stdin": {
-                  "version": "5.0.1",
-                  "from": "get-stdin@*",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"
+                  "version": "4.0.1",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
                 },
                 "meow": {
                   "version": "3.6.0",
-                  "from": "meow@*",
+                  "from": "meow@>=3.3.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
@@ -511,15 +511,15 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
                             },
                             "spdx-expression-parse": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
+                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
                               "dependencies": {
                                 "spdx-exceptions": {
                                   "version": "1.0.4",
@@ -528,7 +528,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -703,14 +703,7 @@
                         "strip-indent": {
                           "version": "1.0.1",
                           "from": "strip-indent@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-                          "dependencies": {
-                            "get-stdin": {
-                              "version": "4.0.1",
-                              "from": "get-stdin@>=4.0.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-                            }
-                          }
+                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
                         }
                       }
                     },
@@ -854,9 +847,9 @@
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
@@ -900,9 +893,9 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
@@ -915,9 +908,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.3",
+                      "version": "1.0.5",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -988,9 +981,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.7.0",
+                          "version": "2.7.3",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -1041,9 +1034,9 @@
               "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
               "dependencies": {
                 "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -1106,9 +1099,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -1209,9 +1202,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.7.0",
+                          "version": "2.7.3",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -1228,9 +1221,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.7.0",
+                      "version": "2.7.3",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -1271,18 +1264,25 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
           "dependencies": {
             "cross-spawn-async": {
-              "version": "2.0.0",
+              "version": "2.0.1",
               "from": "cross-spawn-async@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.7.0",
-                  "from": "lru-cache@>=2.6.5 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                  "version": "3.2.0",
+                  "from": "lru-cache@>=3.2.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+                  "dependencies": {
+                    "pseudomap": {
+                      "version": "1.0.1",
+                      "from": "pseudomap@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
+                    }
+                  }
                 },
                 "which": {
                   "version": "1.2.0",
-                  "from": "which@>=1.1.1 <2.0.0",
+                  "from": "which@>=1.2.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
                   "dependencies": {
                     "is-absolute": {
@@ -1327,9 +1327,9 @@
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
@@ -1337,9 +1337,9 @@
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "process-nextick-args": {
-                          "version": "1.0.3",
+                          "version": "1.0.5",
                           "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
@@ -1390,9 +1390,9 @@
                   "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
                   "dependencies": {
                     "JSONStream": {
-                      "version": "1.0.6",
+                      "version": "1.0.7",
                       "from": "JSONStream@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.6.tgz",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
                       "dependencies": {
                         "jsonparse": {
                           "version": "1.2.0",
@@ -1465,9 +1465,9 @@
                               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                               "dependencies": {
                                 "core-util-is": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                                 }
                               }
                             },
@@ -1503,9 +1503,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.5.2",
+                      "version": "3.5.3",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.2.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1627,9 +1627,9 @@
                           "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.1.1",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
+                              "version": "4.4.0",
+                              "from": "bn.js@>=4.1.1 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "4.0.0",
@@ -1659,9 +1659,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "4.0.0",
+                                  "version": "4.2.1",
                                   "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.0.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1702,9 +1702,9 @@
                           "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.1.1",
+                              "version": "4.4.0",
                               "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
                             },
                             "elliptic": {
                               "version": "6.0.2",
@@ -1758,9 +1758,9 @@
                           "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.1.1",
+                              "version": "4.4.0",
                               "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
                             },
                             "miller-rabin": {
                               "version": "4.0.0",
@@ -1787,9 +1787,9 @@
                           "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.1.1",
+                              "version": "4.4.0",
                               "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.1.1.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
                             },
                             "browserify-rsa": {
                               "version": "4.0.0",
@@ -1802,9 +1802,9 @@
                               "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
                               "dependencies": {
                                 "asn1.js": {
-                                  "version": "4.0.0",
+                                  "version": "4.2.1",
                                   "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.0.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
                                   "dependencies": {
                                     "minimalistic-assert": {
                                       "version": "1.0.0",
@@ -1956,7 +1956,7 @@
                         },
                         "is-buffer": {
                           "version": "1.1.0",
-                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                          "from": "is-buffer@>=1.1.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
                         },
                         "lexical-scope": {
@@ -2042,9 +2042,9 @@
                                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                                   "dependencies": {
                                     "core-util-is": {
-                                      "version": "1.0.1",
+                                      "version": "1.0.2",
                                       "from": "core-util-is@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                                     }
                                   }
                                 },
@@ -2114,9 +2114,9 @@
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         }
                       }
                     },
@@ -2291,7 +2291,7 @@
                               "dependencies": {
                                 "align-text": {
                                   "version": "0.1.3",
-                                  "from": "align-text@>=0.1.0 <0.2.0",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                                   "dependencies": {
                                     "kind-of": {
@@ -2332,7 +2332,7 @@
                               "dependencies": {
                                 "align-text": {
                                   "version": "0.1.3",
-                                  "from": "align-text@>=0.1.0 <0.2.0",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                                   "dependencies": {
                                     "kind-of": {
@@ -2415,9 +2415,9 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.7.0",
+                              "version": "2.7.3",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
@@ -2589,9 +2589,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.7.0",
+                      "version": "2.7.3",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -2601,9 +2601,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.2",
+                  "version": "1.3.3",
                   "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -2647,14 +2647,14 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -2666,9 +2666,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -2779,9 +2779,9 @@
                       }
                     },
                     "spdx-expression-parse": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
                       "dependencies": {
                         "spdx-exceptions": {
                           "version": "1.0.4",
@@ -2790,7 +2790,7 @@
                         },
                         "spdx-license-ids": {
                           "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                         }
                       }
@@ -2812,9 +2812,9 @@
               }
             },
             "npm": {
-              "version": "2.14.11",
+              "version": "2.14.13",
               "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.11.tgz",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.13.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
@@ -3057,9 +3057,9 @@
                   }
                 },
                 "node-gyp": {
-                  "version": "3.0.3",
-                  "from": "node-gyp@3.0.3",
-                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+                  "version": "3.2.0",
+                  "from": "node-gyp@>=3.2.0 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
                   "dependencies": {
                     "glob": {
                       "version": "4.5.3",
@@ -3232,11 +3232,6 @@
                           }
                         }
                       }
-                    },
-                    "tar": {
-                      "version": "1.0.3",
-                      "from": "tar@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
                     }
                   }
                 },
@@ -3388,13 +3383,13 @@
                   "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
                 },
                 "npm-registry-client": {
-                  "version": "7.0.7",
-                  "from": "npm-registry-client@7.0.7",
+                  "version": "7.0.8",
+                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
                   "dependencies": {
                     "concat-stream": {
-                      "version": "1.5.0",
+                      "version": "1.5.1",
                       "from": "concat-stream@>=1.4.6 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
                       "dependencies": {
                         "typedarray": {
                           "version": "0.0.6",
@@ -3402,9 +3397,9 @@
                           "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
                         },
                         "readable-stream": {
-                          "version": "2.0.2",
+                          "version": "2.0.4",
                           "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                           "dependencies": {
                             "core-util-is": {
                               "version": "1.0.1",
@@ -3427,9 +3422,9 @@
                               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                             },
                             "util-deprecate": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                             }
                           }
                         }
@@ -3999,11 +3994,6 @@
                   "version": "1.0.0",
                   "from": "sorted-object@"
                 },
-                "spdx": {
-                  "version": "0.4.1",
-                  "from": "spdx@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz"
-                },
                 "tar": {
                   "version": "2.2.1",
                   "from": "tar@2.2.1"
@@ -4024,23 +4014,23 @@
                 },
                 "validate-npm-package-license": {
                   "version": "3.0.1",
-                  "from": "validate-npm-package-license@3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
                   "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
                   "dependencies": {
                     "spdx-correct": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
                     },
                     "spdx-expression-parse": {
-                      "version": "1.0.0",
+                      "version": "1.0.2",
                       "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
                       "dependencies": {
                         "spdx-exceptions": {
-                          "version": "1.0.2",
-                          "from": "spdx-exceptions@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
                         }
                       }
                     }
@@ -4154,9 +4144,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.2",
+                  "version": "1.3.3",
                   "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -4259,9 +4249,9 @@
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
@@ -4438,9 +4428,9 @@
                       }
                     },
                     "rimraf": {
-                      "version": "2.4.3",
+                      "version": "2.4.4",
                       "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
                       "dependencies": {
                         "glob": {
                           "version": "5.0.15",
@@ -4465,14 +4455,14 @@
                               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                               "dependencies": {
                                 "brace-expansion": {
-                                  "version": "1.1.1",
+                                  "version": "1.1.2",
                                   "from": "brace-expansion@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                                   "dependencies": {
                                     "balanced-match": {
-                                      "version": "0.2.1",
-                                      "from": "balanced-match@>=0.2.0 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                      "version": "0.3.0",
+                                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                                     },
                                     "concat-map": {
                                       "version": "0.0.1",
@@ -4484,9 +4474,9 @@
                               }
                             },
                             "once": {
-                              "version": "1.3.2",
+                              "version": "1.3.3",
                               "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                               "dependencies": {
                                 "wrappy": {
                                   "version": "1.0.1",
@@ -4524,9 +4514,9 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
@@ -4540,7 +4530,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -4675,9 +4665,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.7.0",
+                          "version": "2.7.3",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -4723,14 +4713,14 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                   "dependencies": {
                     "brace-expansion": {
-                      "version": "1.1.1",
+                      "version": "1.1.2",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                       "dependencies": {
                         "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                         },
                         "concat-map": {
                           "version": "0.0.1",
@@ -4742,9 +4732,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.2",
+                  "version": "1.3.3",
                   "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -4839,9 +4829,9 @@
                           }
                         },
                         "spdx-expression-parse": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
                           "dependencies": {
                             "spdx-exceptions": {
                               "version": "1.0.4",
@@ -5093,9 +5083,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.2",
+                  "version": "1.3.3",
                   "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -5129,9 +5119,9 @@
               }
             },
             "node-gyp": {
-              "version": "3.1.0",
+              "version": "3.2.0",
               "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.1.0.tgz",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
               "dependencies": {
                 "fstream": {
                   "version": "1.0.8",
@@ -5173,14 +5163,14 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -5192,9 +5182,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -5216,9 +5206,9 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                   "dependencies": {
                     "lru-cache": {
-                      "version": "2.7.0",
+                      "version": "2.7.3",
                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                     },
                     "sigmund": {
                       "version": "1.0.1",
@@ -5265,9 +5255,9 @@
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                           "dependencies": {
                             "core-util-is": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                             },
                             "isarray": {
                               "version": "0.0.1",
@@ -5418,9 +5408,9 @@
                   }
                 },
                 "rimraf": {
-                  "version": "2.4.3",
+                  "version": "2.4.4",
                   "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
                   "dependencies": {
                     "glob": {
                       "version": "5.0.15",
@@ -5450,14 +5440,14 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                           "dependencies": {
                             "brace-expansion": {
-                              "version": "1.1.1",
+                              "version": "1.1.2",
                               "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                               "dependencies": {
                                 "balanced-match": {
-                                  "version": "0.2.1",
-                                  "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                                 },
                                 "concat-map": {
                                   "version": "0.0.1",
@@ -5469,9 +5459,9 @@
                           }
                         },
                         "once": {
-                          "version": "1.3.2",
+                          "version": "1.3.3",
                           "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                           "dependencies": {
                             "wrappy": {
                               "version": "1.0.1",
@@ -5528,9 +5518,9 @@
               }
             },
             "request": {
-              "version": "2.65.0",
+              "version": "2.67.0",
               "from": "request@>=2.61.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
               "dependencies": {
                 "bl": {
                   "version": "1.0.0",
@@ -5543,9 +5533,9 @@
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                       "dependencies": {
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
@@ -5558,9 +5548,9 @@
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "process-nextick-args": {
-                          "version": "1.0.3",
+                          "version": "1.0.5",
                           "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
@@ -5609,20 +5599,20 @@
                   "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                 },
                 "mime-types": {
-                  "version": "2.1.7",
+                  "version": "2.1.8",
                   "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.19.0",
-                      "from": "mime-db@>=1.19.0 <1.20.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                      "version": "1.20.0",
+                      "from": "mime-db@>=1.20.0 <1.21.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
                     }
                   }
                 },
                 "node-uuid": {
                   "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.3 <1.5.0",
+                  "from": "node-uuid@>=1.4.7 <1.5.0",
                   "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                 },
                 "qs": {
@@ -5641,24 +5631,85 @@
                   "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
                 },
                 "http-signature": {
-                  "version": "0.11.0",
-                  "from": "http-signature@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                  "version": "1.1.0",
+                  "from": "http-signature@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
                   "dependencies": {
                     "assert-plus": {
                       "version": "0.1.5",
                       "from": "assert-plus@>=0.1.5 <0.2.0",
                       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                     },
-                    "asn1": {
-                      "version": "0.1.11",
-                      "from": "asn1@0.1.11",
-                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    "jsprim": {
+                      "version": "1.2.2",
+                      "from": "jsprim@>=1.2.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
+                      "dependencies": {
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "from": "extsprintf@1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                        },
+                        "json-schema": {
+                          "version": "0.2.2",
+                          "from": "json-schema@0.2.2",
+                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                        },
+                        "verror": {
+                          "version": "1.3.6",
+                          "from": "verror@1.3.6",
+                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                        }
+                      }
                     },
-                    "ctype": {
-                      "version": "0.5.3",
-                      "from": "ctype@0.5.3",
-                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    "sshpk": {
+                      "version": "1.7.1",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
+                      "dependencies": {
+                        "asn1": {
+                          "version": "0.2.3",
+                          "from": "asn1@>=0.2.3 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                        },
+                        "assert-plus": {
+                          "version": "0.2.0",
+                          "from": "assert-plus@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                        },
+                        "dashdash": {
+                          "version": "1.10.1",
+                          "from": "dashdash@>=1.10.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
+                          "dependencies": {
+                            "assert-plus": {
+                              "version": "0.1.5",
+                              "from": "assert-plus@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                            }
+                          }
+                        },
+                        "jsbn": {
+                          "version": "0.1.0",
+                          "from": "jsbn@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                        },
+                        "tweetnacl": {
+                          "version": "0.13.2",
+                          "from": "tweetnacl@>=0.13.0 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                        },
+                        "jodid25519": {
+                          "version": "1.0.2",
+                          "from": "jodid25519@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                        },
+                        "ecc-jsbn": {
+                          "version": "0.1.1",
+                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                        }
+                      }
                     }
                   }
                 },
@@ -5668,9 +5719,9 @@
                   "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
                 },
                 "hawk": {
-                  "version": "3.1.1",
+                  "version": "3.1.2",
                   "from": "hawk@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
                   "dependencies": {
                     "hoek": {
                       "version": "2.16.3",
@@ -5679,7 +5730,7 @@
                     },
                     "boom": {
                       "version": "2.10.1",
-                      "from": "boom@>=2.8.0 <3.0.0",
+                      "from": "boom@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                     },
                     "cryptiles": {
@@ -5721,14 +5772,19 @@
                   "from": "isstream@>=0.1.2 <0.2.0",
                   "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                 },
+                "is-typedarray": {
+                  "version": "1.0.0",
+                  "from": "is-typedarray@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                },
                 "har-validator": {
-                  "version": "2.0.2",
+                  "version": "2.0.3",
                   "from": "har-validator@>=2.0.2 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
+                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
                   "dependencies": {
                     "commander": {
                       "version": "2.9.0",
-                      "from": "commander@>=2.8.1 <3.0.0",
+                      "from": "commander@>=2.9.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                       "dependencies": {
                         "graceful-readlink": {
@@ -5740,7 +5796,7 @@
                     },
                     "is-my-json-valid": {
                       "version": "2.12.3",
-                      "from": "is-my-json-valid@>=2.12.2 <3.0.0",
+                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
                       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
                       "dependencies": {
                         "generate-function": {
@@ -5773,14 +5829,14 @@
                       }
                     },
                     "pinkie-promise": {
-                      "version": "1.0.0",
-                      "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                      "version": "2.0.0",
+                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                       "dependencies": {
                         "pinkie": {
-                          "version": "1.0.0",
-                          "from": "pinkie@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                          "version": "2.0.1",
+                          "from": "pinkie@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                         }
                       }
                     }
@@ -5809,9 +5865,9 @@
                       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                     },
                     "cliui": {
-                      "version": "3.0.3",
+                      "version": "3.1.0",
                       "from": "cliui@>=3.0.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.0.3.tgz",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
                       "dependencies": {
                         "string-width": {
                           "version": "1.0.1",
@@ -5914,9 +5970,9 @@
               "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
               "dependencies": {
                 "once": {
-                  "version": "1.3.2",
+                  "version": "1.3.3",
                   "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -5996,9 +6052,9 @@
                   }
                 },
                 "rimraf": {
-                  "version": "2.4.3",
+                  "version": "2.4.4",
                   "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
                   "dependencies": {
                     "glob": {
                       "version": "5.0.15",
@@ -6023,14 +6079,14 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                           "dependencies": {
                             "brace-expansion": {
-                              "version": "1.1.1",
+                              "version": "1.1.2",
                               "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                               "dependencies": {
                                 "balanced-match": {
-                                  "version": "0.2.1",
-                                  "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                                 },
                                 "concat-map": {
                                   "version": "0.0.1",
@@ -6042,9 +6098,9 @@
                           }
                         },
                         "once": {
-                          "version": "1.3.2",
+                          "version": "1.3.3",
                           "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                           "dependencies": {
                             "wrappy": {
                               "version": "1.0.1",
@@ -6111,9 +6167,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -6167,9 +6223,9 @@
                   "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
                   "dependencies": {
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -6186,9 +6242,9 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
@@ -6201,9 +6257,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.3",
+                      "version": "1.0.5",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -6247,9 +6303,9 @@
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -6266,14 +6322,14 @@
                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
                   "dependencies": {
                     "brace-expansion": {
-                      "version": "1.1.1",
+                      "version": "1.1.2",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                       "dependencies": {
                         "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                         },
                         "concat-map": {
                           "version": "0.0.1",
@@ -6322,9 +6378,9 @@
                               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                               "dependencies": {
                                 "core-util-is": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
@@ -6337,9 +6393,9 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "process-nextick-args": {
-                                  "version": "1.0.3",
+                                  "version": "1.0.5",
                                   "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
                                 },
                                 "string_decoder": {
                                   "version": "0.10.31",
@@ -6409,9 +6465,9 @@
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                           "dependencies": {
                             "lru-cache": {
-                              "version": "2.7.0",
+                              "version": "2.7.3",
                               "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
@@ -6481,9 +6537,9 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
-                      "version": "1.0.1",
+                      "version": "1.0.2",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
@@ -7233,9 +7289,9 @@
               }
             },
             "rimraf": {
-              "version": "2.4.3",
+              "version": "2.4.4",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
@@ -7265,14 +7321,14 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -7284,9 +7340,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -7371,9 +7427,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
@@ -7708,9 +7764,9 @@
               }
             },
             "rimraf": {
-              "version": "2.4.3",
+              "version": "2.4.4",
               "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
               "dependencies": {
                 "glob": {
                   "version": "5.0.15",
@@ -7735,14 +7791,14 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.1",
+                          "version": "1.1.2",
                           "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.1",
-                              "from": "balanced-match@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -7754,9 +7810,9 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
@@ -7823,9 +7879,9 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
-              "version": "1.0.1",
+              "version": "1.0.2",
               "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
             },
             "isarray": {
               "version": "0.0.1",
@@ -7896,9 +7952,9 @@
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                   "dependencies": {
                     "wrappy": {
                       "version": "1.0.1",
@@ -7915,14 +7971,14 @@
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
               "dependencies": {
                 "brace-expansion": {
-                  "version": "1.1.1",
+                  "version": "1.1.2",
                   "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                   "dependencies": {
                     "balanced-match": {
-                      "version": "0.2.1",
-                      "from": "balanced-match@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                      "version": "0.3.0",
+                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
@@ -8000,9 +8056,9 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.7.0",
+                          "version": "2.7.3",
                           "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                         },
                         "sigmund": {
                           "version": "1.0.1",
@@ -8067,9 +8123,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
diff --git a/package.json b/package.json
index 3626a94c9b..8dbaa6942b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 40294f7f9bb88bfa122fc8e9812a78097c370aaf Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 14 Dec 2015 10:38:57 -0600
Subject: [PATCH 0841/1100] use bundledDependencies

Using bundledDependencies cuts down on the number of network requests
needed to install ionic. Attempts to mitigate
https://github.com/npm/npm/issues/8196.
---
 npm-shrinkwrap.json | 8198 -------------------------------------------
 package.json        |   36 +-
 2 files changed, 35 insertions(+), 8199 deletions(-)
 delete mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index 0f601ee875..0000000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,8198 +0,0 @@
-{
-  "name": "ionic",
-  "version": "1.7.10",
-  "dependencies": {
-    "async": {
-      "version": "0.9.2",
-      "from": "async@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-    },
-    "cheerio": {
-      "version": "0.19.0",
-      "from": "cheerio@>=0.19.0 <0.20.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
-      "dependencies": {
-        "css-select": {
-          "version": "1.0.0",
-          "from": "css-select@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
-          "dependencies": {
-            "css-what": {
-              "version": "1.0.0",
-              "from": "css-what@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
-            },
-            "domutils": {
-              "version": "1.4.3",
-              "from": "domutils@>=1.4.0 <1.5.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
-              "dependencies": {
-                "domelementtype": {
-                  "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-                }
-              }
-            },
-            "boolbase": {
-              "version": "1.0.0",
-              "from": "boolbase@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
-            },
-            "nth-check": {
-              "version": "1.0.1",
-              "from": "nth-check@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
-            }
-          }
-        },
-        "entities": {
-          "version": "1.1.1",
-          "from": "entities@>=1.1.1 <1.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
-        },
-        "htmlparser2": {
-          "version": "3.8.3",
-          "from": "htmlparser2@>=3.8.1 <3.9.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-          "dependencies": {
-            "domhandler": {
-              "version": "2.3.0",
-              "from": "domhandler@>=2.3.0 <2.4.0",
-              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
-            },
-            "domutils": {
-              "version": "1.5.1",
-              "from": "domutils@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
-            },
-            "domelementtype": {
-              "version": "1.3.0",
-              "from": "domelementtype@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-            },
-            "readable-stream": {
-              "version": "1.1.13",
-              "from": "readable-stream@>=1.1.0 <1.2.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "entities": {
-              "version": "1.0.0",
-              "from": "entities@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
-            }
-          }
-        },
-        "dom-serializer": {
-          "version": "0.1.0",
-          "from": "dom-serializer@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.1.3",
-              "from": "domelementtype@>=1.1.1 <1.2.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
-            }
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        }
-      }
-    },
-    "cli-table": {
-      "version": "0.3.1",
-      "from": "cli-table@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "from": "colors@1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-        }
-      }
-    },
-    "colors": {
-      "version": "0.6.2",
-      "from": "colors@0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-    },
-    "connect": {
-      "version": "3.1.1",
-      "from": "connect@3.1.1",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "1.0.4",
-          "from": "debug@1.0.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "finalhandler": {
-          "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
-          "dependencies": {
-            "escape-html": {
-              "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-            }
-          }
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "connect-livereload": {
-      "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
-    },
-    "crc": {
-      "version": "3.2.1",
-      "from": "crc@3.2.1",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
-    },
-    "cross-spawn": {
-      "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.7.3",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-        }
-      }
-    },
-    "event-stream": {
-      "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-      "dependencies": {
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        },
-        "duplexer": {
-          "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-        },
-        "from": {
-          "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
-        },
-        "map-stream": {
-          "version": "0.0.6",
-          "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
-        },
-        "pause-stream": {
-          "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
-          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
-        },
-        "split": {
-          "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
-        },
-        "stream-combiner": {
-          "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "1.2.0",
-      "from": "expand-tilde@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
-      "dependencies": {
-        "user-home": {
-          "version": "1.1.1",
-          "from": "user-home@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        }
-      }
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "from": "form-data@0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "dependencies": {
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-        }
-      }
-    },
-    "gulp": {
-      "version": "3.8.8",
-      "from": "gulp@3.8.8",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
-      "dependencies": {
-        "archy": {
-          "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
-          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-            },
-            "has-ansi": {
-              "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "strip-ansi": {
-              "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "supports-color": {
-              "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
-            }
-          }
-        },
-        "deprecated": {
-          "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
-          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
-        },
-        "gulp-util": {
-          "version": "3.0.7",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
-          "dependencies": {
-            "array-differ": {
-              "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
-            },
-            "array-uniq": {
-              "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
-            },
-            "beeper": {
-              "version": "1.1.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "dateformat": {
-              "version": "1.0.12",
-              "from": "dateformat@>=1.0.11 <2.0.0",
-              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-              "dependencies": {
-                "get-stdin": {
-                  "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-                },
-                "meow": {
-                  "version": "3.6.0",
-                  "from": "meow@>=3.3.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-                  "dependencies": {
-                    "camelcase-keys": {
-                      "version": "2.0.0",
-                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "2.0.1",
-                          "from": "camelcase@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                        },
-                        "map-obj": {
-                          "version": "1.0.1",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "loud-rejection": {
-                      "version": "1.2.0",
-                      "from": "loud-rejection@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                      "dependencies": {
-                        "signal-exit": {
-                          "version": "2.1.2",
-                          "from": "signal-exit@>=2.1.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "validate-npm-package-license": {
-                          "version": "3.0.1",
-                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                          "dependencies": {
-                            "spdx-correct": {
-                              "version": "1.0.2",
-                              "from": "spdx-correct@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            },
-                            "spdx-expression-parse": {
-                              "version": "1.0.2",
-                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-exceptions": {
-                                  "version": "1.0.4",
-                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                                },
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "object-assign": {
-                      "version": "4.0.1",
-                      "from": "object-assign@>=4.0.1 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                    },
-                    "read-pkg-up": {
-                      "version": "1.0.1",
-                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                      "dependencies": {
-                        "find-up": {
-                          "version": "1.1.0",
-                          "from": "find-up@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                          "dependencies": {
-                            "path-exists": {
-                              "version": "2.1.0",
-                              "from": "path-exists@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "read-pkg": {
-                          "version": "1.1.0",
-                          "from": "read-pkg@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                          "dependencies": {
-                            "load-json-file": {
-                              "version": "1.1.0",
-                              "from": "load-json-file@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "parse-json": {
-                                  "version": "2.2.0",
-                                  "from": "parse-json@>=2.2.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                                  "dependencies": {
-                                    "error-ex": {
-                                      "version": "1.3.0",
-                                      "from": "error-ex@>=1.2.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                      "dependencies": {
-                                        "is-arrayish": {
-                                          "version": "0.2.1",
-                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                },
-                                "strip-bom": {
-                                  "version": "2.0.0",
-                                  "from": "strip-bom@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                                  "dependencies": {
-                                    "is-utf8": {
-                                      "version": "0.2.0",
-                                      "from": "is-utf8@>=0.2.0 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "path-type": {
-                              "version": "1.1.0",
-                              "from": "path-type@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "redent": {
-                      "version": "1.0.0",
-                      "from": "redent@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                      "dependencies": {
-                        "indent-string": {
-                          "version": "2.1.0",
-                          "from": "indent-string@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                          "dependencies": {
-                            "repeating": {
-                              "version": "2.0.0",
-                              "from": "repeating@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                              "dependencies": {
-                                "is-finite": {
-                                  "version": "1.0.1",
-                                  "from": "is-finite@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                                  "dependencies": {
-                                    "number-is-nan": {
-                                      "version": "1.0.0",
-                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "strip-indent": {
-                          "version": "1.0.1",
-                          "from": "strip-indent@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "trim-newlines": {
-                      "version": "1.0.0",
-                      "from": "trim-newlines@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "fancy-log": {
-              "version": "1.1.0",
-              "from": "fancy-log@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
-            },
-            "gulplog": {
-              "version": "1.0.0",
-              "from": "gulplog@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-              "dependencies": {
-                "glogg": {
-                  "version": "1.0.0",
-                  "from": "glogg@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-                  "dependencies": {
-                    "sparkles": {
-                      "version": "1.0.0",
-                      "from": "sparkles@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "has-gulplog": {
-              "version": "0.1.0",
-              "from": "has-gulplog@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-              "dependencies": {
-                "sparkles": {
-                  "version": "1.0.0",
-                  "from": "sparkles@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                }
-              }
-            },
-            "lodash._reescape": {
-              "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-            },
-            "lodash._reevaluate": {
-              "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-            },
-            "lodash._reinterpolate": {
-              "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-            },
-            "lodash.template": {
-              "version": "3.6.2",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-              "dependencies": {
-                "lodash._basecopy": {
-                  "version": "3.0.1",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-                },
-                "lodash._basetostring": {
-                  "version": "3.0.1",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                },
-                "lodash._basevalues": {
-                  "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
-                },
-                "lodash._isiterateecall": {
-                  "version": "3.0.9",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-                },
-                "lodash.escape": {
-                  "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
-                },
-                "lodash.keys": {
-                  "version": "3.1.2",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-                  "dependencies": {
-                    "lodash._getnative": {
-                      "version": "3.9.1",
-                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-                    },
-                    "lodash.isarguments": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
-                    },
-                    "lodash.isarray": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-                    }
-                  }
-                },
-                "lodash.restparam": {
-                  "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-                },
-                "lodash.templatesettings": {
-                  "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
-                }
-              }
-            },
-            "multipipe": {
-              "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-              "dependencies": {
-                "duplexer2": {
-                  "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
-                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "object-assign": {
-              "version": "3.0.0",
-              "from": "object-assign@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
-            },
-            "replace-ext": {
-              "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
-              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
-            },
-            "through2": {
-              "version": "2.0.0",
-              "from": "through2@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.5",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.5.3",
-              "from": "vinyl@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "1.0.2",
-                  "from": "clone@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "interpret": {
-          "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
-        },
-        "liftoff": {
-          "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
-          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
-          "dependencies": {
-            "findup-sync": {
-              "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                }
-              }
-            },
-            "resolve": {
-              "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
-            },
-            "minimist": {
-              "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
-            },
-            "extend": {
-              "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
-            }
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-        },
-        "orchestrator": {
-          "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
-          "dependencies": {
-            "end-of-stream": {
-              "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-              "dependencies": {
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "sequencify": {
-              "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
-              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
-            },
-            "stream-consume": {
-              "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
-            }
-          }
-        },
-        "pretty-hrtime": {
-          "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
-        },
-        "semver": {
-          "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
-        },
-        "tildify": {
-          "version": "1.1.2",
-          "from": "tildify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
-          "dependencies": {
-            "os-homedir": {
-              "version": "1.0.1",
-              "from": "os-homedir@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "ionic-app-lib": {
-      "version": "0.6.5",
-      "from": "ionic-app-lib@0.6.5",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-0.6.5.tgz",
-      "dependencies": {
-        "archiver": {
-          "version": "0.5.2",
-          "from": "archiver@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "zip-stream": {
-              "version": "0.1.4",
-              "from": "zip-stream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
-              "dependencies": {
-                "lodash.defaults": {
-                  "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash.keys": {
-                      "version": "2.4.1",
-                      "from": "lodash.keys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        },
-                        "lodash.isobject": {
-                          "version": "2.4.1",
-                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
-                        },
-                        "lodash._shimkeys": {
-                          "version": "2.4.1",
-                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._objecttypes": {
-                      "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "lazystream": {
-              "version": "0.1.0",
-              "from": "lazystream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
-            },
-            "file-utils": {
-              "version": "0.1.5",
-              "from": "file-utils@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
-              "dependencies": {
-                "lodash": {
-                  "version": "2.1.0",
-                  "from": "lodash@>=2.1.0 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
-                },
-                "iconv-lite": {
-                  "version": "0.2.11",
-                  "from": "iconv-lite@>=0.2.11 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
-                },
-                "rimraf": {
-                  "version": "2.2.8",
-                  "from": "rimraf@>=2.2.2 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                },
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.6 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "0.2.14",
-                  "from": "minimatch@>=0.2.12 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "findup-sync": {
-                  "version": "0.1.3",
-                  "from": "findup-sync@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "2.4.2",
-                      "from": "lodash@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                    }
-                  }
-                },
-                "isbinaryfile": {
-                  "version": "0.1.9",
-                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
-                }
-              }
-            },
-            "lodash": {
-              "version": "2.4.2",
-              "from": "lodash@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-            }
-          }
-        },
-        "cross-spawn": {
-          "version": "2.0.0",
-          "from": "cross-spawn@2.0.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
-          "dependencies": {
-            "cross-spawn-async": {
-              "version": "2.0.1",
-              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "3.2.0",
-                  "from": "lru-cache@>=3.2.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-                  "dependencies": {
-                    "pseudomap": {
-                      "version": "1.0.1",
-                      "from": "pseudomap@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "spawn-sync": {
-              "version": "1.0.14",
-              "from": "spawn-sync@>=1.0.13 <2.0.0",
-              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
-              "dependencies": {
-                "concat-stream": {
-                  "version": "1.5.1",
-                  "from": "concat-stream@>=1.4.7 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "typedarray": {
-                      "version": "0.0.6",
-                      "from": "typedarray@>=0.0.5 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                    },
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.5",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "os-shim": {
-                  "version": "0.1.3",
-                  "from": "os-shim@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "ionic-cordova-lib": {
-          "version": "5.1.10",
-          "from": "ionic-cordova-lib@5.1.10",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
-          "dependencies": {
-            "bplist-parser": {
-              "version": "0.0.6",
-              "from": "bplist-parser@0.0.6",
-              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
-            },
-            "cordova-app-hello-world": {
-              "version": "3.9.0",
-              "from": "cordova-app-hello-world@3.9.0",
-              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
-            },
-            "cordova-js": {
-              "version": "4.0.0",
-              "from": "cordova-js@4.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
-              "dependencies": {
-                "browserify": {
-                  "version": "10.1.3",
-                  "from": "browserify@10.1.3",
-                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
-                  "dependencies": {
-                    "JSONStream": {
-                      "version": "1.0.7",
-                      "from": "JSONStream@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
-                      "dependencies": {
-                        "jsonparse": {
-                          "version": "1.2.0",
-                          "from": "jsonparse@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "assert": {
-                      "version": "1.3.0",
-                      "from": "assert@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
-                    },
-                    "browser-pack": {
-                      "version": "4.0.4",
-                      "from": "browser-pack@>=4.0.3 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.3.0",
-                          "from": "combine-source-map@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
-                          "dependencies": {
-                            "inline-source-map": {
-                              "version": "0.3.1",
-                              "from": "inline-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-                              "dependencies": {
-                                "source-map": {
-                                  "version": "0.3.0",
-                                  "from": "source-map@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "1.0.0",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "convert-source-map": {
-                              "version": "0.3.5",
-                              "from": "convert-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.1.43",
-                              "from": "source-map@>=0.1.31 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "through2": {
-                          "version": "0.5.1",
-                          "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "1.0.33",
-                              "from": "readable-stream@>=1.0.17 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "xtend": {
-                              "version": "3.0.0",
-                              "from": "xtend@>=3.0.0 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                            }
-                          }
-                        },
-                        "umd": {
-                          "version": "3.0.1",
-                          "from": "umd@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
-                        }
-                      }
-                    },
-                    "browser-resolve": {
-                      "version": "1.10.1",
-                      "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
-                    },
-                    "browserify-zlib": {
-                      "version": "0.1.4",
-                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-                      "dependencies": {
-                        "pako": {
-                          "version": "0.2.8",
-                          "from": "pako@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
-                        }
-                      }
-                    },
-                    "buffer": {
-                      "version": "3.5.3",
-                      "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
-                      "dependencies": {
-                        "base64-js": {
-                          "version": "0.0.8",
-                          "from": "base64-js@0.0.8",
-                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-                        },
-                        "ieee754": {
-                          "version": "1.1.6",
-                          "from": "ieee754@>=1.1.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
-                        },
-                        "is-array": {
-                          "version": "1.0.1",
-                          "from": "is-array@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@>=0.0.3 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    },
-                    "commondir": {
-                      "version": "0.0.1",
-                      "from": "commondir@0.0.1",
-                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
-                    },
-                    "concat-stream": {
-                      "version": "1.4.10",
-                      "from": "concat-stream@>=1.4.1 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        }
-                      }
-                    },
-                    "console-browserify": {
-                      "version": "1.1.0",
-                      "from": "console-browserify@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-                      "dependencies": {
-                        "date-now": {
-                          "version": "0.1.4",
-                          "from": "date-now@>=0.1.4 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
-                        }
-                      }
-                    },
-                    "constants-browserify": {
-                      "version": "0.0.1",
-                      "from": "constants-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
-                    },
-                    "crypto-browserify": {
-                      "version": "3.11.0",
-                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
-                      "dependencies": {
-                        "browserify-cipher": {
-                          "version": "1.0.0",
-                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-                          "dependencies": {
-                            "browserify-aes": {
-                              "version": "1.0.5",
-                              "from": "browserify-aes@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                              "dependencies": {
-                                "buffer-xor": {
-                                  "version": "1.0.3",
-                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                },
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "browserify-des": {
-                              "version": "1.0.0",
-                              "from": "browserify-des@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-                              "dependencies": {
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                },
-                                "des.js": {
-                                  "version": "1.0.0",
-                                  "from": "des.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "evp_bytestokey": {
-                              "version": "1.0.0",
-                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "browserify-sign": {
-                          "version": "4.0.0",
-                          "from": "browserify-sign@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-ecdh": {
-                          "version": "4.0.0",
-                          "from": "create-ecdh@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-hash": {
-                          "version": "1.1.2",
-                          "from": "create-hash@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
-                          "dependencies": {
-                            "cipher-base": {
-                              "version": "1.0.2",
-                              "from": "cipher-base@>=1.0.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                            },
-                            "ripemd160": {
-                              "version": "1.0.1",
-                              "from": "ripemd160@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
-                            },
-                            "sha.js": {
-                              "version": "2.4.4",
-                              "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                            }
-                          }
-                        },
-                        "create-hmac": {
-                          "version": "1.1.4",
-                          "from": "create-hmac@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
-                        },
-                        "diffie-hellman": {
-                          "version": "5.0.0",
-                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "miller-rabin": {
-                              "version": "4.0.0",
-                              "from": "miller-rabin@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "pbkdf2": {
-                          "version": "3.0.4",
-                          "from": "pbkdf2@>=3.0.3 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
-                        },
-                        "public-encrypt": {
-                          "version": "4.0.0",
-                          "from": "public-encrypt@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "randombytes": {
-                          "version": "2.0.1",
-                          "from": "randombytes@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
-                        }
-                      }
-                    },
-                    "deep-equal": {
-                      "version": "1.0.1",
-                      "from": "deep-equal@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-                    },
-                    "defined": {
-                      "version": "1.0.0",
-                      "from": "defined@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-                    },
-                    "deps-sort": {
-                      "version": "1.3.9",
-                      "from": "deps-sort@>=1.3.7 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
-                    },
-                    "domain-browser": {
-                      "version": "1.1.4",
-                      "from": "domain-browser@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
-                    },
-                    "duplexer2": {
-                      "version": "0.0.2",
-                      "from": "duplexer2@>=0.0.2 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
-                    },
-                    "events": {
-                      "version": "1.0.2",
-                      "from": "events@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
-                    },
-                    "has": {
-                      "version": "1.0.1",
-                      "from": "has@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-                      "dependencies": {
-                        "function-bind": {
-                          "version": "1.0.2",
-                          "from": "function-bind@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "htmlescape": {
-                      "version": "1.1.0",
-                      "from": "htmlescape@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
-                    },
-                    "http-browserify": {
-                      "version": "1.7.0",
-                      "from": "http-browserify@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-                      "dependencies": {
-                        "Base64": {
-                          "version": "0.2.1",
-                          "from": "Base64@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-                        }
-                      }
-                    },
-                    "https-browserify": {
-                      "version": "0.0.1",
-                      "from": "https-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "insert-module-globals": {
-                      "version": "6.6.3",
-                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.6.1",
-                          "from": "combine-source-map@>=0.6.1 <0.7.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
-                          "dependencies": {
-                            "convert-source-map": {
-                              "version": "1.1.2",
-                              "from": "convert-source-map@>=1.1.0 <1.2.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
-                            },
-                            "inline-source-map": {
-                              "version": "0.5.0",
-                              "from": "inline-source-map@>=0.5.0 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
-                            },
-                            "lodash.memoize": {
-                              "version": "3.0.4",
-                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.4.4",
-                              "from": "source-map@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "is-buffer": {
-                          "version": "1.1.0",
-                          "from": "is-buffer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                        },
-                        "lexical-scope": {
-                          "version": "1.2.0",
-                          "from": "lexical-scope@>=1.2.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-                          "dependencies": {
-                            "astw": {
-                              "version": "2.0.0",
-                              "from": "astw@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
-                              "dependencies": {
-                                "acorn": {
-                                  "version": "1.2.2",
-                                  "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "labeled-stream-splicer": {
-                      "version": "1.0.2",
-                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
-                      "dependencies": {
-                        "stream-splicer": {
-                          "version": "1.3.2",
-                          "from": "stream-splicer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
-                          "dependencies": {
-                            "readable-wrap": {
-                              "version": "1.0.0",
-                              "from": "readable-wrap@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                            },
-                            "indexof": {
-                              "version": "0.0.1",
-                              "from": "indexof@0.0.1",
-                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "module-deps": {
-                      "version": "3.9.1",
-                      "from": "module-deps@>=3.7.11 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
-                      "dependencies": {
-                        "detective": {
-                          "version": "4.3.1",
-                          "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
-                          "dependencies": {
-                            "acorn": {
-                              "version": "1.2.2",
-                              "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                            }
-                          }
-                        },
-                        "stream-combiner2": {
-                          "version": "1.0.2",
-                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
-                          "dependencies": {
-                            "through2": {
-                              "version": "0.5.1",
-                              "from": "through2@>=0.5.1 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                              "dependencies": {
-                                "readable-stream": {
-                                  "version": "1.0.33",
-                                  "from": "readable-stream@>=1.0.17 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                                  "dependencies": {
-                                    "core-util-is": {
-                                      "version": "1.0.2",
-                                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "xtend": {
-                                  "version": "3.0.0",
-                                  "from": "xtend@>=3.0.0 <3.1.0",
-                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "os-browserify": {
-                      "version": "0.1.2",
-                      "from": "os-browserify@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
-                    },
-                    "parents": {
-                      "version": "1.0.1",
-                      "from": "parents@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-                      "dependencies": {
-                        "path-platform": {
-                          "version": "0.11.15",
-                          "from": "path-platform@>=0.11.15 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
-                        }
-                      }
-                    },
-                    "path-browserify": {
-                      "version": "0.0.0",
-                      "from": "path-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
-                    },
-                    "process": {
-                      "version": "0.11.2",
-                      "from": "process@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
-                    },
-                    "punycode": {
-                      "version": "1.3.2",
-                      "from": "punycode@>=1.3.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                    },
-                    "querystring-es3": {
-                      "version": "0.2.1",
-                      "from": "querystring-es3@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
-                    },
-                    "read-only-stream": {
-                      "version": "1.1.1",
-                      "from": "read-only-stream@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
-                      "dependencies": {
-                        "readable-wrap": {
-                          "version": "1.0.0",
-                          "from": "readable-wrap@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.13 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "resolve": {
-                      "version": "1.1.6",
-                      "from": "resolve@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
-                    },
-                    "shallow-copy": {
-                      "version": "0.0.1",
-                      "from": "shallow-copy@0.0.1",
-                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
-                    },
-                    "shasum": {
-                      "version": "1.0.2",
-                      "from": "shasum@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-                      "dependencies": {
-                        "json-stable-stringify": {
-                          "version": "0.0.1",
-                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "from": "jsonify@>=0.0.0 <0.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-                            }
-                          }
-                        },
-                        "sha.js": {
-                          "version": "2.4.4",
-                          "from": "sha.js@>=2.4.4 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                        }
-                      }
-                    },
-                    "shell-quote": {
-                      "version": "0.0.1",
-                      "from": "shell-quote@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
-                    },
-                    "stream-browserify": {
-                      "version": "1.0.0",
-                      "from": "stream-browserify@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "subarg": {
-                      "version": "1.0.0",
-                      "from": "subarg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "1.2.0",
-                          "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "syntax-error": {
-                      "version": "1.1.4",
-                      "from": "syntax-error@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
-                      "dependencies": {
-                        "acorn": {
-                          "version": "1.2.2",
-                          "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                        }
-                      }
-                    },
-                    "through2": {
-                      "version": "1.1.1",
-                      "from": "through2@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
-                    },
-                    "timers-browserify": {
-                      "version": "1.4.1",
-                      "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
-                    },
-                    "tty-browserify": {
-                      "version": "0.0.0",
-                      "from": "tty-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
-                    },
-                    "url": {
-                      "version": "0.10.3",
-                      "from": "url@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-                      "dependencies": {
-                        "querystring": {
-                          "version": "0.2.0",
-                          "from": "querystring@0.2.0",
-                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-                        }
-                      }
-                    },
-                    "util": {
-                      "version": "0.10.3",
-                      "from": "util@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
-                    },
-                    "vm-browserify": {
-                      "version": "0.0.4",
-                      "from": "vm-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-                      "dependencies": {
-                        "indexof": {
-                          "version": "0.0.1",
-                          "from": "indexof@0.0.1",
-                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                        }
-                      }
-                    },
-                    "xtend": {
-                      "version": "4.0.1",
-                      "from": "xtend@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                    }
-                  }
-                },
-                "through": {
-                  "version": "2.3.4",
-                  "from": "through@2.3.4",
-                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
-                },
-                "uglify-js": {
-                  "version": "2.6.1",
-                  "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "0.2.10",
-                      "from": "async@>=0.2.6 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                    },
-                    "source-map": {
-                      "version": "0.5.3",
-                      "from": "source-map@>=0.5.1 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-                    },
-                    "uglify-to-browserify": {
-                      "version": "1.0.2",
-                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-                    },
-                    "yargs": {
-                      "version": "3.10.0",
-                      "from": "yargs@>=3.10.0 <3.11.0",
-                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "1.2.1",
-                          "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                        },
-                        "cliui": {
-                          "version": "2.1.0",
-                          "from": "cliui@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-                          "dependencies": {
-                            "center-align": {
-                              "version": "0.1.2",
-                              "from": "center-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                },
-                                "lazy-cache": {
-                                  "version": "0.2.4",
-                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
-                                }
-                              }
-                            },
-                            "right-align": {
-                              "version": "0.1.3",
-                              "from": "right-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "wordwrap": {
-                              "version": "0.0.2",
-                              "from": "wordwrap@0.0.2",
-                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-                            }
-                          }
-                        },
-                        "decamelize": {
-                          "version": "1.1.1",
-                          "from": "decamelize@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                        },
-                        "window-size": {
-                          "version": "0.1.0",
-                          "from": "window-size@0.1.0",
-                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-registry-mapper": {
-              "version": "1.1.13",
-              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
-              "dependencies": {
-                "tape": {
-                  "version": "3.5.0",
-                  "from": "tape@>=3.5.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
-                  "dependencies": {
-                    "deep-equal": {
-                      "version": "0.2.2",
-                      "from": "deep-equal@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
-                    },
-                    "defined": {
-                      "version": "0.0.0",
-                      "from": "defined@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
-                    },
-                    "glob": {
-                      "version": "3.2.11",
-                      "from": "glob@>=3.2.9 <3.3.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "0.3.0",
-                          "from": "minimatch@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "object-inspect": {
-                      "version": "0.4.0",
-                      "from": "object-inspect@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
-                    },
-                    "resumer": {
-                      "version": "0.0.0",
-                      "from": "resumer@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
-                    },
-                    "through": {
-                      "version": "2.3.8",
-                      "from": "through@>=2.3.4 <2.4.0",
-                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-serve": {
-              "version": "0.1.3",
-              "from": "cordova-serve@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
-              "dependencies": {
-                "chalk": {
-                  "version": "1.1.1",
-                  "from": "chalk@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                  "dependencies": {
-                    "ansi-styles": {
-                      "version": "2.1.0",
-                      "from": "ansi-styles@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                    },
-                    "escape-string-regexp": {
-                      "version": "1.0.3",
-                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                    },
-                    "has-ansi": {
-                      "version": "2.0.0",
-                      "from": "has-ansi@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "strip-ansi": {
-                      "version": "3.0.0",
-                      "from": "strip-ansi@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "supports-color": {
-                      "version": "2.0.0",
-                      "from": "supports-color@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                    }
-                  }
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "d8": {
-                  "version": "0.4.4",
-                  "from": "d8@>=0.4.4 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
-                  "dependencies": {
-                    "m8": {
-                      "version": "0.4.4",
-                      "from": "m8@>=0.4.3",
-                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
-                    }
-                  }
-                },
-                "mime": {
-                  "version": "1.3.4",
-                  "from": "mime@>=1.2.11 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
-                },
-                "q": {
-                  "version": "1.4.1",
-                  "from": "q@>=1.4.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-                },
-                "shelljs": {
-                  "version": "0.5.3",
-                  "from": "shelljs@>=0.5.3 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-                }
-              }
-            },
-            "dep-graph": {
-              "version": "1.1.0",
-              "from": "dep-graph@1.1.0",
-              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
-              "dependencies": {
-                "underscore": {
-                  "version": "1.2.1",
-                  "from": "underscore@1.2.1",
-                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
-                }
-              }
-            },
-            "elementtree": {
-              "version": "0.1.6",
-              "from": "elementtree@0.1.6",
-              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
-              "dependencies": {
-                "sax": {
-                  "version": "0.3.5",
-                  "from": "sax@0.3.5",
-                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
-                }
-              }
-            },
-            "glob": {
-              "version": "4.0.6",
-              "from": "glob@4.0.6",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "init-package-json": {
-              "version": "1.9.1",
-              "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    }
-                  }
-                },
-                "promzard": {
-                  "version": "0.3.0",
-                  "from": "promzard@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    }
-                  }
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        },
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "npm": {
-              "version": "2.14.13",
-              "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.13.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.7 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                },
-                "ansi": {
-                  "version": "0.3.0",
-                  "from": "ansi@latest",
-                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                },
-                "ansicolors": {
-                  "version": "0.3.2",
-                  "from": "ansicolors@latest"
-                },
-                "ansistyles": {
-                  "version": "0.1.3",
-                  "from": "ansistyles@0.1.3",
-                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
-                },
-                "archy": {
-                  "version": "1.0.0",
-                  "from": "archy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-                },
-                "async-some": {
-                  "version": "1.0.2",
-                  "from": "async-some@>=1.0.2 <1.1.0"
-                },
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@0.0.8",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "char-spinner": {
-                  "version": "1.0.1",
-                  "from": "char-spinner@latest",
-                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-                },
-                "chmodr": {
-                  "version": "1.0.2",
-                  "from": "chmodr@>=1.0.2 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
-                },
-                "chownr": {
-                  "version": "1.0.1",
-                  "from": "chownr@1.0.1",
-                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
-                },
-                "cmd-shim": {
-                  "version": "2.0.1",
-                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
-                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "3.0.8",
-                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                    }
-                  }
-                },
-                "columnify": {
-                  "version": "1.5.2",
-                  "from": "columnify@1.5.2",
-                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
-                  "dependencies": {
-                    "wcwidth": {
-                      "version": "1.0.0",
-                      "from": "wcwidth@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
-                      "dependencies": {
-                        "defaults": {
-                          "version": "1.0.2",
-                          "from": "defaults@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
-                          "dependencies": {
-                            "clone": {
-                              "version": "0.1.19",
-                              "from": "clone@>=0.1.5 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.9 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "dezalgo": {
-                  "version": "1.0.3",
-                  "from": "dezalgo@>=1.0.3 <1.1.0",
-                  "dependencies": {
-                    "asap": {
-                      "version": "2.0.3",
-                      "from": "asap@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
-                    }
-                  }
-                },
-                "editor": {
-                  "version": "1.0.0",
-                  "from": "editor@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
-                },
-                "fs-vacuum": {
-                  "version": "1.2.7",
-                  "from": "fs-vacuum@1.2.7"
-                },
-                "fs-write-stream-atomic": {
-                  "version": "1.0.4",
-                  "from": "fs-write-stream-atomic@1.0.4"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@1.0.8"
-                },
-                "fstream-npm": {
-                  "version": "1.0.7",
-                  "from": "fstream-npm@>=1.0.7 <1.1.0",
-                  "dependencies": {
-                    "fstream-ignore": {
-                      "version": "1.0.3",
-                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
-                    }
-                  }
-                },
-                "github-url-from-git": {
-                  "version": "1.4.0",
-                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
-                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-                },
-                "github-url-from-username-repo": {
-                  "version": "1.0.2",
-                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
-                },
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@5.0.15",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "hosted-git-info": {
-                  "version": "2.1.4",
-                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                },
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <1.1.0"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@latest",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@latest",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "init-package-json": {
-                  "version": "1.9.1",
-                  "from": "init-package-json@1.9.1",
-                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-                  "dependencies": {
-                    "promzard": {
-                      "version": "0.3.0",
-                      "from": "promzard@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                    }
-                  }
-                },
-                "lockfile": {
-                  "version": "1.0.1",
-                  "from": "lockfile@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
-                },
-                "lru-cache": {
-                  "version": "2.7.0",
-                  "from": "lru-cache@2.7.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.1",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "node-gyp": {
-                  "version": "3.2.0",
-                  "from": "node-gyp@>=3.2.0 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "4.5.3",
-                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "2.0.10",
-                          "from": "minimatch@>=2.0.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.1",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.2.1",
-                                  "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "1.0.0",
-                      "from": "minimatch@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                      "dependencies": {
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "path-array": {
-                      "version": "1.0.0",
-                      "from": "path-array@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                      "dependencies": {
-                        "array-index": {
-                          "version": "0.1.1",
-                          "from": "array-index@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                          "dependencies": {
-                            "debug": {
-                              "version": "2.2.0",
-                              "from": "debug@*",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                              "dependencies": {
-                                "ms": {
-                                  "version": "0.7.1",
-                                  "from": "ms@0.7.1",
-                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.6 <3.1.0"
-                },
-                "normalize-git-url": {
-                  "version": "3.0.1",
-                  "from": "normalize-git-url@latest"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-cache-filename": {
-                  "version": "1.0.2",
-                  "from": "npm-cache-filename@1.0.2",
-                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
-                },
-                "npm-install-checks": {
-                  "version": "1.0.6",
-                  "from": "npm-install-checks@1.0.6",
-                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
-                  "dependencies": {
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
-                },
-                "npm-registry-client": {
-                  "version": "7.0.8",
-                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
-                  "dependencies": {
-                    "concat-stream": {
-                      "version": "1.5.1",
-                      "from": "concat-stream@>=1.4.6 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.3",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-user-validate": {
-                  "version": "0.1.2",
-                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
-                },
-                "npmlog": {
-                  "version": "2.0.0",
-                  "from": "npmlog@>=2.0.0 <2.1.0",
-                  "dependencies": {
-                    "are-we-there-yet": {
-                      "version": "1.0.4",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.2 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
-                },
-                "opener": {
-                  "version": "1.4.1",
-                  "from": "opener@>=1.4.1 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@0.1.3",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.0",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-inside": {
-                  "version": "1.0.1",
-                  "from": "path-is-inside@1.0.1",
-                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@1.0.7",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-installed": {
-                  "version": "4.0.3",
-                  "from": "read-installed@4.0.3",
-                  "dependencies": {
-                    "debuglog": {
-                      "version": "1.0.1",
-                      "from": "debuglog@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
-                    },
-                    "readdir-scoped-modules": {
-                      "version": "1.0.2",
-                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
-                    },
-                    "util-extend": {
-                      "version": "1.0.1",
-                      "from": "util-extend@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=2.0.2 <2.1.0",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.13 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    }
-                  }
-                },
-                "realize-package-specifier": {
-                  "version": "3.0.1",
-                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
-                },
-                "request": {
-                  "version": "2.65.0",
-                  "from": "request@>=2.65.0 <2.66.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
-                  "dependencies": {
-                    "bl": {
-                      "version": "1.0.0",
-                      "from": "bl@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "2.0.3",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.3",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "caseless": {
-                      "version": "0.11.0",
-                      "from": "caseless@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                    },
-                    "extend": {
-                      "version": "3.0.0",
-                      "from": "extend@>=3.0.0 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                    },
-                    "forever-agent": {
-                      "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.1 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                    },
-                    "form-data": {
-                      "version": "1.0.0-rc3",
-                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                      "dependencies": {
-                        "async": {
-                          "version": "1.5.0",
-                          "from": "async@>=1.4.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                        }
-                      }
-                    },
-                    "json-stringify-safe": {
-                      "version": "5.0.1",
-                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                    },
-                    "mime-types": {
-                      "version": "2.1.7",
-                      "from": "mime-types@>=2.1.7 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
-                      "dependencies": {
-                        "mime-db": {
-                          "version": "1.19.0",
-                          "from": "mime-db@>=1.19.0 <1.20.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-                        }
-                      }
-                    },
-                    "node-uuid": {
-                      "version": "1.4.3",
-                      "from": "node-uuid@>=1.4.3 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-                    },
-                    "qs": {
-                      "version": "5.2.0",
-                      "from": "qs@>=5.2.0 <5.3.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                    },
-                    "tunnel-agent": {
-                      "version": "0.4.1",
-                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                    },
-                    "tough-cookie": {
-                      "version": "2.2.0",
-                      "from": "tough-cookie@>=2.2.0 <2.3.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
-                    },
-                    "http-signature": {
-                      "version": "0.11.0",
-                      "from": "http-signature@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "from": "assert-plus@>=0.1.5 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        },
-                        "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                        },
-                        "ctype": {
-                          "version": "0.5.3",
-                          "from": "ctype@0.5.3",
-                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                        }
-                      }
-                    },
-                    "oauth-sign": {
-                      "version": "0.8.0",
-                      "from": "oauth-sign@>=0.8.0 <0.9.0",
-                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                    },
-                    "hawk": {
-                      "version": "3.1.0",
-                      "from": "hawk@>=3.1.0 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "2.16.3",
-                          "from": "hoek@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                        },
-                        "boom": {
-                          "version": "2.10.0",
-                          "from": "boom@>=2.8.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
-                        },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
-                        "sntp": {
-                          "version": "1.0.9",
-                          "from": "sntp@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                        }
-                      }
-                    },
-                    "aws-sign2": {
-                      "version": "0.6.0",
-                      "from": "aws-sign2@>=0.6.0 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                    },
-                    "stringstream": {
-                      "version": "0.0.5",
-                      "from": "stringstream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                    },
-                    "combined-stream": {
-                      "version": "1.0.5",
-                      "from": "combined-stream@>=1.0.5 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                      "dependencies": {
-                        "delayed-stream": {
-                          "version": "1.0.0",
-                          "from": "delayed-stream@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "isstream": {
-                      "version": "0.1.2",
-                      "from": "isstream@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                    },
-                    "har-validator": {
-                      "version": "2.0.2",
-                      "from": "har-validator@>=2.0.2 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
-                      "dependencies": {
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@>=1.1.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                          "dependencies": {
-                            "ansi-styles": {
-                              "version": "2.1.0",
-                              "from": "ansi-styles@>=2.1.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                            },
-                            "escape-string-regexp": {
-                              "version": "1.0.3",
-                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                            },
-                            "has-ansi": {
-                              "version": "2.0.0",
-                              "from": "has-ansi@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                            },
-                            "supports-color": {
-                              "version": "2.0.0",
-                              "from": "supports-color@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "commander": {
-                          "version": "2.9.0",
-                          "from": "commander@>=2.8.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                          "dependencies": {
-                            "graceful-readlink": {
-                              "version": "1.0.1",
-                              "from": "graceful-readlink@>=1.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "is-my-json-valid": {
-                          "version": "2.12.2",
-                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
-                          "dependencies": {
-                            "generate-function": {
-                              "version": "2.0.0",
-                              "from": "generate-function@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                            },
-                            "generate-object-property": {
-                              "version": "1.2.0",
-                              "from": "generate-object-property@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                              "dependencies": {
-                                "is-property": {
-                                  "version": "1.0.2",
-                                  "from": "is-property@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "jsonpointer": {
-                              "version": "2.0.0",
-                              "from": "jsonpointer@2.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                            },
-                            "xtend": {
-                              "version": "4.0.0",
-                              "from": "xtend@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
-                            }
-                          }
-                        },
-                        "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "1.0.0",
-                              "from": "pinkie@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "retry": {
-                  "version": "0.8.0",
-                  "from": "retry@0.8.0",
-                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
-                },
-                "rimraf": {
-                  "version": "2.4.3",
-                  "from": "rimraf@2.4.3",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
-                },
-                "semver": {
-                  "version": "5.0.3",
-                  "from": "semver@5.0.3",
-                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
-                },
-                "sha": {
-                  "version": "2.0.1",
-                  "from": "sha@2.0.1",
-                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.2",
-                      "from": "readable-stream@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.3",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.1",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "slide": {
-                  "version": "1.1.6",
-                  "from": "slide@>=1.1.6 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
-                },
-                "sorted-object": {
-                  "version": "1.0.0",
-                  "from": "sorted-object@"
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@2.2.1"
-                },
-                "text-table": {
-                  "version": "0.2.0",
-                  "from": "text-table@~0.2.0"
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "from": "uid-number@>=0.0.6 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-                },
-                "umask": {
-                  "version": "1.1.0",
-                  "from": "umask@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@2.2.2",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@1.0.1",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                },
-                "write-file-atomic": {
-                  "version": "1.1.3",
-                  "from": "write-file-atomic@1.1.3",
-                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
-                },
-                "ansi-regex": {
-                  "version": "2.0.0",
-                  "from": "ansi-regex@2.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                },
-                "spdx-license-ids": {
-                  "version": "1.1.0",
-                  "from": "spdx-license-ids@1.1.0",
-                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@3.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-                }
-              }
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "osenv": {
-              "version": "0.1.0",
-              "from": "osenv@0.1.0",
-              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
-            },
-            "plist": {
-              "version": "1.1.0",
-              "from": "plist@1.1.0",
-              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
-              "dependencies": {
-                "base64-js": {
-                  "version": "0.0.6",
-                  "from": "base64-js@0.0.6",
-                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
-                },
-                "xmlbuilder": {
-                  "version": "2.2.1",
-                  "from": "xmlbuilder@2.2.1",
-                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
-                  "dependencies": {
-                    "lodash-node": {
-                      "version": "2.4.1",
-                      "from": "lodash-node@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
-                    }
-                  }
-                },
-                "xmldom": {
-                  "version": "0.1.19",
-                  "from": "xmldom@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
-                },
-                "util-deprecate": {
-                  "version": "1.0.0",
-                  "from": "util-deprecate@1.0.0",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
-                }
-              }
-            },
-            "properties-parser": {
-              "version": "0.2.3",
-              "from": "properties-parser@0.2.3",
-              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
-            },
-            "rc": {
-              "version": "0.5.2",
-              "from": "rc@0.5.2",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.10",
-                  "from": "minimist@>=0.0.7 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                },
-                "deep-extend": {
-                  "version": "0.2.11",
-                  "from": "deep-extend@>=0.2.5 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
-                },
-                "strip-json-comments": {
-                  "version": "0.1.3",
-                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                },
-                "ini": {
-                  "version": "1.1.0",
-                  "from": "ini@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                }
-              }
-            },
-            "request": {
-              "version": "2.47.0",
-              "from": "request@2.47.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "0.9.4",
-                  "from": "bl@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.0.33",
-                      "from": "readable-stream@>=1.0.26 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.6.0",
-                  "from": "caseless@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.5.2",
-                  "from": "forever-agent@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "1.0.2",
-                  "from": "mime-types@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.0 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "2.3.3",
-                  "from": "qs@>=2.3.1 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.1",
-                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "0.10.1",
-                  "from": "http-signature@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "asn1": {
-                      "version": "0.1.11",
-                      "from": "asn1@0.1.11",
-                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                    },
-                    "ctype": {
-                      "version": "0.5.3",
-                      "from": "ctype@0.5.3",
-                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.4.0",
-                  "from": "oauth-sign@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
-                },
-                "hawk": {
-                  "version": "1.1.1",
-                  "from": "hawk@1.1.1",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1",
-                      "from": "hoek@>=0.9.0 <0.10.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                    },
-                    "boom": {
-                      "version": "0.4.2",
-                      "from": "boom@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "0.2.2",
-                      "from": "cryptiles@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                    },
-                    "sntp": {
-                      "version": "0.2.4",
-                      "from": "sntp@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.5.0",
-                  "from": "aws-sign2@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "0.0.7",
-                  "from": "combined-stream@>=0.0.5 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "shelljs": {
-              "version": "0.3.0",
-              "from": "shelljs@0.3.0",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
-            },
-            "tar": {
-              "version": "1.0.2",
-              "from": "tar@1.0.2",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
-              "dependencies": {
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    },
-                    "mkdirp": {
-                      "version": "0.5.1",
-                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        }
-                      }
-                    },
-                    "rimraf": {
-                      "version": "2.4.4",
-                      "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                      "dependencies": {
-                        "glob": {
-                          "version": "5.0.15",
-                          "from": "glob@>=5.0.14 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                          "dependencies": {
-                            "inflight": {
-                              "version": "1.0.4",
-                              "from": "inflight@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                              "dependencies": {
-                                "brace-expansion": {
-                                  "version": "1.1.2",
-                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                                  "dependencies": {
-                                    "balanced-match": {
-                                      "version": "0.3.0",
-                                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                    },
-                                    "concat-map": {
-                                      "version": "0.0.1",
-                                      "from": "concat-map@0.0.1",
-                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "once": {
-                              "version": "1.3.3",
-                              "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "path-is-absolute": {
-                              "version": "1.0.0",
-                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.3",
-              "from": "through2@0.6.3",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "unorm": {
-              "version": "1.3.3",
-              "from": "unorm@1.3.3",
-              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
-            },
-            "valid-identifier": {
-              "version": "0.0.1",
-              "from": "valid-identifier@0.0.1",
-              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
-            },
-            "ionic-xcode": {
-              "version": "0.8.3",
-              "from": "ionic-xcode@0.8.3",
-              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
-              "dependencies": {
-                "pegjs": {
-                  "version": "0.6.2",
-                  "from": "pegjs@0.6.2",
-                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.3.3",
-                  "from": "node-uuid@1.3.3",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "node-sass": {
-          "version": "3.4.2",
-          "from": "node-sass@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
-          "dependencies": {
-            "async-foreach": {
-              "version": "0.1.3",
-              "from": "async-foreach@>=0.1.3 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.1.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "get-stdin": {
-              "version": "4.0.1",
-              "from": "get-stdin@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-            },
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.14 <6.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0",
-                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                }
-              }
-            },
-            "meow": {
-              "version": "3.6.0",
-              "from": "meow@>=3.3.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-              "dependencies": {
-                "camelcase-keys": {
-                  "version": "2.0.0",
-                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "2.0.1",
-                      "from": "camelcase@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                    },
-                    "map-obj": {
-                      "version": "1.0.1",
-                      "from": "map-obj@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                    }
-                  }
-                },
-                "loud-rejection": {
-                  "version": "1.2.0",
-                  "from": "loud-rejection@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                  "dependencies": {
-                    "signal-exit": {
-                      "version": "2.1.2",
-                      "from": "signal-exit@>=2.1.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                    }
-                  }
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "from": "minimist@>=1.1.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    },
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "validate-npm-package-license": {
-                      "version": "3.0.1",
-                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                      "dependencies": {
-                        "spdx-correct": {
-                          "version": "1.0.2",
-                          "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "spdx-expression-parse": {
-                          "version": "1.0.2",
-                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-exceptions": {
-                              "version": "1.0.4",
-                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                            },
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "object-assign": {
-                  "version": "4.0.1",
-                  "from": "object-assign@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                },
-                "read-pkg-up": {
-                  "version": "1.0.1",
-                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                  "dependencies": {
-                    "find-up": {
-                      "version": "1.1.0",
-                      "from": "find-up@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                      "dependencies": {
-                        "path-exists": {
-                          "version": "2.1.0",
-                          "from": "path-exists@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                        },
-                        "pinkie-promise": {
-                          "version": "2.0.0",
-                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "2.0.1",
-                              "from": "pinkie@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "read-pkg": {
-                      "version": "1.1.0",
-                      "from": "read-pkg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                      "dependencies": {
-                        "load-json-file": {
-                          "version": "1.1.0",
-                          "from": "load-json-file@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "parse-json": {
-                              "version": "2.2.0",
-                              "from": "parse-json@>=2.2.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                              "dependencies": {
-                                "error-ex": {
-                                  "version": "1.3.0",
-                                  "from": "error-ex@>=1.2.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                  "dependencies": {
-                                    "is-arrayish": {
-                                      "version": "0.2.1",
-                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "strip-bom": {
-                              "version": "2.0.0",
-                              "from": "strip-bom@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                              "dependencies": {
-                                "is-utf8": {
-                                  "version": "0.2.0",
-                                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "path-type": {
-                          "version": "1.1.0",
-                          "from": "path-type@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "redent": {
-                  "version": "1.0.0",
-                  "from": "redent@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                  "dependencies": {
-                    "indent-string": {
-                      "version": "2.1.0",
-                      "from": "indent-string@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                      "dependencies": {
-                        "repeating": {
-                          "version": "2.0.0",
-                          "from": "repeating@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                          "dependencies": {
-                            "is-finite": {
-                              "version": "1.0.1",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "strip-indent": {
-                      "version": "1.0.1",
-                      "from": "strip-indent@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                    }
-                  }
-                },
-                "trim-newlines": {
-                  "version": "1.0.0",
-                  "from": "trim-newlines@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "nan": {
-              "version": "2.1.0",
-              "from": "nan@>=2.0.8 <3.0.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.2 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "node-gyp": {
-              "version": "3.2.0",
-              "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
-              "dependencies": {
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "npmlog": {
-                  "version": "1.2.1",
-                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                  "dependencies": {
-                    "ansi": {
-                      "version": "0.3.0",
-                      "from": "ansi@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                    },
-                    "are-we-there-yet": {
-                      "version": "1.0.4",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.0.0 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-array": {
-                  "version": "1.0.0",
-                  "from": "path-array@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                  "dependencies": {
-                    "array-index": {
-                      "version": "0.1.1",
-                      "from": "array-index@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                      "dependencies": {
-                        "debug": {
-                          "version": "2.2.0",
-                          "from": "debug@*",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                          "dependencies": {
-                            "ms": {
-                              "version": "0.7.1",
-                              "from": "ms@0.7.1",
-                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-                  "dependencies": {
-                    "block-stream": {
-                      "version": "0.0.8",
-                      "from": "block-stream@*",
-                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "request": {
-              "version": "2.67.0",
-              "from": "request@>=2.61.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "1.0.0",
-                  "from": "bl@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.5",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.11.0",
-                  "from": "caseless@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                },
-                "extend": {
-                  "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.1 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                },
-                "form-data": {
-                  "version": "1.0.0-rc3",
-                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "1.5.0",
-                      "from": "async@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                    }
-                  }
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "2.1.8",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.20.0",
-                      "from": "mime-db@>=1.20.0 <1.21.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
-                    }
-                  }
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.7 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "5.2.0",
-                  "from": "qs@>=5.2.0 <5.3.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.1",
-                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "1.1.0",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "jsprim": {
-                      "version": "1.2.2",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
-                      "dependencies": {
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "from": "extsprintf@1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                        },
-                        "json-schema": {
-                          "version": "0.2.2",
-                          "from": "json-schema@0.2.2",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "from": "verror@1.3.6",
-                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.7.1",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "from": "asn1@>=0.2.3 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                        },
-                        "assert-plus": {
-                          "version": "0.2.0",
-                          "from": "assert-plus@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                        },
-                        "dashdash": {
-                          "version": "1.10.1",
-                          "from": "dashdash@>=1.10.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
-                          "dependencies": {
-                            "assert-plus": {
-                              "version": "0.1.5",
-                              "from": "assert-plus@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                            }
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.0",
-                          "from": "jsbn@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                        },
-                        "tweetnacl": {
-                          "version": "0.13.2",
-                          "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "from": "jodid25519@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.8.0",
-                  "from": "oauth-sign@>=0.8.0 <0.9.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                },
-                "hawk": {
-                  "version": "3.1.2",
-                  "from": "hawk@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "2.16.3",
-                      "from": "hoek@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                    },
-                    "boom": {
-                      "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "from": "cryptiles@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "from": "sntp@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "from": "isstream@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                },
-                "har-validator": {
-                  "version": "2.0.3",
-                  "from": "har-validator@>=2.0.2 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
-                  "dependencies": {
-                    "commander": {
-                      "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                      "dependencies": {
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "from": "graceful-readlink@>=1.0.0",
-                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "is-my-json-valid": {
-                      "version": "2.12.3",
-                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
-                      "dependencies": {
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "from": "generate-function@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "from": "generate-object-property@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                          "dependencies": {
-                            "is-property": {
-                              "version": "1.0.2",
-                              "from": "is-property@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "from": "jsonpointer@2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    },
-                    "pinkie-promise": {
-                      "version": "2.0.0",
-                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                      "dependencies": {
-                        "pinkie": {
-                          "version": "2.0.1",
-                          "from": "pinkie@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "sass-graph": {
-              "version": "2.0.1",
-              "from": "sass-graph@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
-              "dependencies": {
-                "lodash": {
-                  "version": "3.10.1",
-                  "from": "lodash@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-                },
-                "yargs": {
-                  "version": "3.30.0",
-                  "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "1.2.1",
-                      "from": "camelcase@>=1.2.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                    },
-                    "cliui": {
-                      "version": "3.1.0",
-                      "from": "cliui@>=3.0.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
-                      "dependencies": {
-                        "string-width": {
-                          "version": "1.0.1",
-                          "from": "string-width@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
-                          "dependencies": {
-                            "code-point-at": {
-                              "version": "1.0.0",
-                              "from": "code-point-at@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            },
-                            "is-fullwidth-code-point": {
-                              "version": "1.0.0",
-                              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                          "dependencies": {
-                            "ansi-regex": {
-                              "version": "2.0.0",
-                              "from": "ansi-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "wrap-ansi": {
-                          "version": "1.0.0",
-                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "decamelize": {
-                      "version": "1.1.1",
-                      "from": "decamelize@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                    },
-                    "os-locale": {
-                      "version": "1.4.0",
-                      "from": "os-locale@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-                      "dependencies": {
-                        "lcid": {
-                          "version": "1.0.0",
-                          "from": "lcid@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                          "dependencies": {
-                            "invert-kv": {
-                              "version": "1.0.0",
-                              "from": "invert-kv@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "window-size": {
-                      "version": "0.1.4",
-                      "from": "window-size@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
-                    },
-                    "y18n": {
-                      "version": "3.2.0",
-                      "from": "y18n@>=3.2.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "opbeat-ionic": {
-          "version": "1.1.3",
-          "from": "opbeat-ionic@>=1.1.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/opbeat-ionic/-/opbeat-ionic-1.1.3.tgz",
-          "dependencies": {
-            "after-all": {
-              "version": "2.0.2",
-              "from": "after-all@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/after-all/-/after-all-2.0.2.tgz",
-              "dependencies": {
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "console-log-level": {
-              "version": "1.2.1",
-              "from": "console-log-level@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.2.1.tgz"
-            },
-            "json-stringify-safe": {
-              "version": "5.0.1",
-              "from": "json-stringify-safe@>=5.0.0 <6.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-            },
-            "stackman": {
-              "version": "0.2.3",
-              "from": "stackman@>=0.2.2 <0.3.0",
-              "resolved": "https://registry.npmjs.org/stackman/-/stackman-0.2.3.tgz",
-              "dependencies": {
-                "stackback": {
-                  "version": "0.0.2",
-                  "from": "stackback@0.0.2",
-                  "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz"
-                }
-              }
-            }
-          }
-        },
-        "request-progress": {
-          "version": "0.3.1",
-          "from": "request-progress@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-          "dependencies": {
-            "throttleit": {
-              "version": "0.0.2",
-              "from": "throttleit@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-            }
-          }
-        },
-        "unzip2": {
-          "version": "0.2.5",
-          "from": "unzip2@0.2.5",
-          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
-          "dependencies": {
-            "fstream": {
-              "version": "0.1.31",
-              "from": "fstream@>=0.1.21 <0.2.0",
-              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "pullstream": {
-              "version": "0.4.1",
-              "from": "pullstream@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-              "dependencies": {
-                "over": {
-                  "version": "0.0.5",
-                  "from": "over@>=0.0.5 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-                },
-                "slice-stream": {
-                  "version": "1.0.0",
-                  "from": "slice-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-                }
-              }
-            },
-            "binary": {
-              "version": "0.3.0",
-              "from": "binary@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-              "dependencies": {
-                "chainsaw": {
-                  "version": "0.1.0",
-                  "from": "chainsaw@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-                  "dependencies": {
-                    "traverse": {
-                      "version": "0.3.9",
-                      "from": "traverse@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                    }
-                  }
-                },
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "setimmediate": {
-              "version": "1.0.4",
-              "from": "setimmediate@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-            },
-            "match-stream": {
-              "version": "0.0.2",
-              "from": "match-stream@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-              "dependencies": {
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "vinyl-fs": {
-          "version": "1.0.0",
-          "from": "vinyl-fs@1.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
-          "dependencies": {
-            "duplexify": {
-              "version": "3.4.2",
-              "from": "duplexify@>=3.2.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
-              "dependencies": {
-                "end-of-stream": {
-                  "version": "1.0.0",
-                  "from": "end-of-stream@1.0.0",
-                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-                  "dependencies": {
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.5",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "glob-stream": {
-              "version": "4.1.1",
-              "from": "glob-stream@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=4.3.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "2.0.10",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "ordered-read-streams": {
-                  "version": "0.1.0",
-                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-                },
-                "glob2base": {
-                  "version": "0.0.12",
-                  "from": "glob2base@>=0.0.12 <0.0.13",
-                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-                  "dependencies": {
-                    "find-index": {
-                      "version": "0.1.1",
-                      "from": "find-index@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                    }
-                  }
-                },
-                "unique-stream": {
-                  "version": "2.2.0",
-                  "from": "unique-stream@>=2.0.2 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
-                  "dependencies": {
-                    "through2-filter": {
-                      "version": "2.0.0",
-                      "from": "through2-filter@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-                      "dependencies": {
-                        "through2": {
-                          "version": "2.0.0",
-                          "from": "through2@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "2.0.4",
-                              "from": "readable-stream@>=2.0.0 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@>=2.0.1 <2.1.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "process-nextick-args": {
-                                  "version": "1.0.5",
-                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                },
-                                "util-deprecate": {
-                                  "version": "1.0.2",
-                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <4.1.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "glob-watcher": {
-              "version": "0.0.8",
-              "from": "glob-watcher@>=0.0.8 <0.0.9",
-              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
-              "dependencies": {
-                "gaze": {
-                  "version": "0.5.2",
-                  "from": "gaze@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-                  "dependencies": {
-                    "globule": {
-                      "version": "0.1.0",
-                      "from": "globule@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                      "dependencies": {
-                        "lodash": {
-                          "version": "1.0.2",
-                          "from": "lodash@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                        },
-                        "glob": {
-                          "version": "3.1.21",
-                          "from": "glob@>=3.1.21 <3.2.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "1.2.3",
-                              "from": "graceful-fs@>=1.2.0 <1.3.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                            },
-                            "inherits": {
-                              "version": "1.0.2",
-                              "from": "inherits@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "0.2.14",
-                          "from": "minimatch@>=0.2.11 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "merge-stream": {
-              "version": "0.1.8",
-              "from": "merge-stream@>=0.1.7 <0.2.0",
-              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "2.1.1",
-              "from": "object-assign@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
-            },
-            "strip-bom": {
-              "version": "1.0.0",
-              "from": "strip-bom@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-              "dependencies": {
-                "first-chunk-stream": {
-                  "version": "1.0.0",
-                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-                },
-                "is-utf8": {
-                  "version": "0.2.0",
-                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.5",
-              "from": "through2@>=0.6.1 <0.7.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "1.1.2",
-          "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.0.0",
-              "from": "async@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
-            },
-            "colors": {
-              "version": "1.0.3",
-              "from": "colors@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "isstream": {
-              "version": "0.1.2",
-              "from": "isstream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-            },
-            "pkginfo": {
-              "version": "0.3.1",
-              "from": "pkginfo@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "moment": {
-      "version": "2.10.6",
-      "from": "moment@>=2.10.6 <3.0.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
-    },
-    "ncp": {
-      "version": "0.4.2",
-      "from": "ncp@0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
-    },
-    "npm": {
-      "version": "2.1.3",
-      "from": "npm@2.1.3",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.3.tgz",
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.5",
-          "from": "abbrev@latest",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
-        },
-        "ansi": {
-          "version": "0.3.0",
-          "from": "ansi@latest",
-          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-        },
-        "ansicolors": {
-          "version": "0.3.2",
-          "from": "ansicolors@latest"
-        },
-        "ansistyles": {
-          "version": "0.1.3",
-          "from": "ansistyles@0.1.3",
-          "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
-        },
-        "archy": {
-          "version": "0.0.2",
-          "from": "archy@0.0.2"
-        },
-        "async-some": {
-          "version": "1.0.1",
-          "from": "async-some@>=1.0.1-0 <2.0.0-0",
-          "resolved": "https://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz"
-        },
-        "block-stream": {
-          "version": "0.0.7",
-          "from": "block-stream@latest"
-        },
-        "char-spinner": {
-          "version": "1.0.1",
-          "from": "char-spinner@latest",
-          "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-        },
-        "child-process-close": {
-          "version": "0.1.1",
-          "from": "child-process-close@",
-          "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
-        },
-        "chmodr": {
-          "version": "0.1.0",
-          "from": "chmodr@latest"
-        },
-        "chownr": {
-          "version": "0.0.1",
-          "from": "../chownr"
-        },
-        "cmd-shim": {
-          "version": "2.0.1",
-          "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
-          "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
-        },
-        "columnify": {
-          "version": "1.2.1",
-          "from": "columnify@>=1.2.1-0 <2.0.0-0",
-          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz",
-          "dependencies": {
-            "strip-ansi": {
-              "version": "1.0.0",
-              "from": "strip-ansi@>=1.0.0-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@0.2.1",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "wcwidth": {
-              "version": "1.0.0",
-              "from": "wcwidth@>=1.0.0-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
-              "dependencies": {
-                "defaults": {
-                  "version": "1.0.0",
-                  "from": "defaults@>=1.0.0-0 <2.0.0-0",
-                  "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz",
-                  "dependencies": {
-                    "clone": {
-                      "version": "0.1.18",
-                      "from": "clone@>=0.1.5-0 <0.2.0-0",
-                      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.18.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "dezalgo": {
-          "version": "1.0.1",
-          "from": "dezalgo@latest",
-          "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz",
-          "dependencies": {
-            "asap": {
-              "version": "1.0.0",
-              "from": "asap@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
-            }
-          }
-        },
-        "editor": {
-          "version": "0.1.0",
-          "from": "editor@latest",
-          "resolved": "https://registry.npmjs.org/editor/-/editor-0.1.0.tgz"
-        },
-        "fs-vacuum": {
-          "version": "1.2.1",
-          "from": "fs-vacuum@>=1.2.1-0 <1.3.0-0"
-        },
-        "fs-write-stream-atomic": {
-          "version": "1.0.2",
-          "from": "fs-write-stream-atomic@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz"
-        },
-        "fstream": {
-          "version": "1.0.2",
-          "from": "fstream@1.0.2",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz"
-        },
-        "fstream-npm": {
-          "version": "1.0.0",
-          "from": "fstream-npm@latest",
-          "dependencies": {
-            "fstream-ignore": {
-              "version": "1.0.1",
-              "from": "fstream-ignore@^1.0.0"
-            }
-          }
-        },
-        "github-url-from-git": {
-          "version": "1.4.0",
-          "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
-          "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-        },
-        "github-url-from-username-repo": {
-          "version": "1.0.2",
-          "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
-        },
-        "glob": {
-          "version": "4.0.5",
-          "from": "glob@latest",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz"
-        },
-        "graceful-fs": {
-          "version": "3.0.2",
-          "from": "graceful-fs@~3.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
-        },
-        "inflight": {
-          "version": "1.0.3",
-          "from": "inflight@>=1.0.3 <1.1.0"
-        },
-        "inherits": {
-          "version": "2.0.1",
-          "from": "inherits@latest",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-        },
-        "ini": {
-          "version": "1.2.1",
-          "from": "ini@latest",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.2.1.tgz"
-        },
-        "init-package-json": {
-          "version": "1.1.0",
-          "from": "init-package-json@>=1.1.0 <1.2.0",
-          "dependencies": {
-            "promzard": {
-              "version": "0.2.2",
-              "from": "promzard@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz"
-            }
-          }
-        },
-        "lockfile": {
-          "version": "1.0.0",
-          "from": "lockfile@1.0.0",
-          "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"
-        },
-        "lru-cache": {
-          "version": "2.5.0",
-          "from": "lru-cache@latest"
-        },
-        "minimatch": {
-          "version": "1.0.0",
-          "from": "minimatch@latest",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-          "dependencies": {
-            "sigmund": {
-              "version": "1.0.0",
-              "from": "sigmund@~1.0.0",
-              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
-            }
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.0",
-          "from": "mkdirp@latest",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "from": "minimist@0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-            }
-          }
-        },
-        "node-gyp": {
-          "version": "1.0.2",
-          "from": "node-gyp@>=1.0.1-0 <1.1.0-0",
-          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"
-        },
-        "nopt": {
-          "version": "3.0.1",
-          "from": "nopt@latest"
-        },
-        "normalize-package-data": {
-          "version": "1.0.3",
-          "from": "normalize-package-data@>=1.0.3 <1.1.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
-        },
-        "npm-cache-filename": {
-          "version": "1.0.1",
-          "from": "npm-cache-filename@latest",
-          "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
-        },
-        "npm-install-checks": {
-          "version": "1.0.4",
-          "from": "npm-install-checks@>=1.0.2-0 <1.1.0-0",
-          "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz"
-        },
-        "npm-package-arg": {
-          "version": "2.1.3",
-          "from": "npm-package-arg@~2.1.3"
-        },
-        "npm-registry-client": {
-          "version": "3.2.2",
-          "from": "npm-registry-client@>=3.2.2 <3.3.0"
-        },
-        "npm-user-validate": {
-          "version": "0.1.0",
-          "from": "npm-user-validate@latest"
-        },
-        "npmconf": {
-          "version": "2.1.0",
-          "from": "npmconf@>=2.1.0 <2.2.0",
-          "dependencies": {
-            "config-chain": {
-              "version": "1.1.8",
-              "from": "config-chain@>=1.1.8 <1.2.0",
-              "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz",
-              "dependencies": {
-                "proto-list": {
-                  "version": "1.2.3",
-                  "from": "proto-list@>=1.2.1 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "npmlog": {
-          "version": "0.1.1",
-          "from": "npmlog@latest"
-        },
-        "once": {
-          "version": "1.3.0",
-          "from": "once@latest"
-        },
-        "opener": {
-          "version": "1.3.0",
-          "from": "opener@latest"
-        },
-        "osenv": {
-          "version": "0.1.0",
-          "from": "osenv@~0.1.0"
-        },
-        "path-is-inside": {
-          "version": "1.0.1",
-          "from": "path-is-inside@1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
-        },
-        "read": {
-          "version": "1.0.5",
-          "from": "read@latest",
-          "dependencies": {
-            "mute-stream": {
-              "version": "0.0.4",
-              "from": "mute-stream@~0.0.4"
-            }
-          }
-        },
-        "read-installed": {
-          "version": "3.1.3",
-          "from": "read-installed@>=3.1.2-0 <3.2.0-0",
-          "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.3.tgz",
-          "dependencies": {
-            "debuglog": {
-              "version": "1.0.1",
-              "from": "debuglog@>=1.0.1-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
-            },
-            "readdir-scoped-modules": {
-              "version": "1.0.0",
-              "from": "readdir-scoped-modules@>=1.0.0-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.0.tgz"
-            },
-            "util-extend": {
-              "version": "1.0.1",
-              "from": "util-extend@>=1.0.1-0 <2.0.0-0",
-              "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
-            }
-          }
-        },
-        "read-package-json": {
-          "version": "1.2.7",
-          "from": "read-package-json@>=1.2.7-0 <1.3.0-0",
-          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.32",
-          "from": "readable-stream@*",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.1",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            }
-          }
-        },
-        "realize-package-specifier": {
-          "version": "1.1.0",
-          "from": "realize-package-specifier@1.1.0"
-        },
-        "request": {
-          "version": "2.44.0",
-          "from": "request@>=2.44.0 <2.45.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.44.0.tgz",
-          "dependencies": {
-            "bl": {
-              "version": "0.9.3",
-              "from": "bl@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz"
-            },
-            "caseless": {
-              "version": "0.6.0",
-              "from": "caseless@>=0.6.0 <0.7.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
-            },
-            "forever-agent": {
-              "version": "0.5.2",
-              "from": "forever-agent@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-            },
-            "qs": {
-              "version": "1.2.2",
-              "from": "qs@>=1.2.0 <1.3.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
-            },
-            "json-stringify-safe": {
-              "version": "5.0.0",
-              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-            },
-            "mime-types": {
-              "version": "1.0.2",
-              "from": "mime-types@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-            },
-            "node-uuid": {
-              "version": "1.4.1",
-              "from": "node-uuid@>=1.4.0 <1.5.0",
-              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-            },
-            "tunnel-agent": {
-              "version": "0.4.0",
-              "from": "tunnel-agent@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-            },
-            "tough-cookie": {
-              "version": "0.12.1",
-              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-              "dependencies": {
-                "punycode": {
-                  "version": "1.3.1",
-                  "from": "punycode@>=0.2.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
-                }
-              }
-            },
-            "form-data": {
-              "version": "0.1.4",
-              "from": "form-data@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-              "dependencies": {
-                "combined-stream": {
-                  "version": "0.0.5",
-                  "from": "combined-stream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "mime": {
-                  "version": "1.2.11",
-                  "from": "mime@>=1.2.11 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                },
-                "async": {
-                  "version": "0.9.0",
-                  "from": "async@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
-                }
-              }
-            },
-            "http-signature": {
-              "version": "0.10.0",
-              "from": "http-signature@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
-              "dependencies": {
-                "assert-plus": {
-                  "version": "0.1.2",
-                  "from": "assert-plus@0.1.2",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
-                },
-                "asn1": {
-                  "version": "0.1.11",
-                  "from": "asn1@0.1.11",
-                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                },
-                "ctype": {
-                  "version": "0.5.2",
-                  "from": "ctype@0.5.2",
-                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
-                }
-              }
-            },
-            "oauth-sign": {
-              "version": "0.4.0",
-              "from": "oauth-sign@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
-            },
-            "hawk": {
-              "version": "1.1.1",
-              "from": "hawk@1.1.1",
-              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                },
-                "boom": {
-                  "version": "0.4.2",
-                  "from": "boom@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                },
-                "cryptiles": {
-                  "version": "0.2.2",
-                  "from": "cryptiles@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                },
-                "sntp": {
-                  "version": "0.2.4",
-                  "from": "sntp@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                }
-              }
-            },
-            "aws-sign2": {
-              "version": "0.5.0",
-              "from": "aws-sign2@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-            },
-            "stringstream": {
-              "version": "0.0.4",
-              "from": "stringstream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
-            }
-          }
-        },
-        "retry": {
-          "version": "0.6.0",
-          "from": "retry"
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "from": "rimraf@latest",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-        },
-        "semver": {
-          "version": "4.0.0",
-          "from": "semver@>=4.0.0-0 <5.0.0-0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.0.0.tgz"
-        },
-        "sha": {
-          "version": "1.2.4",
-          "from": "sha@>=1.2.1 <1.3.0",
-          "resolved": "https://registry.npmjs.org/sha/-/sha-1.2.4.tgz"
-        },
-        "slide": {
-          "version": "1.1.6",
-          "from": "slide@>=1.1.6 <1.2.0",
-          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
-        },
-        "sorted-object": {
-          "version": "1.0.0",
-          "from": "sorted-object@"
-        },
-        "tar": {
-          "version": "1.0.1",
-          "from": "tar@1.0.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz"
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "from": "text-table@~0.2.0"
-        },
-        "uid-number": {
-          "version": "0.0.5",
-          "from": "uid-number@latest",
-          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-        },
-        "which": {
-          "version": "1.0.5",
-          "from": "which@1"
-        },
-        "wrappy": {
-          "version": "1.0.1",
-          "from": "wrappy@1.0.1",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-        },
-        "write-file-atomic": {
-          "version": "1.1.0",
-          "from": "write-file-atomic@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz"
-        }
-      }
-    },
-    "open": {
-      "version": "0.0.5",
-      "from": "open@0.0.5",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
-    },
-    "optimist": {
-      "version": "0.6.0",
-      "from": "optimist@0.6.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-        },
-        "minimist": {
-          "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-        }
-      }
-    },
-    "progress": {
-      "version": "1.1.7",
-      "from": "progress@1.1.7",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
-    },
-    "prompt": {
-      "version": "0.2.12",
-      "from": "prompt@0.2.12",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
-      "dependencies": {
-        "pkginfo": {
-          "version": "0.3.1",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-        },
-        "read": {
-          "version": "1.0.7",
-          "from": "read@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-          "dependencies": {
-            "mute-stream": {
-              "version": "0.0.5",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "revalidator": {
-          "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
-        },
-        "utile": {
-          "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-            },
-            "deep-equal": {
-              "version": "1.0.1",
-              "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-            },
-            "i": {
-              "version": "0.3.3",
-              "from": "i@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "pkginfo": {
-              "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
-            },
-            "request": {
-              "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "proxy-middleware": {
-      "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
-      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
-    },
-    "q": {
-      "version": "1.0.1",
-      "from": "q@1.0.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
-    },
-    "request": {
-      "version": "2.51.0",
-      "from": "request@2.51.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
-      "dependencies": {
-        "bl": {
-          "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "caseless": {
-          "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-        },
-        "form-data": {
-          "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-          "dependencies": {
-            "mime-types": {
-              "version": "2.0.14",
-              "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-              "dependencies": {
-                "mime-db": {
-                  "version": "1.12.0",
-                  "from": "mime-db@>=1.12.0 <1.13.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-        },
-        "mime-types": {
-          "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-        },
-        "node-uuid": {
-          "version": "1.4.7",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-        },
-        "qs": {
-          "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-        },
-        "tunnel-agent": {
-          "version": "0.4.1",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-        },
-        "tough-cookie": {
-          "version": "2.2.1",
-          "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-        },
-        "http-signature": {
-          "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-            },
-            "asn1": {
-              "version": "0.1.11",
-              "from": "asn1@0.1.11",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-            },
-            "ctype": {
-              "version": "0.5.3",
-              "from": "ctype@0.5.3",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-            }
-          }
-        },
-        "oauth-sign": {
-          "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
-        },
-        "hawk": {
-          "version": "1.1.1",
-          "from": "hawk@1.1.1",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-          "dependencies": {
-            "hoek": {
-              "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-            },
-            "boom": {
-              "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-            },
-            "cryptiles": {
-              "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-            },
-            "sntp": {
-              "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-            }
-          }
-        },
-        "aws-sign2": {
-          "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "from": "stringstream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-        },
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        }
-      }
-    },
-    "semver": {
-      "version": "4.3.6",
-      "from": "semver@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-    },
-    "serve-static": {
-      "version": "1.7.1",
-      "from": "serve-static@1.7.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
-      "dependencies": {
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "send": {
-          "version": "0.10.1",
-          "from": "send@0.10.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "2.1.3",
-              "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.7.0",
-                  "from": "ms@0.7.0",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
-                }
-              }
-            },
-            "depd": {
-              "version": "1.0.1",
-              "from": "depd@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
-            },
-            "destroy": {
-              "version": "1.0.3",
-              "from": "destroy@1.0.3",
-              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
-            },
-            "etag": {
-              "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
-            },
-            "fresh": {
-              "version": "0.2.4",
-              "from": "fresh@0.2.4",
-              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            },
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            },
-            "on-finished": {
-              "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-              "dependencies": {
-                "ee-first": {
-                  "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
-                }
-              }
-            },
-            "range-parser": {
-              "version": "1.0.3",
-              "from": "range-parser@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
-            }
-          }
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "shelljs": {
-      "version": "0.2.6",
-      "from": "shelljs@0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
-    },
-    "tiny-lr-fork": {
-      "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
-      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
-      "dependencies": {
-        "qs": {
-          "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
-        },
-        "faye-websocket": {
-          "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
-        },
-        "noptify": {
-          "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
-          "dependencies": {
-            "nopt": {
-              "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                }
-              }
-            }
-          }
-        },
-        "debug": {
-          "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-        }
-      }
-    },
-    "underscore": {
-      "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-    },
-    "unzip": {
-      "version": "0.1.9",
-      "from": "unzip@0.1.9",
-      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
-      "dependencies": {
-        "fstream": {
-          "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-          "dependencies": {
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "pullstream": {
-          "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-          "dependencies": {
-            "over": {
-              "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
-              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-            },
-            "slice-stream": {
-              "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "binary": {
-          "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-          "dependencies": {
-            "chainsaw": {
-              "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-              "dependencies": {
-                "traverse": {
-                  "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                }
-              }
-            },
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.2",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "setimmediate": {
-          "version": "1.0.4",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-        },
-        "match-stream": {
-          "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-          "dependencies": {
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "vinyl-fs": {
-      "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-      "dependencies": {
-        "glob-stream": {
-          "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "4.5.3",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "minimatch": {
-              "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.2",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.3.0",
-                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "ordered-read-streams": {
-              "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-            },
-            "glob2base": {
-              "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "dependencies": {
-                "find-index": {
-                  "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                }
-              }
-            },
-            "unique-stream": {
-              "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "glob-watcher": {
-          "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
-          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-          "dependencies": {
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "3.0.8",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "from": "minimist@0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-            }
-          }
-        },
-        "strip-bom": {
-          "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-          "dependencies": {
-            "first-chunk-stream": {
-              "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-            },
-            "is-utf8": {
-              "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-            }
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "xtend": {
-              "version": "4.0.1",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "dependencies": {
-            "clone": {
-              "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-            },
-            "clone-stats": {
-              "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
-              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "xml2js": {
-      "version": "0.4.4",
-      "from": "xml2js@0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-      "dependencies": {
-        "sax": {
-          "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
-        },
-        "xmlbuilder": {
-          "version": "4.1.0",
-          "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index 8dbaa6942b..c9eb1c1dda 100644
--- a/package.json
+++ b/package.json
@@ -90,5 +90,39 @@
   "devDependencies": {
     "jasmine-node": "^1.14.5",
     "rewire": "^2.3.4"
-  }
+  },
+  "bundledDependencies": [
+    "async",
+    "cheerio",
+    "cli-table",
+    "colors",
+    "connect",
+    "connect-livereload",
+    "crc",
+    "cross-spawn",
+    "event-stream",
+    "expand-tilde",
+    "finalhandler",
+    "form-data",
+    "gulp",
+    "ionic-app-lib",
+    "moment",
+    "ncp",
+    "npm",
+    "open",
+    "optimist",
+    "progress",
+    "prompt",
+    "proxy-middleware",
+    "q",
+    "request",
+    "semver",
+    "serve-static",
+    "shelljs",
+    "tiny-lr-fork",
+    "underscore",
+    "unzip",
+    "vinyl-fs",
+    "xml2js"
+  ]
 }

From bf34d713fe6d6bc3c31c40c211bccb77579c2457 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 14 Dec 2015 10:57:23 -0600
Subject: [PATCH 0842/1100] bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9eb1c1dda..324a15161b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.11",
+  "version": "1.7.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 23ef8314b44f8f338b22977eadd3cee1b49c380f Mon Sep 17 00:00:00 2001
From: Matheus Cruz Rocha <matheus.rocha89@gmail.com>
Date: Fri, 1 Jan 2016 11:54:19 -0300
Subject: [PATCH 0843/1100] Adding plugins alias to project

---
 lib/ionic/cordova.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 9cf339e6df..ddb5a33f40 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -44,7 +44,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     var addDefaultResources = false;
     var isPlatformCmd = argv._.indexOf('platform') != -1 || argv._.indexOf('platforms') != -1;
     var isAddCmd = argv._.indexOf('add') != -1;
-    var isPluginCmd = argv._.indexOf('plugin') != -1;
+    var isPluginCmd = argv._.indexOf('plugin') != -1 || argv._.indexOf('plugins') != -1;
     var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
     if (isPlatformCmd || isAddCmd) {

From 816eee08d513fccb7213686926ef462785610fcd Mon Sep 17 00:00:00 2001
From: Matheus Cruz Rocha <matheus.rocha89@gmail.com>
Date: Fri, 1 Jan 2016 11:59:42 -0300
Subject: [PATCH 0844/1100] Just to run the build on circleci


From f80dc694e2d33aa7fb6082bfed8484327f594263 Mon Sep 17 00:00:00 2001
From: Matheus Cruz Rocha <matheus.rocha89@gmail.com>
Date: Fri, 1 Jan 2016 18:27:55 -0300
Subject: [PATCH 0845/1100] Adding alt to plugin task object

---
 lib/tasks/cliTasks.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 2a16ada6f6..bf3d7b2063 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -187,6 +187,7 @@ var TASKS = [
         boolean: true
       }
     },
+    alt: ['plugins'],
     module: './ionic/cordova'
   },
   {

From 4f75f8a7d91f68350bd346f119aafae5c722d8de Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 19 Jan 2016 22:13:35 -0600
Subject: [PATCH 0846/1100] Remove stale commands

---
 lib/tasks/cliTasks.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 2a16ada6f6..e2f255b349 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -400,6 +400,7 @@ var TASKS = [
     module: './ionic/add',
     alt: ['ls']
    },
+   /*
    {
     title: 'ions',
     name: 'ions',
@@ -418,6 +419,7 @@ var TASKS = [
      summary: 'List information about the users runtime environment',
      module: './ionic/info'
    },
+   */
    {
      title: 'help',
      name: 'help',

From c77fc9995506e91d41a22c6f7d533e166e1e865a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 19 Jan 2016 22:14:49 -0600
Subject: [PATCH 0847/1100] New version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 324a15161b..f3595310e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.12",
+  "version": "1.7.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From fec24f7eecdc02d536fc62f5eb27b93084127001 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 20 Jan 2016 12:20:23 -0600
Subject: [PATCH 0848/1100] fix(): add info back in

---
 lib/tasks/cliTasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index e2f255b349..25233c9ace 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -413,13 +413,13 @@ var TASKS = [
     summary: 'List available Ionic starter templates',
     module: './ionic/templates'
    },
+   */
    {
      title: 'info',
      name: 'info',
      summary: 'List information about the users runtime environment',
      module: './ionic/info'
    },
-   */
    {
      title: 'help',
      name: 'help',

From 8f4ca0c182f2fd456087cf40a84a10bd97dccac7 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 1 Feb 2016 16:39:02 -0600
Subject: [PATCH 0849/1100] Send options to app-lib, including --noresources
 flag for package

---
 lib/ionic/package.js  | 11 ++++++++---
 lib/tasks/cliTasks.js |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 55e7855d22..c4d244883d 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -82,28 +82,33 @@ function packageBuild(ionic, argv, dir, project, appId) {
       return jar;
     })
     .then(function(j) {
+      var options = {};
       jar = j;
 
       if (typeof argv.p !== 'undefined') {
         argv.profile = argv.p;
       }
 
+      if (typeof argv.noresources !== 'undefined') {
+        options.noresources = true;
+      }
+
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          return Package.buildAndroidDebug(dir, jar, appId);
+          return Package.buildAndroidDebug(dir, jar, appId, options);
         } else if (buildMode === 'release') {
           if (typeof argv.profile === 'undefined') {
             return Utils.fail("Must specify security profile for android release builds (--profile <tag>).", 'package');
           }
 
-          return Package.buildAndroidRelease(dir, jar, appId, argv.profile)
+          return Package.buildAndroidRelease(dir, jar, appId, argv.profile, options);
         }
       } else if (platform === 'ios') {
         if (typeof argv.profile === 'undefined') {
           return Utils.fail("Must specify security profile for ios builds (--profile <tag>).", 'package');
         }
 
-        return Package.buildIOS(dir, jar, appId, argv.profile, buildMode)
+        return Package.buildIOS(dir, jar, appId, argv.profile, buildMode, options);
       }
 
       return Q.reject('Unrecognized platform/build mode.');
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 25233c9ace..408244e350 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -333,6 +333,7 @@ var TASKS = [
     options: {
       '--release': '(' + 'build <platform>'.yellow + ') Mark this build as a release',
       '--profile|-p <tag>': '(' + 'build <platform>'.yellow + ') Specify the Security Profile to use with this build',
+      '--noresources': '(' + 'build <platform>'.yellow + ') Do not generate icon and splash screen resources during this build',
       '--destination|-d <path>': '(' + 'download'.yellow + ') Specify the destination directory to download your packaged app.'
     },
     module: './ionic/package'

From 5b03fedea11144cebd15a374c14c48252a318723 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Mon, 1 Feb 2016 17:05:12 -0600
Subject: [PATCH 0850/1100] bump to 1.7.14

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f3595310e8..e18f01d307 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.6.5",
+    "ionic-app-lib": "0.7.0",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 3d675b1584b5921ca05aad6af17d84fd691e7b0c Mon Sep 17 00:00:00 2001
From: fuiste <drawncloser@gmail.com>
Date: Thu, 10 Mar 2016 11:20:56 -0600
Subject: [PATCH 0851/1100] Update bower error msg

---
 lib/ionic/add.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 01f593b59a..20e9760f76 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -20,7 +20,8 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(compo
 
   if (result.code != 0) {
     //Error happened, report it.
-    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    var errorMessage = 'Bower error, check that "'.error.bold + componentName.verbose + '"'.error.bold + ' exists,'.error.bold + 
+                       '\nor try running "'.error.bold + bowerInstallCommand.verbose + '" for more info.'.error.bold;
     this.ionic.fail(errorMessage, 'add');
   } else {
     var message = 'Bower component installed - ' + componentName;

From 666ae35acf37560600b17bca8ef27dba0c0a6b7a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 14:45:14 -0600
Subject: [PATCH 0852/1100] feat(v2): New v2 support

---
 CHANGELOG.md                                  |  16 +-
 README.md                                     |  38 +-
 e2e/e2e.spec.js                               | 194 ++--
 e2e/shell.spec.js                             | 198 ++--
 lib/cli.js                                    |  87 +-
 .../after_platform_add/010_install_plugins.js |  25 +-
 lib/ionic/add.js                              |   4 -
 lib/ionic/app.js                              |   3 +-
 lib/ionic/browser.js                          |   2 -
 lib/ionic/cordova.js                          | 188 +++-
 lib/ionic/docs.js                             |   3 -
 lib/ionic/generate.js                         |  78 ++
 lib/ionic/help.js                             |   4 -
 lib/ionic/hooks.js                            |   3 -
 lib/ionic/info.js                             |   5 +-
 lib/ionic/ions.js                             |   1 -
 lib/ionic/lib.js                              |   4 +-
 lib/ionic/link.js                             |   3 +-
 lib/ionic/login.js                            |   5 +-
 lib/ionic/package.js                          |   1 +
 lib/ionic/push.js                             |   7 +-
 lib/ionic/resources/generate.js               | 898 ++++++++++++++++++
 lib/ionic/serve.js                            |  40 +-
 lib/ionic/service.js                          |   4 -
 lib/ionic/setup.js                            |   6 +-
 lib/ionic/share.js                            |   3 -
 lib/ionic/start.js                            |  27 +-
 lib/ionic/state.js                            |   3 -
 lib/ionic/stats.js                            |  12 +-
 lib/ionic/templates.js                        |   3 -
 lib/ionic/upload.js                           |   3 -
 lib/ionic/v2.js                               |  33 +
 lib/tasks/cliTasks.js                         |  42 +-
 package.json                                  |  10 +-
 spec/cli.spec.js                              | 285 +++---
 spec/serve.spec.js                            |  88 ++
 spec/start.spec.js                            |  22 +
 spec/stats.spec.js                            |  69 ++
 38 files changed, 1979 insertions(+), 438 deletions(-)
 create mode 100644 lib/ionic/generate.js
 create mode 100644 lib/ionic/resources/generate.js
 create mode 100644 lib/ionic/v2.js
 create mode 100644 spec/serve.spec.js
 create mode 100644 spec/start.spec.js
 create mode 100644 spec/stats.spec.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf05d242ce..57483baf70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,12 @@
 
 * Added security command for managing Security Profiles.
 * Added package command for Ionic Package.
+* Added winston as default logger - may break event listeners.
+* Added ENV variable CONNECT_LIVE_RELOAD_PORT for users to expose the live reload server on a port.
+* Speed up CLI by lazy-loading ionic-app-lib modules.
+* Update hooks - use `util` instead of deprecated `sys`.
+* Update hooks to run sequentially instead of asychronously.
+* Added additional tests for CLI, stats, and running commands.
 
 ### 1.6.5
 
@@ -37,7 +43,7 @@
 
 ### 1.6.4
 
-* Updating app-lib dependency
+* Updating app-lib dependency.
 
 ### 1.6.3
 
@@ -47,7 +53,7 @@
 
 * Added `io init` command to initialize your project with ionic.io.
 * Added config command to centralize ionic.io services configuration.
-* Added `--deploy` flag to upload command. 
+* Added `--deploy` flag to upload command.
 
 ### 1.6.1
 
@@ -75,7 +81,7 @@
 * Fix(platform): Remove console.log command from ionic-cordova-lib, bump to 5.1.5 to have that change.
 * Update ionic-cordova-lib to 5.1.4 for fix with cordova lib run propagating errors to callers.
 * Fix for serve - directory root is using path.join instead of path.resolve.
-* Add build platform to the cordova command. 
+* Add build platform to the cordova command.
 * Bump version of ionic-cordova-lib.
 
 ### 1.5.5
@@ -138,7 +144,7 @@
 * Fix for a bug when serve wont start console logs with `--consolelogs` argument.
 * Added flag `--platform` for serve command that opens the browser with those platform specific styles (android/ios).
 
-### 1.4.1 
+### 1.4.1
 
 * Corrected a bug with ionic state restore command - it now properly passes the app directory to be fixed.
 * Corrected landscape and portrait sizes for the resources command.
@@ -164,7 +170,7 @@
 
 * Fix for Ionic default hooks permissions
 
-### 1.3.20 
+### 1.3.20
 
 * Adding in a command with ionic start to provide an ionic io app ID. `ionic start --io-app-id <someid>`
 
diff --git a/README.md b/README.md
index 3e5242f3b1..ede0734da3 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ __Command-line flags/options:__
     [--no-cordova|-w]  ....  Do not create an app targeted for Cordova
     [--sass|-s] ...........  Setup the project to use Sass CSS precompiling
     [--list|-l]  ..........  List starter templates available
-    
+
     [--io-app-id] .........  The Ionic.io app ID to use
 
 ## Adding a platform target
@@ -448,7 +448,7 @@ Set `IONIC_EMAIL` and `IONIC_PASSWORD` as variables to have the CLI read these i
 
 ## Upload your Ionic app
 
-Use the `ionic upload` command to take your current application you are developing and upload it to the Ionic.io servers. 
+Use the `ionic upload` command to take your current application you are developing and upload it to the Ionic.io servers.
 
 Now you can use [the ionic view app](http://view.ionic.io/) to view that application or have others view the application.
 
@@ -467,7 +467,7 @@ You can then view that App ID from the View app or the application listing on io
 
 ### Adding a note with your upload
 
-To add a note to your build, pass the `--note` option as follows: 
+To add a note to your build, pass the `--note` option as follows:
 
 `ionic upload --note "This version of the application fixes the menu selections"`.
 
@@ -490,9 +490,9 @@ To get help with a doc you may not remember, just type the name close enough: `i
 
 # Ionic Hooks
 
-Ionic provides some default hooks for you to use in your Cordova application. In versions prior to 1.3.18, these hooks were automatically installed via the `ionic platform` command. 
+Ionic provides some default hooks for you to use in your Cordova application. In versions prior to 1.3.18, these hooks were automatically installed via the `ionic platform` command.
 
-In 1.3.18, the hooks were automatically removed due to some errors users were having with Crosswalk and other plugins with variables. 
+In 1.3.18, the hooks were automatically removed due to some errors users were having with Crosswalk and other plugins with variables.
 
 If you were a user who would still like to use those hooks, you can re-install these hooks with the `ionic hooks add` command.
 
@@ -541,7 +541,7 @@ Your package.json file might look something like the following:
 
 ## ionic state save
 
-The `ionic state save` command does some lookup in your platforms and plugins to save the current state of your cordova application. 
+The `ionic state save` command does some lookup in your platforms and plugins to save the current state of your cordova application.
 
 First it looks in your platforms folder to see which platforms are installed, and saves the name and version in your `package.json` file under the `cordovaPlatforms` attribute.
 
@@ -568,20 +568,18 @@ The `ionic state reset` method will first remove your platforms and plugins fold
 This command can be helpful for you to reinstall your plugins and platforms to get a fresh start.
 
 
-# ionic.project file
+# Ionic CLI 2.0
+
+## Ionic Generators
+
+First class support has come to the Ionic CLI to scaffold and generate Ionic and Angular 2 components. To use this feature, first install the V2 Ionic CLI: `npm install ionic@alpha` and start an app.
+
+Once in the app folder, use the `generate` command (alias: `g`).
 
-The ionic.project is a configuration for an ionic project that stores the following:
+Usage:
+* `ionic generate page About` - Generate a page named About with HTML, JavaScript, and Sass named `about`.
+* `ionic g tabs MyTabPage` - Generate a page named MyTabPage, queries for the amount of tabs, and creates pages for those tabs.
 
-* `app_id` - the associated app ID in ionic.io.  
-* `browsers` - the installed browsers (CrossWalk).  
-* `createDocumentRoot` - boolean setting stating to create the designated.document root upon serve (for CI, using `app` folder, and compiling)  
-* `defaultBrowser` - the browser they prefer to use with `ionic serve`. Chrome, Firefox, etc.  
-* `documentRoot` - the associated document root with HTML/JS/CSS files.  
-* `gulpDependantTasks` - gulp tasks that are run before `ionic serve` launches. Think of `gulp build`, `gulp sass`, etc.  
-* `gulpStartupTasks` - gulp tasks that are run and kept alive during `ionic serve`.  
-* `imagePaths` - paths relative to document root that specify the release feature to compress images.  
-* `proxies` - designated proxies to use during `ionic serve`.  
-* `name` - the name of the application.  
-* `sass` - the setting to watch sass during `ionic serve`.  
-* `watchPatterns` - the patterns to watch and live reload during `ionic.serve`.  
+List:
 
+View all generators: `ionic g --list`.
diff --git a/e2e/e2e.spec.js b/e2e/e2e.spec.js
index 1ea7e017f7..cf12370c20 100644
--- a/e2e/e2e.spec.js
+++ b/e2e/e2e.spec.js
@@ -1,111 +1,111 @@
-var fs = require('fs'),
-    helpers = require('./helpers'),
-    path = require('path'),
-    Q = require('q'),
-    shell = require('shelljs');
+// var fs = require('fs'),
+//     helpers = require('./helpers'),
+//     path = require('path'),
+//     Q = require('q'),
+//     shell = require('shelljs');
 
-var IonicCli = require('../lib/cli');
-var IonicAppLib = require('ionic-app-lib');
+// var IonicCli = require('../lib/cli');
+// var IonicAppLib = require('ionic-app-lib');
 
-var tmpDir = helpers.tmpDir('create_test');
-var appName = 'TestIonic';
-var appId = 'org.ionic.testing';
-var project = path.join(tmpDir, appName);
-var optimist = require('optimist');
-var start = IonicAppLib.start;
-var utils = IonicAppLib.utils;
-var optimistSpy;
+// var tmpDir = helpers.tmpDir('create_test');
+// var appName = 'TestIonic';
+// var appId = 'org.ionic.testing';
+// var project = path.join(tmpDir, appName);
+// var optimist = require('optimist');
+// var start = IonicAppLib.start;
+// var utils = IonicAppLib.utils;
+// var optimistSpy;
 
 
-describe('end-to-end', function() {
-  beforeEach(function() {
-      jasmine.getEnv().defaultTimeoutInterval = 150000;
-      // if (optimistSpy) {
-      //   optimistSpy.reset();
-      // }
-      optimistSpy = spyOn(optimist, 'boolean');
-      optimist.boolean.reset();
+// xdescribe('end-to-end', function() {
+//   beforeEach(function() {
+//       jasmine.getEnv().defaultTimeoutInterval = 150000;
+//       // if (optimistSpy) {
+//       //   optimistSpy.reset();
+//       // }
+//       optimistSpy = spyOn(optimist, 'boolean');
+//       optimist.boolean.reset();
 
-      //Mock out call to get the app directory, return our project
-      spyOn(utils, 'getProjectDirectory').andReturn(project);
+//       //Mock out call to get the app directory, return our project
+//       spyOn(utils, 'getProjectDirectory').andReturn(project);
 
-      //Disable console.log statements
-      // spyOn(IonicAppLib.events, 'on');
-      // spyOn(process.stdout, 'write');
-      spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
+//       //Disable console.log statements
+//       // spyOn(IonicAppLib.events, 'on');
+//       // spyOn(process.stdout, 'write');
+//       spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
 
 
-      shell.rm('-rf', project);
-      shell.mkdir('-p', tmpDir);
-  });
-  afterEach(function() {
-      process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
-      // shell.rm('-rf', tmpDir);
-  });
+//       shell.rm('-rf', project);
+//       shell.mkdir('-p', tmpDir);
+//   });
+//   afterEach(function() {
+//       process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
+//       // shell.rm('-rf', tmpDir);
+//   });
 
-  describe('#start e2e', function() {
-    it('should call start with default template and folder name', function(done) {
-      console.log('default template');
-      var args = { _: ['start', 'test'], verbose: true};
-      //Mock out args from the commands.
-      // optimistSpy.andReturn({argv: args});
-      optimistSpy.andCallFake(function(){
-        return {argv: args};
-      });
+//   describe('#start e2e', function() {
+//     it('should call start with default template and folder name', function(done) {
+//       console.log('default template');
+//       var args = { _: ['start', 'test'], verbose: true};
+//       //Mock out args from the commands.
+//       // optimistSpy.andReturn({argv: args});
+//       optimistSpy.andCallFake(function(){
+//         return {argv: args};
+//       });
 
-      Q()
-      .then(function() {
-        return IonicCli.run(args);
-      }).then(function(){
-        expect(path.join(project, 'www', 'index.html')).toExist();
-        expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
-      })
-      .catch(function(error) {
-        expect('this').toBe('not this');
-      })
-      .fin(done);
-    });
+//       Q()
+//       .then(function() {
+//         return IonicCli.run(args);
+//       }).then(function(){
+//         expect(path.join(project, 'www', 'index.html')).toExist();
+//         expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
+//       })
+//       .catch(function(error) {
+//         expect('this').toBe('not this');
+//       })
+//       .fin(done);
+//     });
 
-    it('should call start with sidemenu template and folder name', function(done) {
-      console.log('sidemenu template');
-      var args = { _: ['start', 'test', 'sidemenu'], verbose: true};
-      //Mock out args from the commands.
-      // optimistSpy.andReturn({argv: args});
-      optimistSpy.andCallFake(function(){
-        return {argv: args};
-      });
+//     it('should call start with sidemenu template and folder name', function(done) {
+//       console.log('sidemenu template');
+//       var args = { _: ['start', 'test', 'sidemenu'], verbose: true};
+//       //Mock out args from the commands.
+//       // optimistSpy.andReturn({argv: args});
+//       optimistSpy.andCallFake(function(){
+//         return {argv: args};
+//       });
 
-      Q()
-      .then(function() {
-        return IonicCli.run(args);
-      }).then(function(){
-        expect(path.join(project, 'www', 'index.html')).toExist();
-        expect(path.join(project, 'www', 'templates', 'menu.html')).toExist();
-      })
-      .catch(function(error) {
-        expect('this').toBe('not this');
-      })
-      .fin(done);
-    });
+//       Q()
+//       .then(function() {
+//         return IonicCli.run(args);
+//       }).then(function(){
+//         expect(path.join(project, 'www', 'index.html')).toExist();
+//         expect(path.join(project, 'www', 'templates', 'menu.html')).toExist();
+//       })
+//       .catch(function(error) {
+//         expect('this').toBe('not this');
+//       })
+//       .fin(done);
+//     });
 
-    it('should call start with blank template and folder name', function(done) {
-      var args = { _: ['start', 'test', 'blank'], verbose: true};
-      //Mock out args from the commands.
-      optimistSpy.andCallFake(function(){
-        return {argv: args};
-      });
+//     it('should call start with blank template and folder name', function(done) {
+//       var args = { _: ['start', 'test', 'blank'], verbose: true};
+//       //Mock out args from the commands.
+//       optimistSpy.andCallFake(function(){
+//         return {argv: args};
+//       });
 
-      Q()
-      .then(function() {
-        return IonicCli.run(args);
-      }).then(function(){
-        expect(path.join(project, 'www', 'index.html')).toExist();
-        expect(path.join(project, 'www', 'js', 'app.js')).toExist();
-      })
-      .catch(function(error) {
-        expect('this').toBe('not this');
-      })
-      .fin(done);
-    });
-  });
-});
+//       Q()
+//       .then(function() {
+//         return IonicCli.run(args);
+//       }).then(function(){
+//         expect(path.join(project, 'www', 'index.html')).toExist();
+//         expect(path.join(project, 'www', 'js', 'app.js')).toExist();
+//       })
+//       .catch(function(error) {
+//         expect('this').toBe('not this');
+//       })
+//       .fin(done);
+//     });
+//   });
+// });
diff --git a/e2e/shell.spec.js b/e2e/shell.spec.js
index d6ec55e2b6..052e7782cb 100644
--- a/e2e/shell.spec.js
+++ b/e2e/shell.spec.js
@@ -45,6 +45,7 @@ ddescribe('end-to-end', function() {
       spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
 
 
+      console.log('Removing project', project);
       shell.rm('-rf', project);
       shell.mkdir('-p', tmpDir);
 
@@ -57,90 +58,147 @@ ddescribe('end-to-end', function() {
       // shell.rm('-rf', tmpDir);
   });
 
+  //This is working, Tim!
   describe('#start', function(){
-    xit('should start a new app', function(done) {
+    it('should start a v2 app without cordova cli', function() {
+      console.log('Starting v2 app');
       shell.cd(tmpDir);
-      shell.exec('echo "yes" | ionic start s1');
-      // expect(path.join(project, 's1', 'www', 'index.html')).toExist();
-      // expect(path.join(project, 's1', 'www', 'templates', 'tabs.html')).toExist();
-      shell.cd(path.join(tmpDir, 's1'));
-
-      // var deferred = Q.defer();
-
-      // spyOn(Serve, 'showFinishedServeMessage').andReturn(deferred.promise);
-
-      Q()
-      .then(function() {
-        // var deferred = Q.defer();
-        // shell.exec('ionic serve -b & ', {async: true});
-          // deferred.resolve();
-        // });
-        // return deferred.promise;
-      })
-      .then(function(){
-        console.log('ionic serve is done');
-        var deferred = Q.defer();
-
-        request({ url: 'http://0.0.0.0:8100' }, function(err, res, body) {
-          try {
-            console.log('body returned', body);
-            deferred.resolve(body);
-          } catch(e) {
-            deferred.reject(body);
-          }
-        });
-        return deferred.promise;
-      })
-      .then(function(result) {
-        console.log('result:', result);
-        expect(result).toBe(true);
-      })
-      .catch(function(err){
-        expect('this').toBe('not this');
-      })
-      .fin(done);
-
+      // shell.rm('-rf', path.join(project, 'i2'));
+      shell.exec('ionic start ' + appName +' --v2');
+      console.log('Ionic v2 app start completed. Now checking files existing.');
+      expect(path.join(project, 'node_modules', 'ionic-framework')).toExist();
+      expect(path.join(project, 'www', 'index.html')).toExist();
+      // expect(path.join(project, 'hooks', 'before_prepare', '01_gulp_build.js')).toExist();
+      console.log('v2 start completed');
+      // done();
+      return;
     });
+  });
 
-    iit('should start a new app and run it', function() {
-      shell.cd(tmpDir);
-      shell.exec('echo "yes" | ionic start ' + appName);
-      shell.cd(project);
+  // xdescribe('#start', function(){
+  //   xit('should start a new app', function(done) {
+  //     shell.cd(tmpDir);
+  //     shell.exec('echo "yes" | ionic start s1');
+  //     // expect(path.join(project, 's1', 'www', 'index.html')).toExist();
+  //     // expect(path.join(project, 's1', 'www', 'templates', 'tabs.html')).toExist();
+  //     shell.cd(path.join(tmpDir, 's1'));
+
+  //     // var deferred = Q.defer();
+
+  //     // spyOn(Serve, 'showFinishedServeMessage').andReturn(deferred.promise);
+
+  //     Q()
+  //     .then(function() {
+  //       // var deferred = Q.defer();
+  //       // shell.exec('ionic serve -b & ', {async: true});
+  //         // deferred.resolve();
+  //       // });
+  //       // return deferred.promise;
+  //     })
+  //     .then(function(){
+  //       console.log('ionic serve is done');
+  //       var deferred = Q.defer();
+
+  //       request({ url: 'http://0.0.0.0:8100' }, function(err, res, body) {
+  //         try {
+  //           console.log('body returned', body);
+  //           deferred.resolve(body);
+  //         } catch(e) {
+  //           deferred.reject(body);
+  //         }
+  //       });
+  //       return deferred.promise;
+  //     })
+  //     .then(function(result) {
+  //       console.log('result:', result);
+  //       expect(result).toBe(true);
+  //     })
+  //     .catch(function(err){
+  //       expect('this').toBe('not this');
+  //     })
+  //     .fin(done);
+
+  //   });
+
+  //   iit('should start a new app and run it', function() {
+  //     shell.cd(tmpDir);
+  //     shell.exec('echo "yes" | ionic start ' + appName);
+  //     shell.cd(project);
       
-      expect(path.join(project, 'www', 'index.html')).toExist();
-      expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
+  //     expect(path.join(project, 'www', 'index.html')).toExist();
+  //     expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
       
-      shell.exec('ionic plugin add org.apache.cordova.splashscreen');
+  //     shell.exec('ionic plugin add org.apache.cordova.splashscreen');
       
-      expect(path.join(project, 'plugins', 'org.apache.cordova.splashscreen', 'plugin.xml')).toExist();
+  //     expect(path.join(project, 'plugins', 'org.apache.cordova.splashscreen', 'plugin.xml')).toExist();
       
-      shell.exec('ionic platform add android');
+  //     shell.exec('ionic platform add android');
 
-      expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
-      expect(path.join(project, 'resources', 'icon.png')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
+  //     expect(path.join(project, 'resources', 'icon.png')).toExist();
 
-      shell.exec('ionic hooks add');
-      expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
+  //     shell.exec('ionic hooks add');
+  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
 
-      shell.exec('ionic hooks remove');
-      expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
+  //     shell.exec('ionic hooks remove');
+  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
 
-      shell.exec('ionic build ios');
-      expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
+  //     shell.exec('ionic build ios');
+  //     expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
 
-      shell.exec('ionic build android');
-      //NOTE this expects you're using ant to build. In cordova android 4.0.0 - gradle is used, ant-build wont be there.
-      expect(path.join(project, 'platforms', 'android', 'ant-build', 'MainActivity-debug.apk')).toExist();
-      expect(path.join(project, 'platforms', 'android', 'build.xml')).toExist();
+  //     shell.exec('ionic build android');
+  //     //NOTE this expects you're using ant to build. In cordova android 4.0.0 - gradle is used, ant-build wont be there.
+  //     expect(path.join(project, 'platforms', 'android', 'ant-build', 'MainActivity-debug.apk')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build.xml')).toExist();
 
-      shell.exec('ionic browser add crosswalk');
-      expect(path.join(project, 'engine', 'xwalk-webviews')).toExist();
+  //     shell.exec('ionic browser add crosswalk');
+  //     expect(path.join(project, 'engine', 'xwalk-webviews')).toExist();
 
-      shell.exec('ionic build android');
-      expect(path.join(project, 'platforms', 'android', 'gradle.properties')).toExist();
-      expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-armv7-debug.apk')).toExist();
-      expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-x86-debug.apk')).toExist();
+  //     shell.exec('ionic build android');
+  //     expect(path.join(project, 'platforms', 'android', 'gradle.properties')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-armv7-debug.apk')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-x86-debug.apk')).toExist();
 
-    });
-  });
+  //   });
+
+  //   iit('should start new v2 app', function() {
+  //     shell.cd(tmpDir);
+  //     shell.exec('echo "yes" | ionic start ' + appName);
+  //     shell.cd(project);
+      
+  //     expect(path.join(project, 'www', 'index.html')).toExist();
+  //     expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
+      
+  //     shell.exec('ionic plugin add org.apache.cordova.splashscreen');
+      
+  //     expect(path.join(project, 'plugins', 'org.apache.cordova.splashscreen', 'plugin.xml')).toExist();
+      
+  //     shell.exec('ionic platform add android');
+
+  //     expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
+  //     expect(path.join(project, 'resources', 'icon.png')).toExist();
+
+  //     shell.exec('ionic hooks add');
+  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
+
+  //     shell.exec('ionic hooks remove');
+  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
+
+  //     shell.exec('ionic build ios');
+  //     expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
+
+  //     shell.exec('ionic build android');
+  //     //NOTE this expects you're using ant to build. In cordova android 4.0.0 - gradle is used, ant-build wont be there.
+  //     expect(path.join(project, 'platforms', 'android', 'ant-build', 'MainActivity-debug.apk')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build.xml')).toExist();
+
+  //     shell.exec('ionic browser add crosswalk');
+  //     expect(path.join(project, 'engine', 'xwalk-webviews')).toExist();
+
+  //     shell.exec('ionic build android');
+  //     expect(path.join(project, 'platforms', 'android', 'gradle.properties')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-armv7-debug.apk')).toExist();
+  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-x86-debug.apk')).toExist();
+  //   })
+  // });
 });
diff --git a/lib/cli.js b/lib/cli.js
index 94a6b2c0f1..97126a5208 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -2,8 +2,10 @@ var Cli = module.exports,
     colors = require('colors'),
     IonicAppLib = require('ionic-app-lib'),
     ConfigXml = IonicAppLib.configXml,
+    IonicStats = require('./ionic/stats').IonicStats,
     IonicStore = require('./ionic/store').IonicStore,
     IonicConfig = new IonicStore('ionic.config'),
+    Ionic2Project = IonicAppLib.v2.project,
     Info = IonicAppLib.info,
     Ionitron = require('./ionic/ionitron'),
     optimist = require('optimist'),
@@ -22,6 +24,8 @@ Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
+// This is where the logger for the app-lib can be configured (or replaced).
+logging.logger.level = 'info';
 
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
@@ -38,7 +42,6 @@ Cli.PRIVATE_PATH = '.ionic';
 // parsing out the args/options in the way they need.
 // This way, we can still test with passing in arguments.
 Cli.run = function run(processArgv) {
-
   try {
     //First we parse out the args to use them.
     //Later, we will fetch the command they are trying to
@@ -55,7 +58,7 @@ Cli.run = function run(processArgv) {
 
     //Before taking any more steps, lets check their
     //environment and display any upgrade warnings
-    Cli.doRuntimeCheck(settings.version);
+    // Cli.doRuntimeCheck(settings.version);
 
     if ((argv.version || argv.v) && !argv._.length) {
       return Cli.version();
@@ -77,8 +80,10 @@ Cli.run = function run(processArgv) {
     if(argv['stats-opt-out']) {
       IonicConfig.set('statsOptOut', true);
       IonicConfig.save();
-      console.log('Successful stats opt-out');
+      logging.logger.info('Successful stats opt-out');
       return;
+    } else {
+      IonicStats.t();
     }
 
     var taskSetting = Cli.tryBuildingTask(argv);
@@ -86,13 +91,53 @@ Cli.run = function run(processArgv) {
       return Cli.printAvailableTasks();
     }
 
+    logging.logger.debug('Task setting:', taskSetting);
+
+    // assume false for tasks that can be run outside of Ionic projects
+    // start, help, docs, v2
+    var isIonicV2 = false;
+
+    // Addressing issue #471
+    // Changes the cwd to the project root
+    // (whereever it finds ionic.project, errors if it doesn't find it) for tasks that require it.
+    // The cliTasks are in lib/tasks/cliTasks.js - with an attribute to disable changing pwd
+    // for commands like start, help, docs, and v2
+    if (!taskSetting.disableChangePwd) {
+      try {
+        logging.logger.debug('Looking up ionic root, cwd:', process.env.PWD);
+        var root = Utils.cdIonicRoot();
+        isIonicV2 = Utils.isIonicV2(root);
+        isIonicV2 && logging.logger.debug('Ionic 2 project.')
+        logging.logger.debug('ionic root now set pwd:', process.env.PWD);
+      } catch (error) {
+        logging.logger.debug(error);
+      }
+    }
+
     var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
 
     argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
 
     var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
-    var promise = taskInstance.run(Cli, argv);
+
+    var config;
+    if (isIonicV2) {
+      // probably a better way to do this, but to avoid changing run() for every
+      // task for now
+      argv.v2 = true;
+      var config = require(path.resolve(process.cwd() + path.sep + Ionic2Project.CONFIG_FILE));
+      Cli.runHook('before', taskSetting.name, config, argv);
+    }
+
+    // Only some tasks return promises
+    var promise = Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+    if (isIonicV2){
+      promise.then(function(){
+        Cli.runHook('after', taskSetting.name, config, argv);
+      });
+    }
+
     return promise;
   } catch (ex) {
     logging.logger.debug('Cli.Run - Error', ex);
@@ -179,6 +224,10 @@ Cli.lookupTask = function lookupTask(module) {
 };
 
 Cli.printVersionWarning = function printVersionWarning() {
+  if (settings.version.indexOf('beta') > -1 || settings.version.indexOf('alpha') > -1) {
+    return;
+  }
+
   if (Cli.npmVersion && Cli.npmVersion != settings.version.trim()) {
     process.stdout.write('\n------------------------------------\n'.red);
     process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
@@ -195,7 +244,7 @@ Cli.checkLatestVersion = function checkLatestVersion() {
   Cli.latestVersion = Q.defer();
 
   try {
-    if (settings.version.indexOf('beta') > -1) {
+    if (settings.version.indexOf('beta') > -1 || settings.version.indexOf('alpha') > -1) {
       // don't bother checking if its a beta
       Cli.latestVersion.resolve();
       return;
@@ -451,14 +500,14 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
           return q.promise;
         }
 
-        process.stdout.write('+---------------------------------------------------------+\n'.green);
+        process.stdout.write('+---------------------------------------------------------+\n');
 
-        var monthMessage = ['+ New Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').green;
+        var monthMessage = ['+ Extra! Extra! Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('');
         process.stdout.write(monthMessage);
 
         for(var i = 0, j = messagesJson.list.length; i < j; i++) {
           var entry = messagesJson.list[i];
-          var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.yellow, '\n+\n'].join('');
+          var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.blue.bold, '\n+\n'].join('');
           process.stdout.write(entryMessage);
         }
         process.stdout.write('+---------------------------------------------------------+\n'.green);
@@ -484,6 +533,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 //not the node_module/ionic-app-lib directory
 Cli.reportExtras = function reportExtras(err) {
   var commandLineInfo = process.argv;
+
   var info = Cli.gatherInfo();
   info.command = commandLineInfo;
   return info;
@@ -509,12 +559,13 @@ Cli.attachErrorHandling = function attachErrorHandling() {
       logging.logger.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
-      // console.log('stack', stack, arguments.caller);
       if (msg) {
         var info = Cli.gatherInfo();
         var ionicCliVersion = info.ionic_cli;
-        process.stderr.write('\n' + stack.error.bold + '\n\n');
-        process.stderr.write(errorMessage.error.bold);
+        if (stack && stack.length > 0) {
+          process.stderr.write('\n' + stack.error.bold + '\n\n');
+        }
+        process.stderr.write('\n' + errorMessage.error.bold);
         process.stderr.write( (' (CLI v' + ionicCliVersion + ')').error.bold + '\n');
 
         Info.printInfo(info);
@@ -527,6 +578,8 @@ Cli.attachErrorHandling = function attachErrorHandling() {
       console.log(ex.stack);
     }
   };
+
+  //TODO Attach error reporter here
 };
 
 //Backwards compatability for those commands that havent been
@@ -560,3 +613,15 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
     IonicConfig.save();
   }
 };
+
+Cli.runHook = function runBeforeTaskHook(hookType, taskName, projectConfig, argv) {
+  if (!hookType || !taskName || !projectConfig || !projectConfig.hooks) return;
+
+  var hookName = hookType + taskName[0].toUpperCase() + taskName.slice(1);
+  var hook = projectConfig.hooks[hookName];
+  if (hook) {
+    return hook(argv);
+  } else {
+    return null;
+  }
+}
diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
index f162e60fd4..8260f82b45 100644
--- a/lib/hooks/after_platform_add/010_install_plugins.js
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -22,8 +22,23 @@ var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
 // var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
-packageJSON.cordovaPlugins.forEach(function (plugin) {
-  exec('cordova plugin add ' + plugin, function (error, stdout, stderr) {
-    util.puts(stdout);
-  });
-});
+
+function installNextPlugin() {
+  var curPlugin = packageJSON.cordovaPlugins.shift();
+  if (curPlugin) {
+    exec('cordova plugin add ' + curPlugin, function(err, stdout, stderr) {
+        util.puts(stdout);
+        util.puts(stderr);
+    })
+    .on("exit", function(code) {
+      if (code) {
+          console.log("'cordova plugin add " + curPlugin + "' failed with code '" + code + "'");
+          process.exit(code);
+      } else {
+          installNextPlugin();
+      }
+    });
+  }
+}
+
+installNextPlugin();
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 20e9760f76..a4274765b7 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -2,7 +2,6 @@ require('shelljs/global')
 
 var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     // argv = require('optimist').argv,
     fs = require('fs'),
     ioLib = require('ionic-app-lib').ioConfig,
@@ -60,11 +59,8 @@ IonicTask.prototype.listComponents = function listComponents() {
 // Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
 IonicTask.prototype.run = function(ionic, argv) {
-  // console.log('running ', argv._)
   this.ionic = ionic;
 
-  IonicStats.t();
-
   if (!bower.IonicBower.checkForBower()) {
     this.ionic.fail(bower.IonicBower.installMessage, 'add');
     return;
diff --git a/lib/ionic/app.js b/lib/ionic/app.js
index 23fd8ad77d..ba9993f510 100644
--- a/lib/ionic/app.js
+++ b/lib/ionic/app.js
@@ -6,7 +6,6 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     Task = require('./task').Task,
     IonicLoginTask = require('./login').IonicTask,
     IonicUploadTask = require('./upload').IonicTask,
@@ -26,7 +25,7 @@ IonicTask.prototype.run = function(ionic) {
   this.getCmdLineOptions();
 
   ionic.IONIC_DASH = 'http://stage.apps.ionic.io';
-  
+
   var login = new IonicLoginTask();
   login.get(ionic, function(jar) {
     self.jar = jar;
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 99d1dddfd1..8c68a3f760 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -17,7 +17,6 @@
 
 var argv = require('optimist').argv,
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
     IonicAppLib = require('ionic-app-lib'),
@@ -96,7 +95,6 @@ IonicTask.prototype.run = function run(ionic) {
         Browser.listInstalledBrowsers(appDirectory);
     }
 
-    IonicStats.t();
   } catch (ex) {
     console.log(ex.stack);
     console.log('Exception:', ex);
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index ddb5a33f40..5101eb95be 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,61 +1,120 @@
 var Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
+    os = require('os'),
     Q = require('q'),
     // argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
     path = require('path'),
     exec = require('child_process').exec,
     colors = require('colors'),
     shelljs = require('shelljs'),
+    generate = require('./resources/generate'),
+    prompt = require('prompt'),
+    settings = require('./resources/settings'),
     IonicAppLib = require('ionic-app-lib'),
-    IonicProject = require('./project'),
+    IonicProject = IonicAppLib.project,
     IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
     Hooks = IonicAppLib.hooks,
     Serve = IonicAppLib.serve,
     State = IonicAppLib.state,
-    Utils = IonicAppLib.utils;
+    Utils = IonicAppLib.utils,
+    Logging = IonicAppLib.logging;
 
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
   this.ionic = ionic;
-  var self = this;
-  var appDirectory = process.cwd();
-  var cmdName = process.argv[2].toLowerCase();
-  var q;
+
+  var self = this,
+      cmdName = process.argv[2].toLowerCase(),
+      appDirectory = process.cwd(),
+      q;
 
   try {
-    this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
-    this.addIcons = !(argv.noresources || argv.r);
+    // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
+    // if not, try to install it.
+    if (argv._.indexOf('run') != -1 || argv._.indexOf('build') != -1 || argv._.indexOf('emulate') != -1) {
 
-    if(this.isLiveReload) {
-      q = self.setupLiveReload(argv);
+      if (runPlatform == 'ios' && os.platform() !== 'darwin') {
+        return Logging.logger.info('✗ You cannot run iOS unless you are on Mac OSX.'.red);
+      }
+
+      var runPlatform = argv._[1] || 'ios',
+          platformInstalled = self.checkIfPlatformInstalled(runPlatform),
+          pluginsInstalled = self.checkForPlugins();
+
+      if (!platformInstalled) {
+        var notInstalledMsg = ['• You\'re trying to build for ', runPlatform, ', but don\'t have the platform installed yet.'].join('').yellow,
+          installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join('').blue,
+          installedMessage = ['√ Installed platform ', runPlatform].join('').green,
+          installCmd = 'ionic platform add ' + runPlatform;
+        Logging.logger.info(notInstalledMsg);
+        Logging.logger.info(installingMsg);
+        // Logging.logger.info(installCmd);
+        shelljs.exec(installCmd);
+        Logging.logger.info(installedMessage);
+      }
+
+      if (!pluginsInstalled) {
+        q = Q(true);
+      } else {
+        q = Q(false);
+      }
     } else {
-      // ensure the content node was set back to its original
-      q = self.ionic.setConfigXml({
-        resetContent: true,
-        errorWhenNotFound: false
-      });
+      q = Q(false);
     }
 
+    this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
+
+    this.addIcons = !(argv.noresources || argv.r);
+
     var addDefaultResources = false;
     var isPlatformCmd = argv._.indexOf('platform') != -1 || argv._.indexOf('platforms') != -1;
     var isAddCmd = argv._.indexOf('add') != -1;
     var isPluginCmd = argv._.indexOf('plugin') != -1 || argv._.indexOf('plugins') != -1;
     var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
-    if (isPlatformCmd || isAddCmd) {
-      Hooks.setHooksPermission(process.cwd());
-    }
+    // if (isAddCmd || isRmCmd) {
+    //   console.log('this this this', isAddCmd, isRmCmd)
+    //   Hooks.setHooksPermission(process.cwd());
+    // }
 
     if(isPlatformCmd && isAddCmd) {
       addDefaultResources = true;
     }
 
-    return q.then(function(serveOptions){
+    return q.then(function(installPlugins) {
+      if (!installPlugins) {
+        return;
+      }
+      var plugins = [
+        "cordova-plugin-device",
+        "cordova-plugin-console",
+        "cordova-plugin-whitelist",
+        "cordova-plugin-splashscreen",
+        "cordova-plugin-statusbar",
+        "ionic-plugin-keyboard"
+      ];
+
+      plugins.forEach(function(plugin) {
+        Logging.logger.info(['Installing ', plugin].join('').blue);
+        shelljs.exec('ionic plugin add ' + plugin);
+      });
+    })
+    .then(function() {
+      if(self.isLiveReload) {
+        return self.setupLiveReload(argv);
+      } else {
+        // ensure the content node was set back to its original
+        return self.ionic.setConfigXml({
+          resetContent: true,
+          errorWhenNotFound: false
+        });
+      }
+    })
+    .then(function(serveOptions){
       if (self.isLiveReload) {
         self.options = serveOptions;
       }
@@ -68,6 +127,20 @@ IonicTask.prototype.run = function(ionic, argv) {
         return false;
       }
     })
+    .then(function(){
+      // TODO :(
+      if (argv.v2 && cmdName === 'build'){
+        var Build = IonicAppLib.v2.build;
+        var buildOptions = {
+          appDirectory: process.cwd(),
+          callback: function() {
+            console.log('√ Compiling files complete.'.green.bold);
+          },
+          watch: false
+        };
+        return Build.bundle(buildOptions);
+      }
+    })
     .then(function() {
       return self.runCordova(cmdName, argv);
     })
@@ -158,7 +231,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
           foundAddressCmd = true;
         }
         break;
-      } 
+      }
     }
     if(isValdCmd && !foundAddressCmd) {
       // make sure --target= has double quotes around it (process.argv removes them)
@@ -171,9 +244,54 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
       foundAddressCmd = true;
     }
   }
+  var cordovaIsInstalled = Utils.cordovaInstalled();
+
+  Logging.logger.debug('Cordova is installed:', cordovaIsInstalled);
+  if (!cordovaIsInstalled) {
+    Logging.logger.debug('Executing cordova without CLI: ' + cleanArgs);
+    //If no cordova CLI is installed, fall back to local cordova-lib.
+    //TODO: Add ability to be smart = only use this if cordova CLI is not installed.
+    //TODO: Enable passing variables with the plugins
+    //TODO: Enable checking for multiple platforms/plugins/ls
+    //ex: (multiple plugin ids) ionic plugin add cordova-plugin-camera cordova-plugin-geolocation
+    //    (multiple platforms) ionic platform add ios android
+    //    (listing) ionic plugin ls
+    //    (version) ionic platform add ios@8.1.1
+    //    (variables) ionic plugin add cordova-plugin-facebook --variable APP_ID=1 --variable APP_NAME="Goofballs"
+    try {
+      var promise;
+      if (cleanArgs[0] === 'run') {
+        promise = Cordova.runPlatform(process.cwd(), cleanArgs[1]);
+      } else if (cleanArgs[0] === 'platform') {
+        if (cleanArgs[1] === 'add') {
+          promise = Cordova.addPlatform(process.cwd(), cleanArgs[2], true);
+        } else if (cleanArgs[1] === 'remove') {
+          promise = Cordova.removePlatform(process.cwd(), cleanArgs[2], true);
+        }
+      } else if (cleanArgs[0] === 'plugin') {
+        if (cleanArgs[1] === 'add') {
+          promise = Cordova.addPlugin(process.cwd(), cleanArgs[2], null, true);
+        } else if (cleanArgs[1] === 'remove') {
+          promise = Cordova.removePlugin(process.cwd(), cleanArgs[2]);
+        }
+      }
+
+      return promise.then(function(result) {
+        Logging.logger.info('cleanArgs[0]', cleanArgs[0], 'completed');
+        Logging.logger.debug('Result from cordova-lib:', result);
+        deferred.resolve(result);
+      })
+      .catch(function(ex) {
+        deferred.reject(ex);
+      });
+    } catch (ex) {
+      Logging.logger.error('An Error occurred trying to fall back to Cordova-lib execution:', ex);
+      throw ex;
+    }
+  }
 
+  Logging.logger.debug('Executing cordova cli: ' + cleanArgs.join(' '));
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
-// console.log('running cordova ' + cleanArgs.join(' '));
 
   cordovaProcess.stdout.on('data', function (data) {
     process.stdout.write(data);
@@ -228,8 +346,6 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
     });
   }
 
-  IonicStats.t();
-
   return deferred.promise;
 };
 
@@ -303,4 +419,28 @@ IonicTask.prototype.setupLiveReload = function(argv) {
   });
 };
 
+IonicTask.prototype.checkIfPlatformInstalled = function checkIfPlatformInstalled(platform) {
+  platform = platform || 'ios';
+
+  var platformPath = path.join(process.cwd(), 'platforms', platform);
+  var platformStats;
+  try {
+    platformStats = fs.statSync(platformPath);
+    return true;
+  } catch (ex) {
+    return false;
+  }
+};
+
+IonicTask.prototype.checkForPlugins = function checkForPlugins() {
+  var pluginPath = path.join(process.cwd(), 'plugins');
+  var platformStats;
+  try {
+    platformStats = fs.statSync(pluginPath);
+    return true;
+  } catch (ex) {
+    return false;
+  }
+};
+
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 1d81846805..3be8e4b155 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     Q = require('q'),
     prompt = require('prompt'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
     IonicInfo = require('./info').IonicTask,
@@ -168,8 +167,6 @@ IonicTask.prototype.run = function run(ionic) {
     Docs.lookUpCommand(docCmd);
   }
 
-  IonicStats.t();
-
 };
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
new file mode 100644
index 0000000000..17faaa776a
--- /dev/null
+++ b/lib/ionic/generate.js
@@ -0,0 +1,78 @@
+var fs = require('fs'),
+    path = require('path'),
+    Task = require('./task').Task,
+    ionicAppLib = require('ionic-app-lib'),
+    Q = require('q'),
+    Utils = ionicAppLib.utils,
+    logging = ionicAppLib.logging,
+    Info = ionicAppLib.info;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic, argv) {
+  /*
+      Usage: `ionic generate` or `ionic g`
+      ionic generate <generator> <name>
+
+      ionic g page about             * generate page in pwd/www/app/about - about.html, about.js, about.scss
+      ionic g page about --tabs
+  */
+  try {
+    var generator = argv._[1];
+    var listing = false;
+
+    if (!Utils.isIonicV2(process.cwd())) {
+      return Utils.fail('You do not appear to have a compatible version of Ionic v2 installed.\n' +
+      'Ionic Framework v2 version 2.0.0-alpha.31 or later is required to use the generators.\n' +
+      'Please run: "npm install ionic-framework"');
+    }
+
+    if (generator == 'help') {
+      logging.logger.info('Get started using generators right now!')
+      logging.logger.info('Generators help you set up code quickly to get running.');
+      logging.logger.info('List all the generators by passing the --list option: "ionic g --list"');
+      logging.logger.info('Or simply type "ionic g page MyPage" to generate a page!');
+      return;
+    }
+
+    if (argv.list) {
+      logging.logger.info('Available generators:');
+      listing = true;
+      // return;
+    }
+
+    var name = argv._[2];
+    var promise;
+
+    var ionicFrameworkModuleName = 'ionic-framework';
+    // var ionicFrameworkModuleName = 'ionic2';
+    var ionicModulePath = path.join(process.cwd(), 'node_modules', ionicFrameworkModuleName);
+
+    try {
+      ionicModule = require(ionicModulePath);
+
+      if (listing) {
+        for (gen in ionicModule.Generate.generators) {
+          console.log(' *'.blue , gen);
+        }
+        return;
+      } else {
+        return ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
+      }
+    } catch (ex) {
+      if (ex.message.indexOf('no generator available') != -1) {
+        return console.log('✗ '.red + ex.message.red);
+      }
+      return Utils.fail('You do not appear to have a compatible version of Ionic v2 installed.\n' +
+      'Ionic Framework v2 version 2.0.0-alpha.31 or later is required to use the generators.\n' +
+      'Please run: "npm install ionic-framework"');
+    }
+
+  } catch (ex) {
+    Utils.fail('There was an error generating your item:', ex);
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 051c7179bb..112771045b 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,6 +1,5 @@
 var IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     argv = require('optimist').argv,
     Task = require('./task').Task;
 
@@ -33,9 +32,6 @@ IonicTask.prototype.run = function(ionic) {
   ionic.printUsage(task);
 
   process.stderr.write('\n\n');
-
-
-  // IonicStats.t();
 }
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 77ee2498dc..90d0d536f6 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     Q = require('q'),
     shelljs = require('shelljs'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     _ = require('underscore'),
     IonicProject = require('./project'),
     IonicInfo = require('./info').IonicTask,
@@ -42,8 +41,6 @@ IonicTask.prototype.run = function run(ionic) {
     console.log('error:', ex, ex.stack);
   }
 
-  IonicStats.t();
-
 };
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 8d63911b18..bc91bef8e0 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -3,8 +3,7 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     Task = require('./task').Task,
     ionicAppLib = require('ionic-app-lib'),
-    Info = ionicAppLib.info,
-    IonicStats = require('./stats').IonicStats;
+    Info = ionicAppLib.info;
 
 var IonicTask = function() {};
 
@@ -26,8 +25,6 @@ IonicTask.prototype.run = function(ionic) {
   } catch (ex) {
     this.ionic.fail('There was an error retrieving your environment information:', ex);
   }
-
-  IonicStats.t();
 }
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
index 61aba3ba13..7ed8fdb90f 100644
--- a/lib/ionic/ions.js
+++ b/lib/ionic/ions.js
@@ -1,7 +1,6 @@
 var argv = require('optimist').argv,
     IonicProject = require('./project'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     _ = require('underscore');
 
 var ions = [
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 30490f8626..2c7c53fe45 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -9,8 +9,7 @@ var fs = require('fs'),
     colors = require('colors'),
     exec = require('child_process').exec,
     Q = require('q'),
-    Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats;
+    Task = require('./task').Task;
 
 var IonicTask = function() {};
 
@@ -299,7 +298,6 @@ IonicTask.prototype.updateFiles = function(version) {
         } catch(e){}
 
         console.log('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
-        IonicStats.t();
 
         self.writeVersionData();
 
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 757404391a..ca2a3c0447 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -2,8 +2,7 @@ var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
     IonicProject = require('./project'),
-    Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats;
+    Task = require('./task').Task;
 
 var IonicTask = function() {};
 
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index f82cdcbbb3..e6fee59f41 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,5 +1,4 @@
 var IonicAppLib = require('ionic-app-lib'),
-    IonicStats = require('./stats').IonicStats,
     IonicStore = require('./store').IonicStore,
     Login = IonicAppLib.login,
     prompt = require('prompt'),
@@ -65,7 +64,7 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
 
   // prompt for log
   console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-  console.log('Don\'t have one? Create a one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
+  console.log('Don\'t have one? Create one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
 
   prompt.override = argv;
   prompt.message = '';
@@ -87,8 +86,6 @@ IonicTask.prototype.run = function(ionic, argv, callback) {
 
   var self = this;
 
-  IonicStats.t();
-
   return LoginTask.login(argv);
 
 };
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index c4d244883d..8eb74f9296 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -14,6 +14,7 @@ var fs = require('fs'),
     Task = require('./task').Task;
 
 var Project = IonicAppLib.project;
+
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 8c23fc9e2d..f5c10b7894 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -7,7 +7,6 @@ var fs = require('fs'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
     Login = IonicAppLib.login,
@@ -200,7 +199,7 @@ IonicTask.prototype.send_push = function(self) {
     required: false,
     isFile: false
   }
-  
+
   prompt.start();
 
   prompt.get({properties: promptProperties}, function(err, promptResult) {
@@ -227,12 +226,12 @@ IonicTask.prototype.send_push = function(self) {
       method: 'POST',
       json: true,
       headers: {
-        'X-Ionic-Application-Id': project.get('app_id'), 
+        'X-Ionic-Application-Id': project.get('app_id'),
         'authorization': 'Basic ' + new Buffer(api_key + ':').toString('base64')
       },
       body: notification
     };
-    
+
     request(options, function(err, response, body) {
       if (!err && response.statusCode == 202) {
         console.log("Successfully queued push notification");
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
new file mode 100644
index 0000000000..ec668220f4
--- /dev/null
+++ b/lib/ionic/resources/generate.js
@@ -0,0 +1,898 @@
+var fs = require('fs'),
+    os = require('os'),
+    path = require('path'),
+    Q = require('q'),
+    argv = require('optimist').argv,
+    request = require('request'),
+    xml2js = require('xml2js'),
+    _ = require('underscore'),
+    crc = require('crc'),
+    resSettings = require('./settings.js'),
+    Task = require('../task').Task,
+    shelljs = require('shelljs'),
+    moduleSettings = require('../../../package.json'),
+    IonicAppLib = require('ionic-app-lib'),
+    Utils = IonicAppLib.utils,
+    IonicStats = require('../stats').IonicStats;
+
+var IonicResources = function() {};
+IonicResources.prototype = new Task();
+
+var settings = resSettings.ResSettings;
+var platformConfigs = resSettings.ResPlatforms;
+var tmpDir = os.tmpdir();
+var configData, buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
+var generateLandscape, generatePortrait, orientation;
+
+IonicResources.prototype.run = function() {
+  buildPlatforms = [];
+  images = [];
+  generateQueue = [];
+  sourceFiles = {};
+  generatingImages = {};
+  generateLandscape = false;
+  generatePortrait = false;
+  orientation = 'default';
+
+  if (!fs.existsSync(settings.configFile)) {
+    console.error('Invalid ' + settings.configFile + ' file. Make sure the working directory is a Cordova project.');
+    return;
+  }
+
+  if(argv.default) {
+    if(hasExistingResources() && !argv.force) {
+      console.log('The resources folder already exists. We will not overwrite your files unless you pass the --force argument.'.red.bold);
+      console.log('Running with the force flag will overwrite your resources directory and modify your config.xml file'.red.bold)
+      return;
+    }
+    copyIconFilesIntoResources(argv.force)
+    .then(function() {
+      return addIonicIcons('ios')
+    })
+    .then(function() {
+      return addIonicIcons('android');
+    })
+    .catch(function(error) {
+      console.error('An error with adding default resources happened:', error);
+    })
+    return
+  }
+
+  if (!fs.existsSync(settings.resourceDir)) {
+    fs.mkdirSync(settings.resourceDir);
+  }
+
+  var hasPlatforms = true;
+  if (_.contains(argv._, 'ios')) {
+    buildPlatforms.push('ios');
+
+  } else if (_.contains(argv._, 'android')) {
+    buildPlatforms.push('android');
+
+  } else if (_.contains(argv._, 'wp8')) {
+    buildPlatforms.push('wp8');
+
+  } else if (!fs.existsSync('platforms')) {
+    hasPlatforms = false;
+
+  } else {
+    buildPlatforms = fs.readdirSync('platforms');
+    hasPlatforms = buildPlatforms.length;
+  }
+
+  if (!hasPlatforms) {
+    console.error('No platforms have been added.');
+    console.error('Please add a platform, for example: ionic platform add ios');
+    console.error('Or provide a platform name, for example: ionic resources android');
+    return;
+  }
+
+  getConfigData().then(function() {
+
+    if (argv.landscape || argv.l) {
+      generateLandscape = true;
+    }
+    if (argv.portrait || argv.p) {
+      generatePortrait = true;
+    }
+    if (!argv.landscape && !argv.l && !argv.portrait && !argv.p) {
+
+      orientation = getOrientationConfigData();
+      if (orientation == 'landscape') {
+        generateLandscape = true;
+      } else if (orientation == 'portrait') {
+        generatePortrait = true;
+      } else {
+        generateLandscape = true;
+        generatePortrait = true;
+      }
+    }
+
+    if (argv['api']) {
+      settings.apiUrl = argv['api'];
+    }
+
+    var promises = [];
+
+    if (argv.icon || argv.i) {
+      console.info('Ionic icon resources generator');
+      promises.push(queueResTypeImages('icon'));
+
+    } else if (argv.splash || argv.s) {
+      console.info('Ionic splash screen resources generator');
+      promises.push(queueResTypeImages('splash'));
+
+    } else {
+      console.info('Ionic icon and splash screen resources generator');
+      promises.push(queueResTypeImages('icon'));
+      promises.push(queueResTypeImages('splash'));
+    }
+
+    Q.all(promises)
+      .then(loadSourceImages)
+      .then(generateResourceImages)
+      .then(loadResourceImages)
+      .then(updateConfigData)
+      .catch(console.error);
+
+  });
+
+};
+
+function queueResTypeImages(resType) {
+  var resTypePlatforms = {};
+
+  return buildImagesData()
+    .then(validateSourceImages)
+    .then(queueResourceImages)
+    .catch(console.error);
+
+  function buildImagesData() {
+    var deferred = Q.defer();
+
+    buildPlatforms.forEach(function(platform) {
+      if (!platformConfigs[platform]) return;
+
+      var platformResourceDir = path.join(settings.resourceDir, platform);
+      var resTypeDir = path.join(platformResourceDir, settings[resType + 'Dir']);
+
+      if (!fs.existsSync(platformResourceDir)) {
+        fs.mkdirSync(platformResourceDir);
+      }
+
+      if (!fs.existsSync(resTypeDir)) {
+        fs.mkdirSync(resTypeDir);
+      }
+
+      _.forEach(platformConfigs[platform][resType].images, function(image) {
+        var data = _.clone(image);
+        _.extend(data, {
+          platform: platform,
+          src: path.join(resTypeDir, image.name),
+          nodeName: platformConfigs[platform][resType].nodeName,
+          nodeAttributes: platformConfigs[platform][resType].nodeAttributes,
+          resType: resType
+        });
+        images.push(data);
+      });
+    });
+
+    deferred.resolve();
+    return deferred.promise;
+  }
+
+  function validateSourceImages() {
+    var deferred = Q.defer();
+
+    var validSourceFiles = _.map(settings.sourceExtensions, function(ext) {
+      return settings[resType + 'SourceFile'] + '.' + ext;
+    });
+
+    images.forEach(function(image) {
+      if (resTypePlatforms[image.platform]) return;
+      resTypePlatforms[image.platform] = { platform: image.platform };
+    });
+
+    _.each(resTypePlatforms, function(resTypePlatform) {
+      for (var x = 0; x < validSourceFiles.length; x++) {
+        globalSourceFile = path.join(settings.resourceDir, validSourceFiles[x]);
+        platformSourceFile = path.join(settings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
+
+        if (fs.existsSync(platformSourceFile)) {
+          resTypePlatform.sourceFilePath = platformSourceFile;
+          resTypePlatform.sourceFilename = resTypePlatform.platform + '/' + validSourceFiles[x];
+          break;
+
+        } else if (fs.existsSync(globalSourceFile)) {
+          resTypePlatform.sourceFilePath = globalSourceFile;
+          resTypePlatform.sourceFilename = validSourceFiles[x];
+          break;
+        }
+      }
+
+      if (!resTypePlatform.sourceFilePath || sourceFiles[resTypePlatform.sourceFilePath]) return;
+
+      sourceFiles[resTypePlatform.sourceFilePath] = {
+        filePath: resTypePlatform.sourceFilePath,
+        filename: resTypePlatform.sourceFilename
+      };
+    });
+
+    var missingPlatformSources = _.filter(resTypePlatforms, function(resTypePlatform) {
+      return !resTypePlatform.sourceFilePath;
+    });
+
+    if (missingPlatformSources.length) {
+      var notFoundDirs = ['resources'];
+      missingPlatformSources.forEach(function(missingPlatformSource) {
+        notFoundDirs.push('resources/' + missingPlatformSource.platform);
+      });
+
+      var msg = resType + ' source file not found in ';
+      if (notFoundDirs.length > 1) {
+        msg += 'any of these directories: ' + notFoundDirs.join(', ');
+      } else {
+        msg += 'the resources directory';
+      }
+
+      console.error(msg);
+      console.error('valid ' + resType + ' source files: ' + validSourceFiles.join(', '));
+    }
+
+    deferred.resolve();
+
+    return deferred.promise;
+  }
+
+  function queueResourceImages() {
+    var promises = [];
+
+    _.each(resTypePlatforms, function(resTypePlatform) {
+
+      if (!resTypePlatform.sourceFilePath) return;
+
+      var deferred = Q.defer();
+      promises.push(deferred.promise);
+
+      fs.readFile(resTypePlatform.sourceFilePath, function(err, buf) {
+        if (err) {
+          deferred.reject('Error reading ' + resTypePlatform.sourceFilePath);
+
+        } else {
+          try {
+            sourceFiles[resTypePlatform.sourceFilePath].imageId = crc.crc32(buf).toString(16);
+
+            var resImages = _.filter(images, function(image) {
+              return image.resType == resType;
+            });
+
+            resImages.forEach(function(image) {
+              if (image.platform == resTypePlatform.platform) {
+                image.sourceFilePath = resTypePlatform.sourceFilePath;
+
+                var sourceFile = sourceFiles[image.sourceFilePath];
+                var tmpFilename = sourceFile.imageId + '-' + image.width + 'x' + image.height + '.png';
+
+                image.imageId = sourceFile.imageId;
+                image.tmpPath = path.join(tmpDir, tmpFilename);
+
+                if (resType == 'splash') {
+                  if (!((image.width >= image.height && generateLandscape) || (image.height >= image.width && generatePortrait))) {
+                    image.skip = true;
+                    return;
+                  }
+                }
+
+                if (settings.cacheImages && fs.existsSync(image.tmpPath)) {
+                  console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
+
+                } else {
+                  loadCachedSourceImageData(sourceFile);
+
+                  if (sourceFile.cachedData && !sourceFile.cachedData.vector && (sourceFile.cachedData.width < image.width || sourceFile.cachedData.height < image.height)) {
+                    image.skip = true;
+                    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.cachedData.width + 'x' + sourceFile.cachedData.height + ') too small');
+
+                  } else {
+                    sourceFile.upload = true;
+                    generateQueue.push(image);
+                  }
+                }
+              }
+            });
+            deferred.resolve();
+
+          } catch (e) {
+            deferred.reject('Error loading ' + resTypePlatform.sourceFilePath + ' md5: ' + e);
+          }
+        }
+      });
+    });
+
+    return Q.all(promises);
+  }
+
+}
+
+function loadSourceImages() {
+  var promises = [];
+
+  _.each(sourceFiles, function(sourceFile) {
+    if (!sourceFile.upload) return;
+
+    var deferred = Q.defer();
+
+    console.log(' uploading ' + sourceFile.filename + '...');
+
+    var postData = {
+      url: settings.apiUrl + settings.apiUploadPath,
+      formData: {
+        image_id: sourceFile.imageId,
+        src: fs.createReadStream(sourceFile.filePath),
+        cli_version: moduleSettings.version
+      },
+      proxy: process.env.PROXY || null
+    };
+
+    request.post(postData, function(err, httpResponse, body) {
+      function reject(msg) {
+        try {
+          msg += JSON.parse(body).Error;
+        } catch (e) {
+          msg += body || '';
+        }
+        deferred.reject(msg);
+      }
+
+      if (err) {
+        var msg = 'Failed to upload source image: ';
+        if (err.code == 'ENOTFOUND') {
+          msg += 'requires network connection';
+        } else {
+          msg += err;
+        }
+        deferred.reject(msg);
+
+      } else if (!httpResponse) {
+        reject('Invalid http response');
+
+      } else if (httpResponse.statusCode >= 500) {
+        reject('Image server temporarily unavailable: ');
+
+      } else if (httpResponse.statusCode == 404) {
+        reject('Image server unavailable: ');
+
+      } else if (httpResponse.statusCode > 200) {
+        reject('Invalid upload: ');
+
+      } else {
+        try {
+          var d = JSON.parse(body);
+          sourceFile.width = d.Width;
+          sourceFile.height = d.Height;
+          sourceFile.vector = d.Vector;
+          if (sourceFile.vector) {
+            console.success(sourceFile.filename + ' (vector image) upload complete');
+          } else {
+            console.success(sourceFile.filename + ' (' + d.Width + 'x' + d.Height + ') upload complete');
+          }
+
+          cacheSourceImageData(sourceFile);
+          deferred.resolve();
+
+        } catch (e) {
+          reject('Error parsing upload response: ');
+        }
+      }
+    });
+    promises.push(deferred.promise);
+  });
+
+  return Q.all(promises);
+}
+
+function cacheSourceImageData(sourceFile) {
+  try {
+    var data = JSON.stringify({
+      width: sourceFile.width,
+      height: sourceFile.height,
+      vector: sourceFile.vector,
+      version: 1
+    });
+    var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
+    fs.writeFile(cachedImagePath, data, function(err) {
+      if (err) console.error('Error writing cacheSourceImageData: ' + err);
+    });
+  } catch (e) {
+    console.error('Error cacheSourceImageData: ' + e);
+  }
+}
+
+function loadCachedSourceImageData(sourceFile) {
+  if (settings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
+    try {
+      var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
+      sourceFile.cachedData = JSON.parse(fs.readFileSync(cachedImagePath));
+    } catch (e) {
+      sourceFile.cachedData = false;
+    }
+  }
+}
+
+
+function generateResourceImages() {
+  var deferred = Q.defer();
+
+  // https://github.com/ferentchak/QThrottle
+  var max = settings.generateThrottle - 1;
+  var outstanding = 0;
+
+  function catchingFunction(value) {
+    deferred.notify(value);
+    outstanding--;
+
+    if (generateQueue.length) {
+      outstanding++;
+      generateResourceImage(generateQueue.pop())
+        .then(catchingFunction)
+        .fail(deferred.reject);
+
+    } else if (outstanding === 0) {
+      deferred.resolve();
+    }
+  }
+
+  if (generateQueue.length) {
+    while (max-- && generateQueue.length) {
+      generateResourceImage(generateQueue.pop())
+        .then(catchingFunction)
+        .fail(deferred.reject);
+      outstanding++;
+    }
+  } else {
+    deferred.resolve();
+  }
+
+  return deferred.promise;
+}
+
+function generateResourceImage(image) {
+  var deferred = Q.defer();
+
+  var sourceFile = sourceFiles[image.sourceFilePath];
+
+  if (!sourceFile.vector && (sourceFile.width < image.width || sourceFile.height < image.height)) {
+    image.skip = true;
+    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.width + 'x' + sourceFile.height + ') too small');
+    deferred.resolve();
+
+  } else if (generatingImages[image.tmpPath]) {
+    console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
+    deferred.resolve();
+
+  } else {
+    console.log(' generating ' + image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ')...');
+    generatingImages[image.tmpPath] = true;
+
+    var postData = {
+      url: settings.apiUrl + settings.apiTransformPath,
+      formData: {
+        image_id: image.imageId,
+        name: image.name,
+        platform: image.platform,
+        width: image.width,
+        height: image.height,
+        res_type: image.resType,
+        crop: 'center',
+        encoding: 'png',
+        cli_version: moduleSettings.version
+      },
+      proxy: process.env.PROXY || null
+    };
+
+    var wr = fs.createWriteStream(image.tmpPath, { flags: 'w' });
+    wr.on("error", function(err) {
+      console.error('Error copying to ' + image.tmpPath + ': ' + err);
+      deferred.resolve();
+    });
+    wr.on("finish", function() {
+      if (!image.skip) {
+        console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
+        deferred.resolve();
+      }
+    });
+
+    request.post(postData, function(err, httpResponse, body) {
+
+      function reject(msg) {
+        image.skip = true;
+        try {
+          delete generatingImages[image.tmpPath];
+          wr.close();
+          fs.unlink(image.tmpPath);
+        } catch (err) {}
+
+        try {
+          msg += JSON.parse(body).Error;
+        } catch (e) {
+          msg += body || '';
+        }
+        deferred.reject(msg);
+      }
+
+      if (err || !httpResponse) {
+        reject('Failed to generate image: ' + err);
+
+      } else if (httpResponse.statusCode >= 500) {
+        reject('Image transformation server temporarily unavailable: ');
+
+      } else if (httpResponse.statusCode > 200) {
+        reject('Invalid transformation: ');
+      }
+    })
+    .pipe(wr);
+  }
+
+  return deferred.promise;
+}
+
+function loadResourceImages() {
+  var promises = [];
+
+  images.forEach(function(image) {
+    if (!image.tmpPath || !fs.existsSync(image.tmpPath)) return;
+
+    var deferred = Q.defer();
+    promises.push(deferred.promise);
+
+    var rd = fs.createReadStream(image.tmpPath);
+    rd.on('error', function(err) {
+      deferred.reject('Unable to read generated image: ' + err);
+    });
+
+    var wr = fs.createWriteStream(image.src, {flags: 'w'});
+    wr.on('error', function(err) {
+      deferred.reject('Unable to copy to ' + image.src + ': ' + err);
+    });
+    wr.on('finish', function() {
+      image.isValid = true;
+      deferred.resolve();
+    });
+    rd.pipe(wr);
+  });
+
+  return Q.all(promises);
+}
+
+
+function getConfigData() {
+  var deferred = Q.defer();
+
+  try {
+    fs.readFile(resSettings.ResSettings.configFile, onConfigRead);
+  } catch (err) {
+    console.error('Error saveConfigData: ' + err);
+    deferred.reject();
+  }
+
+  function onConfigRead(err, data) {
+    if (err) {
+      console.error('Error reading config file: ' + err);
+      deferred.reject();
+      return;
+    }
+
+    try {
+      var parser = new xml2js.Parser();
+      parser.parseString(data, onXmlParse);
+    } catch (e) {
+      console.error('Error xml2js parseString: ' + e);
+      deferred.reject();
+    }
+  }
+
+  function onXmlParse(err, parsedData) {
+    if (err) {
+      console.error('Error parsing config file: ' + err);
+      deferred.reject();
+      return;
+    }
+    configData = parsedData;
+    deferred.resolve(configData);
+  }
+
+  return deferred.promise;
+}
+
+
+function updateConfigData() {
+  images = _.filter(images, function(image) {
+    return image.isValid && !image.skip;
+  });
+
+  if (!images.length || !configData) return;
+
+  var settings = resSettings.ResSettings;
+  var madeChanges = false;
+
+  clearResourcesNodes();
+  images.forEach(updateImageNode);
+  buildDefaultIconNode();
+  buildPreferenceSplashNodes();
+  writeConfigData(configData);
+
+  function clearResourcesNodes() {
+    images.forEach(function(image) {
+      if (!image) return;
+      var platformConfigData = getPlatformConfigData(image.platform);
+      if (platformConfigData && platformConfigData[image.resType]) {
+        delete platformConfigData[image.resType];
+        madeChanges = true;
+      }
+    });
+  }
+
+  function updateImageNode(image) {
+    if (!image) return;
+
+    if (!configData.widget.platform) {
+      configData.widget.platform = [];
+    }
+
+    var platformConfigData = getPlatformConfigData(image.platform);
+
+    if (!platformConfigData) {
+      configData.widget.platform.push({ '$': { name: image.platform } });
+      platformConfigData = getPlatformConfigData(image.platform);
+    }
+
+    if (!platformConfigData[image.nodeName]) {
+      platformConfigData[image.nodeName] = [];
+    }
+
+    var node = getResourceConfigNode(platformConfigData, image.nodeName, image.src);
+    if (!node) {
+      node = { '$': {} };
+      platformConfigData[image.nodeName].push(node);
+      madeChanges = true;
+    }
+
+    image.nodeAttributes.forEach(function(nodeAttribute) {
+      node.$[nodeAttribute] = image[nodeAttribute];
+    });
+  }
+
+  function buildDefaultIconNode() {
+    var currentSize = 0;
+    var defaultIcon;
+
+    images.forEach(function(image) {
+      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= settings.defaultMaxIconSize) {
+        currentSize = image.width;
+        defaultIcon = image;
+      }
+    });
+
+    if (defaultIcon) {
+      configData.widget.icon = [{ '$': { src: defaultIcon.src } }];
+      madeChanges = true;
+    }
+  }
+
+  function buildPreferenceSplashNodes() {
+    var hasAndroidSplash = _.find(images, function(image) {
+      return image.platform == 'android' && image.resType == 'splash';
+    });
+
+    if (hasAndroidSplash) {
+      if (!configData.widget.preference) {
+        configData.widget.preference = [];
+      }
+
+      var hasScreenPref = _.find(configData.widget.preference, function(d) {
+        return d && d.$ && d.$.name == 'SplashScreen';
+      });
+      if (!hasScreenPref) {
+        configData.widget.preference.push({ '$': { name: 'SplashScreen', value: 'screen' } });
+        madeChanges = true;
+      }
+
+      var hasDelayPref = _.find(configData.widget.preference, function(d) {
+        return d && d.$ && d.$.name == 'SplashScreenDelay';
+      });
+      if (!hasDelayPref) {
+        configData.widget.preference.push({ '$': { name: 'SplashScreenDelay', value: '3000' } });
+        madeChanges = true;
+      }
+    }
+
+  }
+
+}
+
+function getOrientationConfigData(platform) {
+  if (configData.widget && configData.widget.preference) {
+    var n = _.find(configData.widget.preference, function(d) {
+      return d && d.$ && d.$.name && d.$.name.toLowerCase() == 'orientation';
+    });
+    if (n && n.$ && n.$.value) {
+      return n.$.value.toLowerCase();
+    }
+  }
+  return 'default';
+}
+
+function getPlatformConfigData(platform) {
+  if (configData.widget && configData.widget.platform) {
+    return _.find(configData.widget.platform, function(d) {
+      return d && d.$ && d.$.name == platform;
+    });
+  }
+}
+
+function getResourceConfigNode(platformData, nodeName, src) {
+  if (platformData[nodeName]) {
+    return _.find(platformData[nodeName], function(d) {
+      return d && d.$ && d.$.src == src;
+    });
+  }
+}
+
+function writeConfigData(configData) {
+  // if (!madeChanges) return;
+
+  try {
+    var builder = new xml2js.Builder();
+    var xmlString = builder.buildObject(configData);
+
+    fs.writeFile(settings.configFile, xmlString, function(err) {
+      if (err) console.error('Error writing config data: ' + err);
+    });
+  } catch (e) {
+    console.error('Error writeConfigData: ' + e);
+  }
+}
+
+function addIonicIcons(platform, forceAddResources) {
+
+  switch(platform) {
+    case 'android':
+    case 'ios':
+      break;
+    default:
+      platform = 'android';//most likely crosswalk `cordova platform add ./engine/cordova-android`
+  }
+
+  try {
+    var promise = null;
+
+    if(forceAddResources) {
+      console.log('forceAddResources')
+      promise = copyIconFilesIntoResources(forceAddResources);
+    } else {
+      promise = Q();
+    }
+
+    return promise
+    .then(getConfigData)
+    .then(function(data) {
+      if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
+        console.log('Adding icons for platform:'.blue.bold, platform.green)
+        addPlatformIcons(platform, data)
+        addSplashScreenPreferences(data)
+        writeConfigData(data)
+      }
+    })
+    .catch(function(error) {
+      console.log('Error happened:', error)
+      throw error;
+    })
+  } catch(ex) {
+    Utils.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
+  }
+}
+
+function hasExistingResources() {
+  //Check resources
+  // resources/icon.png
+  // resources/splash.png
+  // resources/ios/
+  // resources/android
+  var hasResources = fs.existsSync(path.join('./', 'resources')),
+      hasAndroidResources = fs.existsSync(path.join('./', 'resources', 'android')),
+      hasIosResources = fs.existsSync(path.join('./', 'resources', 'ios')),
+      hasIconResource = fs.existsSync(path.join('./', 'resources', 'icon.png')),
+      hasSplashResource = fs.existsSync(path.join('./', 'resources', 'splash.png'));
+
+  var hasAnyResources = hasResources || hasAndroidResources || hasIosResources || hasIconResource || hasSplashResource;
+
+  return hasAnyResources;
+}
+
+function copyIconFilesIntoResources(forceAddResources) {
+  var unzipPath = path.join('resources');
+
+  if(hasExistingResources() && !forceAddResources) {
+    // console.log('Not copying over default resources, the resources directory already exist. Please pass the --force argument to overwrite that folder'.red.bold);
+    return Q();
+  }
+
+  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
+  // console.log('uzip to: ', unzipPath)
+  console.log('Downloading Default Ionic Resources'.yellow);
+  return Utils.fetchArchive(unzipPath, ionicResourcesUrl)
+  .then(function() {
+    shelljs.config.silent = true
+    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
+    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
+    console.log('Done adding default Ionic resources'.yellow)
+  })
+}
+
+function addPlatformIcons(platform, configData) {
+  var platElem = { '$': { name: platform }, icon: [], splash: [] };
+  if(!configData.widget.platform) {
+    configData.widget.platform = [];
+  }
+
+  configData.widget.platform.push(platElem);
+
+  resSettings.ResPlatforms[platform].icon.images.forEach(function(image) {
+    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
+    if(platform == 'android') {
+      platElem.icon.push({'$': { src: iconDir, density: image.density }})
+    } else {
+      platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
+    }
+  });
+
+  resSettings.ResPlatforms[platform].splash.images.forEach(function(image) {
+    //resources/ios/splash/
+    var splashDir = ['resources/', platform, '/splash/', image.name].join('');
+    if(platform == 'android') {
+      platElem.splash.push({'$': { src: splashDir, density: image.density }})
+    } else {
+      platElem.splash.push({'$': { src: splashDir, height: image.height, width: image.width }})
+    }
+  })
+
+  // generate.writeConfigData(configData);
+}
+
+function addSplashScreenPreferences(configData) {
+  //Check for splash screen stuff
+  //<preference name="SplashScreen" value="screen"/>
+  //<preference name="SplashScreenDelay" value="3000"/>
+  var preferences = configData.widget.preference;
+
+  if(!configData.widget.preference) {
+    configData.widget.preference = []
+  }
+
+  var hasSplashScreen = false, hasSplashScreenDelay = false;
+
+  configData.widget.preference.forEach(function(pref) {
+    if(pref.$.name == 'SplashScreen') {
+      hasSplashScreen = true;
+    }
+    if(pref.$.name == 'SplashScreenDelay') {
+      hasSplashScreenDelay = true;
+    }
+  })
+
+  if(!hasSplashScreen) {
+    configData.widget.preference.push({'$': { name: 'SplashScreen', value: 'screen'}});
+  }
+  if(!hasSplashScreenDelay) {
+    configData.widget.preference.push({'$': { name: 'SplashScreenDelay', value: '3000'}});
+  }
+}
+
+module.exports = {
+  IonicTask: IonicResources,
+  addIonicIcons: addIonicIcons,
+  copyIconFilesIntoResources: copyIconFilesIntoResources,
+  getConfigData: getConfigData,
+  hasExistingResources: hasExistingResources,
+  writeConfigData: writeConfigData
+}
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 41f9e14549..7c67c9bbbd 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,11 +1,8 @@
 var IonicAppLib = require('ionic-app-lib'),
-    IonicStats = require('./stats').IonicStats,
-    IonicProject = require('./project'),
+    Utils = IonicAppLib.utils,
     events = IonicAppLib.events,
     Q = require('q'),
-    Serve = IonicAppLib.serve,
-    Task = require('./task').Task,
-    Utils = require('./utils');
+    Task = require('./task').Task;
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
@@ -21,28 +18,46 @@ IonicTask.prototype.run = function(ionic, argv) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
+  var isIonicV2 = argv.v2;
+  var Serve, IonicProject;
+
+  if (isIonicV2) {
+    Serve = IonicAppLib.v2.serve;
+    IonicProject = IonicAppLib.v2.project;
+  } else {
+    Serve = IonicAppLib.serve;
+    IonicProject = IonicAppLib.project;
+  }
+
   if (argv._[0] == 'address') {
-      // reset any address configs
-      var ionicConfig = require('./config').load();
-      ionicConfig.set('ionicServeAddress', null);
-      ionicConfig.set('platformServeAddress', null);
-      return Serve.getAddress({isAddressCmd: true});
+    // reset any address configs
+    var ionicConfig = require('./config').load();
+    ionicConfig.set('ionicServeAddress', null);
+    ionicConfig.set('platformServeAddress', null);
+    return Serve.getAddress({isAddressCmd: true});
   }
 
   var project = null;
+  var cwd = process.cwd();
 
   try {
-    project = IonicProject.load(process.cwd());
+    project = isIonicV2 ? IonicProject.loadConfig(cwd) : IonicProject.load(cwd);
   } catch (ex) {
     console.log('Error occured', ex);
     return Utils.fail(ex.message);
   }
 
   var options = Serve.loadSettings(argv, project);
-  options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
+
+  options.appDirectory = cwd;//called from cli - ionic serve - cwd is this
 
   options.nogulp = argv.nogulp;
 
+  //check if CONNECT_LIVE_RELOAD_PORT is defined and use that instead
+  if (process.env.CONNECT_LIVE_RELOAD_PORT) {
+    options.liveReloadPort = process.env.CONNECT_LIVE_RELOAD_PORT;
+  }
+
   var promise;
 
   try {
@@ -56,7 +71,6 @@ IonicTask.prototype.run = function(ionic, argv) {
       promise = Serve.getAddress(options);
     }
 
-
     return promise
     .then(function() {
       // console.log('options.address', options.address);
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 22854a5de4..37d9d2bc93 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -2,7 +2,6 @@ require('shelljs/global')
 
 var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     argv = require('optimist').argv,
     fs = require('fs'),
     path = require('path'),
@@ -175,9 +174,6 @@ IonicTask.prototype.listServices = function listServices() {
 IonicTask.prototype.run = function run(ionic, argv, callback) {
   this.ionic = ionic;
 
-  IonicStats.t();
-
-
   if (!bower.IonicBower.checkForBower()) {
     this.ionic.fail(bower.IonicBower.installMessage, 'service');
     return;
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 39cd93d3f1..6ccbb4c5be 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,5 +1,4 @@
 var Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
@@ -50,9 +49,8 @@ IonicTask.prototype.run = function(ionic) {
   })
   .catch(function(error) {
     console.log('Error from setup - ' + error);
-  })
-
-  IonicStats.t();
+  });
+  
 };
 
 IonicTask.prototype.runSetupTask = function runSetupTask(setupTask) {
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 8e00f146a3..07f0b989f7 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -9,7 +9,6 @@ var path = require('path'),
     IonicProject = require('./project'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     LoginTask = require('./login'),
     IonicAppLib = require('ionic-app-lib'),
     Share = IonicAppLib.share,
@@ -46,8 +45,6 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   console.log(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
 
-  IonicStats.t();
-
   return Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5427d5ce41..bc2c6418c3 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -8,11 +8,10 @@ var fs = require('fs'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     IonicAppLib = require('ionic-app-lib'),
-    Start = IonicAppLib.start,
     Utils = IonicAppLib.utils;
 
+var Start;
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
@@ -37,7 +36,12 @@ IonicTask.prototype.run = function run(ionic, argv) {
       startingApp = true;
   // Grab the app's relative directory name
 
-  IonicStats.t();
+  var isV2Start = argv.v2 || argv.v;
+  if (isV2Start) {
+    Start = IonicAppLib.v2.start;
+  } else {
+    Start = IonicAppLib.start;
+  }
 
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
@@ -56,17 +60,28 @@ IonicTask.prototype.run = function run(ionic, argv) {
   })
   .then(function() {
     if (startingApp) {
-      Start.printQuickHelp(options);
-      return Start.promptLogin(options);
+      return Start.printQuickHelp(options);
     }
   })
+  /*
   .then(function() {
     if (startingApp) {
       return ionic.printNewsUpdates(true);
     }
   })
+  */
+  .then(function() {
+    return Start.promptLogin(options);
+  })
+  .then(function() {
+    if (isV2Start) {
+      console.log('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
+    }
+  })
   .catch(function(error) {
-    Utils.fail(error);
+    // return Utils.fail(error);
+    console.error(error);
+    throw error;
   });
 };
 
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index bfddfdb08b..80dc657572 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -32,7 +32,6 @@ var fs = require('fs'),
   Q = require('q'),
   shelljs = require('shelljs'),
   Task = require('./task').Task,
-  IonicStats = require('./stats').IonicStats,
   _ = require('underscore'),
   IonicProject = require('./project'),
   IonicAppLib = require('ionic-app-lib'),
@@ -94,8 +93,6 @@ IonicTask.prototype.run = function run(ionic, argv) {
       console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);
   }
 
-  IonicStats.t();
-
 };
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 41d643da75..87e8b47d75 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -13,6 +13,11 @@ var path = require('path'),
     os = require('os'),
     IonicConfig = require('./config');
 
+exports.getVersion = function getVersion() {
+  var packageJson = require('../../package.json');
+  return packageJson;
+};
+
 /*
     Heavily inspired by the original js library copyright Mixpanel, Inc.
     (http://mixpanel.com/)
@@ -521,6 +526,9 @@ exports.IonicStats = {
   t: function(additionalData) {
     try {
 
+      var packageJson = exports.getVersion();
+      if (packageJson.version.indexOf('beta') > -1) return;
+
       if(process.argv.length < 3) return;
 
       if( ionicConfig.get('statsOptOut') === true ) {
@@ -593,8 +601,7 @@ exports.IonicStats = {
 
       // add which cli version is being used
       try {
-        statsData.cli_version = require('../../package.json').version;
-        if(statsData.cli_version.indexOf('beta') > -1) return;
+        statsData.cli_version = packageJson.version;
       } catch(e2) {}
 
       try {
@@ -606,7 +613,6 @@ exports.IonicStats = {
       } catch (e2) {}
 
       this.mp(cmdName, statsData);
-      //console.log(cmdName, statsData);
 
     } catch(e) {
       console.log( ('Error stats: ' + e) );
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 5172aa387f..1fbd05bb5a 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -3,7 +3,6 @@ var colors = require('colors'),
     _ = require('underscore'),
     Q = require('q'),
     Task = require('./task').Task,
-    IonicStats = require('./stats').IonicStats,
     request = require('request');
     // starterTemplates = require('./starter-templates')
 
@@ -68,8 +67,6 @@ IonicTask.prototype.run = function(ionic) {
     self.list(templates);
   });
 
-  IonicStats.t();
-
 };
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 2c31f89ab7..757ea11063 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,6 +1,5 @@
 var IonicAppLib = require('ionic-app-lib'),
     IonicLoginTask = require('./login').IonicTask,
-    IonicStats = require('./stats').IonicStats,
     Login = IonicAppLib.login,
     LoginTask = require('./login'),
     Task = require('./task').Task,
@@ -15,8 +14,6 @@ IonicTask.prototype.run = function run(ionic, argv) {
   var note = argv.note;
   var deploy = argv.deploy || false;
 
-  IonicStats.t();
-
   return Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
diff --git a/lib/ionic/v2.js b/lib/ionic/v2.js
new file mode 100644
index 0000000000..ca5354e330
--- /dev/null
+++ b/lib/ionic/v2.js
@@ -0,0 +1,33 @@
+var fs = require('fs'),
+    path = require('path'),
+    // argv = require('optimist').argv,
+    Task = require('./task').Task,
+    ionicAppLib = require('ionic-app-lib'),
+    Info = ionicAppLib.info;
+
+var IonicTask = function() {};
+
+IonicTask.prototype = new Task();
+
+IonicTask.prototype.run = function(ionic, arv) {
+  this.ionic = ionic;
+
+  try {
+    console.log('**********************************************'.yellow)
+    console.log('Getting started with Ionic v2\n'.green)
+    console.log('Start a simple app: `ionic start MyIonicV2App --v2`\n');
+    console.log('That will download the files you need as well as install node modules and cordova plugins.\n');
+    console.log('Run `ionic serve` to serve the app in the browser.\n');
+    console.log('**********************************************'.yellow);
+    // console.log('* Transpiling files\n'.green);
+    // console.log('Ionic is built on TypeScript/ES6. Files must be compiled and translated (commonly called transpiled) to JavaScript.\n');
+    // console.log('When you make a change to your files with ionic serve, ionic cli will automatically transpile files and reload the browser.\n');
+    // console.log('You can also run `ionic transpile` to transpile the files manually.\n');
+    // console.log('Ionic cli also compiles sass for you `ionic transpile sass`.\n');
+    // console.log('**********************************************'.yellow);
+  } catch (ex) {
+    this.ionic.fail('Unidentified error');
+  }
+}
+
+exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index b93d1773fa..7eb890471c 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -57,9 +57,14 @@ var TASKS = [
       },
       '--io-app-id': 'The Ionic.io app ID to use',
       '--template|-t': 'Project starter template',
+      '--v2|-v': {
+        boolean: true,
+        title: 'Start a Ionic v2 project'
+      },
       '--zip-file|-z': 'URL to download zipfile for starter template'
     },
-    module: './ionic/start'
+    module: './ionic/start',
+    disableChangePwd: true
   },
   {
     title: 'serve',
@@ -106,7 +111,11 @@ var TASKS = [
         title: 'Disable running gulp during serve',
         boolean: true
       },
-      '--platform|-t': 'Start serve with a specific platform (ios/android)'
+      '--platform|-t': 'Start serve with a specific platform (ios/android)',
+      '--nobuild|-i': {
+        boolean: true,
+        title: 'Do not run build before serve (v2)'
+      }
     },
     module: './ionic/serve'
   },
@@ -157,7 +166,8 @@ var TASKS = [
   {
     title: 'build',
     name: 'build',
-    summary: 'Locally build an Ionic project for a given platform',
+    summary: 'Locally build an Ionic project for a given platform.\n' +
+             '(v2 only) does webpack build before given platform.',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
@@ -429,7 +439,8 @@ var TASKS = [
      args: {
        '[command]': 'The command you desire help with'
      },
-     module: './ionic/help'
+     module: './ionic/help',
+     disableChangePwd: true
    },
    {
     title: 'link',
@@ -486,7 +497,28 @@ var TASKS = [
     args: {
       '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
     },
-    module: './ionic/docs'
+    module: './ionic/docs',
+    disableChangePwd: true
+   },
+   {
+    title: 'v2',
+    name: 'v2',
+    summary: 'Gives simple information to get started with Ionic v2',
+    module: './ionic/v2',
+    disableChangePwd: true
+   },
+   {
+    title: 'generate',
+    alt: ['g'],
+    name: 'generate',
+    summary: 'Generate pages and components',
+    module: './ionic/generate',
+    options: {
+      '--list': {
+        title: 'List available generators',
+        boolean: true
+      }
+    },
    }
 ];
 
diff --git a/package.json b/package.json
index e18f01d307..2c6cf9d10e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "ionic",
+<<<<<<< f9f6b5783fc4530a3a1fca289da235327e83dded
   "version": "1.7.14",
+=======
+  "version": "2.0.0",
+>>>>>>> feat(v2): New v2 support
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,10 +71,14 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
+<<<<<<< f9f6b5783fc4530a3a1fca289da235327e83dded
     "ionic-app-lib": "0.7.0",
+=======
+    "inquirer": "^0.11.0",
+    "ionic-app-lib": "2.0.0",
+>>>>>>> feat(v2): New v2 support
     "moment": "^2.10.6",
     "ncp": "0.4.2",
-    "npm": "2.1.3",
     "open": "0.0.5",
     "optimist": "0.6.0",
     "progress": "1.1.7",
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 07b240f7cb..a6a0302396 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -2,6 +2,7 @@ var IonicAppLib = require('ionic-app-lib'),
     Ionitron = require('../lib/ionic/ionitron'),
     IonicCli = require('../lib/cli'),
     Q = require('q'),
+    IonicStats = require('../lib/ionic/stats').IonicStats,
     Task = require('../lib/ionic/task').Task,
     Info = IonicAppLib.info,
     Utils = IonicAppLib.utils,
@@ -51,7 +52,7 @@ describe('Cli', function() {
         expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
       });
 
-      it('should run info doRuntimeCheck on run', function() {
+      xit('should run info doRuntimeCheck on run', function() {
         spyOn(IonicCli, 'printHelpLines');
         IonicCli.run(['node', 'bin/ionic', '--h']);
         expect(IonicCli.doRuntimeCheck).toHaveBeenCalled();
@@ -118,7 +119,25 @@ describe('Cli', function() {
         var task = IonicCli.getTaskWithName('start');
         var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
         //We expect 6 total = 3 options, each with short hand notation.
-        expect(booleanOptions.length).toBe(6);
+        expect(booleanOptions.length).toBe(8);
+      });
+
+      it('should track stats for cli', function() {
+        spyOn(IonicStats, 't');
+        IonicCli.run(['node', 'bin/ionic', 'run', 'ios']);
+        expect(IonicStats.t).toHaveBeenCalled();
+      });
+
+      it('should change pwd for commands', function() {
+        spyOn(Utils, 'cdIonicRoot');
+        IonicCli.run(['node', 'bin/ionic', 'serve']);
+        expect(Utils.cdIonicRoot).toHaveBeenCalled();
+      });
+
+      it('should not change pwd for commands', function() {
+        spyOn(Utils, 'cdIonicRoot');
+        IonicCli.run(['node', 'bin/ionic', 'start']);
+        expect(Utils.cdIonicRoot).not.toHaveBeenCalled();
       });
     });
   });
@@ -136,178 +155,200 @@ describe('Cli', function() {
 
     });
 
-    it('should parse start options correctly', function() {
+    it('should parse start options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
 
-      IonicCli.run(processArgs);
-
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
-
-      var taskArgv = taskArgs[1];
-      expect(taskArgv._.length).toBe(2);
-      expect(taskArgv._[0]).toBe('start');
-      expect(taskArgv._[1]).toBe('s1');
-      expect(taskArgv.appname).toBe('asdf');
-      expect(taskArgv.s).toBe(false);
-      expect(taskArgv.sass).toBe(false);
-      expect(taskArgv.l).toBe(false);
-      expect(taskArgv.list).toBe(false);
-      expect(taskArgv['no-cordova']).toBe(false);
-      expect(taskArgv.w).toBe(true);
-      expect(taskArgv.id).toBeUndefined();
-      expect(taskArgv.i).toBeUndefined();
+      var promise = IonicCli.run(processArgs);
+
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+        var taskArgv = taskArgs[1];
+        expect(taskArgv._.length).toBe(2);
+        expect(taskArgv._[0]).toBe('start');
+        expect(taskArgv._[1]).toBe('s1');
+        expect(taskArgv.appname).toBe('asdf');
+        expect(taskArgv.s).toBe(false);
+        expect(taskArgv.sass).toBe(false);
+        expect(taskArgv.l).toBe(false);
+        expect(taskArgv.list).toBe(false);
+        expect(taskArgv['no-cordova']).toBe(false);
+        expect(taskArgv.w).toBe(true);
+        expect(taskArgv.id).toBeUndefined();
+        expect(taskArgv.i).toBeUndefined();
+        done();
+      });
     });
 
-    it('should parse serve options correctly', function() {
+    it('should parse serve options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
 
-      IonicCli.run(processArgs);
-
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
-
-      var taskArgv = taskArgs[1];
-      // console.log('taskArgv', taskArgv);
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(1);
-      expect(taskArgv.browser).toBe('firefox');
-      expect(taskArgv.nogulp).toBe(true);
-      expect(taskArgv.all).toBe(true);
-      expect(taskArgv.lab).toBe(false);
-      expect(taskArgv.nobrowser).toBe(false);
-
+      var promise = IonicCli.run(processArgs);
+
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+        var taskArgv = taskArgs[1];
+        // console.log('taskArgv', taskArgv);
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(1);
+        expect(taskArgv.browser).toBe('firefox');
+        expect(taskArgv.nogulp).toBe(true);
+        expect(taskArgv.all).toBe(true);
+        expect(taskArgv.lab).toBe(false);
+        expect(taskArgv.nobrowser).toBe(false);
+        done();
+      });
     });
 
 
-    it('should parse upload options correctly', function() {
+    it('should parse upload options correctly', function(done) {
       var note = 'A note for notes';
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'upload', '--email', 'user@ionic.io', '--password', 'pass', '--note', note];
 
-      IonicCli.run(processArgs);
-
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      var promise = IonicCli.run(processArgs);
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
-
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(1);
-      expect(taskArgv.note).toBe(note);
-      expect(taskArgv.email).toBe('user@ionic.io');
-      expect(taskArgv.password).toBe('pass');
+        var taskArgv = taskArgs[1];
 
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(1);
+        expect(taskArgv.note).toBe(note);
+        expect(taskArgv.email).toBe('user@ionic.io');
+        expect(taskArgv.password).toBe('pass');
+        done();
+      });
     });
 
-    it('should parse login options correctly', function() {
+    it('should parse login options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
 
-      IonicCli.run(processArgs);
+      var promise = IonicCli.run(processArgs);
 
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
+        var taskArgv = taskArgs[1];
 
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(1);
-      expect(taskArgv.email).toBe('user@ionic.io');
-      expect(taskArgv.password).toBe('pass');
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(1);
+        expect(taskArgv.email).toBe('user@ionic.io');
+        expect(taskArgv.password).toBe('pass');
+        done();
+      });
     });
 
-    it('should parse run options correctly', function() {
+    it('should parse run options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
 
-      IonicCli.run(processArgs);
+      var promise = IonicCli.run(processArgs);
 
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
-
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(2);
-      expect(taskArgv.r).toBe(35730);
-      expect(taskArgv.port).toBe(5000);
-      expect(taskArgv.consolelogs).toBe(true);
-      expect(taskArgv.serverlogs).toBe(true);
-      expect(taskArgv.livereload).toBe(true);
-      expect(taskArgv.device).toBe(true);
+        var taskArgv = taskArgs[1];
 
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(2);
+        expect(taskArgv.r).toBe(35730);
+        expect(taskArgv.port).toBe(5000);
+        expect(taskArgv.consolelogs).toBe(true);
+        expect(taskArgv.serverlogs).toBe(true);
+        expect(taskArgv.livereload).toBe(true);
+        expect(taskArgv.device).toBe(true);
+        done();
+      });
     });
 
     it('should parse emulate options correctly', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
 
-      IonicCli.run(processArgs);
-
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
-
-      var taskArgv = taskArgs[1];
-
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(2);
-      expect(taskArgv._[1]).toBe('android');
-      expect(taskArgv.r).toBe(35730);
-      expect(taskArgv.address).toBe('localhost');
-      expect(taskArgv.port).toBe(5000);
-      expect(taskArgv.consolelogs).toBe(true);
-      expect(taskArgv.serverlogs).toBe(true);
-      expect(taskArgv.livereload).toBe(true);
+      var promise = IonicCli.run(processArgs);
+
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+
+        var taskArgv = taskArgs[1];
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(2);
+        expect(taskArgv._[1]).toBe('android');
+        expect(taskArgv.r).toBe(35730);
+        expect(taskArgv.address).toBe('localhost');
+        expect(taskArgv.port).toBe(5000);
+        expect(taskArgv.consolelogs).toBe(true);
+        expect(taskArgv.serverlogs).toBe(true);
+        expect(taskArgv.livereload).toBe(true);
+        done();
+      });
     });
 
-    it('should parse state options correctly', function() {
+    it('should parse state options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
 
-      IonicCli.run(processArgs);
+      var promise = IonicCli.run(processArgs);
 
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
+        var taskArgv = taskArgs[1];
 
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(2);
-      expect(taskArgv._[1]).toBe('save');
-      expect(taskArgv.plugins).toBe(true);
-      expect(taskArgv.platforms).toBe(false);
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(2);
+        expect(taskArgv._[1]).toBe('save');
+        expect(taskArgv.plugins).toBe(true);
+        expect(taskArgv.platforms).toBe(false);
+        done();
+      });
     });
 
-    it('should parse plugin options correctly', function() {
+    it('should parse plugin options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'plugin', 'add', 'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
 
-      IonicCli.run(processArgs);
+      var promise = IonicCli.run(processArgs);
 
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
+        var taskArgv = taskArgs[1];
 
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(3);
-      expect(taskArgv._[0]).toBe('plugin');
-      expect(taskArgv._[1]).toBe('add');
-      expect(taskArgv._[2]).toBe('org.apache.cordova.splashscreen');
-      expect(taskArgv.nosave).toBe(true);
-      expect(taskArgv.searchpath).toBe('../');
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(3);
+        expect(taskArgv._[0]).toBe('plugin');
+        expect(taskArgv._[1]).toBe('add');
+        expect(taskArgv._[2]).toBe('org.apache.cordova.splashscreen');
+        expect(taskArgv.nosave).toBe(true);
+        expect(taskArgv.searchpath).toBe('../');
+        done();
+      });
     });
 
-    it('should parse build options correctly', function() {
+    it('should parse build options correctly', function(done) {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
 
-      IonicCli.run(processArgs);
+      var promise = IonicCli.run(processArgs);
 
-      expect(fakeTask.prototype.run).toHaveBeenCalled();
-      var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function(){
+        expect(fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
 
-      var taskArgv = taskArgs[1];
+        var taskArgv = taskArgs[1];
 
-      //should only have serve in the command args
-      expect(taskArgv._.length).toBe(2);
-      expect(taskArgv._[0]).toBe('build');
-      expect(taskArgv._[1]).toBe('ios');
-      expect(taskArgv.nohooks).toBe(true);
+        //should only have serve in the command args
+        expect(taskArgv._.length).toBe(2);
+        expect(taskArgv._[0]).toBe('build');
+        expect(taskArgv._[1]).toBe('ios');
+        expect(taskArgv.nohooks).toBe(true);
+        done();
+      });
     });
 
     describe('version checking for checkRuntime', function() {
@@ -316,7 +357,7 @@ describe('Cli', function() {
         IonicCli = rewire('../lib/cli');
       });
 
-      it('should do runtime check when version is not checked', function() {
+      xit('should do runtime check when version is not checked', function() {
         var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
         IonicCli.__set__('IonicConfig', IonicConfigSpy);
@@ -326,7 +367,7 @@ describe('Cli', function() {
         expect(IonicConfigSpy.save).not.toHaveBeenCalled();
       });
 
-      it('should do runtime check when version is not checked', function() {
+      xit('should do runtime check when version is not checked', function() {
         var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
         IonicCli.__set__('IonicConfig', IonicConfigSpy);
diff --git a/spec/serve.spec.js b/spec/serve.spec.js
new file mode 100644
index 0000000000..f087bc4177
--- /dev/null
+++ b/spec/serve.spec.js
@@ -0,0 +1,88 @@
+var IonicAppLib = require('ionic-app-lib'),
+    IonicProject = IonicAppLib.project,
+    Serve = IonicAppLib.serve,
+    Q = require('q'),
+    rewire = require('rewire'),
+    Utils = IonicAppLib.utils;
+
+var argv = { 
+  _: ['--livereload'],
+  nogulp: false
+}
+
+describe('Serve', function() {
+  var serveTask;
+
+  beforeEach(function() {
+    serveTask = rewire('../lib/ionic/serve');
+
+    spyOn(Utils, 'isIonicV2').andReturn(false);
+    
+  });
+
+  it('should have serve defined', function() {
+    expect(serveTask).toBeDefined();
+  });
+
+  it('should use connect live reload port from env var', function(done) {
+    spyOn(IonicProject, 'load').andReturn({});
+    spyOn(Serve, 'loadSettings').andReturn({});
+    spyOn(Serve, 'getAddress').andReturn(Q());
+
+    spyOn(Serve, 'checkPorts');
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    spyOn(process, 'cwd').andReturn('/ionic/app/path');
+
+    process.env = { CONNECT_LIVE_RELOAD_PORT: 5000 };
+
+    var serve = new serveTask.IonicTask();
+    var options = {
+      appDirectory: '/ionic/app/path',
+      liveReloadPort: 5000,
+      nogulp: false
+    };
+
+    Q()
+    .then(function(){
+      return serve.run({}, argv);
+    })
+    .then(function() {
+      expect(Serve.start).toHaveBeenCalledWith(options);
+    })
+    .catch(function(ex){
+      expect('this').toBe(ex.stack);
+    })
+    .fin(done);
+  });
+
+  it('should use connect live reload port from env var', function(done) {
+    spyOn(IonicProject, 'load').andReturn({
+      get: function() {
+        return false;
+      }
+    });
+    process.env = {};
+    spyOn(Serve, 'getAddress').andReturn(Q());
+
+    spyOn(Serve, 'checkPorts');
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    spyOn(process, 'cwd').andReturn('/ionic/app/path');
+
+    var serve = new serveTask.IonicTask();
+
+    Q()
+    .then(function(){
+      return serve.run({}, argv);
+    })
+    .then(function() {
+      var calls = Serve.start.calls[0].args[0];
+      expect(calls.liveReloadPort).toBe(35729);
+    })
+    .catch(function(ex){
+      expect('this').toBe(ex.stack);
+    })
+    .fin(done);
+  });
+});
diff --git a/spec/start.spec.js b/spec/start.spec.js
new file mode 100644
index 0000000000..2bb971ca8a
--- /dev/null
+++ b/spec/start.spec.js
@@ -0,0 +1,22 @@
+var IonicAppLib = require('ionic-app-lib'),
+    IonicProject = IonicAppLib.project,
+    Serve = IonicAppLib.serve,
+    Q = require('q'),
+    rewire = require('rewire');
+
+var argv = { 
+  _: ['--livereload'],
+  nogulp: false
+}
+
+describe('Start', function() {
+  var startTask;
+
+  beforeEach(function() {
+    startTask = rewire('../lib/ionic/serve');
+  });
+
+  it('should have serve defined', function() {
+    expect(startTask).toBeDefined();
+  });
+});
diff --git a/spec/stats.spec.js b/spec/stats.spec.js
new file mode 100644
index 0000000000..7fff9daa15
--- /dev/null
+++ b/spec/stats.spec.js
@@ -0,0 +1,69 @@
+var Q = require('q'),
+    // IonicStats = require('../lib/ionic/stats').IonicStats,
+    IonicStatsModule,
+    IonicStats,
+    IonicConfig = require('../lib/ionic/config'),
+    path = require('path'),
+    rewire = require('rewire');
+
+describe('Stats', function() {
+  beforeEach(function() {
+    IonicStatsModule = rewire('../lib/ionic/stats');
+    IonicStats = IonicStatsModule.IonicStats;
+  });
+
+  it('should have stats defined', function() {
+    expect(IonicStats).toBeDefined();
+  });
+
+  describe('#t', function() {
+    it('should not track if process.argv is less than 3', function() {
+      var oldprocessargv = process.argv;
+      process.argv = ['node', 'bin/ionic'];
+
+      spyOn(IonicStats, 'mp');
+
+      var configSpy = createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(true);
+
+      IonicStatsModule.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(configSpy.get).not.toHaveBeenCalled();
+      expect(IonicStats.mp).not.toHaveBeenCalled();
+      process.argv = oldprocessargv;
+    });
+
+    it('should not track stats if opted out', function() {
+      var configSpy = createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(true);
+      spyOn(IonicStatsModule, 'getVersion').andReturn({version: '1.6.4'});
+
+      IonicStatsModule.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(configSpy.get).toHaveBeenCalled();
+    });
+
+    it('should track the correct command', function() {
+      var oldprocessargv = process.argv;
+      process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
+      var packageJson = { version: '1.6.4' };
+
+      spyOn(IonicStats, 'mp');
+      spyOn(IonicStatsModule, 'getVersion').andReturn(packageJson);
+
+      var configSpy = createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(false);
+
+      IonicStatsModule.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(IonicStats.mp).toHaveBeenCalledWith('start', { cli_version: packageJson.version, email: false, account_id: false });
+      process.argv = oldprocessargv;
+    });
+  });
+});

From 34fff346b30b2bb4b32f68f4bdfc9788dcf8b3ce Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 14:47:59 -0600
Subject: [PATCH 0853/1100] vBump

---
 package.json | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 2c6cf9d10e..b2479cc216 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "ionic",
-<<<<<<< f9f6b5783fc4530a3a1fca289da235327e83dded
-  "version": "1.7.14",
-=======
-  "version": "2.0.0",
->>>>>>> feat(v2): New v2 support
+  "version": "2.0.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -71,12 +67,8 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-<<<<<<< f9f6b5783fc4530a3a1fca289da235327e83dded
-    "ionic-app-lib": "0.7.0",
-=======
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0",
->>>>>>> feat(v2): New v2 support
+    "ionic-app-lib": "2.0.0-beta.1",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From be1a38cc8da53589f9138870151b69cd111ee633 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 14:58:11 -0600
Subject: [PATCH 0854/1100] Shrink

---
 npm-shrinkwrap.json | 11238 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 11238 insertions(+)
 create mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 0000000000..15670feca4
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,11238 @@
+{
+  "name": "ionic",
+  "version": "2.0.0-beta.1",
+  "dependencies": {
+    "async": {
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+    },
+    "cheerio": {
+      "version": "0.19.0",
+      "from": "cheerio@>=0.19.0 <0.20.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "dependencies": {
+        "css-select": {
+          "version": "1.0.0",
+          "from": "css-select@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "dependencies": {
+            "css-what": {
+              "version": "1.0.0",
+              "from": "css-what@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "from": "domutils@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.3.0",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+                }
+              }
+            },
+            "boolbase": {
+              "version": "1.0.0",
+              "from": "boolbase@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+            },
+            "nth-check": {
+              "version": "1.0.1",
+              "from": "nth-check@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1",
+          "from": "entities@>=1.1.1 <1.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+        },
+        "htmlparser2": {
+          "version": "3.8.3",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.3.0",
+              "from": "domhandler@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+            },
+            "domutils": {
+              "version": "1.5.1",
+              "from": "domutils@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+            },
+            "domelementtype": {
+              "version": "1.3.0",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0",
+              "from": "entities@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.1.0",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.3",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        }
+      }
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "from": "cli-table@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "from": "colors@1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+        }
+      }
+    },
+    "colors": {
+      "version": "0.6.2",
+      "from": "colors@0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+    },
+    "connect": {
+      "version": "3.1.1",
+      "from": "connect@3.1.1",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "1.0.4",
+          "from": "debug@1.0.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "finalhandler": {
+          "version": "0.1.0",
+          "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+            }
+          }
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "connect-livereload": {
+      "version": "0.5.2",
+      "from": "connect-livereload@0.5.2",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
+    },
+    "crc": {
+      "version": "3.2.1",
+      "from": "crc@3.2.1",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+    },
+    "cross-spawn": {
+      "version": "0.2.3",
+      "from": "cross-spawn@0.2.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.7.3",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+        }
+      }
+    },
+    "event-stream": {
+      "version": "3.0.20",
+      "from": "event-stream@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "dependencies": {
+        "through": {
+          "version": "2.3.8",
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+        },
+        "duplexer": {
+          "version": "0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+        },
+        "from": {
+          "version": "0.1.3",
+          "from": "from@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+        },
+        "map-stream": {
+          "version": "0.0.6",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
+        },
+        "pause-stream": {
+          "version": "0.0.11",
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+        },
+        "split": {
+          "version": "0.2.10",
+          "from": "split@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+        },
+        "stream-combiner": {
+          "version": "0.0.4",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "1.2.0",
+      "from": "expand-tilde@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
+      "dependencies": {
+        "user-home": {
+          "version": "1.1.1",
+          "from": "user-home@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "0.2.0",
+      "from": "finalhandler@0.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        }
+      }
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "from": "form-data@0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "dependencies": {
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "from": "mime@>=1.2.11 <1.3.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+        }
+      }
+    },
+    "gulp": {
+      "version": "3.8.8",
+      "from": "gulp@3.8.8",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "dependencies": {
+        "archy": {
+          "version": "0.0.2",
+          "from": "archy@>=0.0.2 <0.0.3",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "from": "chalk@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "from": "supports-color@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+            }
+          }
+        },
+        "deprecated": {
+          "version": "0.0.1",
+          "from": "deprecated@>=0.0.1 <0.0.2",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+        },
+        "gulp-util": {
+          "version": "3.0.7",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+          "dependencies": {
+            "array-differ": {
+              "version": "1.0.0",
+              "from": "array-differ@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+            },
+            "array-uniq": {
+              "version": "1.0.2",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+            },
+            "beeper": {
+              "version": "1.1.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "dateformat": {
+              "version": "1.0.12",
+              "from": "dateformat@>=1.0.11 <2.0.0",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                },
+                "meow": {
+                  "version": "3.6.0",
+                  "from": "meow@>=3.3.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "2.0.0",
+                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "2.0.1",
+                          "from": "camelcase@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.1",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "loud-rejection": {
+                      "version": "1.2.0",
+                      "from": "loud-rejection@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                      "dependencies": {
+                        "signal-exit": {
+                          "version": "2.1.2",
+                          "from": "signal-exit@>=2.1.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.5",
+                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "validate-npm-package-license": {
+                          "version": "3.0.1",
+                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                          "dependencies": {
+                            "spdx-correct": {
+                              "version": "1.0.2",
+                              "from": "spdx-correct@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                              "dependencies": {
+                                "spdx-license-ids": {
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                                }
+                              }
+                            },
+                            "spdx-expression-parse": {
+                              "version": "1.0.2",
+                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                              "dependencies": {
+                                "spdx-exceptions": {
+                                  "version": "1.0.4",
+                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                                },
+                                "spdx-license-ids": {
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "object-assign": {
+                      "version": "4.0.1",
+                      "from": "object-assign@>=4.0.1 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                    },
+                    "read-pkg-up": {
+                      "version": "1.0.1",
+                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                      "dependencies": {
+                        "find-up": {
+                          "version": "1.1.0",
+                          "from": "find-up@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
+                          "dependencies": {
+                            "path-exists": {
+                              "version": "2.1.0",
+                              "from": "path-exists@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "read-pkg": {
+                          "version": "1.1.0",
+                          "from": "read-pkg@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                          "dependencies": {
+                            "load-json-file": {
+                              "version": "1.1.0",
+                              "from": "load-json-file@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "parse-json": {
+                                  "version": "2.2.0",
+                                  "from": "parse-json@>=2.2.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                                  "dependencies": {
+                                    "error-ex": {
+                                      "version": "1.3.0",
+                                      "from": "error-ex@>=1.2.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                      "dependencies": {
+                                        "is-arrayish": {
+                                          "version": "0.2.1",
+                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "pify": {
+                                  "version": "2.3.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "strip-bom": {
+                                  "version": "2.0.0",
+                                  "from": "strip-bom@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                                  "dependencies": {
+                                    "is-utf8": {
+                                      "version": "0.2.0",
+                                      "from": "is-utf8@>=0.2.0 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "path-type": {
+                              "version": "1.1.0",
+                              "from": "path-type@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "pify": {
+                                  "version": "2.3.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "redent": {
+                      "version": "1.0.0",
+                      "from": "redent@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                      "dependencies": {
+                        "indent-string": {
+                          "version": "2.1.0",
+                          "from": "indent-string@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                          "dependencies": {
+                            "repeating": {
+                              "version": "2.0.0",
+                              "from": "repeating@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                              "dependencies": {
+                                "is-finite": {
+                                  "version": "1.0.1",
+                                  "from": "is-finite@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                                  "dependencies": {
+                                    "number-is-nan": {
+                                      "version": "1.0.0",
+                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "strip-indent": {
+                          "version": "1.0.1",
+                          "from": "strip-indent@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "trim-newlines": {
+                      "version": "1.0.0",
+                      "from": "trim-newlines@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "fancy-log": {
+              "version": "1.1.0",
+              "from": "fancy-log@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
+            },
+            "gulplog": {
+              "version": "1.0.0",
+              "from": "gulplog@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+              "dependencies": {
+                "glogg": {
+                  "version": "1.0.0",
+                  "from": "glogg@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+                  "dependencies": {
+                    "sparkles": {
+                      "version": "1.0.0",
+                      "from": "sparkles@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "has-gulplog": {
+              "version": "0.1.0",
+              "from": "has-gulplog@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+              "dependencies": {
+                "sparkles": {
+                  "version": "1.0.0",
+                  "from": "sparkles@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                }
+              }
+            },
+            "lodash._reescape": {
+              "version": "3.0.0",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+            },
+            "lodash._reevaluate": {
+              "version": "3.0.0",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+            },
+            "lodash._reinterpolate": {
+              "version": "3.0.0",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+            },
+            "lodash.template": {
+              "version": "3.6.2",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+              "dependencies": {
+                "lodash._basecopy": {
+                  "version": "3.0.1",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+                },
+                "lodash._basetostring": {
+                  "version": "3.0.1",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                },
+                "lodash._basevalues": {
+                  "version": "3.0.0",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+                },
+                "lodash._isiterateecall": {
+                  "version": "3.0.9",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+                },
+                "lodash.escape": {
+                  "version": "3.0.0",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                },
+                "lodash.keys": {
+                  "version": "3.1.2",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                  "dependencies": {
+                    "lodash._getnative": {
+                      "version": "3.9.1",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+                    },
+                    "lodash.isarguments": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
+                    },
+                    "lodash.isarray": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+                    }
+                  }
+                },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+                },
+                "lodash.templatesettings": {
+                  "version": "3.1.0",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
+                }
+              }
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "from": "multipipe@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "from": "duplexer2@0.0.2",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "object-assign": {
+              "version": "3.0.0",
+              "from": "object-assign@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+            },
+            "replace-ext": {
+              "version": "0.0.1",
+              "from": "replace-ext@0.0.1",
+              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+            },
+            "through2": {
+              "version": "2.0.0",
+              "from": "through2@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.5",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.5.3",
+              "from": "vinyl@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "1.0.2",
+                  "from": "clone@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "interpret": {
+          "version": "0.3.10",
+          "from": "interpret@>=0.3.2 <0.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
+        },
+        "liftoff": {
+          "version": "0.12.1",
+          "from": "liftoff@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "dependencies": {
+            "findup-sync": {
+              "version": "0.1.3",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.9 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash": {
+                  "version": "2.4.2",
+                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                }
+              }
+            },
+            "resolve": {
+              "version": "0.7.4",
+              "from": "resolve@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+            },
+            "minimist": {
+              "version": "0.2.0",
+              "from": "minimist@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+            },
+            "extend": {
+              "version": "1.3.0",
+              "from": "extend@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "from": "minimist@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+        },
+        "orchestrator": {
+          "version": "0.3.7",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "dependencies": {
+            "end-of-stream": {
+              "version": "0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "sequencify": {
+              "version": "0.0.7",
+              "from": "sequencify@>=0.0.7 <0.1.0",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+            },
+            "stream-consume": {
+              "version": "0.1.0",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+            }
+          }
+        },
+        "pretty-hrtime": {
+          "version": "0.2.2",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
+        },
+        "semver": {
+          "version": "3.0.1",
+          "from": "semver@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
+        },
+        "tildify": {
+          "version": "1.1.2",
+          "from": "tildify@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
+          "dependencies": {
+            "os-homedir": {
+              "version": "1.0.1",
+              "from": "os-homedir@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "inquirer": {
+      "version": "0.11.0",
+      "from": "inquirer@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz",
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "1.1.0",
+          "from": "ansi-escapes@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.1.0.tgz"
+        },
+        "ansi-regex": {
+          "version": "2.0.0",
+          "from": "ansi-regex@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+        },
+        "chalk": {
+          "version": "1.1.1",
+          "from": "chalk@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.1.0",
+              "from": "ansi-styles@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "2.0.0",
+              "from": "has-ansi@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+            },
+            "supports-color": {
+              "version": "2.0.0",
+              "from": "supports-color@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+            }
+          }
+        },
+        "cli-cursor": {
+          "version": "1.0.2",
+          "from": "cli-cursor@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "dependencies": {
+            "restore-cursor": {
+              "version": "1.0.1",
+              "from": "restore-cursor@>=1.0.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+              "dependencies": {
+                "exit-hook": {
+                  "version": "1.1.1",
+                  "from": "exit-hook@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"
+                },
+                "onetime": {
+                  "version": "1.0.0",
+                  "from": "onetime@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "cli-width": {
+          "version": "1.1.0",
+          "from": "cli-width@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.0.tgz"
+        },
+        "figures": {
+          "version": "1.4.0",
+          "from": "figures@>=1.3.5 <2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.4.0.tgz"
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.3.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        },
+        "readline2": {
+          "version": "1.0.1",
+          "from": "readline2@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+          "dependencies": {
+            "code-point-at": {
+              "version": "1.0.0",
+              "from": "code-point-at@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
+              "dependencies": {
+                "number-is-nan": {
+                  "version": "1.0.0",
+                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                }
+              }
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "dependencies": {
+                "number-is-nan": {
+                  "version": "1.0.0",
+                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                }
+              }
+            },
+            "mute-stream": {
+              "version": "0.0.5",
+              "from": "mute-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "run-async": {
+          "version": "0.1.0",
+          "from": "run-async@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+          "dependencies": {
+            "once": {
+              "version": "1.3.3",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+              "dependencies": {
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "rx-lite": {
+          "version": "3.1.2",
+          "from": "rx-lite@>=3.1.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"
+        },
+        "strip-ansi": {
+          "version": "3.0.0",
+          "from": "strip-ansi@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+        },
+        "through": {
+          "version": "2.3.8",
+          "from": "through@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+        }
+      }
+    },
+    "ionic-app-lib": {
+      "version": "2.0.0-beta.1",
+      "dependencies": {
+        "archiver": {
+          "version": "0.5.2",
+          "from": "archiver@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "zip-stream": {
+              "version": "0.1.4",
+              "from": "zip-stream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "from": "lodash.keys@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash.isobject": {
+                          "version": "2.4.1",
+                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1",
+                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lazystream": {
+              "version": "0.1.0",
+              "from": "lazystream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
+            },
+            "file-utils": {
+              "version": "0.1.5",
+              "from": "file-utils@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+              "dependencies": {
+                "lodash": {
+                  "version": "2.1.0",
+                  "from": "lodash@>=2.1.0 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+                },
+                "iconv-lite": {
+                  "version": "0.2.11",
+                  "from": "iconv-lite@>=0.2.11 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+                },
+                "rimraf": {
+                  "version": "2.2.8",
+                  "from": "rimraf@>=2.2.2 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                },
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "0.2.14",
+                  "from": "minimatch@>=0.2.12 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "findup-sync": {
+                  "version": "0.1.3",
+                  "from": "findup-sync@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "2.4.2",
+                      "from": "lodash@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                    }
+                  }
+                },
+                "isbinaryfile": {
+                  "version": "0.1.9",
+                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
+                }
+              }
+            },
+            "lodash": {
+              "version": "2.4.2",
+              "from": "lodash@>=2.4.1 <2.5.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+            }
+          }
+        },
+        "async": {
+          "version": "0.9.2",
+          "from": "async@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+        },
+        "autoprefixer": {
+          "version": "6.1.2",
+          "from": "autoprefixer@>=6.0.2 <7.0.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.1.2.tgz",
+          "dependencies": {
+            "postcss-value-parser": {
+              "version": "3.1.3",
+              "from": "postcss-value-parser@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
+            },
+            "num2fraction": {
+              "version": "1.2.2",
+              "from": "num2fraction@>=1.2.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
+            },
+            "browserslist": {
+              "version": "1.0.1",
+              "from": "browserslist@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.0.1.tgz"
+            },
+            "caniuse-db": {
+              "version": "1.0.30000372",
+              "from": "caniuse-db@>=1.0.30000372 <2.0.0",
+              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000372.tgz"
+            }
+          }
+        },
+        "autoprefixer-loader": {
+          "version": "3.1.0",
+          "from": "autoprefixer-loader@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer-loader/-/autoprefixer-loader-3.1.0.tgz",
+          "dependencies": {
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "postcss-safe-parser": {
+              "version": "1.0.1",
+              "from": "postcss-safe-parser@>=1.0.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.1.tgz"
+            }
+          }
+        },
+        "awesome-typescript-loader": {
+          "version": "0.13.1",
+          "from": "awesome-typescript-loader@>=0.13.1 <0.14.0",
+          "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-0.13.1.tgz",
+          "dependencies": {
+            "bluebird": {
+              "version": "2.10.2",
+              "from": "bluebird@>=2.7.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
+            },
+            "colors": {
+              "version": "1.1.2",
+              "from": "colors@>=1.1.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
+            },
+            "deasync": {
+              "version": "0.1.4",
+              "from": "deasync@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.4.tgz",
+              "dependencies": {
+                "bindings": {
+                  "version": "1.2.1",
+                  "from": "bindings@>=1.2.1 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+                },
+                "nan": {
+                  "version": "2.1.0",
+                  "from": "nan@>=2.0.7 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
+                }
+              }
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.6 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "2.1.1",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+            }
+          }
+        },
+        "cheerio": {
+          "version": "0.19.0",
+          "from": "cheerio@>=0.19.0 <0.20.0",
+          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+          "dependencies": {
+            "css-select": {
+              "version": "1.0.0",
+              "from": "css-select@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+              "dependencies": {
+                "css-what": {
+                  "version": "1.0.0",
+                  "from": "css-what@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
+                },
+                "domutils": {
+                  "version": "1.4.3",
+                  "from": "domutils@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+                  "dependencies": {
+                    "domelementtype": {
+                      "version": "1.3.0",
+                      "from": "domelementtype@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+                    }
+                  }
+                },
+                "boolbase": {
+                  "version": "1.0.0",
+                  "from": "boolbase@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+                },
+                "nth-check": {
+                  "version": "1.0.1",
+                  "from": "nth-check@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.1.1",
+              "from": "entities@>=1.1.1 <1.2.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+            },
+            "htmlparser2": {
+              "version": "3.8.3",
+              "from": "htmlparser2@>=3.8.1 <3.9.0",
+              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+              "dependencies": {
+                "domhandler": {
+                  "version": "2.3.0",
+                  "from": "domhandler@>=2.3.0 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+                },
+                "domutils": {
+                  "version": "1.5.1",
+                  "from": "domutils@>=1.5.0 <1.6.0",
+                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+                },
+                "domelementtype": {
+                  "version": "1.3.0",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "entities": {
+                  "version": "1.0.0",
+                  "from": "entities@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+                }
+              }
+            },
+            "dom-serializer": {
+              "version": "0.1.0",
+              "from": "dom-serializer@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.1.3",
+                  "from": "domelementtype@>=1.1.1 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "colors": {
+          "version": "0.6.2",
+          "from": "colors@0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+        },
+        "connect": {
+          "version": "3.1.1",
+          "from": "connect@3.1.1",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "1.0.4",
+              "from": "debug@1.0.4",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "ms@0.6.2",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
+            },
+            "finalhandler": {
+              "version": "0.1.0",
+              "from": "finalhandler@0.1.0",
+              "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+              "dependencies": {
+                "escape-html": {
+                  "version": "1.0.1",
+                  "from": "escape-html@1.0.1",
+                  "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+                }
+              }
+            },
+            "parseurl": {
+              "version": "1.3.0",
+              "from": "parseurl@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+            },
+            "utils-merge": {
+              "version": "1.0.0",
+              "from": "utils-merge@1.0.0",
+              "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+            }
+          }
+        },
+        "connect-livereload": {
+          "version": "0.5.2",
+          "from": "connect-livereload@0.5.2",
+          "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
+        },
+        "crc": {
+          "version": "3.2.1",
+          "from": "crc@3.2.1",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+        },
+        "cross-spawn": {
+          "version": "2.0.0",
+          "from": "cross-spawn@2.0.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
+          "dependencies": {
+            "cross-spawn-async": {
+              "version": "2.0.1",
+              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "3.2.0",
+                  "from": "lru-cache@>=3.2.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+                  "dependencies": {
+                    "pseudomap": {
+                      "version": "1.0.1",
+                      "from": "pseudomap@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "spawn-sync": {
+              "version": "1.0.14",
+              "from": "spawn-sync@>=1.0.13 <2.0.0",
+              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
+              "dependencies": {
+                "concat-stream": {
+                  "version": "1.5.1",
+                  "from": "concat-stream@>=1.4.7 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "typedarray": {
+                      "version": "0.0.6",
+                      "from": "typedarray@>=0.0.5 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                    },
+                    "readable-stream": {
+                      "version": "2.0.4",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.5",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "os-shim": {
+                  "version": "0.1.3",
+                  "from": "os-shim@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "css-loader": {
+          "version": "0.22.0",
+          "from": "css-loader@0.22.0",
+          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.22.0.tgz",
+          "dependencies": {
+            "css-selector-tokenizer": {
+              "version": "0.5.4",
+              "from": "css-selector-tokenizer@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz",
+              "dependencies": {
+                "cssesc": {
+                  "version": "0.1.0",
+                  "from": "cssesc@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz"
+                },
+                "fastparse": {
+                  "version": "1.1.1",
+                  "from": "fastparse@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz"
+                }
+              }
+            },
+            "cssnano": {
+              "version": "3.3.2",
+              "from": "cssnano@>=2.6.1 <4.0.0",
+              "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.3.2.tgz",
+              "dependencies": {
+                "decamelize": {
+                  "version": "1.1.1",
+                  "from": "decamelize@>=1.1.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                },
+                "defined": {
+                  "version": "1.0.0",
+                  "from": "defined@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
+                },
+                "indexes-of": {
+                  "version": "1.0.1",
+                  "from": "indexes-of@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"
+                },
+                "postcss-calc": {
+                  "version": "5.0.0",
+                  "from": "postcss-calc@>=5.0.0 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.0.0.tgz",
+                  "dependencies": {
+                    "postcss-message-helpers": {
+                      "version": "2.0.0",
+                      "from": "postcss-message-helpers@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz"
+                    },
+                    "reduce-css-calc": {
+                      "version": "1.2.0",
+                      "from": "reduce-css-calc@>=1.2.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.2.0.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.1.0",
+                          "from": "balanced-match@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz"
+                        },
+                        "reduce-function-call": {
+                          "version": "1.0.1",
+                          "from": "reduce-function-call@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "postcss-colormin": {
+                  "version": "2.1.7",
+                  "from": "postcss-colormin@>=2.1.7 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.1.7.tgz",
+                  "dependencies": {
+                    "colr-convert": {
+                      "version": "1.0.5",
+                      "from": "colr-convert@>=1.0.5 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/colr-convert/-/colr-convert-1.0.5.tgz"
+                    },
+                    "css-color-names": {
+                      "version": "0.0.2",
+                      "from": "css-color-names@0.0.2",
+                      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.2.tgz"
+                    }
+                  }
+                },
+                "postcss-convert-values": {
+                  "version": "2.3.4",
+                  "from": "postcss-convert-values@>=2.3.4 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.3.4.tgz"
+                },
+                "postcss-discard-comments": {
+                  "version": "2.0.2",
+                  "from": "postcss-discard-comments@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.2.tgz"
+                },
+                "postcss-discard-duplicates": {
+                  "version": "2.0.0",
+                  "from": "postcss-discard-duplicates@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.0.tgz"
+                },
+                "postcss-discard-empty": {
+                  "version": "2.0.0",
+                  "from": "postcss-discard-empty@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.0.0.tgz"
+                },
+                "postcss-discard-unused": {
+                  "version": "2.1.0",
+                  "from": "postcss-discard-unused@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.1.0.tgz",
+                  "dependencies": {
+                    "flatten": {
+                      "version": "0.0.1",
+                      "from": "flatten@0.0.1",
+                      "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"
+                    },
+                    "uniqs": {
+                      "version": "2.0.0",
+                      "from": "uniqs@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-filter-plugins": {
+                  "version": "2.0.0",
+                  "from": "postcss-filter-plugins@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.0.tgz",
+                  "dependencies": {
+                    "uniqid": {
+                      "version": "1.0.0",
+                      "from": "uniqid@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-1.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-merge-idents": {
+                  "version": "2.1.3",
+                  "from": "postcss-merge-idents@>=2.1.3 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.3.tgz",
+                  "dependencies": {
+                    "has-own": {
+                      "version": "1.0.0",
+                      "from": "has-own@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/has-own/-/has-own-1.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-merge-longhand": {
+                  "version": "2.0.1",
+                  "from": "postcss-merge-longhand@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.1.tgz"
+                },
+                "postcss-merge-rules": {
+                  "version": "2.0.2",
+                  "from": "postcss-merge-rules@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.0.2.tgz"
+                },
+                "postcss-minify-font-values": {
+                  "version": "1.0.2",
+                  "from": "postcss-minify-font-values@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.2.tgz",
+                  "dependencies": {
+                    "uniqs": {
+                      "version": "2.0.0",
+                      "from": "uniqs@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-minify-params": {
+                  "version": "1.0.4",
+                  "from": "postcss-minify-params@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.0.4.tgz",
+                  "dependencies": {
+                    "alphanum-sort": {
+                      "version": "1.0.2",
+                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
+                    },
+                    "uniqs": {
+                      "version": "2.0.0",
+                      "from": "uniqs@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-minify-selectors": {
+                  "version": "2.0.1",
+                  "from": "postcss-minify-selectors@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.0.1.tgz",
+                  "dependencies": {
+                    "alphanum-sort": {
+                      "version": "1.0.2",
+                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
+                    },
+                    "postcss-selector-parser": {
+                      "version": "1.3.0",
+                      "from": "postcss-selector-parser@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.0.tgz",
+                      "dependencies": {
+                        "flatten": {
+                          "version": "0.0.1",
+                          "from": "flatten@0.0.1",
+                          "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"
+                        },
+                        "uniq": {
+                          "version": "1.0.1",
+                          "from": "uniq@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "postcss-normalize-charset": {
+                  "version": "1.1.0",
+                  "from": "postcss-normalize-charset@>=1.1.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.0.tgz"
+                },
+                "postcss-normalize-url": {
+                  "version": "3.0.4",
+                  "from": "postcss-normalize-url@>=3.0.4 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.4.tgz",
+                  "dependencies": {
+                    "is-absolute-url": {
+                      "version": "2.0.0",
+                      "from": "is-absolute-url@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.0.0.tgz"
+                    },
+                    "normalize-url": {
+                      "version": "1.4.0",
+                      "from": "normalize-url@>=1.3.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.4.0.tgz",
+                      "dependencies": {
+                        "prepend-http": {
+                          "version": "1.0.3",
+                          "from": "prepend-http@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz"
+                        },
+                        "query-string": {
+                          "version": "3.0.0",
+                          "from": "query-string@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/query-string/-/query-string-3.0.0.tgz",
+                          "dependencies": {
+                            "strict-uri-encode": {
+                              "version": "1.0.2",
+                              "from": "strict-uri-encode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "sort-keys": {
+                          "version": "1.1.1",
+                          "from": "sort-keys@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz",
+                          "dependencies": {
+                            "is-plain-obj": {
+                              "version": "1.1.0",
+                              "from": "is-plain-obj@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "postcss-ordered-values": {
+                  "version": "2.0.2",
+                  "from": "postcss-ordered-values@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.0.2.tgz"
+                },
+                "postcss-reduce-idents": {
+                  "version": "2.2.1",
+                  "from": "postcss-reduce-idents@>=2.2.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.2.1.tgz"
+                },
+                "postcss-reduce-transforms": {
+                  "version": "1.0.3",
+                  "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.3.tgz"
+                },
+                "postcss-svgo": {
+                  "version": "2.1.0",
+                  "from": "postcss-svgo@>=2.0.4 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.0.tgz",
+                  "dependencies": {
+                    "is-svg": {
+                      "version": "1.1.1",
+                      "from": "is-svg@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-1.1.1.tgz"
+                    },
+                    "svgo": {
+                      "version": "0.5.6",
+                      "from": "svgo@>=0.5.6 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.5.6.tgz",
+                      "dependencies": {
+                        "sax": {
+                          "version": "1.1.4",
+                          "from": "sax@>=1.1.1 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"
+                        },
+                        "coa": {
+                          "version": "1.0.1",
+                          "from": "coa@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz",
+                          "dependencies": {
+                            "q": {
+                              "version": "1.4.1",
+                              "from": "q@>=1.1.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+                            }
+                          }
+                        },
+                        "js-yaml": {
+                          "version": "3.3.1",
+                          "from": "js-yaml@>=3.3.1 <3.4.0",
+                          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz",
+                          "dependencies": {
+                            "argparse": {
+                              "version": "1.0.3",
+                              "from": "argparse@>=1.0.2 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.3.tgz",
+                              "dependencies": {
+                                "sprintf-js": {
+                                  "version": "1.0.3",
+                                  "from": "sprintf-js@>=1.0.2 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+                                }
+                              }
+                            },
+                            "esprima": {
+                              "version": "2.2.0",
+                              "from": "esprima@>=2.2.0 <2.3.0",
+                              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"
+                            }
+                          }
+                        },
+                        "colors": {
+                          "version": "1.1.2",
+                          "from": "colors@>=1.1.2 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
+                        },
+                        "whet.extend": {
+                          "version": "0.9.9",
+                          "from": "whet.extend@>=0.9.9 <0.10.0",
+                          "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"
+                        },
+                        "mkdirp": {
+                          "version": "0.5.1",
+                          "from": "mkdirp@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.8",
+                              "from": "minimist@0.0.8",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "postcss-unique-selectors": {
+                  "version": "2.0.1",
+                  "from": "postcss-unique-selectors@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.1.tgz",
+                  "dependencies": {
+                    "alphanum-sort": {
+                      "version": "1.0.2",
+                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
+                    },
+                    "uniqs": {
+                      "version": "2.0.0",
+                      "from": "uniqs@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
+                    }
+                  }
+                },
+                "postcss-value-parser": {
+                  "version": "3.1.3",
+                  "from": "postcss-value-parser@>=3.1.1 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
+                },
+                "postcss-zindex": {
+                  "version": "2.0.0",
+                  "from": "postcss-zindex@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.0.0.tgz"
+                }
+              }
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.2 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "4.0.1",
+              "from": "object-assign@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+            },
+            "lodash.camelcase": {
+              "version": "3.0.1",
+              "from": "lodash.camelcase@>=3.0.1 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz",
+              "dependencies": {
+                "lodash._createcompounder": {
+                  "version": "3.0.0",
+                  "from": "lodash._createcompounder@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz",
+                  "dependencies": {
+                    "lodash.deburr": {
+                      "version": "3.0.2",
+                      "from": "lodash.deburr@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-3.0.2.tgz",
+                      "dependencies": {
+                        "lodash._basetostring": {
+                          "version": "3.0.1",
+                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash.words": {
+                      "version": "3.0.2",
+                      "from": "lodash.words@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-3.0.2.tgz",
+                      "dependencies": {
+                        "lodash._basetostring": {
+                          "version": "3.0.1",
+                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                        },
+                        "lodash._isiterateecall": {
+                          "version": "3.0.9",
+                          "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "postcss-modules-extract-imports": {
+              "version": "1.0.0-beta2",
+              "from": "postcss-modules-extract-imports@1.0.0-beta2",
+              "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0-beta2.tgz"
+            },
+            "postcss-modules-local-by-default": {
+              "version": "1.0.0",
+              "from": "postcss-modules-local-by-default@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.0.0.tgz"
+            },
+            "postcss-modules-scope": {
+              "version": "1.0.0-beta2",
+              "from": "postcss-modules-scope@1.0.0-beta2",
+              "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.0.0-beta2.tgz"
+            },
+            "postcss-modules-values": {
+              "version": "1.1.1",
+              "from": "postcss-modules-values@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.1.1.tgz",
+              "dependencies": {
+                "icss-replace-symbols": {
+                  "version": "1.0.2",
+                  "from": "icss-replace-symbols@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz"
+                }
+              }
+            },
+            "source-list-map": {
+              "version": "0.1.5",
+              "from": "source-list-map@>=0.1.4 <0.2.0",
+              "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
+            }
+          }
+        },
+        "event-stream": {
+          "version": "3.0.20",
+          "from": "event-stream@>=3.0.0 <3.1.0",
+          "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+          "dependencies": {
+            "through": {
+              "version": "2.3.8",
+              "from": "through@>=2.3.1 <2.4.0",
+              "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+            },
+            "duplexer": {
+              "version": "0.1.1",
+              "from": "duplexer@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+            },
+            "from": {
+              "version": "0.1.3",
+              "from": "from@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+            },
+            "map-stream": {
+              "version": "0.0.6",
+              "from": "map-stream@>=0.0.3 <0.1.0",
+              "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
+            },
+            "pause-stream": {
+              "version": "0.0.11",
+              "from": "pause-stream@0.0.11",
+              "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+            },
+            "split": {
+              "version": "0.2.10",
+              "from": "split@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+            },
+            "stream-combiner": {
+              "version": "0.0.4",
+              "from": "stream-combiner@>=0.0.3 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+            }
+          }
+        },
+        "file-loader": {
+          "version": "0.8.4",
+          "from": "file-loader@0.8.4",
+          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.8.4.tgz",
+          "dependencies": {
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "finalhandler": {
+          "version": "0.2.0",
+          "from": "finalhandler@0.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "2.0.0",
+              "from": "debug@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "ms@0.6.2",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                }
+              }
+            },
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+            }
+          }
+        },
+        "form-data": {
+          "version": "0.1.4",
+          "from": "form-data@0.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+          "dependencies": {
+            "combined-stream": {
+              "version": "0.0.7",
+              "from": "combined-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+              "dependencies": {
+                "delayed-stream": {
+                  "version": "0.0.5",
+                  "from": "delayed-stream@0.0.5",
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                }
+              }
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@>=1.2.0 <1.3.0",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            }
+          }
+        },
+        "ionic-cordova-lib": {
+          "version": "5.1.10",
+          "from": "ionic-cordova-lib@5.1.10",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
+          "dependencies": {
+            "bplist-parser": {
+              "version": "0.0.6",
+              "from": "bplist-parser@0.0.6",
+              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
+            },
+            "cordova-app-hello-world": {
+              "version": "3.9.0",
+              "from": "cordova-app-hello-world@3.9.0",
+              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
+            },
+            "cordova-js": {
+              "version": "4.0.0",
+              "from": "cordova-js@4.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
+              "dependencies": {
+                "browserify": {
+                  "version": "10.1.3",
+                  "from": "browserify@10.1.3",
+                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
+                  "dependencies": {
+                    "JSONStream": {
+                      "version": "1.0.7",
+                      "from": "JSONStream@>=1.0.3 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
+                      "dependencies": {
+                        "jsonparse": {
+                          "version": "1.2.0",
+                          "from": "jsonparse@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "assert": {
+                      "version": "1.3.0",
+                      "from": "assert@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
+                    },
+                    "browser-pack": {
+                      "version": "4.0.4",
+                      "from": "browser-pack@>=4.0.3 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.3.0",
+                          "from": "combine-source-map@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "inline-source-map": {
+                              "version": "0.3.1",
+                              "from": "inline-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.3.0",
+                                  "from": "source-map@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "1.0.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "convert-source-map": {
+                              "version": "0.3.5",
+                              "from": "convert-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.1.43",
+                              "from": "source-map@>=0.1.31 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "through2": {
+                          "version": "0.5.1",
+                          "from": "through2@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@>=1.0.17 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.2",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "xtend": {
+                              "version": "3.0.0",
+                              "from": "xtend@>=3.0.0 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                            }
+                          }
+                        },
+                        "umd": {
+                          "version": "3.0.1",
+                          "from": "umd@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
+                        }
+                      }
+                    },
+                    "browser-resolve": {
+                      "version": "1.10.1",
+                      "from": "browser-resolve@>=1.7.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
+                    },
+                    "browserify-zlib": {
+                      "version": "0.1.4",
+                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                      "dependencies": {
+                        "pako": {
+                          "version": "0.2.8",
+                          "from": "pako@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
+                        }
+                      }
+                    },
+                    "buffer": {
+                      "version": "3.5.3",
+                      "from": "buffer@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                      "dependencies": {
+                        "base64-js": {
+                          "version": "0.0.8",
+                          "from": "base64-js@0.0.8",
+                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                        },
+                        "ieee754": {
+                          "version": "1.1.6",
+                          "from": "ieee754@>=1.1.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
+                        },
+                        "is-array": {
+                          "version": "1.0.1",
+                          "from": "is-array@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@>=0.0.3 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    },
+                    "commondir": {
+                      "version": "0.0.1",
+                      "from": "commondir@0.0.1",
+                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+                    },
+                    "concat-stream": {
+                      "version": "1.4.10",
+                      "from": "concat-stream@>=1.4.1 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        }
+                      }
+                    },
+                    "console-browserify": {
+                      "version": "1.1.0",
+                      "from": "console-browserify@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                      "dependencies": {
+                        "date-now": {
+                          "version": "0.1.4",
+                          "from": "date-now@>=0.1.4 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                        }
+                      }
+                    },
+                    "constants-browserify": {
+                      "version": "0.0.1",
+                      "from": "constants-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                    },
+                    "crypto-browserify": {
+                      "version": "3.11.0",
+                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
+                      "dependencies": {
+                        "browserify-cipher": {
+                          "version": "1.0.0",
+                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+                          "dependencies": {
+                            "browserify-aes": {
+                              "version": "1.0.5",
+                              "from": "browserify-aes@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                              "dependencies": {
+                                "buffer-xor": {
+                                  "version": "1.0.3",
+                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                },
+                                "cipher-base": {
+                                  "version": "1.0.2",
+                                  "from": "cipher-base@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "browserify-des": {
+                              "version": "1.0.0",
+                              "from": "browserify-des@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+                              "dependencies": {
+                                "cipher-base": {
+                                  "version": "1.0.2",
+                                  "from": "cipher-base@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                },
+                                "des.js": {
+                                  "version": "1.0.0",
+                                  "from": "des.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "evp_bytestokey": {
+                              "version": "1.0.0",
+                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "browserify-sign": {
+                          "version": "4.0.0",
+                          "from": "browserify-sign@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.4.0",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "6.0.2",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            },
+                            "parse-asn1": {
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "4.2.1",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.2",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-ecdh": {
+                          "version": "4.0.0",
+                          "from": "create-ecdh@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.4.0",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "6.0.2",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-hash": {
+                          "version": "1.1.2",
+                          "from": "create-hash@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
+                          "dependencies": {
+                            "cipher-base": {
+                              "version": "1.0.2",
+                              "from": "cipher-base@>=1.0.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                            },
+                            "ripemd160": {
+                              "version": "1.0.1",
+                              "from": "ripemd160@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
+                            },
+                            "sha.js": {
+                              "version": "2.4.4",
+                              "from": "sha.js@>=2.3.6 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                            }
+                          }
+                        },
+                        "create-hmac": {
+                          "version": "1.1.4",
+                          "from": "create-hmac@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
+                        },
+                        "diffie-hellman": {
+                          "version": "5.0.0",
+                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.4.0",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
+                            },
+                            "miller-rabin": {
+                              "version": "4.0.0",
+                              "from": "miller-rabin@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "pbkdf2": {
+                          "version": "3.0.4",
+                          "from": "pbkdf2@>=3.0.3 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
+                        },
+                        "public-encrypt": {
+                          "version": "4.0.0",
+                          "from": "public-encrypt@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.4.0",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
+                            },
+                            "parse-asn1": {
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "4.2.1",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.2",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "randombytes": {
+                          "version": "2.0.1",
+                          "from": "randombytes@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
+                        }
+                      }
+                    },
+                    "deep-equal": {
+                      "version": "1.0.1",
+                      "from": "deep-equal@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+                    },
+                    "defined": {
+                      "version": "1.0.0",
+                      "from": "defined@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
+                    },
+                    "deps-sort": {
+                      "version": "1.3.9",
+                      "from": "deps-sort@>=1.3.7 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
+                    },
+                    "domain-browser": {
+                      "version": "1.1.4",
+                      "from": "domain-browser@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                    },
+                    "duplexer2": {
+                      "version": "0.0.2",
+                      "from": "duplexer2@>=0.0.2 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
+                    },
+                    "events": {
+                      "version": "1.0.2",
+                      "from": "events@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
+                    },
+                    "has": {
+                      "version": "1.0.1",
+                      "from": "has@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+                      "dependencies": {
+                        "function-bind": {
+                          "version": "1.0.2",
+                          "from": "function-bind@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "htmlescape": {
+                      "version": "1.1.0",
+                      "from": "htmlescape@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
+                    },
+                    "http-browserify": {
+                      "version": "1.7.0",
+                      "from": "http-browserify@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                      "dependencies": {
+                        "Base64": {
+                          "version": "0.2.1",
+                          "from": "Base64@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                        }
+                      }
+                    },
+                    "https-browserify": {
+                      "version": "0.0.1",
+                      "from": "https-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "insert-module-globals": {
+                      "version": "6.6.3",
+                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.6.1",
+                          "from": "combine-source-map@>=0.6.1 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+                          "dependencies": {
+                            "convert-source-map": {
+                              "version": "1.1.2",
+                              "from": "convert-source-map@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
+                            },
+                            "inline-source-map": {
+                              "version": "0.5.0",
+                              "from": "inline-source-map@>=0.5.0 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
+                            },
+                            "lodash.memoize": {
+                              "version": "3.0.4",
+                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.4.4",
+                              "from": "source-map@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "is-buffer": {
+                          "version": "1.1.0",
+                          "from": "is-buffer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                        },
+                        "lexical-scope": {
+                          "version": "1.2.0",
+                          "from": "lexical-scope@>=1.2.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+                          "dependencies": {
+                            "astw": {
+                              "version": "2.0.0",
+                              "from": "astw@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
+                              "dependencies": {
+                                "acorn": {
+                                  "version": "1.2.2",
+                                  "from": "acorn@>=1.0.3 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "labeled-stream-splicer": {
+                      "version": "1.0.2",
+                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+                      "dependencies": {
+                        "stream-splicer": {
+                          "version": "1.3.2",
+                          "from": "stream-splicer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+                          "dependencies": {
+                            "readable-wrap": {
+                              "version": "1.0.0",
+                              "from": "readable-wrap@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                            },
+                            "indexof": {
+                              "version": "0.0.1",
+                              "from": "indexof@0.0.1",
+                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "module-deps": {
+                      "version": "3.9.1",
+                      "from": "module-deps@>=3.7.11 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+                      "dependencies": {
+                        "detective": {
+                          "version": "4.3.1",
+                          "from": "detective@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
+                          "dependencies": {
+                            "acorn": {
+                              "version": "1.2.2",
+                              "from": "acorn@>=1.0.3 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                            }
+                          }
+                        },
+                        "stream-combiner2": {
+                          "version": "1.0.2",
+                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                          "dependencies": {
+                            "through2": {
+                              "version": "0.5.1",
+                              "from": "through2@>=0.5.1 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@>=1.0.17 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.2",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "xtend": {
+                                  "version": "3.0.0",
+                                  "from": "xtend@>=3.0.0 <3.1.0",
+                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "os-browserify": {
+                      "version": "0.1.2",
+                      "from": "os-browserify@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                    },
+                    "parents": {
+                      "version": "1.0.1",
+                      "from": "parents@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                      "dependencies": {
+                        "path-platform": {
+                          "version": "0.11.15",
+                          "from": "path-platform@>=0.11.15 <0.12.0",
+                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+                        }
+                      }
+                    },
+                    "path-browserify": {
+                      "version": "0.0.0",
+                      "from": "path-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                    },
+                    "process": {
+                      "version": "0.11.2",
+                      "from": "process@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
+                    },
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "punycode@>=1.3.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    },
+                    "querystring-es3": {
+                      "version": "0.2.1",
+                      "from": "querystring-es3@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                    },
+                    "read-only-stream": {
+                      "version": "1.1.1",
+                      "from": "read-only-stream@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
+                      "dependencies": {
+                        "readable-wrap": {
+                          "version": "1.0.0",
+                          "from": "readable-wrap@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.13 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "resolve": {
+                      "version": "1.1.6",
+                      "from": "resolve@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                    },
+                    "shallow-copy": {
+                      "version": "0.0.1",
+                      "from": "shallow-copy@0.0.1",
+                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+                    },
+                    "shasum": {
+                      "version": "1.0.2",
+                      "from": "shasum@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+                      "dependencies": {
+                        "json-stable-stringify": {
+                          "version": "0.0.1",
+                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "from": "jsonify@>=0.0.0 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+                            }
+                          }
+                        },
+                        "sha.js": {
+                          "version": "2.4.4",
+                          "from": "sha.js@>=2.4.4 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                        }
+                      }
+                    },
+                    "shell-quote": {
+                      "version": "0.0.1",
+                      "from": "shell-quote@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
+                    },
+                    "stream-browserify": {
+                      "version": "1.0.0",
+                      "from": "stream-browserify@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "subarg": {
+                      "version": "1.0.0",
+                      "from": "subarg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "1.2.0",
+                          "from": "minimist@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "syntax-error": {
+                      "version": "1.1.4",
+                      "from": "syntax-error@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
+                      "dependencies": {
+                        "acorn": {
+                          "version": "1.2.2",
+                          "from": "acorn@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                        }
+                      }
+                    },
+                    "through2": {
+                      "version": "1.1.1",
+                      "from": "through2@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
+                    },
+                    "timers-browserify": {
+                      "version": "1.4.1",
+                      "from": "timers-browserify@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                    },
+                    "tty-browserify": {
+                      "version": "0.0.0",
+                      "from": "tty-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                    },
+                    "url": {
+                      "version": "0.10.3",
+                      "from": "url@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                      "dependencies": {
+                        "querystring": {
+                          "version": "0.2.0",
+                          "from": "querystring@0.2.0",
+                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                        }
+                      }
+                    },
+                    "util": {
+                      "version": "0.10.3",
+                      "from": "util@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+                    },
+                    "vm-browserify": {
+                      "version": "0.0.4",
+                      "from": "vm-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                      "dependencies": {
+                        "indexof": {
+                          "version": "0.0.1",
+                          "from": "indexof@0.0.1",
+                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "xtend": {
+                      "version": "4.0.1",
+                      "from": "xtend@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.4",
+                  "from": "through@2.3.4",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+                },
+                "uglify-js": {
+                  "version": "2.6.1",
+                  "from": "uglify-js@>=2.4.15 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10",
+                      "from": "async@>=0.2.6 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.5.3",
+                      "from": "source-map@>=0.5.1 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    },
+                    "yargs": {
+                      "version": "3.10.0",
+                      "from": "yargs@>=3.10.0 <3.11.0",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.2.1",
+                          "from": "camelcase@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                        },
+                        "cliui": {
+                          "version": "2.1.0",
+                          "from": "cliui@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                          "dependencies": {
+                            "center-align": {
+                              "version": "0.1.2",
+                              "from": "center-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                },
+                                "lazy-cache": {
+                                  "version": "0.2.4",
+                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                                }
+                              }
+                            },
+                            "right-align": {
+                              "version": "0.1.3",
+                              "from": "right-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "wordwrap": {
+                              "version": "0.0.2",
+                              "from": "wordwrap@0.0.2",
+                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                            }
+                          }
+                        },
+                        "decamelize": {
+                          "version": "1.1.1",
+                          "from": "decamelize@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                        },
+                        "window-size": {
+                          "version": "0.1.0",
+                          "from": "window-size@0.1.0",
+                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-registry-mapper": {
+              "version": "1.1.13",
+              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
+              "dependencies": {
+                "tape": {
+                  "version": "3.5.0",
+                  "from": "tape@>=3.5.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
+                  "dependencies": {
+                    "deep-equal": {
+                      "version": "0.2.2",
+                      "from": "deep-equal@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                    },
+                    "defined": {
+                      "version": "0.0.0",
+                      "from": "defined@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                    },
+                    "glob": {
+                      "version": "3.2.11",
+                      "from": "glob@>=3.2.9 <3.3.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "0.3.0",
+                          "from": "minimatch@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "object-inspect": {
+                      "version": "0.4.0",
+                      "from": "object-inspect@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
+                    },
+                    "resumer": {
+                      "version": "0.0.0",
+                      "from": "resumer@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
+                    },
+                    "through": {
+                      "version": "2.3.8",
+                      "from": "through@>=2.3.4 <2.4.0",
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-serve": {
+              "version": "0.1.3",
+              "from": "cordova-serve@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
+              "dependencies": {
+                "chalk": {
+                  "version": "1.1.1",
+                  "from": "chalk@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                  "dependencies": {
+                    "ansi-styles": {
+                      "version": "2.1.0",
+                      "from": "ansi-styles@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                    },
+                    "escape-string-regexp": {
+                      "version": "1.0.3",
+                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                    },
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "supports-color": {
+                      "version": "2.0.0",
+                      "from": "supports-color@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                    }
+                  }
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "d8": {
+                  "version": "0.4.4",
+                  "from": "d8@>=0.4.4 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+                  "dependencies": {
+                    "m8": {
+                      "version": "0.4.4",
+                      "from": "m8@>=0.4.3",
+                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.3.4",
+                  "from": "mime@>=1.2.11 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+                },
+                "q": {
+                  "version": "1.4.1",
+                  "from": "q@>=1.4.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+                },
+                "shelljs": {
+                  "version": "0.5.3",
+                  "from": "shelljs@>=0.5.3 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
+                }
+              }
+            },
+            "dep-graph": {
+              "version": "1.1.0",
+              "from": "dep-graph@1.1.0",
+              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.2.1",
+                  "from": "underscore@1.2.1",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
+                }
+              }
+            },
+            "elementtree": {
+              "version": "0.1.6",
+              "from": "elementtree@0.1.6",
+              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+              "dependencies": {
+                "sax": {
+                  "version": "0.3.5",
+                  "from": "sax@0.3.5",
+                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
+                }
+              }
+            },
+            "glob": {
+              "version": "4.0.6",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "init-package-json": {
+              "version": "1.9.1",
+              "from": "init-package-json@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.3 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.1.0",
+                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    }
+                  }
+                },
+                "promzard": {
+                  "version": "0.3.0",
+                  "from": "promzard@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.2",
+                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.1",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.5",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    }
+                  }
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.2",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.1.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.2",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                        },
+                        "spdx-license-ids": {
+                          "version": "1.1.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "npm": {
+              "version": "2.14.13",
+              "from": "npm@>=2.10.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.13.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.7 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                },
+                "ansi": {
+                  "version": "0.3.0",
+                  "from": "ansi@latest",
+                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                },
+                "ansicolors": {
+                  "version": "0.3.2",
+                  "from": "ansicolors@latest"
+                },
+                "ansistyles": {
+                  "version": "0.1.3",
+                  "from": "ansistyles@0.1.3",
+                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+                },
+                "archy": {
+                  "version": "1.0.0",
+                  "from": "archy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+                },
+                "async-some": {
+                  "version": "1.0.2",
+                  "from": "async-some@>=1.0.2 <1.1.0"
+                },
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@0.0.8",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "char-spinner": {
+                  "version": "1.0.1",
+                  "from": "char-spinner@latest",
+                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+                },
+                "chmodr": {
+                  "version": "1.0.2",
+                  "from": "chmodr@>=1.0.2 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
+                },
+                "chownr": {
+                  "version": "1.0.1",
+                  "from": "chownr@1.0.1",
+                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
+                },
+                "cmd-shim": {
+                  "version": "2.0.1",
+                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "columnify": {
+                  "version": "1.5.2",
+                  "from": "columnify@1.5.2",
+                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+                  "dependencies": {
+                    "wcwidth": {
+                      "version": "1.0.0",
+                      "from": "wcwidth@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+                      "dependencies": {
+                        "defaults": {
+                          "version": "1.0.2",
+                          "from": "defaults@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+                          "dependencies": {
+                            "clone": {
+                              "version": "0.1.19",
+                              "from": "clone@>=0.1.5 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.9 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "dezalgo": {
+                  "version": "1.0.3",
+                  "from": "dezalgo@>=1.0.3 <1.1.0",
+                  "dependencies": {
+                    "asap": {
+                      "version": "2.0.3",
+                      "from": "asap@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+                    }
+                  }
+                },
+                "editor": {
+                  "version": "1.0.0",
+                  "from": "editor@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
+                },
+                "fs-vacuum": {
+                  "version": "1.2.7",
+                  "from": "fs-vacuum@1.2.7"
+                },
+                "fs-write-stream-atomic": {
+                  "version": "1.0.4",
+                  "from": "fs-write-stream-atomic@1.0.4"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@1.0.8"
+                },
+                "fstream-npm": {
+                  "version": "1.0.7",
+                  "from": "fstream-npm@>=1.0.7 <1.1.0",
+                  "dependencies": {
+                    "fstream-ignore": {
+                      "version": "1.0.3",
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
+                    }
+                  }
+                },
+                "github-url-from-git": {
+                  "version": "1.4.0",
+                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
+                },
+                "github-url-from-username-repo": {
+                  "version": "1.0.2",
+                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
+                },
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@5.0.15",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                },
+                "hosted-git-info": {
+                  "version": "2.1.4",
+                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                },
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <1.1.0"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@latest",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@latest",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "init-package-json": {
+                  "version": "1.9.1",
+                  "from": "init-package-json@1.9.1",
+                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+                  "dependencies": {
+                    "promzard": {
+                      "version": "0.3.0",
+                      "from": "promzard@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                    }
+                  }
+                },
+                "lockfile": {
+                  "version": "1.0.1",
+                  "from": "lockfile@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+                },
+                "lru-cache": {
+                  "version": "2.7.0",
+                  "from": "lru-cache@2.7.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.0",
+                  "from": "minimatch@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.1",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.1",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "node-gyp": {
+                  "version": "3.2.0",
+                  "from": "node-gyp@>=3.2.0 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.10",
+                          "from": "minimatch@>=2.0.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.1",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.2.1",
+                                  "from": "balanced-match@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "1.0.0",
+                      "from": "minimatch@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                      "dependencies": {
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "path-array": {
+                      "version": "1.0.0",
+                      "from": "path-array@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                      "dependencies": {
+                        "array-index": {
+                          "version": "0.1.1",
+                          "from": "array-index@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                          "dependencies": {
+                            "debug": {
+                              "version": "2.2.0",
+                              "from": "debug@*",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                              "dependencies": {
+                                "ms": {
+                                  "version": "0.7.1",
+                                  "from": "ms@0.7.1",
+                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.6 <3.1.0"
+                },
+                "normalize-git-url": {
+                  "version": "3.0.1",
+                  "from": "normalize-git-url@latest"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.5",
+                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                  "dependencies": {
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-cache-filename": {
+                  "version": "1.0.2",
+                  "from": "npm-cache-filename@1.0.2",
+                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
+                },
+                "npm-install-checks": {
+                  "version": "1.0.6",
+                  "from": "npm-install-checks@1.0.6",
+                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
+                  "dependencies": {
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.1.0",
+                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
+                },
+                "npm-registry-client": {
+                  "version": "7.0.8",
+                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
+                  "dependencies": {
+                    "concat-stream": {
+                      "version": "1.5.1",
+                      "from": "concat-stream@>=1.4.6 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "2.0.4",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-user-validate": {
+                  "version": "0.1.2",
+                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
+                },
+                "npmlog": {
+                  "version": "2.0.0",
+                  "from": "npmlog@>=2.0.0 <2.1.0",
+                  "dependencies": {
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.2",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.2 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                },
+                "opener": {
+                  "version": "1.4.1",
+                  "from": "opener@>=1.4.1 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@0.1.3",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.0",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-inside": {
+                  "version": "1.0.1",
+                  "from": "path-is-inside@1.0.1",
+                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@1.0.7",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-installed": {
+                  "version": "4.0.3",
+                  "from": "read-installed@4.0.3",
+                  "dependencies": {
+                    "debuglog": {
+                      "version": "1.0.1",
+                      "from": "debuglog@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+                    },
+                    "readdir-scoped-modules": {
+                      "version": "1.0.2",
+                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
+                    },
+                    "util-extend": {
+                      "version": "1.0.1",
+                      "from": "util-extend@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.2",
+                  "from": "read-package-json@>=2.0.2 <2.1.0",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.1",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    }
+                  }
+                },
+                "realize-package-specifier": {
+                  "version": "3.0.1",
+                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
+                },
+                "request": {
+                  "version": "2.65.0",
+                  "from": "request@>=2.65.0 <2.66.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
+                  "dependencies": {
+                    "bl": {
+                      "version": "1.0.0",
+                      "from": "bl@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.3",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                    },
+                    "forever-agent": {
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.1 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
+                    "form-data": {
+                      "version": "1.0.0-rc3",
+                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                      "dependencies": {
+                        "async": {
+                          "version": "1.5.0",
+                          "from": "async@>=1.4.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                        }
+                      }
+                    },
+                    "json-stringify-safe": {
+                      "version": "5.0.1",
+                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                    },
+                    "mime-types": {
+                      "version": "2.1.7",
+                      "from": "mime-types@>=2.1.7 <2.2.0",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.19.0",
+                          "from": "mime-db@>=1.19.0 <1.20.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                        }
+                      }
+                    },
+                    "node-uuid": {
+                      "version": "1.4.3",
+                      "from": "node-uuid@>=1.4.3 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                    },
+                    "qs": {
+                      "version": "5.2.0",
+                      "from": "qs@>=5.2.0 <5.3.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                    },
+                    "tunnel-agent": {
+                      "version": "0.4.1",
+                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                    },
+                    "tough-cookie": {
+                      "version": "2.2.0",
+                      "from": "tough-cookie@>=2.2.0 <2.3.0",
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                    },
+                    "http-signature": {
+                      "version": "0.11.0",
+                      "from": "http-signature@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "0.1.5",
+                          "from": "assert-plus@>=0.1.5 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                        },
+                        "ctype": {
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        }
+                      }
+                    },
+                    "oauth-sign": {
+                      "version": "0.8.0",
+                      "from": "oauth-sign@>=0.8.0 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                    },
+                    "hawk": {
+                      "version": "3.1.0",
+                      "from": "hawk@>=3.1.0 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                      "dependencies": {
+                        "hoek": {
+                          "version": "2.16.3",
+                          "from": "hoek@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                        },
+                        "boom": {
+                          "version": "2.10.0",
+                          "from": "boom@>=2.8.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        }
+                      }
+                    },
+                    "aws-sign2": {
+                      "version": "0.6.0",
+                      "from": "aws-sign2@>=0.6.0 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                    },
+                    "stringstream": {
+                      "version": "0.0.5",
+                      "from": "stringstream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                    },
+                    "combined-stream": {
+                      "version": "1.0.5",
+                      "from": "combined-stream@>=1.0.5 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "isstream": {
+                      "version": "0.1.2",
+                      "from": "isstream@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                    },
+                    "har-validator": {
+                      "version": "2.0.2",
+                      "from": "har-validator@>=2.0.2 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
+                      "dependencies": {
+                        "chalk": {
+                          "version": "1.1.1",
+                          "from": "chalk@>=1.1.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                          "dependencies": {
+                            "ansi-styles": {
+                              "version": "2.1.0",
+                              "from": "ansi-styles@>=2.1.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                            },
+                            "escape-string-regexp": {
+                              "version": "1.0.3",
+                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                            },
+                            "has-ansi": {
+                              "version": "2.0.0",
+                              "from": "has-ansi@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+                            },
+                            "supports-color": {
+                              "version": "2.0.0",
+                              "from": "supports-color@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "commander": {
+                          "version": "2.9.0",
+                          "from": "commander@>=2.8.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                          "dependencies": {
+                            "graceful-readlink": {
+                              "version": "1.0.1",
+                              "from": "graceful-readlink@>=1.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.2",
+                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                          "dependencies": {
+                            "generate-function": {
+                              "version": "2.0.0",
+                              "from": "generate-function@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                            },
+                            "generate-object-property": {
+                              "version": "1.2.0",
+                              "from": "generate-object-property@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                              "dependencies": {
+                                "is-property": {
+                                  "version": "1.0.2",
+                                  "from": "is-property@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "jsonpointer": {
+                              "version": "2.0.0",
+                              "from": "jsonpointer@2.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                            },
+                            "xtend": {
+                              "version": "4.0.0",
+                              "from": "xtend@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                            }
+                          }
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "1.0.0",
+                              "from": "pinkie@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "retry": {
+                  "version": "0.8.0",
+                  "from": "retry@0.8.0",
+                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+                },
+                "rimraf": {
+                  "version": "2.4.3",
+                  "from": "rimraf@2.4.3",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+                },
+                "semver": {
+                  "version": "5.0.3",
+                  "from": "semver@5.0.3",
+                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                },
+                "sha": {
+                  "version": "2.0.1",
+                  "from": "sha@2.0.1",
+                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.2",
+                      "from": "readable-stream@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.3",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.1",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "slide": {
+                  "version": "1.1.6",
+                  "from": "slide@>=1.1.6 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+                },
+                "sorted-object": {
+                  "version": "1.0.0",
+                  "from": "sorted-object@"
+                },
+                "tar": {
+                  "version": "2.2.1",
+                  "from": "tar@2.2.1"
+                },
+                "text-table": {
+                  "version": "0.2.0",
+                  "from": "text-table@~0.2.0"
+                },
+                "uid-number": {
+                  "version": "0.0.6",
+                  "from": "uid-number@>=0.0.6 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+                },
+                "umask": {
+                  "version": "1.1.0",
+                  "from": "umask@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.2",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.2",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@2.2.2",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.2.0 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@1.0.1",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                },
+                "write-file-atomic": {
+                  "version": "1.1.3",
+                  "from": "write-file-atomic@1.1.3",
+                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
+                },
+                "ansi-regex": {
+                  "version": "2.0.0",
+                  "from": "ansi-regex@2.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                },
+                "spdx-license-ids": {
+                  "version": "1.1.0",
+                  "from": "spdx-license-ids@1.1.0",
+                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@3.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+                }
+              }
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.1.0",
+              "from": "osenv@0.1.0",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
+            },
+            "plist": {
+              "version": "1.1.0",
+              "from": "plist@1.1.0",
+              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.6",
+                  "from": "base64-js@0.0.6",
+                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
+                },
+                "xmlbuilder": {
+                  "version": "2.2.1",
+                  "from": "xmlbuilder@2.2.1",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
+                  "dependencies": {
+                    "lodash-node": {
+                      "version": "2.4.1",
+                      "from": "lodash-node@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+                    }
+                  }
+                },
+                "xmldom": {
+                  "version": "0.1.19",
+                  "from": "xmldom@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
+                },
+                "util-deprecate": {
+                  "version": "1.0.0",
+                  "from": "util-deprecate@1.0.0",
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
+                }
+              }
+            },
+            "properties-parser": {
+              "version": "0.2.3",
+              "from": "properties-parser@0.2.3",
+              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
+            },
+            "rc": {
+              "version": "0.5.2",
+              "from": "rc@0.5.2",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "minimist@>=0.0.7 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                },
+                "deep-extend": {
+                  "version": "0.2.11",
+                  "from": "deep-extend@>=0.2.5 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                },
+                "strip-json-comments": {
+                  "version": "0.1.3",
+                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                }
+              }
+            },
+            "request": {
+              "version": "2.47.0",
+              "from": "request@2.47.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "bl@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.26 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.6.0",
+                  "from": "caseless@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "from": "forever-agent@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "mime-types@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.7",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                },
+                "qs": {
+                  "version": "2.3.3",
+                  "from": "qs@>=2.3.1 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.1",
+                  "from": "tough-cookie@>=0.12.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "from": "http-signature@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "asn1@0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "ctype@0.5.3",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.4.0",
+                  "from": "oauth-sign@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "from": "hawk@1.1.1",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1",
+                      "from": "hoek@>=0.9.0 <0.10.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "boom": {
+                      "version": "0.4.2",
+                      "from": "boom@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "from": "cryptiles@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "from": "sntp@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "aws-sign2@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@>=0.0.5 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "shelljs": {
+              "version": "0.3.0",
+              "from": "shelljs@0.3.0",
+              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+            },
+            "tar": {
+              "version": "1.0.2",
+              "from": "tar@1.0.2",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+              "dependencies": {
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@*",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    },
+                    "mkdirp": {
+                      "version": "0.5.1",
+                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        }
+                      }
+                    },
+                    "rimraf": {
+                      "version": "2.4.4",
+                      "from": "rimraf@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                      "dependencies": {
+                        "glob": {
+                          "version": "5.0.15",
+                          "from": "glob@>=5.0.14 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                          "dependencies": {
+                            "inflight": {
+                              "version": "1.0.4",
+                              "from": "inflight@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                              "dependencies": {
+                                "brace-expansion": {
+                                  "version": "1.1.2",
+                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                                  "dependencies": {
+                                    "balanced-match": {
+                                      "version": "0.3.0",
+                                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                    },
+                                    "concat-map": {
+                                      "version": "0.0.1",
+                                      "from": "concat-map@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "once": {
+                              "version": "1.3.3",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "path-is-absolute": {
+                              "version": "1.0.0",
+                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "from": "through2@0.6.3",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "unorm": {
+              "version": "1.3.3",
+              "from": "unorm@1.3.3",
+              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
+            },
+            "valid-identifier": {
+              "version": "0.0.1",
+              "from": "valid-identifier@0.0.1",
+              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
+            },
+            "ionic-xcode": {
+              "version": "0.8.3",
+              "from": "ionic-xcode@0.8.3",
+              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
+              "dependencies": {
+                "pegjs": {
+                  "version": "0.6.2",
+                  "from": "pegjs@0.6.2",
+                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.3.3",
+                  "from": "node-uuid@1.3.3",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.10.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        },
+        "node-sass": {
+          "version": "3.4.2",
+          "from": "node-sass@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
+          "dependencies": {
+            "async-foreach": {
+              "version": "0.1.3",
+              "from": "async-foreach@>=0.1.3 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "get-stdin": {
+              "version": "4.0.1",
+              "from": "get-stdin@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+            },
+            "glob": {
+              "version": "5.0.15",
+              "from": "glob@>=5.0.14 <6.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.0",
+                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.2",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            },
+            "meow": {
+              "version": "3.6.0",
+              "from": "meow@>=3.3.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
+              "dependencies": {
+                "camelcase-keys": {
+                  "version": "2.0.0",
+                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "2.0.1",
+                      "from": "camelcase@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
+                    },
+                    "map-obj": {
+                      "version": "1.0.1",
+                      "from": "map-obj@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                    }
+                  }
+                },
+                "loud-rejection": {
+                  "version": "1.2.0",
+                  "from": "loud-rejection@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                  "dependencies": {
+                    "signal-exit": {
+                      "version": "2.1.2",
+                      "from": "signal-exit@>=2.1.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                    }
+                  }
+                },
+                "minimist": {
+                  "version": "1.2.0",
+                  "from": "minimist@>=1.1.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.5",
+                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    },
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "validate-npm-package-license": {
+                      "version": "3.0.1",
+                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                      "dependencies": {
+                        "spdx-correct": {
+                          "version": "1.0.2",
+                          "from": "spdx-correct@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                          "dependencies": {
+                            "spdx-license-ids": {
+                              "version": "1.1.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "spdx-expression-parse": {
+                          "version": "1.0.2",
+                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                          "dependencies": {
+                            "spdx-exceptions": {
+                              "version": "1.0.4",
+                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                            },
+                            "spdx-license-ids": {
+                              "version": "1.1.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "object-assign": {
+                  "version": "4.0.1",
+                  "from": "object-assign@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                },
+                "read-pkg-up": {
+                  "version": "1.0.1",
+                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                  "dependencies": {
+                    "find-up": {
+                      "version": "1.1.0",
+                      "from": "find-up@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
+                      "dependencies": {
+                        "path-exists": {
+                          "version": "2.1.0",
+                          "from": "path-exists@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+                        },
+                        "pinkie-promise": {
+                          "version": "2.0.0",
+                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "2.0.1",
+                              "from": "pinkie@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "read-pkg": {
+                      "version": "1.1.0",
+                      "from": "read-pkg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                      "dependencies": {
+                        "load-json-file": {
+                          "version": "1.1.0",
+                          "from": "load-json-file@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "parse-json": {
+                              "version": "2.2.0",
+                              "from": "parse-json@>=2.2.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                              "dependencies": {
+                                "error-ex": {
+                                  "version": "1.3.0",
+                                  "from": "error-ex@>=1.2.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                  "dependencies": {
+                                    "is-arrayish": {
+                                      "version": "0.2.1",
+                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "pify": {
+                              "version": "2.3.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "strip-bom": {
+                              "version": "2.0.0",
+                              "from": "strip-bom@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                              "dependencies": {
+                                "is-utf8": {
+                                  "version": "0.2.0",
+                                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "path-type": {
+                          "version": "1.1.0",
+                          "from": "path-type@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "pify": {
+                              "version": "2.3.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "redent": {
+                  "version": "1.0.0",
+                  "from": "redent@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                  "dependencies": {
+                    "indent-string": {
+                      "version": "2.1.0",
+                      "from": "indent-string@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "2.0.0",
+                          "from": "repeating@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.1",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "strip-indent": {
+                      "version": "1.0.1",
+                      "from": "strip-indent@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+                    }
+                  }
+                },
+                "trim-newlines": {
+                  "version": "1.0.0",
+                  "from": "trim-newlines@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "nan": {
+              "version": "2.1.0",
+              "from": "nan@>=2.0.8 <3.0.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.2 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@2.0.1",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "node-gyp": {
+              "version": "3.2.0",
+              "from": "node-gyp@>=3.0.1 <4.0.0",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
+              "dependencies": {
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.10",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "npmlog": {
+                  "version": "1.2.1",
+                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "dependencies": {
+                    "ansi": {
+                      "version": "0.3.0",
+                      "from": "ansi@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                    },
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.2",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.2",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.0.0 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-array": {
+                  "version": "1.0.0",
+                  "from": "path-array@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                  "dependencies": {
+                    "array-index": {
+                      "version": "0.1.1",
+                      "from": "array-index@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                      "dependencies": {
+                        "debug": {
+                          "version": "2.2.0",
+                          "from": "debug@*",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                          "dependencies": {
+                            "ms": {
+                              "version": "0.7.1",
+                              "from": "ms@0.7.1",
+                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "tar": {
+                  "version": "2.2.1",
+                  "from": "tar@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+                  "dependencies": {
+                    "block-stream": {
+                      "version": "0.0.8",
+                      "from": "block-stream@*",
+                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "request": {
+              "version": "2.67.0",
+              "from": "request@>=2.61.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "1.0.0",
+                  "from": "bl@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.4",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.5",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.11.0",
+                  "from": "caseless@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                },
+                "extend": {
+                  "version": "3.0.0",
+                  "from": "extend@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.6.1",
+                  "from": "forever-agent@>=0.6.1 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                },
+                "form-data": {
+                  "version": "1.0.0-rc3",
+                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "1.5.0",
+                      "from": "async@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "2.1.8",
+                  "from": "mime-types@>=2.1.7 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.20.0",
+                      "from": "mime-db@>=1.20.0 <1.21.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
+                    }
+                  }
+                },
+                "node-uuid": {
+                  "version": "1.4.7",
+                  "from": "node-uuid@>=1.4.7 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                },
+                "qs": {
+                  "version": "5.2.0",
+                  "from": "qs@>=5.2.0 <5.3.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.1",
+                  "from": "tough-cookie@>=2.2.0 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+                },
+                "http-signature": {
+                  "version": "1.1.0",
+                  "from": "http-signature@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "jsprim": {
+                      "version": "1.2.2",
+                      "from": "jsprim@>=1.2.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
+                      "dependencies": {
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "from": "extsprintf@1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                        },
+                        "json-schema": {
+                          "version": "0.2.2",
+                          "from": "json-schema@0.2.2",
+                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                        },
+                        "verror": {
+                          "version": "1.3.6",
+                          "from": "verror@1.3.6",
+                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                        }
+                      }
+                    },
+                    "sshpk": {
+                      "version": "1.7.1",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
+                      "dependencies": {
+                        "asn1": {
+                          "version": "0.2.3",
+                          "from": "asn1@>=0.2.3 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                        },
+                        "assert-plus": {
+                          "version": "0.2.0",
+                          "from": "assert-plus@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                        },
+                        "dashdash": {
+                          "version": "1.10.1",
+                          "from": "dashdash@>=1.10.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
+                          "dependencies": {
+                            "assert-plus": {
+                              "version": "0.1.5",
+                              "from": "assert-plus@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                            }
+                          }
+                        },
+                        "jsbn": {
+                          "version": "0.1.0",
+                          "from": "jsbn@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                        },
+                        "tweetnacl": {
+                          "version": "0.13.2",
+                          "from": "tweetnacl@>=0.13.0 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                        },
+                        "jodid25519": {
+                          "version": "1.0.2",
+                          "from": "jodid25519@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                        },
+                        "ecc-jsbn": {
+                          "version": "0.1.1",
+                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.8.0",
+                  "from": "oauth-sign@>=0.8.0 <0.9.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                },
+                "hawk": {
+                  "version": "3.1.2",
+                  "from": "hawk@>=3.1.0 <3.2.0",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "2.16.3",
+                      "from": "hoek@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                    },
+                    "boom": {
+                      "version": "2.10.1",
+                      "from": "boom@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "2.0.5",
+                      "from": "cryptiles@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                    },
+                    "sntp": {
+                      "version": "1.0.9",
+                      "from": "sntp@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.6.0",
+                  "from": "aws-sign2@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.5 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "isstream": {
+                  "version": "0.1.2",
+                  "from": "isstream@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                },
+                "is-typedarray": {
+                  "version": "1.0.0",
+                  "from": "is-typedarray@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                },
+                "har-validator": {
+                  "version": "2.0.3",
+                  "from": "har-validator@>=2.0.2 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
+                  "dependencies": {
+                    "commander": {
+                      "version": "2.9.0",
+                      "from": "commander@>=2.9.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                      "dependencies": {
+                        "graceful-readlink": {
+                          "version": "1.0.1",
+                          "from": "graceful-readlink@>=1.0.0",
+                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "is-my-json-valid": {
+                      "version": "2.12.3",
+                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
+                      "dependencies": {
+                        "generate-function": {
+                          "version": "2.0.0",
+                          "from": "generate-function@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                        },
+                        "generate-object-property": {
+                          "version": "1.2.0",
+                          "from": "generate-object-property@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                          "dependencies": {
+                            "is-property": {
+                              "version": "1.0.2",
+                              "from": "is-property@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "jsonpointer": {
+                          "version": "2.0.0",
+                          "from": "jsonpointer@2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        }
+                      }
+                    },
+                    "pinkie-promise": {
+                      "version": "2.0.0",
+                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                      "dependencies": {
+                        "pinkie": {
+                          "version": "2.0.1",
+                          "from": "pinkie@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "sass-graph": {
+              "version": "2.0.1",
+              "from": "sass-graph@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
+              "dependencies": {
+                "yargs": {
+                  "version": "3.30.0",
+                  "from": "yargs@>=3.8.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.2.1",
+                      "from": "camelcase@>=1.2.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                    },
+                    "cliui": {
+                      "version": "3.1.0",
+                      "from": "cliui@>=3.0.3 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
+                      "dependencies": {
+                        "string-width": {
+                          "version": "1.0.1",
+                          "from": "string-width@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
+                          "dependencies": {
+                            "code-point-at": {
+                              "version": "1.0.0",
+                              "from": "code-point-at@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            },
+                            "is-fullwidth-code-point": {
+                              "version": "1.0.0",
+                              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                          "dependencies": {
+                            "ansi-regex": {
+                              "version": "2.0.0",
+                              "from": "ansi-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "wrap-ansi": {
+                          "version": "1.0.0",
+                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "decamelize": {
+                      "version": "1.1.1",
+                      "from": "decamelize@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                    },
+                    "os-locale": {
+                      "version": "1.4.0",
+                      "from": "os-locale@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+                      "dependencies": {
+                        "lcid": {
+                          "version": "1.0.0",
+                          "from": "lcid@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+                          "dependencies": {
+                            "invert-kv": {
+                              "version": "1.0.0",
+                              "from": "invert-kv@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "window-size": {
+                      "version": "0.1.4",
+                      "from": "window-size@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
+                    },
+                    "y18n": {
+                      "version": "3.2.0",
+                      "from": "y18n@>=3.2.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "open": {
+          "version": "0.0.5",
+          "from": "open@0.0.5",
+          "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+        },
+        "optimist": {
+          "version": "0.6.0",
+          "from": "optimist@0.6.0",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.3",
+              "from": "wordwrap@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+            },
+            "minimist": {
+              "version": "0.0.10",
+              "from": "minimist@>=0.0.1 <0.1.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+            }
+          }
+        },
+        "postcss": {
+          "version": "5.0.12",
+          "from": "postcss@>=5.0.5 <6.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.12.tgz",
+          "dependencies": {
+            "supports-color": {
+              "version": "3.1.2",
+              "from": "supports-color@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+              "dependencies": {
+                "has-flag": {
+                  "version": "1.0.0",
+                  "from": "has-flag@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+                }
+              }
+            },
+            "source-map": {
+              "version": "0.5.3",
+              "from": "source-map@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+            },
+            "js-base64": {
+              "version": "2.1.9",
+              "from": "js-base64@>=2.1.9 <3.0.0",
+              "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
+            }
+          }
+        },
+        "progress": {
+          "version": "1.1.7",
+          "from": "progress@1.1.7",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+        },
+        "prompt": {
+          "version": "0.2.12",
+          "from": "prompt@0.2.12",
+          "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+          "dependencies": {
+            "pkginfo": {
+              "version": "0.3.1",
+              "from": "pkginfo@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+            },
+            "read": {
+              "version": "1.0.7",
+              "from": "read@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+              "dependencies": {
+                "mute-stream": {
+                  "version": "0.0.5",
+                  "from": "mute-stream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                }
+              }
+            },
+            "revalidator": {
+              "version": "0.1.8",
+              "from": "revalidator@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+            },
+            "utile": {
+              "version": "0.2.1",
+              "from": "utile@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.2.10",
+                  "from": "async@>=0.2.9 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                },
+                "deep-equal": {
+                  "version": "1.0.1",
+                  "from": "deep-equal@*",
+                  "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+                },
+                "i": {
+                  "version": "0.3.3",
+                  "from": "i@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.0.0 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "ncp": {
+                  "version": "0.4.2",
+                  "from": "ncp@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "winston": {
+              "version": "0.6.2",
+              "from": "winston@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.1.22",
+                  "from": "async@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+                },
+                "cycle": {
+                  "version": "1.0.3",
+                  "from": "cycle@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+                },
+                "eyes": {
+                  "version": "0.1.8",
+                  "from": "eyes@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+                },
+                "pkginfo": {
+                  "version": "0.2.3",
+                  "from": "pkginfo@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+                },
+                "request": {
+                  "version": "2.9.203",
+                  "from": "request@>=2.9.0 <2.10.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+                },
+                "stack-trace": {
+                  "version": "0.0.9",
+                  "from": "stack-trace@>=0.0.0 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+                }
+              }
+            }
+          }
+        },
+        "proxy-middleware": {
+          "version": "0.7.0",
+          "from": "proxy-middleware@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+        },
+        "q": {
+          "version": "1.0.1",
+          "from": "q@1.0.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
+        },
+        "request": {
+          "version": "2.51.0",
+          "from": "request@2.51.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+          "dependencies": {
+            "bl": {
+              "version": "0.9.4",
+              "from": "bl@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "caseless": {
+              "version": "0.8.0",
+              "from": "caseless@>=0.8.0 <0.9.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+            },
+            "forever-agent": {
+              "version": "0.5.2",
+              "from": "forever-agent@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+            },
+            "form-data": {
+              "version": "0.2.0",
+              "from": "form-data@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+              "dependencies": {
+                "mime-types": {
+                  "version": "2.0.14",
+                  "from": "mime-types@>=2.0.3 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.12.0",
+                      "from": "mime-db@>=1.12.0 <1.13.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "json-stringify-safe": {
+              "version": "5.0.1",
+              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+            },
+            "mime-types": {
+              "version": "1.0.2",
+              "from": "mime-types@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+            },
+            "node-uuid": {
+              "version": "1.4.7",
+              "from": "node-uuid@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+            },
+            "qs": {
+              "version": "2.3.3",
+              "from": "qs@>=2.3.1 <2.4.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+            },
+            "tunnel-agent": {
+              "version": "0.4.1",
+              "from": "tunnel-agent@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+            },
+            "tough-cookie": {
+              "version": "2.2.1",
+              "from": "tough-cookie@>=0.12.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+            },
+            "http-signature": {
+              "version": "0.10.1",
+              "from": "http-signature@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "dependencies": {
+                "assert-plus": {
+                  "version": "0.1.5",
+                  "from": "assert-plus@>=0.1.5 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                },
+                "asn1": {
+                  "version": "0.1.11",
+                  "from": "asn1@0.1.11",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                },
+                "ctype": {
+                  "version": "0.5.3",
+                  "from": "ctype@0.5.3",
+                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                }
+              }
+            },
+            "oauth-sign": {
+              "version": "0.5.0",
+              "from": "oauth-sign@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+            },
+            "hawk": {
+              "version": "1.1.1",
+              "from": "hawk@1.1.1",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+              "dependencies": {
+                "hoek": {
+                  "version": "0.9.1",
+                  "from": "hoek@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                },
+                "boom": {
+                  "version": "0.4.2",
+                  "from": "boom@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                },
+                "cryptiles": {
+                  "version": "0.2.2",
+                  "from": "cryptiles@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                },
+                "sntp": {
+                  "version": "0.2.4",
+                  "from": "sntp@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                }
+              }
+            },
+            "aws-sign2": {
+              "version": "0.5.0",
+              "from": "aws-sign2@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+            },
+            "stringstream": {
+              "version": "0.0.5",
+              "from": "stringstream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+            },
+            "combined-stream": {
+              "version": "0.0.7",
+              "from": "combined-stream@>=0.0.5 <0.1.0",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+              "dependencies": {
+                "delayed-stream": {
+                  "version": "0.0.5",
+                  "from": "delayed-stream@0.0.5",
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                }
+              }
+            }
+          }
+        },
+        "request-progress": {
+          "version": "0.3.1",
+          "from": "request-progress@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2",
+              "from": "throttleit@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            }
+          }
+        },
+        "resolve-url-loader": {
+          "version": "1.4.2",
+          "from": "resolve-url-loader@1.4.2",
+          "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-1.4.2.tgz",
+          "dependencies": {
+            "camelcase": {
+              "version": "1.2.1",
+              "from": "camelcase@>=1.2.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+            },
+            "convert-source-map": {
+              "version": "1.1.2",
+              "from": "convert-source-map@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "lodash.defaults": {
+              "version": "3.1.2",
+              "from": "lodash.defaults@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
+              "dependencies": {
+                "lodash.assign": {
+                  "version": "3.2.0",
+                  "from": "lodash.assign@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+                  "dependencies": {
+                    "lodash._baseassign": {
+                      "version": "3.2.0",
+                      "from": "lodash._baseassign@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+                      "dependencies": {
+                        "lodash._basecopy": {
+                          "version": "3.0.1",
+                          "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._createassigner": {
+                      "version": "3.1.1",
+                      "from": "lodash._createassigner@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+                      "dependencies": {
+                        "lodash._bindcallback": {
+                          "version": "3.0.1",
+                          "from": "lodash._bindcallback@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
+                        },
+                        "lodash._isiterateecall": {
+                          "version": "3.0.9",
+                          "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+                        }
+                      }
+                    },
+                    "lodash.keys": {
+                      "version": "3.1.2",
+                      "from": "lodash.keys@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                      "dependencies": {
+                        "lodash._getnative": {
+                          "version": "3.9.1",
+                          "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+                        },
+                        "lodash.isarguments": {
+                          "version": "3.0.4",
+                          "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
+                        },
+                        "lodash.isarray": {
+                          "version": "3.0.4",
+                          "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+                }
+              }
+            },
+            "rework": {
+              "version": "1.0.1",
+              "from": "rework@>=1.0.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+              "dependencies": {
+                "css": {
+                  "version": "2.2.1",
+                  "from": "css@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
+                  "dependencies": {
+                    "source-map-resolve": {
+                      "version": "0.3.1",
+                      "from": "source-map-resolve@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
+                      "dependencies": {
+                        "source-map-url": {
+                          "version": "0.3.0",
+                          "from": "source-map-url@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz"
+                        },
+                        "atob": {
+                          "version": "1.1.2",
+                          "from": "atob@>=1.1.0 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.2.tgz"
+                        },
+                        "resolve-url": {
+                          "version": "0.2.1",
+                          "from": "resolve-url@>=0.2.1 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
+                        }
+                      }
+                    },
+                    "urix": {
+                      "version": "0.1.0",
+                      "from": "urix@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "convert-source-map": {
+                  "version": "0.3.5",
+                  "from": "convert-source-map@>=0.3.3 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                }
+              }
+            },
+            "rework-visit": {
+              "version": "1.0.0",
+              "from": "rework-visit@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"
+            },
+            "source-map": {
+              "version": "0.1.43",
+              "from": "source-map@>=0.1.43 <0.2.0",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+              "dependencies": {
+                "amdefine": {
+                  "version": "1.0.0",
+                  "from": "amdefine@>=0.0.4",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "sass-loader": {
+          "version": "3.1.1",
+          "from": "sass-loader@3.1.1",
+          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-3.1.1.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.5.0",
+              "from": "async@>=1.4.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "4.0.1",
+              "from": "object-assign@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+            }
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "from": "semver@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        },
+        "serve-static": {
+          "version": "1.7.1",
+          "from": "serve-static@1.7.1",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+            },
+            "parseurl": {
+              "version": "1.3.0",
+              "from": "parseurl@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+            },
+            "send": {
+              "version": "0.10.1",
+              "from": "send@0.10.1",
+              "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+              "dependencies": {
+                "debug": {
+                  "version": "2.1.3",
+                  "from": "debug@>=2.1.0 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.7.0",
+                      "from": "ms@0.7.0",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                    }
+                  }
+                },
+                "depd": {
+                  "version": "1.0.1",
+                  "from": "depd@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
+                },
+                "destroy": {
+                  "version": "1.0.3",
+                  "from": "destroy@1.0.3",
+                  "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+                },
+                "etag": {
+                  "version": "1.5.1",
+                  "from": "etag@>=1.5.0 <1.6.0",
+                  "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
+                },
+                "fresh": {
+                  "version": "0.2.4",
+                  "from": "fresh@0.2.4",
+                  "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+                },
+                "mime": {
+                  "version": "1.2.11",
+                  "from": "mime@1.2.11",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                },
+                "ms": {
+                  "version": "0.6.2",
+                  "from": "ms@0.6.2",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+                },
+                "on-finished": {
+                  "version": "2.1.1",
+                  "from": "on-finished@>=2.1.1 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+                  "dependencies": {
+                    "ee-first": {
+                      "version": "1.1.0",
+                      "from": "ee-first@1.1.0",
+                      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
+                    }
+                  }
+                },
+                "range-parser": {
+                  "version": "1.0.3",
+                  "from": "range-parser@>=1.0.2 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
+                }
+              }
+            },
+            "utils-merge": {
+              "version": "1.0.0",
+              "from": "utils-merge@1.0.0",
+              "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+            }
+          }
+        },
+        "shelljs": {
+          "version": "0.2.6",
+          "from": "shelljs@0.2.6",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+        },
+        "style-loader": {
+          "version": "0.13.0",
+          "from": "style-loader@>=0.13.0 <0.14.0",
+          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.0.tgz",
+          "dependencies": {
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "tiny-lr-fork": {
+          "version": "0.0.5",
+          "from": "tiny-lr-fork@0.0.5",
+          "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+          "dependencies": {
+            "qs": {
+              "version": "0.5.6",
+              "from": "qs@>=0.5.2 <0.6.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+            },
+            "faye-websocket": {
+              "version": "0.4.4",
+              "from": "faye-websocket@>=0.4.3 <0.5.0",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+            },
+            "noptify": {
+              "version": "0.0.3",
+              "from": "noptify@>=0.0.3 <0.1.0",
+              "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+              "dependencies": {
+                "nopt": {
+                  "version": "2.0.0",
+                  "from": "nopt@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "debug": {
+              "version": "0.7.4",
+              "from": "debug@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+            }
+          }
+        },
+        "typescript": {
+          "version": "1.7.3",
+          "from": "typescript@>=1.5.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz"
+        },
+        "underscore": {
+          "version": "1.7.0",
+          "from": "underscore@>=1.7.0 <1.8.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+        },
+        "unzip": {
+          "version": "0.1.9",
+          "from": "unzip@0.1.9",
+          "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+          "dependencies": {
+            "fstream": {
+              "version": "0.1.31",
+              "from": "fstream@>=0.1.21 <0.2.0",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "pullstream": {
+              "version": "0.4.1",
+              "from": "pullstream@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+              "dependencies": {
+                "over": {
+                  "version": "0.0.5",
+                  "from": "over@>=0.0.5 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+                },
+                "slice-stream": {
+                  "version": "1.0.0",
+                  "from": "slice-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+                }
+              }
+            },
+            "binary": {
+              "version": "0.3.0",
+              "from": "binary@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "from": "chainsaw@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9",
+                      "from": "traverse@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "setimmediate": {
+              "version": "1.0.4",
+              "from": "setimmediate@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+            },
+            "match-stream": {
+              "version": "0.0.2",
+              "from": "match-stream@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+              "dependencies": {
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "unzip2": {
+          "version": "0.2.5",
+          "from": "unzip2@0.2.5",
+          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
+          "dependencies": {
+            "fstream": {
+              "version": "0.1.31",
+              "from": "fstream@>=0.1.21 <0.2.0",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "pullstream": {
+              "version": "0.4.1",
+              "from": "pullstream@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+              "dependencies": {
+                "over": {
+                  "version": "0.0.5",
+                  "from": "over@>=0.0.5 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+                },
+                "slice-stream": {
+                  "version": "1.0.0",
+                  "from": "slice-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+                }
+              }
+            },
+            "binary": {
+              "version": "0.3.0",
+              "from": "binary@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "from": "chainsaw@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9",
+                      "from": "traverse@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "setimmediate": {
+              "version": "1.0.4",
+              "from": "setimmediate@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+            },
+            "match-stream": {
+              "version": "0.0.2",
+              "from": "match-stream@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+              "dependencies": {
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "url-loader": {
+          "version": "0.5.6",
+          "from": "url-loader@0.5.6",
+          "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.6.tgz",
+          "dependencies": {
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@>=1.2.0 <1.3.0",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            }
+          }
+        },
+        "vinyl-fs": {
+          "version": "1.0.0",
+          "from": "vinyl-fs@1.0.0",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
+          "dependencies": {
+            "duplexify": {
+              "version": "3.4.2",
+              "from": "duplexify@>=3.2.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
+              "dependencies": {
+                "end-of-stream": {
+                  "version": "1.0.0",
+                  "from": "end-of-stream@1.0.0",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.5",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "glob-stream": {
+              "version": "4.1.1",
+              "from": "glob-stream@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=4.3.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.10",
+                  "from": "minimatch@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.2",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ordered-read-streams": {
+                  "version": "0.1.0",
+                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+                },
+                "glob2base": {
+                  "version": "0.0.12",
+                  "from": "glob2base@>=0.0.12 <0.0.13",
+                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1",
+                      "from": "find-index@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "2.2.0",
+                  "from": "unique-stream@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
+                  "dependencies": {
+                    "through2-filter": {
+                      "version": "2.0.0",
+                      "from": "through2-filter@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+                      "dependencies": {
+                        "through2": {
+                          "version": "2.0.0",
+                          "from": "through2@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.4",
+                              "from": "readable-stream@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.2",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.5",
+                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@>=4.0.0 <4.1.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "glob-watcher": {
+              "version": "0.0.8",
+              "from": "glob-watcher@>=0.0.8 <0.0.9",
+              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
+              "dependencies": {
+                "gaze": {
+                  "version": "0.5.2",
+                  "from": "gaze@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+                  "dependencies": {
+                    "globule": {
+                      "version": "0.1.0",
+                      "from": "globule@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "1.0.2",
+                          "from": "lodash@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                        },
+                        "glob": {
+                          "version": "3.1.21",
+                          "from": "glob@>=3.1.21 <3.2.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@>=1.2.0 <1.3.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            },
+                            "inherits": {
+                              "version": "1.0.2",
+                              "from": "inherits@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "from": "minimatch@>=0.2.11 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "merge-stream": {
+              "version": "0.1.8",
+              "from": "merge-stream@>=0.1.7 <0.2.0",
+              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "2.1.1",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "from": "strip-bom@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0",
+                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+                },
+                "is-utf8": {
+                  "version": "0.2.0",
+                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "from": "through2@>=0.6.1 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "from": "vinyl@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "webpack": {
+          "version": "1.12.9",
+          "from": "webpack@>=1.12.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.12.9.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.5.0",
+              "from": "async@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+            },
+            "clone": {
+              "version": "1.0.2",
+              "from": "clone@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+            },
+            "enhanced-resolve": {
+              "version": "0.9.1",
+              "from": "enhanced-resolve@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+              "dependencies": {
+                "memory-fs": {
+                  "version": "0.2.0",
+                  "from": "memory-fs@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                }
+              }
+            },
+            "esprima": {
+              "version": "2.7.0",
+              "from": "esprima@>=2.5.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.0.tgz"
+            },
+            "interpret": {
+              "version": "0.6.6",
+              "from": "interpret@>=0.6.4 <0.7.0",
+              "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.11 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "memory-fs": {
+              "version": "0.3.0",
+              "from": "memory-fs@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
+              "dependencies": {
+                "errno": {
+                  "version": "0.1.4",
+                  "from": "errno@>=0.1.3 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+                  "dependencies": {
+                    "prr": {
+                      "version": "0.0.0",
+                      "from": "prr@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.5",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "node-libs-browser": {
+              "version": "0.5.3",
+              "from": "node-libs-browser@>=0.4.0 <=0.6.0",
+              "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz",
+              "dependencies": {
+                "assert": {
+                  "version": "1.3.0",
+                  "from": "assert@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
+                },
+                "browserify-zlib": {
+                  "version": "0.1.4",
+                  "from": "browserify-zlib@>=0.1.4 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                  "dependencies": {
+                    "pako": {
+                      "version": "0.2.8",
+                      "from": "pako@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
+                    }
+                  }
+                },
+                "buffer": {
+                  "version": "3.5.3",
+                  "from": "buffer@>=3.0.3 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                  "dependencies": {
+                    "base64-js": {
+                      "version": "0.0.8",
+                      "from": "base64-js@0.0.8",
+                      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                    },
+                    "ieee754": {
+                      "version": "1.1.6",
+                      "from": "ieee754@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
+                    },
+                    "is-array": {
+                      "version": "1.0.1",
+                      "from": "is-array@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                    }
+                  }
+                },
+                "console-browserify": {
+                  "version": "1.1.0",
+                  "from": "console-browserify@>=1.1.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                  "dependencies": {
+                    "date-now": {
+                      "version": "0.1.4",
+                      "from": "date-now@>=0.1.4 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                    }
+                  }
+                },
+                "constants-browserify": {
+                  "version": "0.0.1",
+                  "from": "constants-browserify@0.0.1",
+                  "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                },
+                "crypto-browserify": {
+                  "version": "3.2.8",
+                  "from": "crypto-browserify@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz",
+                  "dependencies": {
+                    "pbkdf2-compat": {
+                      "version": "2.0.1",
+                      "from": "pbkdf2-compat@2.0.1",
+                      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
+                    },
+                    "ripemd160": {
+                      "version": "0.2.0",
+                      "from": "ripemd160@0.2.0",
+                      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
+                    },
+                    "sha.js": {
+                      "version": "2.2.6",
+                      "from": "sha.js@2.2.6",
+                      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
+                    }
+                  }
+                },
+                "domain-browser": {
+                  "version": "1.1.4",
+                  "from": "domain-browser@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                },
+                "events": {
+                  "version": "1.1.0",
+                  "from": "events@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/events/-/events-1.1.0.tgz"
+                },
+                "http-browserify": {
+                  "version": "1.7.0",
+                  "from": "http-browserify@>=1.3.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                  "dependencies": {
+                    "Base64": {
+                      "version": "0.2.1",
+                      "from": "Base64@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "https-browserify": {
+                  "version": "0.0.0",
+                  "from": "https-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+                },
+                "os-browserify": {
+                  "version": "0.1.2",
+                  "from": "os-browserify@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                },
+                "path-browserify": {
+                  "version": "0.0.0",
+                  "from": "path-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                },
+                "process": {
+                  "version": "0.11.2",
+                  "from": "process@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
+                },
+                "punycode": {
+                  "version": "1.3.2",
+                  "from": "punycode@>=1.2.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                },
+                "querystring-es3": {
+                  "version": "0.2.1",
+                  "from": "querystring-es3@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "stream-browserify": {
+                  "version": "1.0.0",
+                  "from": "stream-browserify@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.25 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "timers-browserify": {
+                  "version": "1.4.1",
+                  "from": "timers-browserify@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                },
+                "tty-browserify": {
+                  "version": "0.0.0",
+                  "from": "tty-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                },
+                "url": {
+                  "version": "0.10.3",
+                  "from": "url@>=0.10.1 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                  "dependencies": {
+                    "querystring": {
+                      "version": "0.2.0",
+                      "from": "querystring@0.2.0",
+                      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                    }
+                  }
+                },
+                "util": {
+                  "version": "0.10.3",
+                  "from": "util@>=0.10.3 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@2.0.1",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "vm-browserify": {
+                  "version": "0.0.4",
+                  "from": "vm-browserify@0.0.4",
+                  "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                  "dependencies": {
+                    "indexof": {
+                      "version": "0.0.1",
+                      "from": "indexof@0.0.1",
+                      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "supports-color": {
+              "version": "3.1.2",
+              "from": "supports-color@>=3.1.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+              "dependencies": {
+                "has-flag": {
+                  "version": "1.0.0",
+                  "from": "has-flag@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+                }
+              }
+            },
+            "tapable": {
+              "version": "0.1.10",
+              "from": "tapable@>=0.1.8 <0.2.0",
+              "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
+            },
+            "uglify-js": {
+              "version": "2.6.1",
+              "from": "uglify-js@>=2.6.0 <2.7.0",
+              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.2.10",
+                  "from": "async@>=0.2.6 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                },
+                "source-map": {
+                  "version": "0.5.3",
+                  "from": "source-map@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+                },
+                "uglify-to-browserify": {
+                  "version": "1.0.2",
+                  "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                },
+                "yargs": {
+                  "version": "3.10.0",
+                  "from": "yargs@>=3.10.0 <3.11.0",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.2.1",
+                      "from": "camelcase@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                    },
+                    "cliui": {
+                      "version": "2.1.0",
+                      "from": "cliui@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                      "dependencies": {
+                        "center-align": {
+                          "version": "0.1.2",
+                          "from": "center-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            },
+                            "lazy-cache": {
+                              "version": "0.2.4",
+                              "from": "lazy-cache@>=0.2.4 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                            }
+                          }
+                        },
+                        "right-align": {
+                          "version": "0.1.3",
+                          "from": "right-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "wordwrap@0.0.2",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    },
+                    "decamelize": {
+                      "version": "1.1.1",
+                      "from": "decamelize@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                    },
+                    "window-size": {
+                      "version": "0.1.0",
+                      "from": "window-size@0.1.0",
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "watchpack": {
+              "version": "0.2.9",
+              "from": "watchpack@>=0.2.1 <0.3.0",
+              "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.9.2",
+                  "from": "async@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+                },
+                "chokidar": {
+                  "version": "1.3.0",
+                  "from": "chokidar@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.3.0.tgz",
+                  "dependencies": {
+                    "anymatch": {
+                      "version": "1.3.0",
+                      "from": "anymatch@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
+                      "dependencies": {
+                        "arrify": {
+                          "version": "1.0.0",
+                          "from": "arrify@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz"
+                        },
+                        "micromatch": {
+                          "version": "2.3.3",
+                          "from": "micromatch@>=2.1.5 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.3.tgz",
+                          "dependencies": {
+                            "arr-diff": {
+                              "version": "1.1.0",
+                              "from": "arr-diff@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+                              "dependencies": {
+                                "arr-flatten": {
+                                  "version": "1.0.1",
+                                  "from": "arr-flatten@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
+                                },
+                                "array-slice": {
+                                  "version": "0.2.3",
+                                  "from": "array-slice@>=0.2.3 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
+                                }
+                              }
+                            },
+                            "array-unique": {
+                              "version": "0.2.1",
+                              "from": "array-unique@>=0.2.1 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
+                            },
+                            "braces": {
+                              "version": "1.8.2",
+                              "from": "braces@>=1.8.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.2.tgz",
+                              "dependencies": {
+                                "expand-range": {
+                                  "version": "1.8.1",
+                                  "from": "expand-range@>=1.8.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
+                                  "dependencies": {
+                                    "fill-range": {
+                                      "version": "2.2.2",
+                                      "from": "fill-range@>=2.1.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz",
+                                      "dependencies": {
+                                        "is-number": {
+                                          "version": "1.1.2",
+                                          "from": "is-number@>=1.1.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz"
+                                        },
+                                        "isobject": {
+                                          "version": "1.0.2",
+                                          "from": "isobject@>=1.0.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
+                                        },
+                                        "randomatic": {
+                                          "version": "1.1.3",
+                                          "from": "randomatic@>=1.1.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.3.tgz",
+                                          "dependencies": {
+                                            "is-number": {
+                                              "version": "2.1.0",
+                                              "from": "is-number@>=2.0.2 <3.0.0",
+                                              "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+                                              "dependencies": {
+                                                "kind-of": {
+                                                  "version": "3.0.2",
+                                                  "from": "kind-of@>=3.0.2 <4.0.0",
+                                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
+                                                  "dependencies": {
+                                                    "is-buffer": {
+                                                      "version": "1.1.0",
+                                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "repeat-string": {
+                                          "version": "1.5.2",
+                                          "from": "repeat-string@>=1.5.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "preserve": {
+                                  "version": "0.2.0",
+                                  "from": "preserve@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
+                                },
+                                "repeat-element": {
+                                  "version": "1.1.2",
+                                  "from": "repeat-element@>=1.1.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
+                                }
+                              }
+                            },
+                            "expand-brackets": {
+                              "version": "0.1.4",
+                              "from": "expand-brackets@>=0.1.4 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.4.tgz"
+                            },
+                            "extglob": {
+                              "version": "0.3.1",
+                              "from": "extglob@>=0.3.1 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.1.tgz",
+                              "dependencies": {
+                                "ansi-green": {
+                                  "version": "0.1.1",
+                                  "from": "ansi-green@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
+                                  "dependencies": {
+                                    "ansi-wrap": {
+                                      "version": "0.1.0",
+                                      "from": "ansi-wrap@0.1.0",
+                                      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "success-symbol": {
+                                  "version": "0.1.0",
+                                  "from": "success-symbol@>=0.1.0 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz"
+                                }
+                              }
+                            },
+                            "filename-regex": {
+                              "version": "2.0.0",
+                              "from": "filename-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
+                            },
+                            "is-extglob": {
+                              "version": "1.0.0",
+                              "from": "is-extglob@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+                            },
+                            "kind-of": {
+                              "version": "2.0.1",
+                              "from": "kind-of@>=2.0.1 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                              "dependencies": {
+                                "is-buffer": {
+                                  "version": "1.1.0",
+                                  "from": "is-buffer@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                }
+                              }
+                            },
+                            "lazy-cache": {
+                              "version": "0.2.4",
+                              "from": "lazy-cache@>=0.2.3 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                            },
+                            "normalize-path": {
+                              "version": "2.0.1",
+                              "from": "normalize-path@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
+                            },
+                            "object.omit": {
+                              "version": "2.0.0",
+                              "from": "object.omit@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
+                              "dependencies": {
+                                "for-own": {
+                                  "version": "0.1.3",
+                                  "from": "for-own@>=0.1.3 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
+                                  "dependencies": {
+                                    "for-in": {
+                                      "version": "0.1.4",
+                                      "from": "for-in@>=0.1.4 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
+                                    }
+                                  }
+                                },
+                                "is-extendable": {
+                                  "version": "0.1.1",
+                                  "from": "is-extendable@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
+                                }
+                              }
+                            },
+                            "parse-glob": {
+                              "version": "3.0.4",
+                              "from": "parse-glob@>=3.0.4 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+                              "dependencies": {
+                                "glob-base": {
+                                  "version": "0.3.0",
+                                  "from": "glob-base@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
+                                },
+                                "is-dotfile": {
+                                  "version": "1.0.2",
+                                  "from": "is-dotfile@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "regex-cache": {
+                              "version": "0.4.2",
+                              "from": "regex-cache@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
+                              "dependencies": {
+                                "is-equal-shallow": {
+                                  "version": "0.1.3",
+                                  "from": "is-equal-shallow@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
+                                },
+                                "is-primitive": {
+                                  "version": "2.0.0",
+                                  "from": "is-primitive@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "async-each": {
+                      "version": "0.1.6",
+                      "from": "async-each@>=0.1.6 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
+                    },
+                    "glob-parent": {
+                      "version": "2.0.0",
+                      "from": "glob-parent@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
+                    },
+                    "is-binary-path": {
+                      "version": "1.0.1",
+                      "from": "is-binary-path@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+                      "dependencies": {
+                        "binary-extensions": {
+                          "version": "1.4.0",
+                          "from": "binary-extensions@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz"
+                        }
+                      }
+                    },
+                    "is-glob": {
+                      "version": "2.0.1",
+                      "from": "is-glob@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+                      "dependencies": {
+                        "is-extglob": {
+                          "version": "1.0.0",
+                          "from": "is-extglob@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    },
+                    "readdirp": {
+                      "version": "2.0.0",
+                      "from": "readdirp@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.0.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.10",
+                          "from": "minimatch@>=2.0.10 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "readable-stream": {
+                          "version": "2.0.4",
+                          "from": "readable-stream@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.2",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.5",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "fsevents": {
+                      "version": "1.0.5",
+                      "from": "fsevents@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.5.tgz",
+                      "dependencies": {
+                        "nan": {
+                          "version": "2.1.0",
+                          "from": "nan@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
+                        },
+                        "node-pre-gyp": {
+                          "version": "0.6.15",
+                          "from": "node-pre-gyp@latest",
+                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.15.tgz",
+                          "dependencies": {
+                            "nopt": {
+                              "version": "3.0.4",
+                              "from": "nopt@>=3.0.1 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
+                            }
+                          }
+                        },
+                        "abbrev": {
+                          "version": "1.0.7",
+                          "from": "abbrev@1",
+                          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                        },
+                        "ansi": {
+                          "version": "0.3.0",
+                          "from": "ansi@~0.3.0",
+                          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                        },
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        },
+                        "ansi-styles": {
+                          "version": "2.1.0",
+                          "from": "ansi-styles@^2.1.0",
+                          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                        },
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                        },
+                        "assert-plus": {
+                          "version": "0.1.5",
+                          "from": "assert-plus@^0.1.5",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                        },
+                        "async": {
+                          "version": "1.5.0",
+                          "from": "async@^1.4.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                        },
+                        "aws-sign2": {
+                          "version": "0.6.0",
+                          "from": "aws-sign2@~0.6.0",
+                          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                        },
+                        "balanced-match": {
+                          "version": "0.2.1",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                        },
+                        "block-stream": {
+                          "version": "0.0.8",
+                          "from": "block-stream@*",
+                          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                        },
+                        "boom": {
+                          "version": "2.10.1",
+                          "from": "boom@^2.8.x",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                        },
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
+                        },
+                        "caseless": {
+                          "version": "0.11.0",
+                          "from": "caseless@~0.11.0",
+                          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                        },
+                        "chalk": {
+                          "version": "1.1.1",
+                          "from": "chalk@^1.1.1",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
+                        },
+                        "combined-stream": {
+                          "version": "1.0.5",
+                          "from": "combined-stream@~1.0.5",
+                          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+                        },
+                        "commander": {
+                          "version": "2.9.0",
+                          "from": "commander@^2.8.1",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@2.x.x",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "ctype": {
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        },
+                        "debug": {
+                          "version": "0.7.4",
+                          "from": "debug@~0.7.2",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                        },
+                        "deep-extend": {
+                          "version": "0.2.11",
+                          "from": "deep-extend@~0.2.5",
+                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                        },
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        },
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@^0.1.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        },
+                        "escape-string-regexp": {
+                          "version": "1.0.3",
+                          "from": "escape-string-regexp@^1.0.2",
+                          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                        },
+                        "extend": {
+                          "version": "3.0.0",
+                          "from": "extend@~3.0.0",
+                          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                        },
+                        "forever-agent": {
+                          "version": "0.6.1",
+                          "from": "forever-agent@~0.6.1",
+                          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                        },
+                        "form-data": {
+                          "version": "1.0.0-rc3",
+                          "from": "form-data@~1.0.0-rc3",
+                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
+                        },
+                        "fstream": {
+                          "version": "1.0.8",
+                          "from": "fstream@^1.0.2",
+                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@~1.2.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
+                        },
+                        "generate-function": {
+                          "version": "2.0.0",
+                          "from": "generate-function@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                        },
+                        "generate-object-property": {
+                          "version": "1.2.0",
+                          "from": "generate-object-property@^1.1.0",
+                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+                        },
+                        "graceful-fs": {
+                          "version": "4.1.2",
+                          "from": "graceful-fs@4.1",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                        },
+                        "graceful-readlink": {
+                          "version": "1.0.1",
+                          "from": "graceful-readlink@>= 1.0.0",
+                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                        },
+                        "har-validator": {
+                          "version": "2.0.2",
+                          "from": "har-validator@~2.0.2",
+                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz"
+                        },
+                        "has-ansi": {
+                          "version": "2.0.0",
+                          "from": "has-ansi@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+                        },
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "hawk": {
+                          "version": "3.1.0",
+                          "from": "hawk@~3.1.0",
+                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
+                        },
+                        "hoek": {
+                          "version": "2.16.3",
+                          "from": "hoek@2.x.x",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                        },
+                        "http-signature": {
+                          "version": "0.11.0",
+                          "from": "http-signature@~0.11.0",
+                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@*",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "ini": {
+                          "version": "1.3.4",
+                          "from": "ini@~1.3.0",
+                          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.2",
+                          "from": "is-my-json-valid@^2.12.2",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
+                        },
+                        "is-property": {
+                          "version": "1.0.2",
+                          "from": "is-property@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "isstream": {
+                          "version": "0.1.2",
+                          "from": "isstream@~0.1.2",
+                          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                        },
+                        "json-stringify-safe": {
+                          "version": "5.0.1",
+                          "from": "json-stringify-safe@~5.0.1",
+                          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                        },
+                        "jsonpointer": {
+                          "version": "2.0.0",
+                          "from": "jsonpointer@2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                        },
+                        "lodash._basetostring": {
+                          "version": "3.0.1",
+                          "from": "lodash._basetostring@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                        },
+                        "lodash._createpadding": {
+                          "version": "3.6.1",
+                          "from": "lodash._createpadding@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+                        },
+                        "lodash.repeat": {
+                          "version": "3.0.1",
+                          "from": "lodash.repeat@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                        },
+                        "mime-db": {
+                          "version": "1.19.0",
+                          "from": "mime-db@~1.19.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                        },
+                        "mime-types": {
+                          "version": "2.1.7",
+                          "from": "mime-types@~2.1.7",
+                          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
+                        },
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        },
+                        "mkdirp": {
+                          "version": "0.5.1",
+                          "from": "mkdirp@>=0.3.0 <0.4.0||>=0.4.0 <0.5.0||>=0.5.0 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+                        },
+                        "node-uuid": {
+                          "version": "1.4.3",
+                          "from": "node-uuid@~1.4.3",
+                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                        },
+                        "oauth-sign": {
+                          "version": "0.8.0",
+                          "from": "oauth-sign@~0.8.0",
+                          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                        },
+                        "once": {
+                          "version": "1.1.1",
+                          "from": "once@~1.1.1",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
+                        },
+                        "npmlog": {
+                          "version": "1.2.1",
+                          "from": "npmlog@~1.2.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        },
+                        "pinkie": {
+                          "version": "1.0.0",
+                          "from": "pinkie@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
+                        },
+                        "qs": {
+                          "version": "5.2.0",
+                          "from": "qs@~5.2.0",
+                          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@^1.1.13",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+                        },
+                        "request": {
+                          "version": "2.65.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz"
+                        },
+                        "semver": {
+                          "version": "5.0.3",
+                          "from": "semver@~5.0.1",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@1.x.x",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@~0.10.x",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "stringstream": {
+                          "version": "0.0.5",
+                          "from": "stringstream@~0.0.4",
+                          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                        },
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+                        },
+                        "strip-json-comments": {
+                          "version": "0.1.3",
+                          "from": "strip-json-comments@0.1.x",
+                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                        },
+                        "supports-color": {
+                          "version": "2.0.0",
+                          "from": "supports-color@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                        },
+                        "tar": {
+                          "version": "2.2.1",
+                          "from": "tar@~2.2.0",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+                        },
+                        "tough-cookie": {
+                          "version": "2.2.0",
+                          "from": "tough-cookie@~2.2.0",
+                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                        },
+                        "tunnel-agent": {
+                          "version": "0.4.1",
+                          "from": "tunnel-agent@~0.4.1",
+                          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                        },
+                        "uid-number": {
+                          "version": "0.0.3",
+                          "from": "uid-number@0.0.3",
+                          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
+                        },
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@^4.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        },
+                        "fstream-ignore": {
+                          "version": "1.0.3",
+                          "from": "fstream-ignore@~1.0.3",
+                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
+                          "dependencies": {
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=3.0.0 <4.0.0"
+                            }
+                          }
+                        },
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "once": {
+                              "version": "1.3.2",
+                              "from": "once@>=1.3.0 <2.0.0"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "1.1.2",
+                          "from": "rc@~1.1.0",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.2.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "1.2.0",
+                              "from": "minimist@^1.1.2",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.4.3",
+                          "from": "rimraf@~2.4.0",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                          "dependencies": {
+                            "glob": {
+                              "version": "5.0.15",
+                              "from": "glob@>=5.0.14 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+                            },
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+                            },
+                            "once": {
+                              "version": "1.3.2",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                            }
+                          }
+                        },
+                        "bl": {
+                          "version": "1.0.0",
+                          "from": "bl@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.4",
+                              "from": "readable-stream@~2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.3",
+                                  "from": "process-nextick-args@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@~1.0.1",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "tar-pack": {
+                          "version": "3.1.0",
+                          "from": "tar-pack@~3.1.0",
+                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@~1.0.2",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                }
+                              }
+                            },
+                            "rimraf": {
+                              "version": "2.2.8",
+                              "from": "rimraf@~2.2.0",
+                              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                }
+              }
+            },
+            "webpack-core": {
+              "version": "0.6.8",
+              "from": "webpack-core@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz",
+              "dependencies": {
+                "source-map": {
+                  "version": "0.4.4",
+                  "from": "source-map@>=0.4.1 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                  "dependencies": {
+                    "amdefine": {
+                      "version": "1.0.0",
+                      "from": "amdefine@>=0.0.4",
+                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                    }
+                  }
+                },
+                "source-list-map": {
+                  "version": "0.1.5",
+                  "from": "source-list-map@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "1.1.2",
+          "from": "winston@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.0.0",
+              "from": "async@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
+            },
+            "colors": {
+              "version": "1.0.3",
+              "from": "colors@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "from": "isstream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+            },
+            "pkginfo": {
+              "version": "0.3.1",
+              "from": "pkginfo@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "from": "xml2js@0.4.4",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+          "dependencies": {
+            "sax": {
+              "version": "0.6.1",
+              "from": "sax@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+            },
+            "xmlbuilder": {
+              "version": "4.1.0",
+              "from": "xmlbuilder@>=1.0.0",
+              "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz"
+            }
+          }
+        },
+        "rewire": {
+          "version": "2.5.1",
+          "from": "rewire@>=2.3.3 <3.0.0",
+          "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.1.tgz"
+        },
+        "jasmine-node": {
+          "version": "1.14.5",
+          "from": "jasmine-node@>=1.14.5 <2.0.0",
+          "resolved": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-1.14.5.tgz",
+          "dependencies": {
+            "coffee-script": {
+              "version": "1.10.0",
+              "from": "coffee-script@>=1.0.1",
+              "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"
+            },
+            "jasmine-reporters": {
+              "version": "1.0.2",
+              "from": "jasmine-reporters@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-1.0.2.tgz"
+            },
+            "jasmine-growl-reporter": {
+              "version": "0.0.3",
+              "from": "jasmine-growl-reporter@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-0.0.3.tgz",
+              "dependencies": {
+                "growl": {
+                  "version": "1.7.0",
+                  "from": "growl@>=1.7.0 <1.8.0",
+                  "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
+                }
+              }
+            },
+            "requirejs": {
+              "version": "2.1.22",
+              "from": "requirejs@>=0.27.1",
+              "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.1.22.tgz"
+            },
+            "walkdir": {
+              "version": "0.0.11",
+              "from": "walkdir@>=0.0.1",
+              "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"
+            },
+            "gaze": {
+              "version": "0.3.4",
+              "from": "gaze@>=0.3.2 <0.4.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz",
+              "dependencies": {
+                "minimatch": {
+                  "version": "0.2.14",
+                  "from": "minimatch@>=0.2.9 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "fileset": {
+                  "version": "0.1.8",
+                  "from": "fileset@>=0.1.5 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.1.8.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "3.2.11",
+                      "from": "glob@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                      "dependencies": {
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "minimatch": {
+                          "version": "0.3.0",
+                          "from": "minimatch@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.3.5",
+              "from": "mkdirp@>=0.3.5 <0.4.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+            }
+          }
+        }
+      }
+    },
+    "moment": {
+      "version": "2.10.6",
+      "from": "moment@>=2.10.6 <3.0.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+    },
+    "open": {
+      "version": "0.0.5",
+      "from": "open@0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+    },
+    "optimist": {
+      "version": "0.6.0",
+      "from": "optimist@0.6.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "from": "minimist@>=0.0.1 <0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+        }
+      }
+    },
+    "progress": {
+      "version": "1.1.7",
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+    },
+    "prompt": {
+      "version": "0.2.12",
+      "from": "prompt@0.2.12",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "dependencies": {
+        "pkginfo": {
+          "version": "0.3.1",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+        },
+        "read": {
+          "version": "1.0.7",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.5",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "revalidator": {
+          "version": "0.1.8",
+          "from": "revalidator@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+        },
+        "utile": {
+          "version": "0.2.1",
+          "from": "utile@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "from": "async@>=0.2.9 <0.3.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+            },
+            "deep-equal": {
+              "version": "1.0.1",
+              "from": "deep-equal@*",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+            },
+            "i": {
+              "version": "0.3.3",
+              "from": "i@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "0.6.2",
+          "from": "winston@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.1.22",
+              "from": "async@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "pkginfo": {
+              "version": "0.2.3",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+            },
+            "request": {
+              "version": "2.9.203",
+              "from": "request@>=2.9.0 <2.10.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        }
+      }
+    },
+    "proxy-middleware": {
+      "version": "0.7.0",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+    },
+    "q": {
+      "version": "1.0.1",
+      "from": "q@1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
+    },
+    "request": {
+      "version": "2.51.0",
+      "from": "request@2.51.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "dependencies": {
+        "bl": {
+          "version": "0.9.4",
+          "from": "bl@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "caseless": {
+          "version": "0.8.0",
+          "from": "caseless@>=0.8.0 <0.9.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "from": "form-data@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "dependencies": {
+            "mime-types": {
+              "version": "2.0.14",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.12.0",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "from": "mime-types@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+        },
+        "node-uuid": {
+          "version": "1.4.7",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+        },
+        "qs": {
+          "version": "2.3.3",
+          "from": "qs@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.4.1",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.2.1",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "from": "http-signature@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "0.1.5",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+            },
+            "asn1": {
+              "version": "0.1.11",
+              "from": "asn1@0.1.11",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+            },
+            "ctype": {
+              "version": "0.5.3",
+              "from": "ctype@0.5.3",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+            }
+          }
+        },
+        "oauth-sign": {
+          "version": "0.5.0",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+        },
+        "hawk": {
+          "version": "1.1.1",
+          "from": "hawk@1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "from": "hoek@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+            },
+            "boom": {
+              "version": "0.4.2",
+              "from": "boom@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+            },
+            "cryptiles": {
+              "version": "0.2.2",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+            },
+            "sntp": {
+              "version": "0.2.4",
+              "from": "sntp@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+            }
+          }
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "4.3.6",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+    },
+    "serve-static": {
+      "version": "1.7.1",
+      "from": "serve-static@1.7.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "dependencies": {
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "send": {
+          "version": "0.10.1",
+          "from": "send@0.10.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "2.1.3",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.7.0",
+                  "from": "ms@0.7.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                }
+              }
+            },
+            "depd": {
+              "version": "1.0.1",
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
+            },
+            "destroy": {
+              "version": "1.0.3",
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+            },
+            "etag": {
+              "version": "1.5.1",
+              "from": "etag@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
+            },
+            "fresh": {
+              "version": "0.2.4",
+              "from": "fresh@0.2.4",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            },
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            },
+            "on-finished": {
+              "version": "2.1.1",
+              "from": "on-finished@>=2.1.1 <2.2.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "dependencies": {
+                "ee-first": {
+                  "version": "1.1.0",
+                  "from": "ee-first@1.1.0",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
+                }
+              }
+            },
+            "range-parser": {
+              "version": "1.0.3",
+              "from": "range-parser@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
+            }
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "shelljs": {
+      "version": "0.2.6",
+      "from": "shelljs@0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+    },
+    "tiny-lr-fork": {
+      "version": "0.0.5",
+      "from": "tiny-lr-fork@0.0.5",
+      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "0.5.6",
+          "from": "qs@>=0.5.2 <0.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+        },
+        "faye-websocket": {
+          "version": "0.4.4",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+        },
+        "noptify": {
+          "version": "0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "dependencies": {
+            "nopt": {
+              "version": "2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                }
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+        }
+      }
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+    },
+    "unzip": {
+      "version": "0.1.9",
+      "from": "unzip@0.1.9",
+      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "dependencies": {
+        "fstream": {
+          "version": "0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "pullstream": {
+          "version": "0.4.1",
+          "from": "pullstream@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "dependencies": {
+            "over": {
+              "version": "0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+            },
+            "slice-stream": {
+              "version": "1.0.0",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "binary": {
+          "version": "0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "dependencies": {
+            "chainsaw": {
+              "version": "0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "dependencies": {
+                "traverse": {
+                  "version": "0.3.9",
+                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                }
+              }
+            },
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.2",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            }
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.4",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+        },
+        "match-stream": {
+          "version": "0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "dependencies": {
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.7",
+      "from": "vinyl-fs@0.3.7",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "dependencies": {
+        "glob-stream": {
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "4.5.3",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "2.0.10",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+              "dependencies": {
+                "brace-expansion": {
+                  "version": "1.1.2",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.3.0",
+                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "ordered-read-streams": {
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+            },
+            "glob2base": {
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
+            },
+            "unique-stream": {
+              "version": "1.0.0",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "glob-watcher": {
+          "version": "0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "dependencies": {
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+            },
+            "is-utf8": {
+              "version": "0.2.0",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.1",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
+            "clone-stats": {
+              "version": "0.0.1",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "xml2js": {
+      "version": "0.4.4",
+      "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "dependencies": {
+        "sax": {
+          "version": "0.6.1",
+          "from": "sax@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+        },
+        "xmlbuilder": {
+          "version": "4.1.0",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "from": "lodash@>=3.5.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+            }
+          }
+        }
+      }
+    }
+  }
+}

From c1a74fba4eabc5c6a04ba680bade13045756ad0a Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 15:22:19 -0600
Subject: [PATCH 0855/1100] vBump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2479cc216..03431ecd5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From bc000cd64174c05e64bb1dee570c5c1e96634bcd Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 19:07:53 -0600
Subject: [PATCH 0856/1100] Fixed bad deleted file issue

---
 bin/ionic                       |   4 +
 lib/cli.js                      |   1 +
 lib/ionic/resources/generate.js | 898 --------------------------------
 lib/ionic/start.js              |   2 +
 lib/ionic/stats.js              |   2 +
 package.json                    |   2 +-
 6 files changed, 10 insertions(+), 899 deletions(-)
 delete mode 100644 lib/ionic/resources/generate.js

diff --git a/bin/ionic b/bin/ionic
index e2cca06895..f22e770f52 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -4,6 +4,10 @@
 
 process.title = 'ionic';
 
+process.on('uncaughtException', function(err) {
+  console.log('Caught exception: ' + err);
+});
+
 var IonicCli = require('../lib/cli');
 
 IonicCli.run(process.argv);
diff --git a/lib/cli.js b/lib/cli.js
index 97126a5208..c2a430e34c 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -27,6 +27,7 @@ Cli.PRIVATE_PATH = '.ionic';
 // This is where the logger for the app-lib can be configured (or replaced).
 logging.logger.level = 'info';
 
+
 // Cli.dev = function dev() {
 //   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
 //     return true;
diff --git a/lib/ionic/resources/generate.js b/lib/ionic/resources/generate.js
deleted file mode 100644
index ec668220f4..0000000000
--- a/lib/ionic/resources/generate.js
+++ /dev/null
@@ -1,898 +0,0 @@
-var fs = require('fs'),
-    os = require('os'),
-    path = require('path'),
-    Q = require('q'),
-    argv = require('optimist').argv,
-    request = require('request'),
-    xml2js = require('xml2js'),
-    _ = require('underscore'),
-    crc = require('crc'),
-    resSettings = require('./settings.js'),
-    Task = require('../task').Task,
-    shelljs = require('shelljs'),
-    moduleSettings = require('../../../package.json'),
-    IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
-    IonicStats = require('../stats').IonicStats;
-
-var IonicResources = function() {};
-IonicResources.prototype = new Task();
-
-var settings = resSettings.ResSettings;
-var platformConfigs = resSettings.ResPlatforms;
-var tmpDir = os.tmpdir();
-var configData, buildPlatforms, images, generateQueue, sourceFiles, generatingImages;
-var generateLandscape, generatePortrait, orientation;
-
-IonicResources.prototype.run = function() {
-  buildPlatforms = [];
-  images = [];
-  generateQueue = [];
-  sourceFiles = {};
-  generatingImages = {};
-  generateLandscape = false;
-  generatePortrait = false;
-  orientation = 'default';
-
-  if (!fs.existsSync(settings.configFile)) {
-    console.error('Invalid ' + settings.configFile + ' file. Make sure the working directory is a Cordova project.');
-    return;
-  }
-
-  if(argv.default) {
-    if(hasExistingResources() && !argv.force) {
-      console.log('The resources folder already exists. We will not overwrite your files unless you pass the --force argument.'.red.bold);
-      console.log('Running with the force flag will overwrite your resources directory and modify your config.xml file'.red.bold)
-      return;
-    }
-    copyIconFilesIntoResources(argv.force)
-    .then(function() {
-      return addIonicIcons('ios')
-    })
-    .then(function() {
-      return addIonicIcons('android');
-    })
-    .catch(function(error) {
-      console.error('An error with adding default resources happened:', error);
-    })
-    return
-  }
-
-  if (!fs.existsSync(settings.resourceDir)) {
-    fs.mkdirSync(settings.resourceDir);
-  }
-
-  var hasPlatforms = true;
-  if (_.contains(argv._, 'ios')) {
-    buildPlatforms.push('ios');
-
-  } else if (_.contains(argv._, 'android')) {
-    buildPlatforms.push('android');
-
-  } else if (_.contains(argv._, 'wp8')) {
-    buildPlatforms.push('wp8');
-
-  } else if (!fs.existsSync('platforms')) {
-    hasPlatforms = false;
-
-  } else {
-    buildPlatforms = fs.readdirSync('platforms');
-    hasPlatforms = buildPlatforms.length;
-  }
-
-  if (!hasPlatforms) {
-    console.error('No platforms have been added.');
-    console.error('Please add a platform, for example: ionic platform add ios');
-    console.error('Or provide a platform name, for example: ionic resources android');
-    return;
-  }
-
-  getConfigData().then(function() {
-
-    if (argv.landscape || argv.l) {
-      generateLandscape = true;
-    }
-    if (argv.portrait || argv.p) {
-      generatePortrait = true;
-    }
-    if (!argv.landscape && !argv.l && !argv.portrait && !argv.p) {
-
-      orientation = getOrientationConfigData();
-      if (orientation == 'landscape') {
-        generateLandscape = true;
-      } else if (orientation == 'portrait') {
-        generatePortrait = true;
-      } else {
-        generateLandscape = true;
-        generatePortrait = true;
-      }
-    }
-
-    if (argv['api']) {
-      settings.apiUrl = argv['api'];
-    }
-
-    var promises = [];
-
-    if (argv.icon || argv.i) {
-      console.info('Ionic icon resources generator');
-      promises.push(queueResTypeImages('icon'));
-
-    } else if (argv.splash || argv.s) {
-      console.info('Ionic splash screen resources generator');
-      promises.push(queueResTypeImages('splash'));
-
-    } else {
-      console.info('Ionic icon and splash screen resources generator');
-      promises.push(queueResTypeImages('icon'));
-      promises.push(queueResTypeImages('splash'));
-    }
-
-    Q.all(promises)
-      .then(loadSourceImages)
-      .then(generateResourceImages)
-      .then(loadResourceImages)
-      .then(updateConfigData)
-      .catch(console.error);
-
-  });
-
-};
-
-function queueResTypeImages(resType) {
-  var resTypePlatforms = {};
-
-  return buildImagesData()
-    .then(validateSourceImages)
-    .then(queueResourceImages)
-    .catch(console.error);
-
-  function buildImagesData() {
-    var deferred = Q.defer();
-
-    buildPlatforms.forEach(function(platform) {
-      if (!platformConfigs[platform]) return;
-
-      var platformResourceDir = path.join(settings.resourceDir, platform);
-      var resTypeDir = path.join(platformResourceDir, settings[resType + 'Dir']);
-
-      if (!fs.existsSync(platformResourceDir)) {
-        fs.mkdirSync(platformResourceDir);
-      }
-
-      if (!fs.existsSync(resTypeDir)) {
-        fs.mkdirSync(resTypeDir);
-      }
-
-      _.forEach(platformConfigs[platform][resType].images, function(image) {
-        var data = _.clone(image);
-        _.extend(data, {
-          platform: platform,
-          src: path.join(resTypeDir, image.name),
-          nodeName: platformConfigs[platform][resType].nodeName,
-          nodeAttributes: platformConfigs[platform][resType].nodeAttributes,
-          resType: resType
-        });
-        images.push(data);
-      });
-    });
-
-    deferred.resolve();
-    return deferred.promise;
-  }
-
-  function validateSourceImages() {
-    var deferred = Q.defer();
-
-    var validSourceFiles = _.map(settings.sourceExtensions, function(ext) {
-      return settings[resType + 'SourceFile'] + '.' + ext;
-    });
-
-    images.forEach(function(image) {
-      if (resTypePlatforms[image.platform]) return;
-      resTypePlatforms[image.platform] = { platform: image.platform };
-    });
-
-    _.each(resTypePlatforms, function(resTypePlatform) {
-      for (var x = 0; x < validSourceFiles.length; x++) {
-        globalSourceFile = path.join(settings.resourceDir, validSourceFiles[x]);
-        platformSourceFile = path.join(settings.resourceDir, resTypePlatform.platform, validSourceFiles[x]);
-
-        if (fs.existsSync(platformSourceFile)) {
-          resTypePlatform.sourceFilePath = platformSourceFile;
-          resTypePlatform.sourceFilename = resTypePlatform.platform + '/' + validSourceFiles[x];
-          break;
-
-        } else if (fs.existsSync(globalSourceFile)) {
-          resTypePlatform.sourceFilePath = globalSourceFile;
-          resTypePlatform.sourceFilename = validSourceFiles[x];
-          break;
-        }
-      }
-
-      if (!resTypePlatform.sourceFilePath || sourceFiles[resTypePlatform.sourceFilePath]) return;
-
-      sourceFiles[resTypePlatform.sourceFilePath] = {
-        filePath: resTypePlatform.sourceFilePath,
-        filename: resTypePlatform.sourceFilename
-      };
-    });
-
-    var missingPlatformSources = _.filter(resTypePlatforms, function(resTypePlatform) {
-      return !resTypePlatform.sourceFilePath;
-    });
-
-    if (missingPlatformSources.length) {
-      var notFoundDirs = ['resources'];
-      missingPlatformSources.forEach(function(missingPlatformSource) {
-        notFoundDirs.push('resources/' + missingPlatformSource.platform);
-      });
-
-      var msg = resType + ' source file not found in ';
-      if (notFoundDirs.length > 1) {
-        msg += 'any of these directories: ' + notFoundDirs.join(', ');
-      } else {
-        msg += 'the resources directory';
-      }
-
-      console.error(msg);
-      console.error('valid ' + resType + ' source files: ' + validSourceFiles.join(', '));
-    }
-
-    deferred.resolve();
-
-    return deferred.promise;
-  }
-
-  function queueResourceImages() {
-    var promises = [];
-
-    _.each(resTypePlatforms, function(resTypePlatform) {
-
-      if (!resTypePlatform.sourceFilePath) return;
-
-      var deferred = Q.defer();
-      promises.push(deferred.promise);
-
-      fs.readFile(resTypePlatform.sourceFilePath, function(err, buf) {
-        if (err) {
-          deferred.reject('Error reading ' + resTypePlatform.sourceFilePath);
-
-        } else {
-          try {
-            sourceFiles[resTypePlatform.sourceFilePath].imageId = crc.crc32(buf).toString(16);
-
-            var resImages = _.filter(images, function(image) {
-              return image.resType == resType;
-            });
-
-            resImages.forEach(function(image) {
-              if (image.platform == resTypePlatform.platform) {
-                image.sourceFilePath = resTypePlatform.sourceFilePath;
-
-                var sourceFile = sourceFiles[image.sourceFilePath];
-                var tmpFilename = sourceFile.imageId + '-' + image.width + 'x' + image.height + '.png';
-
-                image.imageId = sourceFile.imageId;
-                image.tmpPath = path.join(tmpDir, tmpFilename);
-
-                if (resType == 'splash') {
-                  if (!((image.width >= image.height && generateLandscape) || (image.height >= image.width && generatePortrait))) {
-                    image.skip = true;
-                    return;
-                  }
-                }
-
-                if (settings.cacheImages && fs.existsSync(image.tmpPath)) {
-                  console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') from cache');
-
-                } else {
-                  loadCachedSourceImageData(sourceFile);
-
-                  if (sourceFile.cachedData && !sourceFile.cachedData.vector && (sourceFile.cachedData.width < image.width || sourceFile.cachedData.height < image.height)) {
-                    image.skip = true;
-                    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.cachedData.width + 'x' + sourceFile.cachedData.height + ') too small');
-
-                  } else {
-                    sourceFile.upload = true;
-                    generateQueue.push(image);
-                  }
-                }
-              }
-            });
-            deferred.resolve();
-
-          } catch (e) {
-            deferred.reject('Error loading ' + resTypePlatform.sourceFilePath + ' md5: ' + e);
-          }
-        }
-      });
-    });
-
-    return Q.all(promises);
-  }
-
-}
-
-function loadSourceImages() {
-  var promises = [];
-
-  _.each(sourceFiles, function(sourceFile) {
-    if (!sourceFile.upload) return;
-
-    var deferred = Q.defer();
-
-    console.log(' uploading ' + sourceFile.filename + '...');
-
-    var postData = {
-      url: settings.apiUrl + settings.apiUploadPath,
-      formData: {
-        image_id: sourceFile.imageId,
-        src: fs.createReadStream(sourceFile.filePath),
-        cli_version: moduleSettings.version
-      },
-      proxy: process.env.PROXY || null
-    };
-
-    request.post(postData, function(err, httpResponse, body) {
-      function reject(msg) {
-        try {
-          msg += JSON.parse(body).Error;
-        } catch (e) {
-          msg += body || '';
-        }
-        deferred.reject(msg);
-      }
-
-      if (err) {
-        var msg = 'Failed to upload source image: ';
-        if (err.code == 'ENOTFOUND') {
-          msg += 'requires network connection';
-        } else {
-          msg += err;
-        }
-        deferred.reject(msg);
-
-      } else if (!httpResponse) {
-        reject('Invalid http response');
-
-      } else if (httpResponse.statusCode >= 500) {
-        reject('Image server temporarily unavailable: ');
-
-      } else if (httpResponse.statusCode == 404) {
-        reject('Image server unavailable: ');
-
-      } else if (httpResponse.statusCode > 200) {
-        reject('Invalid upload: ');
-
-      } else {
-        try {
-          var d = JSON.parse(body);
-          sourceFile.width = d.Width;
-          sourceFile.height = d.Height;
-          sourceFile.vector = d.Vector;
-          if (sourceFile.vector) {
-            console.success(sourceFile.filename + ' (vector image) upload complete');
-          } else {
-            console.success(sourceFile.filename + ' (' + d.Width + 'x' + d.Height + ') upload complete');
-          }
-
-          cacheSourceImageData(sourceFile);
-          deferred.resolve();
-
-        } catch (e) {
-          reject('Error parsing upload response: ');
-        }
-      }
-    });
-    promises.push(deferred.promise);
-  });
-
-  return Q.all(promises);
-}
-
-function cacheSourceImageData(sourceFile) {
-  try {
-    var data = JSON.stringify({
-      width: sourceFile.width,
-      height: sourceFile.height,
-      vector: sourceFile.vector,
-      version: 1
-    });
-    var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
-    fs.writeFile(cachedImagePath, data, function(err) {
-      if (err) console.error('Error writing cacheSourceImageData: ' + err);
-    });
-  } catch (e) {
-    console.error('Error cacheSourceImageData: ' + e);
-  }
-}
-
-function loadCachedSourceImageData(sourceFile) {
-  if (settings.cacheImages && !sourceFile.cachedData && sourceFile.cachedData !== false) {
-    try {
-      var cachedImagePath = path.join(tmpDir, sourceFile.imageId + '.json');
-      sourceFile.cachedData = JSON.parse(fs.readFileSync(cachedImagePath));
-    } catch (e) {
-      sourceFile.cachedData = false;
-    }
-  }
-}
-
-
-function generateResourceImages() {
-  var deferred = Q.defer();
-
-  // https://github.com/ferentchak/QThrottle
-  var max = settings.generateThrottle - 1;
-  var outstanding = 0;
-
-  function catchingFunction(value) {
-    deferred.notify(value);
-    outstanding--;
-
-    if (generateQueue.length) {
-      outstanding++;
-      generateResourceImage(generateQueue.pop())
-        .then(catchingFunction)
-        .fail(deferred.reject);
-
-    } else if (outstanding === 0) {
-      deferred.resolve();
-    }
-  }
-
-  if (generateQueue.length) {
-    while (max-- && generateQueue.length) {
-      generateResourceImage(generateQueue.pop())
-        .then(catchingFunction)
-        .fail(deferred.reject);
-      outstanding++;
-    }
-  } else {
-    deferred.resolve();
-  }
-
-  return deferred.promise;
-}
-
-function generateResourceImage(image) {
-  var deferred = Q.defer();
-
-  var sourceFile = sourceFiles[image.sourceFilePath];
-
-  if (!sourceFile.vector && (sourceFile.width < image.width || sourceFile.height < image.height)) {
-    image.skip = true;
-    console.error(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') skipped, source image ' + sourceFile.filename + ' (' + sourceFile.width + 'x' + sourceFile.height + ') too small');
-    deferred.resolve();
-
-  } else if (generatingImages[image.tmpPath]) {
-    console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
-    deferred.resolve();
-
-  } else {
-    console.log(' generating ' + image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ')...');
-    generatingImages[image.tmpPath] = true;
-
-    var postData = {
-      url: settings.apiUrl + settings.apiTransformPath,
-      formData: {
-        image_id: image.imageId,
-        name: image.name,
-        platform: image.platform,
-        width: image.width,
-        height: image.height,
-        res_type: image.resType,
-        crop: 'center',
-        encoding: 'png',
-        cli_version: moduleSettings.version
-      },
-      proxy: process.env.PROXY || null
-    };
-
-    var wr = fs.createWriteStream(image.tmpPath, { flags: 'w' });
-    wr.on("error", function(err) {
-      console.error('Error copying to ' + image.tmpPath + ': ' + err);
-      deferred.resolve();
-    });
-    wr.on("finish", function() {
-      if (!image.skip) {
-        console.success(image.resType + ' ' + image.platform + ' ' + image.name + ' (' + image.width + 'x' + image.height + ') generated');
-        deferred.resolve();
-      }
-    });
-
-    request.post(postData, function(err, httpResponse, body) {
-
-      function reject(msg) {
-        image.skip = true;
-        try {
-          delete generatingImages[image.tmpPath];
-          wr.close();
-          fs.unlink(image.tmpPath);
-        } catch (err) {}
-
-        try {
-          msg += JSON.parse(body).Error;
-        } catch (e) {
-          msg += body || '';
-        }
-        deferred.reject(msg);
-      }
-
-      if (err || !httpResponse) {
-        reject('Failed to generate image: ' + err);
-
-      } else if (httpResponse.statusCode >= 500) {
-        reject('Image transformation server temporarily unavailable: ');
-
-      } else if (httpResponse.statusCode > 200) {
-        reject('Invalid transformation: ');
-      }
-    })
-    .pipe(wr);
-  }
-
-  return deferred.promise;
-}
-
-function loadResourceImages() {
-  var promises = [];
-
-  images.forEach(function(image) {
-    if (!image.tmpPath || !fs.existsSync(image.tmpPath)) return;
-
-    var deferred = Q.defer();
-    promises.push(deferred.promise);
-
-    var rd = fs.createReadStream(image.tmpPath);
-    rd.on('error', function(err) {
-      deferred.reject('Unable to read generated image: ' + err);
-    });
-
-    var wr = fs.createWriteStream(image.src, {flags: 'w'});
-    wr.on('error', function(err) {
-      deferred.reject('Unable to copy to ' + image.src + ': ' + err);
-    });
-    wr.on('finish', function() {
-      image.isValid = true;
-      deferred.resolve();
-    });
-    rd.pipe(wr);
-  });
-
-  return Q.all(promises);
-}
-
-
-function getConfigData() {
-  var deferred = Q.defer();
-
-  try {
-    fs.readFile(resSettings.ResSettings.configFile, onConfigRead);
-  } catch (err) {
-    console.error('Error saveConfigData: ' + err);
-    deferred.reject();
-  }
-
-  function onConfigRead(err, data) {
-    if (err) {
-      console.error('Error reading config file: ' + err);
-      deferred.reject();
-      return;
-    }
-
-    try {
-      var parser = new xml2js.Parser();
-      parser.parseString(data, onXmlParse);
-    } catch (e) {
-      console.error('Error xml2js parseString: ' + e);
-      deferred.reject();
-    }
-  }
-
-  function onXmlParse(err, parsedData) {
-    if (err) {
-      console.error('Error parsing config file: ' + err);
-      deferred.reject();
-      return;
-    }
-    configData = parsedData;
-    deferred.resolve(configData);
-  }
-
-  return deferred.promise;
-}
-
-
-function updateConfigData() {
-  images = _.filter(images, function(image) {
-    return image.isValid && !image.skip;
-  });
-
-  if (!images.length || !configData) return;
-
-  var settings = resSettings.ResSettings;
-  var madeChanges = false;
-
-  clearResourcesNodes();
-  images.forEach(updateImageNode);
-  buildDefaultIconNode();
-  buildPreferenceSplashNodes();
-  writeConfigData(configData);
-
-  function clearResourcesNodes() {
-    images.forEach(function(image) {
-      if (!image) return;
-      var platformConfigData = getPlatformConfigData(image.platform);
-      if (platformConfigData && platformConfigData[image.resType]) {
-        delete platformConfigData[image.resType];
-        madeChanges = true;
-      }
-    });
-  }
-
-  function updateImageNode(image) {
-    if (!image) return;
-
-    if (!configData.widget.platform) {
-      configData.widget.platform = [];
-    }
-
-    var platformConfigData = getPlatformConfigData(image.platform);
-
-    if (!platformConfigData) {
-      configData.widget.platform.push({ '$': { name: image.platform } });
-      platformConfigData = getPlatformConfigData(image.platform);
-    }
-
-    if (!platformConfigData[image.nodeName]) {
-      platformConfigData[image.nodeName] = [];
-    }
-
-    var node = getResourceConfigNode(platformConfigData, image.nodeName, image.src);
-    if (!node) {
-      node = { '$': {} };
-      platformConfigData[image.nodeName].push(node);
-      madeChanges = true;
-    }
-
-    image.nodeAttributes.forEach(function(nodeAttribute) {
-      node.$[nodeAttribute] = image[nodeAttribute];
-    });
-  }
-
-  function buildDefaultIconNode() {
-    var currentSize = 0;
-    var defaultIcon;
-
-    images.forEach(function(image) {
-      if (image && image.resType == 'icon' && image.width > currentSize && image.width <= settings.defaultMaxIconSize) {
-        currentSize = image.width;
-        defaultIcon = image;
-      }
-    });
-
-    if (defaultIcon) {
-      configData.widget.icon = [{ '$': { src: defaultIcon.src } }];
-      madeChanges = true;
-    }
-  }
-
-  function buildPreferenceSplashNodes() {
-    var hasAndroidSplash = _.find(images, function(image) {
-      return image.platform == 'android' && image.resType == 'splash';
-    });
-
-    if (hasAndroidSplash) {
-      if (!configData.widget.preference) {
-        configData.widget.preference = [];
-      }
-
-      var hasScreenPref = _.find(configData.widget.preference, function(d) {
-        return d && d.$ && d.$.name == 'SplashScreen';
-      });
-      if (!hasScreenPref) {
-        configData.widget.preference.push({ '$': { name: 'SplashScreen', value: 'screen' } });
-        madeChanges = true;
-      }
-
-      var hasDelayPref = _.find(configData.widget.preference, function(d) {
-        return d && d.$ && d.$.name == 'SplashScreenDelay';
-      });
-      if (!hasDelayPref) {
-        configData.widget.preference.push({ '$': { name: 'SplashScreenDelay', value: '3000' } });
-        madeChanges = true;
-      }
-    }
-
-  }
-
-}
-
-function getOrientationConfigData(platform) {
-  if (configData.widget && configData.widget.preference) {
-    var n = _.find(configData.widget.preference, function(d) {
-      return d && d.$ && d.$.name && d.$.name.toLowerCase() == 'orientation';
-    });
-    if (n && n.$ && n.$.value) {
-      return n.$.value.toLowerCase();
-    }
-  }
-  return 'default';
-}
-
-function getPlatformConfigData(platform) {
-  if (configData.widget && configData.widget.platform) {
-    return _.find(configData.widget.platform, function(d) {
-      return d && d.$ && d.$.name == platform;
-    });
-  }
-}
-
-function getResourceConfigNode(platformData, nodeName, src) {
-  if (platformData[nodeName]) {
-    return _.find(platformData[nodeName], function(d) {
-      return d && d.$ && d.$.src == src;
-    });
-  }
-}
-
-function writeConfigData(configData) {
-  // if (!madeChanges) return;
-
-  try {
-    var builder = new xml2js.Builder();
-    var xmlString = builder.buildObject(configData);
-
-    fs.writeFile(settings.configFile, xmlString, function(err) {
-      if (err) console.error('Error writing config data: ' + err);
-    });
-  } catch (e) {
-    console.error('Error writeConfigData: ' + e);
-  }
-}
-
-function addIonicIcons(platform, forceAddResources) {
-
-  switch(platform) {
-    case 'android':
-    case 'ios':
-      break;
-    default:
-      platform = 'android';//most likely crosswalk `cordova platform add ./engine/cordova-android`
-  }
-
-  try {
-    var promise = null;
-
-    if(forceAddResources) {
-      console.log('forceAddResources')
-      promise = copyIconFilesIntoResources(forceAddResources);
-    } else {
-      promise = Q();
-    }
-
-    return promise
-    .then(getConfigData)
-    .then(function(data) {
-      if(!data.widget.platform || (data.widget.platform.length == 1 && data.widget.platform[0]['$'].name != platform)) {
-        console.log('Adding icons for platform:'.blue.bold, platform.green)
-        addPlatformIcons(platform, data)
-        addSplashScreenPreferences(data)
-        writeConfigData(data)
-      }
-    })
-    .catch(function(error) {
-      console.log('Error happened:', error)
-      throw error;
-    })
-  } catch(ex) {
-    Utils.fail(['Ionic CLI failed to add default Ionic resources - error', ex].join(''));
-  }
-}
-
-function hasExistingResources() {
-  //Check resources
-  // resources/icon.png
-  // resources/splash.png
-  // resources/ios/
-  // resources/android
-  var hasResources = fs.existsSync(path.join('./', 'resources')),
-      hasAndroidResources = fs.existsSync(path.join('./', 'resources', 'android')),
-      hasIosResources = fs.existsSync(path.join('./', 'resources', 'ios')),
-      hasIconResource = fs.existsSync(path.join('./', 'resources', 'icon.png')),
-      hasSplashResource = fs.existsSync(path.join('./', 'resources', 'splash.png'));
-
-  var hasAnyResources = hasResources || hasAndroidResources || hasIosResources || hasIconResource || hasSplashResource;
-
-  return hasAnyResources;
-}
-
-function copyIconFilesIntoResources(forceAddResources) {
-  var unzipPath = path.join('resources');
-
-  if(hasExistingResources() && !forceAddResources) {
-    // console.log('Not copying over default resources, the resources directory already exist. Please pass the --force argument to overwrite that folder'.red.bold);
-    return Q();
-  }
-
-  var ionicResourcesUrl = 'https://github.com/driftyco/ionic-default-resources/archive/master.zip';
-  // console.log('uzip to: ', unzipPath)
-  console.log('Downloading Default Ionic Resources'.yellow);
-  return Utils.fetchArchive(unzipPath, ionicResourcesUrl)
-  .then(function() {
-    shelljs.config.silent = true
-    shelljs.mv('resources/ionic-default-resources-master/*', 'resources')
-    shelljs.rm('-rf', 'resources/ionic-default-resources-master')
-    console.log('Done adding default Ionic resources'.yellow)
-  })
-}
-
-function addPlatformIcons(platform, configData) {
-  var platElem = { '$': { name: platform }, icon: [], splash: [] };
-  if(!configData.widget.platform) {
-    configData.widget.platform = [];
-  }
-
-  configData.widget.platform.push(platElem);
-
-  resSettings.ResPlatforms[platform].icon.images.forEach(function(image) {
-    var iconDir = ['resources/', platform, '/icon/', image.name].join('');
-    if(platform == 'android') {
-      platElem.icon.push({'$': { src: iconDir, density: image.density }})
-    } else {
-      platElem.icon.push({'$': { src: iconDir, width: image.width, height: image.height }})
-    }
-  });
-
-  resSettings.ResPlatforms[platform].splash.images.forEach(function(image) {
-    //resources/ios/splash/
-    var splashDir = ['resources/', platform, '/splash/', image.name].join('');
-    if(platform == 'android') {
-      platElem.splash.push({'$': { src: splashDir, density: image.density }})
-    } else {
-      platElem.splash.push({'$': { src: splashDir, height: image.height, width: image.width }})
-    }
-  })
-
-  // generate.writeConfigData(configData);
-}
-
-function addSplashScreenPreferences(configData) {
-  //Check for splash screen stuff
-  //<preference name="SplashScreen" value="screen"/>
-  //<preference name="SplashScreenDelay" value="3000"/>
-  var preferences = configData.widget.preference;
-
-  if(!configData.widget.preference) {
-    configData.widget.preference = []
-  }
-
-  var hasSplashScreen = false, hasSplashScreenDelay = false;
-
-  configData.widget.preference.forEach(function(pref) {
-    if(pref.$.name == 'SplashScreen') {
-      hasSplashScreen = true;
-    }
-    if(pref.$.name == 'SplashScreenDelay') {
-      hasSplashScreenDelay = true;
-    }
-  })
-
-  if(!hasSplashScreen) {
-    configData.widget.preference.push({'$': { name: 'SplashScreen', value: 'screen'}});
-  }
-  if(!hasSplashScreenDelay) {
-    configData.widget.preference.push({'$': { name: 'SplashScreenDelay', value: '3000'}});
-  }
-}
-
-module.exports = {
-  IonicTask: IonicResources,
-  addIonicIcons: addIonicIcons,
-  copyIconFilesIntoResources: copyIconFilesIntoResources,
-  getConfigData: getConfigData,
-  hasExistingResources: hasExistingResources,
-  writeConfigData: writeConfigData
-}
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index bc2c6418c3..34aa5ab0de 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -38,8 +38,10 @@ IonicTask.prototype.run = function run(ionic, argv) {
 
   var isV2Start = argv.v2 || argv.v;
   if (isV2Start) {
+
     Start = IonicAppLib.v2.start;
   } else {
+    console.log('Starting v1 app...');
     Start = IonicAppLib.start;
   }
 
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 87e8b47d75..9eafaadba4 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -612,6 +612,8 @@ exports.IonicStats = {
         statsData.account_id = ionicConfig.get('id');
       } catch (e2) {}
 
+      //console.log('STATS', cmdName, statsData);
+
       this.mp(cmdName, statsData);
 
     } catch(e) {
diff --git a/package.json b/package.json
index 03431ecd5a..b994ba1117 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 10aac08e966c461c3af38eaa50c3d65b27e8935c Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 19:17:10 -0600
Subject: [PATCH 0857/1100] Accidentally a thing

---
 lib/ionic/cordova.js | 1 -
 package.json         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5101eb95be..e8a9399ccf 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -7,7 +7,6 @@ var Task = require('./task').Task,
     exec = require('child_process').exec,
     colors = require('colors'),
     shelljs = require('shelljs'),
-    generate = require('./resources/generate'),
     prompt = require('prompt'),
     settings = require('./resources/settings'),
     IonicAppLib = require('ionic-app-lib'),
diff --git a/package.json b/package.json
index b994ba1117..a777bba4e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 907f32f6b7676991067c96ef90923570b6a03a86 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 19:25:25 -0600
Subject: [PATCH 0858/1100] Version

---
 lib/ionic/cordova.js | 1 -
 package.json         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index e8a9399ccf..bcd2e5c116 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -8,7 +8,6 @@ var Task = require('./task').Task,
     colors = require('colors'),
     shelljs = require('shelljs'),
     prompt = require('prompt'),
-    settings = require('./resources/settings'),
     IonicAppLib = require('ionic-app-lib'),
     IonicProject = IonicAppLib.project,
     IonicResources = IonicAppLib.resources,
diff --git a/package.json b/package.json
index a777bba4e6..9190e16ec6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 76e128bc26f9d53b0c3a0ff1e6fd46954cd1c889 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 19:37:04 -0600
Subject: [PATCH 0859/1100] bump deps

---
 package.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9190e16ec6..fa4a5cc6a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -25,6 +25,7 @@
     "app",
     "hybrid",
     "cordova",
+    "native",
     "phonegap"
   ],
   "repository": {
@@ -34,12 +35,11 @@
   "contributors": [
     {
       "name": "Max Lynch",
-      "email": "max@drifty.com",
+      "email": "max@ionic.io",
       "web": "https://twitter.com/maxlynch"
     },
     {
       "name": "Peter Collins",
-      "email": "peter@drifty.com",
       "web": "https://twitter.com/SomethingNew2_0"
     },
     {
@@ -48,8 +48,7 @@
     },
     {
       "name": "Josh Bavari",
-      "web": "https://twitter.com/jbavari",
-      "email": "josh@drifty.com"
+      "web": "https://twitter.com/jbavari"
     }
   ],
   "license": "MIT",
@@ -68,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.1",
+    "ionic-app-lib": "2.0.0-beta.2",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 1865912e15978655db1c946ce93409f5a6338390 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 2 Dec 2015 19:48:30 -0600
Subject: [PATCH 0860/1100] Shrink

---
 npm-shrinkwrap.json | 1462 ++++++-------------------------------------
 package.json        |    2 +-
 2 files changed, 177 insertions(+), 1287 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 15670feca4..d3cb547e21 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.6",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -511,7 +511,7 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -528,7 +528,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -908,9 +908,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.5",
+                      "version": "1.0.6",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -1237,7 +1237,8 @@
       }
     },
     "ionic-app-lib": {
-      "version": "2.0.0-beta.1",
+      "version": "2.0.0-beta.2",
+      "from": "ionic-app-lib@2.0.0-beta.2",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1409,11 +1410,6 @@
             }
           }
         },
-        "async": {
-          "version": "0.9.2",
-          "from": "async@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-        },
         "autoprefixer": {
           "version": "6.1.2",
           "from": "autoprefixer@>=6.0.2 <7.0.0",
@@ -1526,174 +1522,6 @@
             }
           }
         },
-        "cheerio": {
-          "version": "0.19.0",
-          "from": "cheerio@>=0.19.0 <0.20.0",
-          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
-          "dependencies": {
-            "css-select": {
-              "version": "1.0.0",
-              "from": "css-select@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
-              "dependencies": {
-                "css-what": {
-                  "version": "1.0.0",
-                  "from": "css-what@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
-                },
-                "domutils": {
-                  "version": "1.4.3",
-                  "from": "domutils@>=1.4.0 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
-                  "dependencies": {
-                    "domelementtype": {
-                      "version": "1.3.0",
-                      "from": "domelementtype@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-                    }
-                  }
-                },
-                "boolbase": {
-                  "version": "1.0.0",
-                  "from": "boolbase@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
-                },
-                "nth-check": {
-                  "version": "1.0.1",
-                  "from": "nth-check@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
-                }
-              }
-            },
-            "entities": {
-              "version": "1.1.1",
-              "from": "entities@>=1.1.1 <1.2.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
-            },
-            "htmlparser2": {
-              "version": "3.8.3",
-              "from": "htmlparser2@>=3.8.1 <3.9.0",
-              "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-              "dependencies": {
-                "domhandler": {
-                  "version": "2.3.0",
-                  "from": "domhandler@>=2.3.0 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
-                },
-                "domutils": {
-                  "version": "1.5.1",
-                  "from": "domutils@>=1.5.0 <1.6.0",
-                  "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
-                },
-                "domelementtype": {
-                  "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "entities": {
-                  "version": "1.0.0",
-                  "from": "entities@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
-                }
-              }
-            },
-            "dom-serializer": {
-              "version": "0.1.0",
-              "from": "dom-serializer@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-              "dependencies": {
-                "domelementtype": {
-                  "version": "1.1.3",
-                  "from": "domelementtype@>=1.1.1 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "colors": {
-          "version": "0.6.2",
-          "from": "colors@0.6.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-        },
-        "connect": {
-          "version": "3.1.1",
-          "from": "connect@3.1.1",
-          "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "1.0.4",
-              "from": "debug@1.0.4",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.6.2",
-                  "from": "ms@0.6.2",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-                }
-              }
-            },
-            "finalhandler": {
-              "version": "0.1.0",
-              "from": "finalhandler@0.1.0",
-              "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
-              "dependencies": {
-                "escape-html": {
-                  "version": "1.0.1",
-                  "from": "escape-html@1.0.1",
-                  "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-                }
-              }
-            },
-            "parseurl": {
-              "version": "1.3.0",
-              "from": "parseurl@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-            },
-            "utils-merge": {
-              "version": "1.0.0",
-              "from": "utils-merge@1.0.0",
-              "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-            }
-          }
-        },
-        "connect-livereload": {
-          "version": "0.5.2",
-          "from": "connect-livereload@0.5.2",
-          "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
-        },
-        "crc": {
-          "version": "3.2.1",
-          "from": "crc@3.2.1",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
-        },
         "cross-spawn": {
           "version": "2.0.0",
           "from": "cross-spawn@2.0.0",
@@ -1773,9 +1601,9 @@
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "process-nextick-args": {
-                          "version": "1.0.5",
+                          "version": "1.0.6",
                           "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
@@ -2295,48 +2123,6 @@
             }
           }
         },
-        "event-stream": {
-          "version": "3.0.20",
-          "from": "event-stream@>=3.0.0 <3.1.0",
-          "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-          "dependencies": {
-            "through": {
-              "version": "2.3.8",
-              "from": "through@>=2.3.1 <2.4.0",
-              "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-            },
-            "duplexer": {
-              "version": "0.1.1",
-              "from": "duplexer@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-            },
-            "from": {
-              "version": "0.1.3",
-              "from": "from@>=0.0.0 <1.0.0",
-              "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
-            },
-            "map-stream": {
-              "version": "0.0.6",
-              "from": "map-stream@>=0.0.3 <0.1.0",
-              "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
-            },
-            "pause-stream": {
-              "version": "0.0.11",
-              "from": "pause-stream@0.0.11",
-              "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
-            },
-            "split": {
-              "version": "0.2.10",
-              "from": "split@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
-            },
-            "stream-combiner": {
-              "version": "0.0.4",
-              "from": "stream-combiner@>=0.0.3 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
-            }
-          }
-        },
         "file-loader": {
           "version": "0.8.4",
           "from": "file-loader@0.8.4",
@@ -2361,54 +2147,6 @@
             }
           }
         },
-        "finalhandler": {
-          "version": "0.2.0",
-          "from": "finalhandler@0.2.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "2.0.0",
-              "from": "debug@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.6.2",
-                  "from": "ms@0.6.2",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-                }
-              }
-            },
-            "escape-html": {
-              "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-            }
-          }
-        },
-        "form-data": {
-          "version": "0.1.4",
-          "from": "form-data@0.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-          "dependencies": {
-            "combined-stream": {
-              "version": "0.0.7",
-              "from": "combined-stream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-              "dependencies": {
-                "delayed-stream": {
-                  "version": "0.0.5",
-                  "from": "delayed-stream@0.0.5",
-                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                }
-              }
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@>=1.2.0 <1.3.0",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            }
-          }
-        },
         "ionic-cordova-lib": {
           "version": "5.1.10",
           "from": "ionic-cordova-lib@5.1.10",
@@ -2673,7 +2411,7 @@
                           "dependencies": {
                             "bn.js": {
                               "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "from": "bn.js@>=4.1.1 <5.0.0",
                               "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
                             },
                             "browserify-rsa": {
@@ -3336,7 +3074,7 @@
                               "dependencies": {
                                 "align-text": {
                                   "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
+                                  "from": "align-text@>=0.1.0 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
                                   "dependencies": {
                                     "kind-of": {
@@ -3835,7 +3573,7 @@
                         },
                         "spdx-license-ids": {
                           "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
                           "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                         }
                       }
@@ -5543,7 +5281,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "from": "inherits@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 }
               }
@@ -6112,7 +5850,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "ini": {
@@ -6169,9 +5907,9 @@
               }
             },
             "node-gyp": {
-              "version": "3.2.0",
+              "version": "3.2.1",
               "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
               "dependencies": {
                 "fstream": {
                   "version": "1.0.8",
@@ -6598,9 +6336,9 @@
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "process-nextick-args": {
-                          "version": "1.0.5",
+                          "version": "1.0.6",
                           "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
@@ -7004,28 +6742,6 @@
             }
           }
         },
-        "open": {
-          "version": "0.0.5",
-          "from": "open@0.0.5",
-          "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
-        },
-        "optimist": {
-          "version": "0.6.0",
-          "from": "optimist@0.6.0",
-          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
-          "dependencies": {
-            "wordwrap": {
-              "version": "0.0.3",
-              "from": "wordwrap@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-            },
-            "minimist": {
-              "version": "0.0.10",
-              "from": "minimist@>=0.0.1 <0.1.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-            }
-          }
-        },
         "postcss": {
           "version": "5.0.12",
           "from": "postcss@>=5.0.5 <6.0.0",
@@ -7055,432 +6771,64 @@
             }
           }
         },
-        "progress": {
-          "version": "1.1.7",
-          "from": "progress@1.1.7",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+        "request-progress": {
+          "version": "0.3.1",
+          "from": "request-progress@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2",
+              "from": "throttleit@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            }
+          }
         },
-        "prompt": {
-          "version": "0.2.12",
-          "from": "prompt@0.2.12",
-          "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+        "resolve-url-loader": {
+          "version": "1.4.2",
+          "from": "resolve-url-loader@1.4.2",
+          "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-1.4.2.tgz",
           "dependencies": {
-            "pkginfo": {
-              "version": "0.3.1",
-              "from": "pkginfo@>=0.0.0 <1.0.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+            "camelcase": {
+              "version": "1.2.1",
+              "from": "camelcase@>=1.2.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+            },
+            "convert-source-map": {
+              "version": "1.1.2",
+              "from": "convert-source-map@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
             },
-            "read": {
-              "version": "1.0.7",
-              "from": "read@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.7 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
               "dependencies": {
-                "mute-stream": {
-                  "version": "0.0.5",
-                  "from": "mute-stream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
                 }
               }
             },
-            "revalidator": {
-              "version": "0.1.8",
-              "from": "revalidator@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
-            },
-            "utile": {
-              "version": "0.2.1",
-              "from": "utile@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+            "lodash.defaults": {
+              "version": "3.1.2",
+              "from": "lodash.defaults@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
               "dependencies": {
-                "async": {
-                  "version": "0.2.10",
-                  "from": "async@>=0.2.9 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                },
-                "deep-equal": {
-                  "version": "1.0.1",
-                  "from": "deep-equal@*",
-                  "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-                },
-                "i": {
-                  "version": "0.3.3",
-                  "from": "i@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.0.0 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "ncp": {
-                  "version": "0.4.2",
-                  "from": "ncp@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                "lodash.assign": {
+                  "version": "3.2.0",
+                  "from": "lodash.assign@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
                   "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "winston": {
-              "version": "0.6.2",
-              "from": "winston@>=0.6.0 <0.7.0",
-              "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-              "dependencies": {
-                "async": {
-                  "version": "0.1.22",
-                  "from": "async@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-                },
-                "cycle": {
-                  "version": "1.0.3",
-                  "from": "cycle@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-                },
-                "eyes": {
-                  "version": "0.1.8",
-                  "from": "eyes@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-                },
-                "pkginfo": {
-                  "version": "0.2.3",
-                  "from": "pkginfo@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
-                },
-                "request": {
-                  "version": "2.9.203",
-                  "from": "request@>=2.9.0 <2.10.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
-                },
-                "stack-trace": {
-                  "version": "0.0.9",
-                  "from": "stack-trace@>=0.0.0 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-                }
-              }
-            }
-          }
-        },
-        "proxy-middleware": {
-          "version": "0.7.0",
-          "from": "proxy-middleware@>=0.7.0 <0.8.0",
-          "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
-        },
-        "q": {
-          "version": "1.0.1",
-          "from": "q@1.0.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
-        },
-        "request": {
-          "version": "2.51.0",
-          "from": "request@2.51.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
-          "dependencies": {
-            "bl": {
-              "version": "0.9.4",
-              "from": "bl@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "caseless": {
-              "version": "0.8.0",
-              "from": "caseless@>=0.8.0 <0.9.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
-            },
-            "forever-agent": {
-              "version": "0.5.2",
-              "from": "forever-agent@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-            },
-            "form-data": {
-              "version": "0.2.0",
-              "from": "form-data@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-              "dependencies": {
-                "mime-types": {
-                  "version": "2.0.14",
-                  "from": "mime-types@>=2.0.3 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.12.0",
-                      "from": "mime-db@>=1.12.0 <1.13.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "json-stringify-safe": {
-              "version": "5.0.1",
-              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-            },
-            "mime-types": {
-              "version": "1.0.2",
-              "from": "mime-types@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-            },
-            "node-uuid": {
-              "version": "1.4.7",
-              "from": "node-uuid@>=1.4.0 <1.5.0",
-              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-            },
-            "qs": {
-              "version": "2.3.3",
-              "from": "qs@>=2.3.1 <2.4.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-            },
-            "tunnel-agent": {
-              "version": "0.4.1",
-              "from": "tunnel-agent@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-            },
-            "tough-cookie": {
-              "version": "2.2.1",
-              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-            },
-            "http-signature": {
-              "version": "0.10.1",
-              "from": "http-signature@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-              "dependencies": {
-                "assert-plus": {
-                  "version": "0.1.5",
-                  "from": "assert-plus@>=0.1.5 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                },
-                "asn1": {
-                  "version": "0.1.11",
-                  "from": "asn1@0.1.11",
-                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                },
-                "ctype": {
-                  "version": "0.5.3",
-                  "from": "ctype@0.5.3",
-                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                }
-              }
-            },
-            "oauth-sign": {
-              "version": "0.5.0",
-              "from": "oauth-sign@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
-            },
-            "hawk": {
-              "version": "1.1.1",
-              "from": "hawk@1.1.1",
-              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                },
-                "boom": {
-                  "version": "0.4.2",
-                  "from": "boom@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                },
-                "cryptiles": {
-                  "version": "0.2.2",
-                  "from": "cryptiles@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                },
-                "sntp": {
-                  "version": "0.2.4",
-                  "from": "sntp@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                }
-              }
-            },
-            "aws-sign2": {
-              "version": "0.5.0",
-              "from": "aws-sign2@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-            },
-            "stringstream": {
-              "version": "0.0.5",
-              "from": "stringstream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-            },
-            "combined-stream": {
-              "version": "0.0.7",
-              "from": "combined-stream@>=0.0.5 <0.1.0",
-              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-              "dependencies": {
-                "delayed-stream": {
-                  "version": "0.0.5",
-                  "from": "delayed-stream@0.0.5",
-                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                }
-              }
-            }
-          }
-        },
-        "request-progress": {
-          "version": "0.3.1",
-          "from": "request-progress@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-          "dependencies": {
-            "throttleit": {
-              "version": "0.0.2",
-              "from": "throttleit@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-            }
-          }
-        },
-        "resolve-url-loader": {
-          "version": "1.4.2",
-          "from": "resolve-url-loader@1.4.2",
-          "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-1.4.2.tgz",
-          "dependencies": {
-            "camelcase": {
-              "version": "1.2.1",
-              "from": "camelcase@>=1.2.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-            },
-            "convert-source-map": {
-              "version": "1.1.2",
-              "from": "convert-source-map@>=1.1.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "lodash.defaults": {
-              "version": "3.1.2",
-              "from": "lodash.defaults@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-              "dependencies": {
-                "lodash.assign": {
-                  "version": "3.2.0",
-                  "from": "lodash.assign@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-                  "dependencies": {
-                    "lodash._baseassign": {
-                      "version": "3.2.0",
-                      "from": "lodash._baseassign@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+                    "lodash._baseassign": {
+                      "version": "3.2.0",
+                      "from": "lodash._baseassign@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
                       "dependencies": {
                         "lodash._basecopy": {
                           "version": "3.0.1",
@@ -7576,432 +6924,100 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "convert-source-map": {
-                  "version": "0.3.5",
-                  "from": "convert-source-map@>=0.3.3 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
-                }
-              }
-            },
-            "rework-visit": {
-              "version": "1.0.0",
-              "from": "rework-visit@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"
-            },
-            "source-map": {
-              "version": "0.1.43",
-              "from": "source-map@>=0.1.43 <0.2.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-              "dependencies": {
-                "amdefine": {
-                  "version": "1.0.0",
-                  "from": "amdefine@>=0.0.4",
-                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "sass-loader": {
-          "version": "3.1.1",
-          "from": "sass-loader@3.1.1",
-          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-3.1.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.5.0",
-              "from": "async@>=1.4.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "4.0.1",
-              "from": "object-assign@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-            }
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "from": "semver@>=4.2.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-        },
-        "serve-static": {
-          "version": "1.7.1",
-          "from": "serve-static@1.7.1",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
-          "dependencies": {
-            "escape-html": {
-              "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-            },
-            "parseurl": {
-              "version": "1.3.0",
-              "from": "parseurl@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-            },
-            "send": {
-              "version": "0.10.1",
-              "from": "send@0.10.1",
-              "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
-              "dependencies": {
-                "debug": {
-                  "version": "2.1.3",
-                  "from": "debug@>=2.1.0 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
-                  "dependencies": {
-                    "ms": {
-                      "version": "0.7.0",
-                      "from": "ms@0.7.0",
-                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
-                    }
-                  }
-                },
-                "depd": {
-                  "version": "1.0.1",
-                  "from": "depd@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
-                },
-                "destroy": {
-                  "version": "1.0.3",
-                  "from": "destroy@1.0.3",
-                  "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
-                },
-                "etag": {
-                  "version": "1.5.1",
-                  "from": "etag@>=1.5.0 <1.6.0",
-                  "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
-                },
-                "fresh": {
-                  "version": "0.2.4",
-                  "from": "fresh@0.2.4",
-                  "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
-                },
-                "mime": {
-                  "version": "1.2.11",
-                  "from": "mime@1.2.11",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                },
-                "ms": {
-                  "version": "0.6.2",
-                  "from": "ms@0.6.2",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-                },
-                "on-finished": {
-                  "version": "2.1.1",
-                  "from": "on-finished@>=2.1.1 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-                  "dependencies": {
-                    "ee-first": {
-                      "version": "1.1.0",
-                      "from": "ee-first@1.1.0",
-                      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
-                    }
-                  }
-                },
-                "range-parser": {
-                  "version": "1.0.3",
-                  "from": "range-parser@>=1.0.2 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
-                }
-              }
-            },
-            "utils-merge": {
-              "version": "1.0.0",
-              "from": "utils-merge@1.0.0",
-              "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-            }
-          }
-        },
-        "shelljs": {
-          "version": "0.2.6",
-          "from": "shelljs@0.2.6",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
-        },
-        "style-loader": {
-          "version": "0.13.0",
-          "from": "style-loader@>=0.13.0 <0.14.0",
-          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.0.tgz",
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "tiny-lr-fork": {
-          "version": "0.0.5",
-          "from": "tiny-lr-fork@0.0.5",
-          "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
-          "dependencies": {
-            "qs": {
-              "version": "0.5.6",
-              "from": "qs@>=0.5.2 <0.6.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
-            },
-            "faye-websocket": {
-              "version": "0.4.4",
-              "from": "faye-websocket@>=0.4.3 <0.5.0",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
-            },
-            "noptify": {
-              "version": "0.0.3",
-              "from": "noptify@>=0.0.3 <0.1.0",
-              "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
-              "dependencies": {
-                "nopt": {
-                  "version": "2.0.0",
-                  "from": "nopt@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "debug": {
-              "version": "0.7.4",
-              "from": "debug@>=0.7.0 <0.8.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-            }
-          }
-        },
-        "typescript": {
-          "version": "1.7.3",
-          "from": "typescript@>=1.5.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz"
-        },
-        "underscore": {
-          "version": "1.7.0",
-          "from": "underscore@>=1.7.0 <1.8.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-        },
-        "unzip": {
-          "version": "0.1.9",
-          "from": "unzip@0.1.9",
-          "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
-          "dependencies": {
-            "fstream": {
-              "version": "0.1.31",
-              "from": "fstream@>=0.1.21 <0.2.0",
-              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "pullstream": {
-              "version": "0.4.1",
-              "from": "pullstream@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-              "dependencies": {
-                "over": {
-                  "version": "0.0.5",
-                  "from": "over@>=0.0.5 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+                      "from": "inherits@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
                 },
-                "slice-stream": {
-                  "version": "1.0.0",
-                  "from": "slice-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+                "convert-source-map": {
+                  "version": "0.3.5",
+                  "from": "convert-source-map@>=0.3.3 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
                 }
               }
             },
-            "binary": {
-              "version": "0.3.0",
-              "from": "binary@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+            "rework-visit": {
+              "version": "1.0.0",
+              "from": "rework-visit@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"
+            },
+            "source-map": {
+              "version": "0.1.43",
+              "from": "source-map@>=0.1.43 <0.2.0",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
               "dependencies": {
-                "chainsaw": {
-                  "version": "0.1.0",
-                  "from": "chainsaw@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-                  "dependencies": {
-                    "traverse": {
-                      "version": "0.3.9",
-                      "from": "traverse@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                    }
-                  }
-                },
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                "amdefine": {
+                  "version": "1.0.0",
+                  "from": "amdefine@>=0.0.4",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                 }
               }
+            }
+          }
+        },
+        "sass-loader": {
+          "version": "3.1.1",
+          "from": "sass-loader@3.1.1",
+          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-3.1.1.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.5.0",
+              "from": "async@>=1.4.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
             },
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.5 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
               "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
                 },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
                 }
               }
             },
-            "setimmediate": {
-              "version": "1.0.4",
-              "from": "setimmediate@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-            },
-            "match-stream": {
-              "version": "0.0.2",
-              "from": "match-stream@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+            "object-assign": {
+              "version": "4.0.1",
+              "from": "object-assign@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+            }
+          }
+        },
+        "style-loader": {
+          "version": "0.13.0",
+          "from": "style-loader@>=0.13.0 <0.14.0",
+          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.0.tgz",
+          "dependencies": {
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.7 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
               "dependencies": {
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
                 }
               }
             }
           }
         },
+        "typescript": {
+          "version": "1.7.3",
+          "from": "typescript@>=1.5.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz"
+        },
         "unzip2": {
           "version": "0.2.5",
           "from": "unzip2@0.2.5",
@@ -8269,9 +7285,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.5",
+                      "version": "1.0.6",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -8405,9 +7421,9 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "process-nextick-args": {
-                                  "version": "1.0.5",
+                                  "version": "1.0.6",
                                   "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                                 },
                                 "string_decoder": {
                                   "version": "0.10.31",
@@ -8684,7 +7700,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@2.0.1",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "isarray": {
@@ -8693,9 +7709,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.5",
+                      "version": "1.0.6",
                       "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -8892,7 +7908,7 @@
                   "dependencies": {
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -9436,9 +8452,9 @@
                               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                             },
                             "process-nextick-args": {
-                              "version": "1.0.5",
+                              "version": "1.0.6",
                               "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.5.tgz"
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                             },
                             "string_decoder": {
                               "version": "0.10.31",
@@ -9566,16 +8582,16 @@
                           "from": "concat-map@0.0.1",
                           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                         },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@2.x.x",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
                         "core-util-is": {
                           "version": "1.0.1",
                           "from": "core-util-is@~1.0.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@2.x.x",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
                         "ctype": {
                           "version": "0.5.3",
                           "from": "ctype@0.5.3",
@@ -9776,6 +8792,11 @@
                           "from": "node-uuid@~1.4.3",
                           "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                         },
+                        "npmlog": {
+                          "version": "1.2.1",
+                          "from": "npmlog@~1.2.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
+                        },
                         "oauth-sign": {
                           "version": "0.8.0",
                           "from": "oauth-sign@~0.8.0",
@@ -9786,11 +8807,6 @@
                           "from": "once@~1.1.1",
                           "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
                         },
-                        "npmlog": {
-                          "version": "1.2.1",
-                          "from": "npmlog@~1.2.0",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
-                        },
                         "path-is-absolute": {
                           "version": "1.0.0",
                           "from": "path-is-absolute@>=1.0.0 <2.0.0",
@@ -9886,17 +8902,6 @@
                           "from": "xtend@^4.0.0",
                           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                         },
-                        "fstream-ignore": {
-                          "version": "1.0.3",
-                          "from": "fstream-ignore@~1.0.3",
-                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
-                          "dependencies": {
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=3.0.0 <4.0.0"
-                            }
-                          }
-                        },
                         "inflight": {
                           "version": "1.0.4",
                           "from": "inflight@>=1.0.4 <2.0.0",
@@ -9920,6 +8925,17 @@
                             }
                           }
                         },
+                        "fstream-ignore": {
+                          "version": "1.0.3",
+                          "from": "fstream-ignore@~1.0.3",
+                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
+                          "dependencies": {
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=3.0.0 <4.0.0"
+                            }
+                          }
+                        },
                         "rimraf": {
                           "version": "2.4.3",
                           "from": "rimraf@~2.4.0",
@@ -10103,132 +9119,6 @@
               "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
             }
           }
-        },
-        "xml2js": {
-          "version": "0.4.4",
-          "from": "xml2js@0.4.4",
-          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-          "dependencies": {
-            "sax": {
-              "version": "0.6.1",
-              "from": "sax@>=0.6.0 <0.7.0",
-              "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
-            },
-            "xmlbuilder": {
-              "version": "4.1.0",
-              "from": "xmlbuilder@>=1.0.0",
-              "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz"
-            }
-          }
-        },
-        "rewire": {
-          "version": "2.5.1",
-          "from": "rewire@>=2.3.3 <3.0.0",
-          "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.1.tgz"
-        },
-        "jasmine-node": {
-          "version": "1.14.5",
-          "from": "jasmine-node@>=1.14.5 <2.0.0",
-          "resolved": "https://registry.npmjs.org/jasmine-node/-/jasmine-node-1.14.5.tgz",
-          "dependencies": {
-            "coffee-script": {
-              "version": "1.10.0",
-              "from": "coffee-script@>=1.0.1",
-              "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"
-            },
-            "jasmine-reporters": {
-              "version": "1.0.2",
-              "from": "jasmine-reporters@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-1.0.2.tgz"
-            },
-            "jasmine-growl-reporter": {
-              "version": "0.0.3",
-              "from": "jasmine-growl-reporter@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/jasmine-growl-reporter/-/jasmine-growl-reporter-0.0.3.tgz",
-              "dependencies": {
-                "growl": {
-                  "version": "1.7.0",
-                  "from": "growl@>=1.7.0 <1.8.0",
-                  "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz"
-                }
-              }
-            },
-            "requirejs": {
-              "version": "2.1.22",
-              "from": "requirejs@>=0.27.1",
-              "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.1.22.tgz"
-            },
-            "walkdir": {
-              "version": "0.0.11",
-              "from": "walkdir@>=0.0.1",
-              "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"
-            },
-            "gaze": {
-              "version": "0.3.4",
-              "from": "gaze@>=0.3.2 <0.4.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.3.4.tgz",
-              "dependencies": {
-                "minimatch": {
-                  "version": "0.2.14",
-                  "from": "minimatch@>=0.2.9 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "fileset": {
-                  "version": "0.1.8",
-                  "from": "fileset@>=0.1.5 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.1.8.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "3.2.11",
-                      "from": "glob@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                      "dependencies": {
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "minimatch": {
-                          "version": "0.3.0",
-                          "from": "minimatch@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.3.5",
-              "from": "mkdirp@>=0.3.5 <0.4.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-            }
-          }
         }
       }
     },
@@ -10615,7 +9505,7 @@
         },
         "combined-stream": {
           "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
           "dependencies": {
             "delayed-stream": {
@@ -10935,7 +9825,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -11159,7 +10049,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
               "dependencies": {
                 "core-util-is": {
diff --git a/package.json b/package.json
index fa4a5cc6a1..a5bedc8814 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 40f86d170482edaafa075e6a5a2689c8c7090c40 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 3 Dec 2015 15:47:04 -0600
Subject: [PATCH 0861/1100] Some exception handling

---
 bin/ionic          | 2 +-
 lib/ionic/start.js | 4 +++-
 package.json       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/ionic b/bin/ionic
index f22e770f52..6734e73f1b 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -5,7 +5,7 @@
 process.title = 'ionic';
 
 process.on('uncaughtException', function(err) {
-  console.log('Caught exception: ' + err);
+  console.error('Caught exception:\n', err.stack, '\n\nMind letting us know? https://github.com/driftyco/ionic-cli/issues\n');
 });
 
 var IonicCli = require('../lib/cli');
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 34aa5ab0de..8f39864704 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -37,11 +37,13 @@ IonicTask.prototype.run = function run(ionic, argv) {
   // Grab the app's relative directory name
 
   var isV2Start = argv.v2 || argv.v;
+
+  console.log('\nOne awesome Ionic app coming right up...\n'.yellow.bold);
+
   if (isV2Start) {
 
     Start = IonicAppLib.v2.start;
   } else {
-    console.log('Starting v1 app...');
     Start = IonicAppLib.start;
   }
 
diff --git a/package.json b/package.json
index a5bedc8814..3490065f10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From cedcec14fbb3efba35c28171dbb0e7d0c26f161d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 3 Dec 2015 15:49:19 -0600
Subject: [PATCH 0862/1100] dep bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3490065f10..30bcfb7d5d 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.2",
+    "ionic-app-lib": "2.0.0-beta.3",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 848714c41c56a7ae90bd28fda2ce6d12fcac1261 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 3 Dec 2015 15:55:11 -0600
Subject: [PATCH 0863/1100] Accidentally a shrinkwrap

---
 npm-shrinkwrap.json | 10128 ------------------------------------------
 package.json        |     2 +-
 2 files changed, 1 insertion(+), 10129 deletions(-)
 delete mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index d3cb547e21..0000000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10128 +0,0 @@
-{
-  "name": "ionic",
-  "version": "2.0.0-beta.6",
-  "dependencies": {
-    "async": {
-      "version": "0.9.2",
-      "from": "async@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-    },
-    "cheerio": {
-      "version": "0.19.0",
-      "from": "cheerio@>=0.19.0 <0.20.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
-      "dependencies": {
-        "css-select": {
-          "version": "1.0.0",
-          "from": "css-select@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
-          "dependencies": {
-            "css-what": {
-              "version": "1.0.0",
-              "from": "css-what@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
-            },
-            "domutils": {
-              "version": "1.4.3",
-              "from": "domutils@>=1.4.0 <1.5.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
-              "dependencies": {
-                "domelementtype": {
-                  "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-                }
-              }
-            },
-            "boolbase": {
-              "version": "1.0.0",
-              "from": "boolbase@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
-            },
-            "nth-check": {
-              "version": "1.0.1",
-              "from": "nth-check@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
-            }
-          }
-        },
-        "entities": {
-          "version": "1.1.1",
-          "from": "entities@>=1.1.1 <1.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
-        },
-        "htmlparser2": {
-          "version": "3.8.3",
-          "from": "htmlparser2@>=3.8.1 <3.9.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-          "dependencies": {
-            "domhandler": {
-              "version": "2.3.0",
-              "from": "domhandler@>=2.3.0 <2.4.0",
-              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
-            },
-            "domutils": {
-              "version": "1.5.1",
-              "from": "domutils@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
-            },
-            "domelementtype": {
-              "version": "1.3.0",
-              "from": "domelementtype@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-            },
-            "readable-stream": {
-              "version": "1.1.13",
-              "from": "readable-stream@>=1.1.0 <1.2.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "entities": {
-              "version": "1.0.0",
-              "from": "entities@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
-            }
-          }
-        },
-        "dom-serializer": {
-          "version": "0.1.0",
-          "from": "dom-serializer@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.1.3",
-              "from": "domelementtype@>=1.1.1 <1.2.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
-            }
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        }
-      }
-    },
-    "cli-table": {
-      "version": "0.3.1",
-      "from": "cli-table@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "from": "colors@1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-        }
-      }
-    },
-    "colors": {
-      "version": "0.6.2",
-      "from": "colors@0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-    },
-    "connect": {
-      "version": "3.1.1",
-      "from": "connect@3.1.1",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "1.0.4",
-          "from": "debug@1.0.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "finalhandler": {
-          "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
-          "dependencies": {
-            "escape-html": {
-              "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-            }
-          }
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "connect-livereload": {
-      "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
-    },
-    "crc": {
-      "version": "3.2.1",
-      "from": "crc@3.2.1",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
-    },
-    "cross-spawn": {
-      "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.7.3",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-        }
-      }
-    },
-    "event-stream": {
-      "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-      "dependencies": {
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        },
-        "duplexer": {
-          "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-        },
-        "from": {
-          "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
-        },
-        "map-stream": {
-          "version": "0.0.6",
-          "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
-        },
-        "pause-stream": {
-          "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
-          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
-        },
-        "split": {
-          "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
-        },
-        "stream-combiner": {
-          "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "1.2.0",
-      "from": "expand-tilde@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
-      "dependencies": {
-        "user-home": {
-          "version": "1.1.1",
-          "from": "user-home@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        }
-      }
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "from": "form-data@0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "dependencies": {
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-        }
-      }
-    },
-    "gulp": {
-      "version": "3.8.8",
-      "from": "gulp@3.8.8",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
-      "dependencies": {
-        "archy": {
-          "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
-          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-            },
-            "has-ansi": {
-              "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "strip-ansi": {
-              "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "supports-color": {
-              "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
-            }
-          }
-        },
-        "deprecated": {
-          "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
-          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
-        },
-        "gulp-util": {
-          "version": "3.0.7",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
-          "dependencies": {
-            "array-differ": {
-              "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
-            },
-            "array-uniq": {
-              "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
-            },
-            "beeper": {
-              "version": "1.1.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "dateformat": {
-              "version": "1.0.12",
-              "from": "dateformat@>=1.0.11 <2.0.0",
-              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-              "dependencies": {
-                "get-stdin": {
-                  "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-                },
-                "meow": {
-                  "version": "3.6.0",
-                  "from": "meow@>=3.3.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-                  "dependencies": {
-                    "camelcase-keys": {
-                      "version": "2.0.0",
-                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "2.0.1",
-                          "from": "camelcase@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                        },
-                        "map-obj": {
-                          "version": "1.0.1",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "loud-rejection": {
-                      "version": "1.2.0",
-                      "from": "loud-rejection@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                      "dependencies": {
-                        "signal-exit": {
-                          "version": "2.1.2",
-                          "from": "signal-exit@>=2.1.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "validate-npm-package-license": {
-                          "version": "3.0.1",
-                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                          "dependencies": {
-                            "spdx-correct": {
-                              "version": "1.0.2",
-                              "from": "spdx-correct@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            },
-                            "spdx-expression-parse": {
-                              "version": "1.0.2",
-                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-exceptions": {
-                                  "version": "1.0.4",
-                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                                },
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "object-assign": {
-                      "version": "4.0.1",
-                      "from": "object-assign@>=4.0.1 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                    },
-                    "read-pkg-up": {
-                      "version": "1.0.1",
-                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                      "dependencies": {
-                        "find-up": {
-                          "version": "1.1.0",
-                          "from": "find-up@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                          "dependencies": {
-                            "path-exists": {
-                              "version": "2.1.0",
-                              "from": "path-exists@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "read-pkg": {
-                          "version": "1.1.0",
-                          "from": "read-pkg@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                          "dependencies": {
-                            "load-json-file": {
-                              "version": "1.1.0",
-                              "from": "load-json-file@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "parse-json": {
-                                  "version": "2.2.0",
-                                  "from": "parse-json@>=2.2.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                                  "dependencies": {
-                                    "error-ex": {
-                                      "version": "1.3.0",
-                                      "from": "error-ex@>=1.2.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                      "dependencies": {
-                                        "is-arrayish": {
-                                          "version": "0.2.1",
-                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                },
-                                "strip-bom": {
-                                  "version": "2.0.0",
-                                  "from": "strip-bom@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                                  "dependencies": {
-                                    "is-utf8": {
-                                      "version": "0.2.0",
-                                      "from": "is-utf8@>=0.2.0 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "path-type": {
-                              "version": "1.1.0",
-                              "from": "path-type@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "redent": {
-                      "version": "1.0.0",
-                      "from": "redent@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                      "dependencies": {
-                        "indent-string": {
-                          "version": "2.1.0",
-                          "from": "indent-string@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                          "dependencies": {
-                            "repeating": {
-                              "version": "2.0.0",
-                              "from": "repeating@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                              "dependencies": {
-                                "is-finite": {
-                                  "version": "1.0.1",
-                                  "from": "is-finite@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                                  "dependencies": {
-                                    "number-is-nan": {
-                                      "version": "1.0.0",
-                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "strip-indent": {
-                          "version": "1.0.1",
-                          "from": "strip-indent@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "trim-newlines": {
-                      "version": "1.0.0",
-                      "from": "trim-newlines@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "fancy-log": {
-              "version": "1.1.0",
-              "from": "fancy-log@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
-            },
-            "gulplog": {
-              "version": "1.0.0",
-              "from": "gulplog@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-              "dependencies": {
-                "glogg": {
-                  "version": "1.0.0",
-                  "from": "glogg@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-                  "dependencies": {
-                    "sparkles": {
-                      "version": "1.0.0",
-                      "from": "sparkles@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "has-gulplog": {
-              "version": "0.1.0",
-              "from": "has-gulplog@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-              "dependencies": {
-                "sparkles": {
-                  "version": "1.0.0",
-                  "from": "sparkles@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                }
-              }
-            },
-            "lodash._reescape": {
-              "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-            },
-            "lodash._reevaluate": {
-              "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-            },
-            "lodash._reinterpolate": {
-              "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-            },
-            "lodash.template": {
-              "version": "3.6.2",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-              "dependencies": {
-                "lodash._basecopy": {
-                  "version": "3.0.1",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-                },
-                "lodash._basetostring": {
-                  "version": "3.0.1",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                },
-                "lodash._basevalues": {
-                  "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
-                },
-                "lodash._isiterateecall": {
-                  "version": "3.0.9",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-                },
-                "lodash.escape": {
-                  "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
-                },
-                "lodash.keys": {
-                  "version": "3.1.2",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-                  "dependencies": {
-                    "lodash._getnative": {
-                      "version": "3.9.1",
-                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-                    },
-                    "lodash.isarguments": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
-                    },
-                    "lodash.isarray": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-                    }
-                  }
-                },
-                "lodash.restparam": {
-                  "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-                },
-                "lodash.templatesettings": {
-                  "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
-                }
-              }
-            },
-            "multipipe": {
-              "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-              "dependencies": {
-                "duplexer2": {
-                  "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
-                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "object-assign": {
-              "version": "3.0.0",
-              "from": "object-assign@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
-            },
-            "replace-ext": {
-              "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
-              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
-            },
-            "through2": {
-              "version": "2.0.0",
-              "from": "through2@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.5.3",
-              "from": "vinyl@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "1.0.2",
-                  "from": "clone@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "interpret": {
-          "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
-        },
-        "liftoff": {
-          "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
-          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
-          "dependencies": {
-            "findup-sync": {
-              "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                }
-              }
-            },
-            "resolve": {
-              "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
-            },
-            "minimist": {
-              "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
-            },
-            "extend": {
-              "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
-            }
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-        },
-        "orchestrator": {
-          "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
-          "dependencies": {
-            "end-of-stream": {
-              "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-              "dependencies": {
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "sequencify": {
-              "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
-              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
-            },
-            "stream-consume": {
-              "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
-            }
-          }
-        },
-        "pretty-hrtime": {
-          "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
-        },
-        "semver": {
-          "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
-        },
-        "tildify": {
-          "version": "1.1.2",
-          "from": "tildify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
-          "dependencies": {
-            "os-homedir": {
-              "version": "1.0.1",
-              "from": "os-homedir@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "inquirer": {
-      "version": "0.11.0",
-      "from": "inquirer@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz",
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "1.1.0",
-          "from": "ansi-escapes@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.1.0.tgz"
-        },
-        "ansi-regex": {
-          "version": "2.0.0",
-          "from": "ansi-regex@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-        },
-        "chalk": {
-          "version": "1.1.1",
-          "from": "chalk@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "2.1.0",
-              "from": "ansi-styles@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-            },
-            "has-ansi": {
-              "version": "2.0.0",
-              "from": "has-ansi@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-            },
-            "supports-color": {
-              "version": "2.0.0",
-              "from": "supports-color@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-            }
-          }
-        },
-        "cli-cursor": {
-          "version": "1.0.2",
-          "from": "cli-cursor@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-          "dependencies": {
-            "restore-cursor": {
-              "version": "1.0.1",
-              "from": "restore-cursor@>=1.0.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-              "dependencies": {
-                "exit-hook": {
-                  "version": "1.1.1",
-                  "from": "exit-hook@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"
-                },
-                "onetime": {
-                  "version": "1.0.0",
-                  "from": "onetime@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "cli-width": {
-          "version": "1.1.0",
-          "from": "cli-width@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.0.tgz"
-        },
-        "figures": {
-          "version": "1.4.0",
-          "from": "figures@>=1.3.5 <2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.4.0.tgz"
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.3.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "readline2": {
-          "version": "1.0.1",
-          "from": "readline2@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-          "dependencies": {
-            "code-point-at": {
-              "version": "1.0.0",
-              "from": "code-point-at@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
-              "dependencies": {
-                "number-is-nan": {
-                  "version": "1.0.0",
-                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                }
-              }
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "dependencies": {
-                "number-is-nan": {
-                  "version": "1.0.0",
-                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                }
-              }
-            },
-            "mute-stream": {
-              "version": "0.0.5",
-              "from": "mute-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "run-async": {
-          "version": "0.1.0",
-          "from": "run-async@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-          "dependencies": {
-            "once": {
-              "version": "1.3.3",
-              "from": "once@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-              "dependencies": {
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "rx-lite": {
-          "version": "3.1.2",
-          "from": "rx-lite@>=3.1.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"
-        },
-        "strip-ansi": {
-          "version": "3.0.0",
-          "from": "strip-ansi@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-        },
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        }
-      }
-    },
-    "ionic-app-lib": {
-      "version": "2.0.0-beta.2",
-      "from": "ionic-app-lib@2.0.0-beta.2",
-      "dependencies": {
-        "archiver": {
-          "version": "0.5.2",
-          "from": "archiver@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "zip-stream": {
-              "version": "0.1.4",
-              "from": "zip-stream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
-              "dependencies": {
-                "lodash.defaults": {
-                  "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash.keys": {
-                      "version": "2.4.1",
-                      "from": "lodash.keys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        },
-                        "lodash.isobject": {
-                          "version": "2.4.1",
-                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
-                        },
-                        "lodash._shimkeys": {
-                          "version": "2.4.1",
-                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._objecttypes": {
-                      "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "lazystream": {
-              "version": "0.1.0",
-              "from": "lazystream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
-            },
-            "file-utils": {
-              "version": "0.1.5",
-              "from": "file-utils@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
-              "dependencies": {
-                "lodash": {
-                  "version": "2.1.0",
-                  "from": "lodash@>=2.1.0 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
-                },
-                "iconv-lite": {
-                  "version": "0.2.11",
-                  "from": "iconv-lite@>=0.2.11 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
-                },
-                "rimraf": {
-                  "version": "2.2.8",
-                  "from": "rimraf@>=2.2.2 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                },
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.6 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "0.2.14",
-                  "from": "minimatch@>=0.2.12 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "findup-sync": {
-                  "version": "0.1.3",
-                  "from": "findup-sync@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "2.4.2",
-                      "from": "lodash@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                    }
-                  }
-                },
-                "isbinaryfile": {
-                  "version": "0.1.9",
-                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
-                }
-              }
-            },
-            "lodash": {
-              "version": "2.4.2",
-              "from": "lodash@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-            }
-          }
-        },
-        "autoprefixer": {
-          "version": "6.1.2",
-          "from": "autoprefixer@>=6.0.2 <7.0.0",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.1.2.tgz",
-          "dependencies": {
-            "postcss-value-parser": {
-              "version": "3.1.3",
-              "from": "postcss-value-parser@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
-            },
-            "num2fraction": {
-              "version": "1.2.2",
-              "from": "num2fraction@>=1.2.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
-            },
-            "browserslist": {
-              "version": "1.0.1",
-              "from": "browserslist@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.0.1.tgz"
-            },
-            "caniuse-db": {
-              "version": "1.0.30000372",
-              "from": "caniuse-db@>=1.0.30000372 <2.0.0",
-              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000372.tgz"
-            }
-          }
-        },
-        "autoprefixer-loader": {
-          "version": "3.1.0",
-          "from": "autoprefixer-loader@>=3.1.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/autoprefixer-loader/-/autoprefixer-loader-3.1.0.tgz",
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "postcss-safe-parser": {
-              "version": "1.0.1",
-              "from": "postcss-safe-parser@>=1.0.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.1.tgz"
-            }
-          }
-        },
-        "awesome-typescript-loader": {
-          "version": "0.13.1",
-          "from": "awesome-typescript-loader@>=0.13.1 <0.14.0",
-          "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-0.13.1.tgz",
-          "dependencies": {
-            "bluebird": {
-              "version": "2.10.2",
-              "from": "bluebird@>=2.7.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
-            },
-            "colors": {
-              "version": "1.1.2",
-              "from": "colors@>=1.1.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-            },
-            "deasync": {
-              "version": "0.1.4",
-              "from": "deasync@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.4.tgz",
-              "dependencies": {
-                "bindings": {
-                  "version": "1.2.1",
-                  "from": "bindings@>=1.2.1 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-                },
-                "nan": {
-                  "version": "2.1.0",
-                  "from": "nan@>=2.0.7 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-                }
-              }
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.6 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "2.1.1",
-              "from": "object-assign@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
-            }
-          }
-        },
-        "cross-spawn": {
-          "version": "2.0.0",
-          "from": "cross-spawn@2.0.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
-          "dependencies": {
-            "cross-spawn-async": {
-              "version": "2.0.1",
-              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "3.2.0",
-                  "from": "lru-cache@>=3.2.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-                  "dependencies": {
-                    "pseudomap": {
-                      "version": "1.0.1",
-                      "from": "pseudomap@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "spawn-sync": {
-              "version": "1.0.14",
-              "from": "spawn-sync@>=1.0.13 <2.0.0",
-              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
-              "dependencies": {
-                "concat-stream": {
-                  "version": "1.5.1",
-                  "from": "concat-stream@>=1.4.7 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "typedarray": {
-                      "version": "0.0.6",
-                      "from": "typedarray@>=0.0.5 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                    },
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.6",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "os-shim": {
-                  "version": "0.1.3",
-                  "from": "os-shim@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "css-loader": {
-          "version": "0.22.0",
-          "from": "css-loader@0.22.0",
-          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.22.0.tgz",
-          "dependencies": {
-            "css-selector-tokenizer": {
-              "version": "0.5.4",
-              "from": "css-selector-tokenizer@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz",
-              "dependencies": {
-                "cssesc": {
-                  "version": "0.1.0",
-                  "from": "cssesc@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz"
-                },
-                "fastparse": {
-                  "version": "1.1.1",
-                  "from": "fastparse@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz"
-                }
-              }
-            },
-            "cssnano": {
-              "version": "3.3.2",
-              "from": "cssnano@>=2.6.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.3.2.tgz",
-              "dependencies": {
-                "decamelize": {
-                  "version": "1.1.1",
-                  "from": "decamelize@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                },
-                "defined": {
-                  "version": "1.0.0",
-                  "from": "defined@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-                },
-                "indexes-of": {
-                  "version": "1.0.1",
-                  "from": "indexes-of@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"
-                },
-                "postcss-calc": {
-                  "version": "5.0.0",
-                  "from": "postcss-calc@>=5.0.0 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.0.0.tgz",
-                  "dependencies": {
-                    "postcss-message-helpers": {
-                      "version": "2.0.0",
-                      "from": "postcss-message-helpers@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz"
-                    },
-                    "reduce-css-calc": {
-                      "version": "1.2.0",
-                      "from": "reduce-css-calc@>=1.2.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.2.0.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.1.0",
-                          "from": "balanced-match@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz"
-                        },
-                        "reduce-function-call": {
-                          "version": "1.0.1",
-                          "from": "reduce-function-call@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "postcss-colormin": {
-                  "version": "2.1.7",
-                  "from": "postcss-colormin@>=2.1.7 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.1.7.tgz",
-                  "dependencies": {
-                    "colr-convert": {
-                      "version": "1.0.5",
-                      "from": "colr-convert@>=1.0.5 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/colr-convert/-/colr-convert-1.0.5.tgz"
-                    },
-                    "css-color-names": {
-                      "version": "0.0.2",
-                      "from": "css-color-names@0.0.2",
-                      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.2.tgz"
-                    }
-                  }
-                },
-                "postcss-convert-values": {
-                  "version": "2.3.4",
-                  "from": "postcss-convert-values@>=2.3.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.3.4.tgz"
-                },
-                "postcss-discard-comments": {
-                  "version": "2.0.2",
-                  "from": "postcss-discard-comments@>=2.0.2 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.2.tgz"
-                },
-                "postcss-discard-duplicates": {
-                  "version": "2.0.0",
-                  "from": "postcss-discard-duplicates@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.0.0.tgz"
-                },
-                "postcss-discard-empty": {
-                  "version": "2.0.0",
-                  "from": "postcss-discard-empty@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.0.0.tgz"
-                },
-                "postcss-discard-unused": {
-                  "version": "2.1.0",
-                  "from": "postcss-discard-unused@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.1.0.tgz",
-                  "dependencies": {
-                    "flatten": {
-                      "version": "0.0.1",
-                      "from": "flatten@0.0.1",
-                      "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"
-                    },
-                    "uniqs": {
-                      "version": "2.0.0",
-                      "from": "uniqs@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-filter-plugins": {
-                  "version": "2.0.0",
-                  "from": "postcss-filter-plugins@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.0.tgz",
-                  "dependencies": {
-                    "uniqid": {
-                      "version": "1.0.0",
-                      "from": "uniqid@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-1.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-merge-idents": {
-                  "version": "2.1.3",
-                  "from": "postcss-merge-idents@>=2.1.3 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.3.tgz",
-                  "dependencies": {
-                    "has-own": {
-                      "version": "1.0.0",
-                      "from": "has-own@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/has-own/-/has-own-1.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-merge-longhand": {
-                  "version": "2.0.1",
-                  "from": "postcss-merge-longhand@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.1.tgz"
-                },
-                "postcss-merge-rules": {
-                  "version": "2.0.2",
-                  "from": "postcss-merge-rules@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.0.2.tgz"
-                },
-                "postcss-minify-font-values": {
-                  "version": "1.0.2",
-                  "from": "postcss-minify-font-values@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.2.tgz",
-                  "dependencies": {
-                    "uniqs": {
-                      "version": "2.0.0",
-                      "from": "uniqs@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-minify-params": {
-                  "version": "1.0.4",
-                  "from": "postcss-minify-params@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.0.4.tgz",
-                  "dependencies": {
-                    "alphanum-sort": {
-                      "version": "1.0.2",
-                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
-                    },
-                    "uniqs": {
-                      "version": "2.0.0",
-                      "from": "uniqs@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-minify-selectors": {
-                  "version": "2.0.1",
-                  "from": "postcss-minify-selectors@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.0.1.tgz",
-                  "dependencies": {
-                    "alphanum-sort": {
-                      "version": "1.0.2",
-                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
-                    },
-                    "postcss-selector-parser": {
-                      "version": "1.3.0",
-                      "from": "postcss-selector-parser@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-1.3.0.tgz",
-                      "dependencies": {
-                        "flatten": {
-                          "version": "0.0.1",
-                          "from": "flatten@0.0.1",
-                          "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"
-                        },
-                        "uniq": {
-                          "version": "1.0.1",
-                          "from": "uniq@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "postcss-normalize-charset": {
-                  "version": "1.1.0",
-                  "from": "postcss-normalize-charset@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.0.tgz"
-                },
-                "postcss-normalize-url": {
-                  "version": "3.0.4",
-                  "from": "postcss-normalize-url@>=3.0.4 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.4.tgz",
-                  "dependencies": {
-                    "is-absolute-url": {
-                      "version": "2.0.0",
-                      "from": "is-absolute-url@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.0.0.tgz"
-                    },
-                    "normalize-url": {
-                      "version": "1.4.0",
-                      "from": "normalize-url@>=1.3.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.4.0.tgz",
-                      "dependencies": {
-                        "prepend-http": {
-                          "version": "1.0.3",
-                          "from": "prepend-http@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz"
-                        },
-                        "query-string": {
-                          "version": "3.0.0",
-                          "from": "query-string@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/query-string/-/query-string-3.0.0.tgz",
-                          "dependencies": {
-                            "strict-uri-encode": {
-                              "version": "1.0.2",
-                              "from": "strict-uri-encode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "sort-keys": {
-                          "version": "1.1.1",
-                          "from": "sort-keys@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz",
-                          "dependencies": {
-                            "is-plain-obj": {
-                              "version": "1.1.0",
-                              "from": "is-plain-obj@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "postcss-ordered-values": {
-                  "version": "2.0.2",
-                  "from": "postcss-ordered-values@>=2.0.2 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.0.2.tgz"
-                },
-                "postcss-reduce-idents": {
-                  "version": "2.2.1",
-                  "from": "postcss-reduce-idents@>=2.2.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.2.1.tgz"
-                },
-                "postcss-reduce-transforms": {
-                  "version": "1.0.3",
-                  "from": "postcss-reduce-transforms@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.3.tgz"
-                },
-                "postcss-svgo": {
-                  "version": "2.1.0",
-                  "from": "postcss-svgo@>=2.0.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.0.tgz",
-                  "dependencies": {
-                    "is-svg": {
-                      "version": "1.1.1",
-                      "from": "is-svg@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-1.1.1.tgz"
-                    },
-                    "svgo": {
-                      "version": "0.5.6",
-                      "from": "svgo@>=0.5.6 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.5.6.tgz",
-                      "dependencies": {
-                        "sax": {
-                          "version": "1.1.4",
-                          "from": "sax@>=1.1.1 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"
-                        },
-                        "coa": {
-                          "version": "1.0.1",
-                          "from": "coa@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz",
-                          "dependencies": {
-                            "q": {
-                              "version": "1.4.1",
-                              "from": "q@>=1.1.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-                            }
-                          }
-                        },
-                        "js-yaml": {
-                          "version": "3.3.1",
-                          "from": "js-yaml@>=3.3.1 <3.4.0",
-                          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz",
-                          "dependencies": {
-                            "argparse": {
-                              "version": "1.0.3",
-                              "from": "argparse@>=1.0.2 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.3.tgz",
-                              "dependencies": {
-                                "sprintf-js": {
-                                  "version": "1.0.3",
-                                  "from": "sprintf-js@>=1.0.2 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-                                }
-                              }
-                            },
-                            "esprima": {
-                              "version": "2.2.0",
-                              "from": "esprima@>=2.2.0 <2.3.0",
-                              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"
-                            }
-                          }
-                        },
-                        "colors": {
-                          "version": "1.1.2",
-                          "from": "colors@>=1.1.2 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-                        },
-                        "whet.extend": {
-                          "version": "0.9.9",
-                          "from": "whet.extend@>=0.9.9 <0.10.0",
-                          "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"
-                        },
-                        "mkdirp": {
-                          "version": "0.5.1",
-                          "from": "mkdirp@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "0.0.8",
-                              "from": "minimist@0.0.8",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "postcss-unique-selectors": {
-                  "version": "2.0.1",
-                  "from": "postcss-unique-selectors@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.1.tgz",
-                  "dependencies": {
-                    "alphanum-sort": {
-                      "version": "1.0.2",
-                      "from": "alphanum-sort@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"
-                    },
-                    "uniqs": {
-                      "version": "2.0.0",
-                      "from": "uniqs@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"
-                    }
-                  }
-                },
-                "postcss-value-parser": {
-                  "version": "3.1.3",
-                  "from": "postcss-value-parser@>=3.1.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
-                },
-                "postcss-zindex": {
-                  "version": "2.0.0",
-                  "from": "postcss-zindex@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.0.0.tgz"
-                }
-              }
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.2 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "4.0.1",
-              "from": "object-assign@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-            },
-            "lodash.camelcase": {
-              "version": "3.0.1",
-              "from": "lodash.camelcase@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz",
-              "dependencies": {
-                "lodash._createcompounder": {
-                  "version": "3.0.0",
-                  "from": "lodash._createcompounder@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._createcompounder/-/lodash._createcompounder-3.0.0.tgz",
-                  "dependencies": {
-                    "lodash.deburr": {
-                      "version": "3.0.2",
-                      "from": "lodash.deburr@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-3.0.2.tgz",
-                      "dependencies": {
-                        "lodash._basetostring": {
-                          "version": "3.0.1",
-                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash.words": {
-                      "version": "3.0.2",
-                      "from": "lodash.words@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.words/-/lodash.words-3.0.2.tgz",
-                      "dependencies": {
-                        "lodash._basetostring": {
-                          "version": "3.0.1",
-                          "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                        },
-                        "lodash._isiterateecall": {
-                          "version": "3.0.9",
-                          "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "postcss-modules-extract-imports": {
-              "version": "1.0.0-beta2",
-              "from": "postcss-modules-extract-imports@1.0.0-beta2",
-              "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0-beta2.tgz"
-            },
-            "postcss-modules-local-by-default": {
-              "version": "1.0.0",
-              "from": "postcss-modules-local-by-default@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.0.0.tgz"
-            },
-            "postcss-modules-scope": {
-              "version": "1.0.0-beta2",
-              "from": "postcss-modules-scope@1.0.0-beta2",
-              "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.0.0-beta2.tgz"
-            },
-            "postcss-modules-values": {
-              "version": "1.1.1",
-              "from": "postcss-modules-values@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.1.1.tgz",
-              "dependencies": {
-                "icss-replace-symbols": {
-                  "version": "1.0.2",
-                  "from": "icss-replace-symbols@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz"
-                }
-              }
-            },
-            "source-list-map": {
-              "version": "0.1.5",
-              "from": "source-list-map@>=0.1.4 <0.2.0",
-              "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
-            }
-          }
-        },
-        "file-loader": {
-          "version": "0.8.4",
-          "from": "file-loader@0.8.4",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.8.4.tgz",
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "ionic-cordova-lib": {
-          "version": "5.1.10",
-          "from": "ionic-cordova-lib@5.1.10",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
-          "dependencies": {
-            "bplist-parser": {
-              "version": "0.0.6",
-              "from": "bplist-parser@0.0.6",
-              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
-            },
-            "cordova-app-hello-world": {
-              "version": "3.9.0",
-              "from": "cordova-app-hello-world@3.9.0",
-              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
-            },
-            "cordova-js": {
-              "version": "4.0.0",
-              "from": "cordova-js@4.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
-              "dependencies": {
-                "browserify": {
-                  "version": "10.1.3",
-                  "from": "browserify@10.1.3",
-                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
-                  "dependencies": {
-                    "JSONStream": {
-                      "version": "1.0.7",
-                      "from": "JSONStream@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
-                      "dependencies": {
-                        "jsonparse": {
-                          "version": "1.2.0",
-                          "from": "jsonparse@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "assert": {
-                      "version": "1.3.0",
-                      "from": "assert@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
-                    },
-                    "browser-pack": {
-                      "version": "4.0.4",
-                      "from": "browser-pack@>=4.0.3 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.3.0",
-                          "from": "combine-source-map@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
-                          "dependencies": {
-                            "inline-source-map": {
-                              "version": "0.3.1",
-                              "from": "inline-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-                              "dependencies": {
-                                "source-map": {
-                                  "version": "0.3.0",
-                                  "from": "source-map@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "1.0.0",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "convert-source-map": {
-                              "version": "0.3.5",
-                              "from": "convert-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.1.43",
-                              "from": "source-map@>=0.1.31 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "through2": {
-                          "version": "0.5.1",
-                          "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "1.0.33",
-                              "from": "readable-stream@>=1.0.17 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "xtend": {
-                              "version": "3.0.0",
-                              "from": "xtend@>=3.0.0 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                            }
-                          }
-                        },
-                        "umd": {
-                          "version": "3.0.1",
-                          "from": "umd@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
-                        }
-                      }
-                    },
-                    "browser-resolve": {
-                      "version": "1.10.1",
-                      "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
-                    },
-                    "browserify-zlib": {
-                      "version": "0.1.4",
-                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-                      "dependencies": {
-                        "pako": {
-                          "version": "0.2.8",
-                          "from": "pako@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
-                        }
-                      }
-                    },
-                    "buffer": {
-                      "version": "3.5.3",
-                      "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
-                      "dependencies": {
-                        "base64-js": {
-                          "version": "0.0.8",
-                          "from": "base64-js@0.0.8",
-                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-                        },
-                        "ieee754": {
-                          "version": "1.1.6",
-                          "from": "ieee754@>=1.1.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
-                        },
-                        "is-array": {
-                          "version": "1.0.1",
-                          "from": "is-array@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@>=0.0.3 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    },
-                    "commondir": {
-                      "version": "0.0.1",
-                      "from": "commondir@0.0.1",
-                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
-                    },
-                    "concat-stream": {
-                      "version": "1.4.10",
-                      "from": "concat-stream@>=1.4.1 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        }
-                      }
-                    },
-                    "console-browserify": {
-                      "version": "1.1.0",
-                      "from": "console-browserify@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-                      "dependencies": {
-                        "date-now": {
-                          "version": "0.1.4",
-                          "from": "date-now@>=0.1.4 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
-                        }
-                      }
-                    },
-                    "constants-browserify": {
-                      "version": "0.0.1",
-                      "from": "constants-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
-                    },
-                    "crypto-browserify": {
-                      "version": "3.11.0",
-                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
-                      "dependencies": {
-                        "browserify-cipher": {
-                          "version": "1.0.0",
-                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-                          "dependencies": {
-                            "browserify-aes": {
-                              "version": "1.0.5",
-                              "from": "browserify-aes@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                              "dependencies": {
-                                "buffer-xor": {
-                                  "version": "1.0.3",
-                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                },
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "browserify-des": {
-                              "version": "1.0.0",
-                              "from": "browserify-des@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-                              "dependencies": {
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                },
-                                "des.js": {
-                                  "version": "1.0.0",
-                                  "from": "des.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "evp_bytestokey": {
-                              "version": "1.0.0",
-                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "browserify-sign": {
-                          "version": "4.0.0",
-                          "from": "browserify-sign@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-ecdh": {
-                          "version": "4.0.0",
-                          "from": "create-ecdh@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-hash": {
-                          "version": "1.1.2",
-                          "from": "create-hash@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
-                          "dependencies": {
-                            "cipher-base": {
-                              "version": "1.0.2",
-                              "from": "cipher-base@>=1.0.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                            },
-                            "ripemd160": {
-                              "version": "1.0.1",
-                              "from": "ripemd160@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
-                            },
-                            "sha.js": {
-                              "version": "2.4.4",
-                              "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                            }
-                          }
-                        },
-                        "create-hmac": {
-                          "version": "1.1.4",
-                          "from": "create-hmac@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
-                        },
-                        "diffie-hellman": {
-                          "version": "5.0.0",
-                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "miller-rabin": {
-                              "version": "4.0.0",
-                              "from": "miller-rabin@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "pbkdf2": {
-                          "version": "3.0.4",
-                          "from": "pbkdf2@>=3.0.3 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
-                        },
-                        "public-encrypt": {
-                          "version": "4.0.0",
-                          "from": "public-encrypt@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.4.0",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.4.0.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "randombytes": {
-                          "version": "2.0.1",
-                          "from": "randombytes@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
-                        }
-                      }
-                    },
-                    "deep-equal": {
-                      "version": "1.0.1",
-                      "from": "deep-equal@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-                    },
-                    "defined": {
-                      "version": "1.0.0",
-                      "from": "defined@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-                    },
-                    "deps-sort": {
-                      "version": "1.3.9",
-                      "from": "deps-sort@>=1.3.7 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
-                    },
-                    "domain-browser": {
-                      "version": "1.1.4",
-                      "from": "domain-browser@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
-                    },
-                    "duplexer2": {
-                      "version": "0.0.2",
-                      "from": "duplexer2@>=0.0.2 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
-                    },
-                    "events": {
-                      "version": "1.0.2",
-                      "from": "events@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
-                    },
-                    "has": {
-                      "version": "1.0.1",
-                      "from": "has@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-                      "dependencies": {
-                        "function-bind": {
-                          "version": "1.0.2",
-                          "from": "function-bind@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "htmlescape": {
-                      "version": "1.1.0",
-                      "from": "htmlescape@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
-                    },
-                    "http-browserify": {
-                      "version": "1.7.0",
-                      "from": "http-browserify@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-                      "dependencies": {
-                        "Base64": {
-                          "version": "0.2.1",
-                          "from": "Base64@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-                        }
-                      }
-                    },
-                    "https-browserify": {
-                      "version": "0.0.1",
-                      "from": "https-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "insert-module-globals": {
-                      "version": "6.6.3",
-                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.6.1",
-                          "from": "combine-source-map@>=0.6.1 <0.7.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
-                          "dependencies": {
-                            "convert-source-map": {
-                              "version": "1.1.2",
-                              "from": "convert-source-map@>=1.1.0 <1.2.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
-                            },
-                            "inline-source-map": {
-                              "version": "0.5.0",
-                              "from": "inline-source-map@>=0.5.0 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
-                            },
-                            "lodash.memoize": {
-                              "version": "3.0.4",
-                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.4.4",
-                              "from": "source-map@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "is-buffer": {
-                          "version": "1.1.0",
-                          "from": "is-buffer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                        },
-                        "lexical-scope": {
-                          "version": "1.2.0",
-                          "from": "lexical-scope@>=1.2.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-                          "dependencies": {
-                            "astw": {
-                              "version": "2.0.0",
-                              "from": "astw@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
-                              "dependencies": {
-                                "acorn": {
-                                  "version": "1.2.2",
-                                  "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "labeled-stream-splicer": {
-                      "version": "1.0.2",
-                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
-                      "dependencies": {
-                        "stream-splicer": {
-                          "version": "1.3.2",
-                          "from": "stream-splicer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
-                          "dependencies": {
-                            "readable-wrap": {
-                              "version": "1.0.0",
-                              "from": "readable-wrap@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                            },
-                            "indexof": {
-                              "version": "0.0.1",
-                              "from": "indexof@0.0.1",
-                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "module-deps": {
-                      "version": "3.9.1",
-                      "from": "module-deps@>=3.7.11 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
-                      "dependencies": {
-                        "detective": {
-                          "version": "4.3.1",
-                          "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
-                          "dependencies": {
-                            "acorn": {
-                              "version": "1.2.2",
-                              "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                            }
-                          }
-                        },
-                        "stream-combiner2": {
-                          "version": "1.0.2",
-                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
-                          "dependencies": {
-                            "through2": {
-                              "version": "0.5.1",
-                              "from": "through2@>=0.5.1 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                              "dependencies": {
-                                "readable-stream": {
-                                  "version": "1.0.33",
-                                  "from": "readable-stream@>=1.0.17 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                                  "dependencies": {
-                                    "core-util-is": {
-                                      "version": "1.0.2",
-                                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "xtend": {
-                                  "version": "3.0.0",
-                                  "from": "xtend@>=3.0.0 <3.1.0",
-                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "os-browserify": {
-                      "version": "0.1.2",
-                      "from": "os-browserify@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
-                    },
-                    "parents": {
-                      "version": "1.0.1",
-                      "from": "parents@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-                      "dependencies": {
-                        "path-platform": {
-                          "version": "0.11.15",
-                          "from": "path-platform@>=0.11.15 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
-                        }
-                      }
-                    },
-                    "path-browserify": {
-                      "version": "0.0.0",
-                      "from": "path-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
-                    },
-                    "process": {
-                      "version": "0.11.2",
-                      "from": "process@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
-                    },
-                    "punycode": {
-                      "version": "1.3.2",
-                      "from": "punycode@>=1.3.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                    },
-                    "querystring-es3": {
-                      "version": "0.2.1",
-                      "from": "querystring-es3@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
-                    },
-                    "read-only-stream": {
-                      "version": "1.1.1",
-                      "from": "read-only-stream@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
-                      "dependencies": {
-                        "readable-wrap": {
-                          "version": "1.0.0",
-                          "from": "readable-wrap@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.13 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "resolve": {
-                      "version": "1.1.6",
-                      "from": "resolve@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
-                    },
-                    "shallow-copy": {
-                      "version": "0.0.1",
-                      "from": "shallow-copy@0.0.1",
-                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
-                    },
-                    "shasum": {
-                      "version": "1.0.2",
-                      "from": "shasum@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-                      "dependencies": {
-                        "json-stable-stringify": {
-                          "version": "0.0.1",
-                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "from": "jsonify@>=0.0.0 <0.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-                            }
-                          }
-                        },
-                        "sha.js": {
-                          "version": "2.4.4",
-                          "from": "sha.js@>=2.4.4 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                        }
-                      }
-                    },
-                    "shell-quote": {
-                      "version": "0.0.1",
-                      "from": "shell-quote@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
-                    },
-                    "stream-browserify": {
-                      "version": "1.0.0",
-                      "from": "stream-browserify@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "subarg": {
-                      "version": "1.0.0",
-                      "from": "subarg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "1.2.0",
-                          "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "syntax-error": {
-                      "version": "1.1.4",
-                      "from": "syntax-error@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
-                      "dependencies": {
-                        "acorn": {
-                          "version": "1.2.2",
-                          "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                        }
-                      }
-                    },
-                    "through2": {
-                      "version": "1.1.1",
-                      "from": "through2@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
-                    },
-                    "timers-browserify": {
-                      "version": "1.4.1",
-                      "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
-                    },
-                    "tty-browserify": {
-                      "version": "0.0.0",
-                      "from": "tty-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
-                    },
-                    "url": {
-                      "version": "0.10.3",
-                      "from": "url@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-                      "dependencies": {
-                        "querystring": {
-                          "version": "0.2.0",
-                          "from": "querystring@0.2.0",
-                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-                        }
-                      }
-                    },
-                    "util": {
-                      "version": "0.10.3",
-                      "from": "util@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
-                    },
-                    "vm-browserify": {
-                      "version": "0.0.4",
-                      "from": "vm-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-                      "dependencies": {
-                        "indexof": {
-                          "version": "0.0.1",
-                          "from": "indexof@0.0.1",
-                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                        }
-                      }
-                    },
-                    "xtend": {
-                      "version": "4.0.1",
-                      "from": "xtend@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                    }
-                  }
-                },
-                "through": {
-                  "version": "2.3.4",
-                  "from": "through@2.3.4",
-                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
-                },
-                "uglify-js": {
-                  "version": "2.6.1",
-                  "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "0.2.10",
-                      "from": "async@>=0.2.6 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                    },
-                    "source-map": {
-                      "version": "0.5.3",
-                      "from": "source-map@>=0.5.1 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-                    },
-                    "uglify-to-browserify": {
-                      "version": "1.0.2",
-                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-                    },
-                    "yargs": {
-                      "version": "3.10.0",
-                      "from": "yargs@>=3.10.0 <3.11.0",
-                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "1.2.1",
-                          "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                        },
-                        "cliui": {
-                          "version": "2.1.0",
-                          "from": "cliui@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-                          "dependencies": {
-                            "center-align": {
-                              "version": "0.1.2",
-                              "from": "center-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.0 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                },
-                                "lazy-cache": {
-                                  "version": "0.2.4",
-                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
-                                }
-                              }
-                            },
-                            "right-align": {
-                              "version": "0.1.3",
-                              "from": "right-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "wordwrap": {
-                              "version": "0.0.2",
-                              "from": "wordwrap@0.0.2",
-                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-                            }
-                          }
-                        },
-                        "decamelize": {
-                          "version": "1.1.1",
-                          "from": "decamelize@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                        },
-                        "window-size": {
-                          "version": "0.1.0",
-                          "from": "window-size@0.1.0",
-                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-registry-mapper": {
-              "version": "1.1.13",
-              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
-              "dependencies": {
-                "tape": {
-                  "version": "3.5.0",
-                  "from": "tape@>=3.5.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
-                  "dependencies": {
-                    "deep-equal": {
-                      "version": "0.2.2",
-                      "from": "deep-equal@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
-                    },
-                    "defined": {
-                      "version": "0.0.0",
-                      "from": "defined@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
-                    },
-                    "glob": {
-                      "version": "3.2.11",
-                      "from": "glob@>=3.2.9 <3.3.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "0.3.0",
-                          "from": "minimatch@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "object-inspect": {
-                      "version": "0.4.0",
-                      "from": "object-inspect@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
-                    },
-                    "resumer": {
-                      "version": "0.0.0",
-                      "from": "resumer@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
-                    },
-                    "through": {
-                      "version": "2.3.8",
-                      "from": "through@>=2.3.4 <2.4.0",
-                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-serve": {
-              "version": "0.1.3",
-              "from": "cordova-serve@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
-              "dependencies": {
-                "chalk": {
-                  "version": "1.1.1",
-                  "from": "chalk@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                  "dependencies": {
-                    "ansi-styles": {
-                      "version": "2.1.0",
-                      "from": "ansi-styles@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                    },
-                    "escape-string-regexp": {
-                      "version": "1.0.3",
-                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                    },
-                    "has-ansi": {
-                      "version": "2.0.0",
-                      "from": "has-ansi@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "strip-ansi": {
-                      "version": "3.0.0",
-                      "from": "strip-ansi@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "supports-color": {
-                      "version": "2.0.0",
-                      "from": "supports-color@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                    }
-                  }
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "d8": {
-                  "version": "0.4.4",
-                  "from": "d8@>=0.4.4 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
-                  "dependencies": {
-                    "m8": {
-                      "version": "0.4.4",
-                      "from": "m8@>=0.4.3",
-                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
-                    }
-                  }
-                },
-                "mime": {
-                  "version": "1.3.4",
-                  "from": "mime@>=1.2.11 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
-                },
-                "q": {
-                  "version": "1.4.1",
-                  "from": "q@>=1.4.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-                },
-                "shelljs": {
-                  "version": "0.5.3",
-                  "from": "shelljs@>=0.5.3 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-                }
-              }
-            },
-            "dep-graph": {
-              "version": "1.1.0",
-              "from": "dep-graph@1.1.0",
-              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
-              "dependencies": {
-                "underscore": {
-                  "version": "1.2.1",
-                  "from": "underscore@1.2.1",
-                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
-                }
-              }
-            },
-            "elementtree": {
-              "version": "0.1.6",
-              "from": "elementtree@0.1.6",
-              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
-              "dependencies": {
-                "sax": {
-                  "version": "0.3.5",
-                  "from": "sax@0.3.5",
-                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
-                }
-              }
-            },
-            "glob": {
-              "version": "4.0.6",
-              "from": "glob@4.0.6",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "init-package-json": {
-              "version": "1.9.1",
-              "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    }
-                  }
-                },
-                "promzard": {
-                  "version": "0.3.0",
-                  "from": "promzard@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    }
-                  }
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        },
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "npm": {
-              "version": "2.14.13",
-              "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.13.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.7 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                },
-                "ansi": {
-                  "version": "0.3.0",
-                  "from": "ansi@latest",
-                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                },
-                "ansicolors": {
-                  "version": "0.3.2",
-                  "from": "ansicolors@latest"
-                },
-                "ansistyles": {
-                  "version": "0.1.3",
-                  "from": "ansistyles@0.1.3",
-                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
-                },
-                "archy": {
-                  "version": "1.0.0",
-                  "from": "archy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-                },
-                "async-some": {
-                  "version": "1.0.2",
-                  "from": "async-some@>=1.0.2 <1.1.0"
-                },
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@0.0.8",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "char-spinner": {
-                  "version": "1.0.1",
-                  "from": "char-spinner@latest",
-                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-                },
-                "chmodr": {
-                  "version": "1.0.2",
-                  "from": "chmodr@>=1.0.2 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
-                },
-                "chownr": {
-                  "version": "1.0.1",
-                  "from": "chownr@1.0.1",
-                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
-                },
-                "cmd-shim": {
-                  "version": "2.0.1",
-                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
-                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "3.0.8",
-                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                    }
-                  }
-                },
-                "columnify": {
-                  "version": "1.5.2",
-                  "from": "columnify@1.5.2",
-                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
-                  "dependencies": {
-                    "wcwidth": {
-                      "version": "1.0.0",
-                      "from": "wcwidth@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
-                      "dependencies": {
-                        "defaults": {
-                          "version": "1.0.2",
-                          "from": "defaults@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
-                          "dependencies": {
-                            "clone": {
-                              "version": "0.1.19",
-                              "from": "clone@>=0.1.5 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.9 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "dezalgo": {
-                  "version": "1.0.3",
-                  "from": "dezalgo@>=1.0.3 <1.1.0",
-                  "dependencies": {
-                    "asap": {
-                      "version": "2.0.3",
-                      "from": "asap@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
-                    }
-                  }
-                },
-                "editor": {
-                  "version": "1.0.0",
-                  "from": "editor@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
-                },
-                "fs-vacuum": {
-                  "version": "1.2.7",
-                  "from": "fs-vacuum@1.2.7"
-                },
-                "fs-write-stream-atomic": {
-                  "version": "1.0.4",
-                  "from": "fs-write-stream-atomic@1.0.4"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@1.0.8"
-                },
-                "fstream-npm": {
-                  "version": "1.0.7",
-                  "from": "fstream-npm@>=1.0.7 <1.1.0",
-                  "dependencies": {
-                    "fstream-ignore": {
-                      "version": "1.0.3",
-                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
-                    }
-                  }
-                },
-                "github-url-from-git": {
-                  "version": "1.4.0",
-                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
-                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-                },
-                "github-url-from-username-repo": {
-                  "version": "1.0.2",
-                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
-                },
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@5.0.15",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "hosted-git-info": {
-                  "version": "2.1.4",
-                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                },
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <1.1.0"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@latest",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@latest",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "init-package-json": {
-                  "version": "1.9.1",
-                  "from": "init-package-json@1.9.1",
-                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-                  "dependencies": {
-                    "promzard": {
-                      "version": "0.3.0",
-                      "from": "promzard@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                    }
-                  }
-                },
-                "lockfile": {
-                  "version": "1.0.1",
-                  "from": "lockfile@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
-                },
-                "lru-cache": {
-                  "version": "2.7.0",
-                  "from": "lru-cache@2.7.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.1",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "node-gyp": {
-                  "version": "3.2.0",
-                  "from": "node-gyp@>=3.2.0 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "4.5.3",
-                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "2.0.10",
-                          "from": "minimatch@>=2.0.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.1",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.2.1",
-                                  "from": "balanced-match@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "1.0.0",
-                      "from": "minimatch@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                      "dependencies": {
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "path-array": {
-                      "version": "1.0.0",
-                      "from": "path-array@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                      "dependencies": {
-                        "array-index": {
-                          "version": "0.1.1",
-                          "from": "array-index@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                          "dependencies": {
-                            "debug": {
-                              "version": "2.2.0",
-                              "from": "debug@*",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                              "dependencies": {
-                                "ms": {
-                                  "version": "0.7.1",
-                                  "from": "ms@0.7.1",
-                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.6 <3.1.0"
-                },
-                "normalize-git-url": {
-                  "version": "3.0.1",
-                  "from": "normalize-git-url@latest"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-cache-filename": {
-                  "version": "1.0.2",
-                  "from": "npm-cache-filename@1.0.2",
-                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
-                },
-                "npm-install-checks": {
-                  "version": "1.0.6",
-                  "from": "npm-install-checks@1.0.6",
-                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
-                  "dependencies": {
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
-                },
-                "npm-registry-client": {
-                  "version": "7.0.8",
-                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
-                  "dependencies": {
-                    "concat-stream": {
-                      "version": "1.5.1",
-                      "from": "concat-stream@>=1.4.6 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.3",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-user-validate": {
-                  "version": "0.1.2",
-                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
-                },
-                "npmlog": {
-                  "version": "2.0.0",
-                  "from": "npmlog@>=2.0.0 <2.1.0",
-                  "dependencies": {
-                    "are-we-there-yet": {
-                      "version": "1.0.4",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.2 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
-                },
-                "opener": {
-                  "version": "1.4.1",
-                  "from": "opener@>=1.4.1 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@0.1.3",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.0",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-inside": {
-                  "version": "1.0.1",
-                  "from": "path-is-inside@1.0.1",
-                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@1.0.7",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-installed": {
-                  "version": "4.0.3",
-                  "from": "read-installed@4.0.3",
-                  "dependencies": {
-                    "debuglog": {
-                      "version": "1.0.1",
-                      "from": "debuglog@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
-                    },
-                    "readdir-scoped-modules": {
-                      "version": "1.0.2",
-                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
-                    },
-                    "util-extend": {
-                      "version": "1.0.1",
-                      "from": "util-extend@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=2.0.2 <2.1.0",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.13 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    }
-                  }
-                },
-                "realize-package-specifier": {
-                  "version": "3.0.1",
-                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
-                },
-                "request": {
-                  "version": "2.65.0",
-                  "from": "request@>=2.65.0 <2.66.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
-                  "dependencies": {
-                    "bl": {
-                      "version": "1.0.0",
-                      "from": "bl@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "2.0.3",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.3",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "caseless": {
-                      "version": "0.11.0",
-                      "from": "caseless@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                    },
-                    "extend": {
-                      "version": "3.0.0",
-                      "from": "extend@>=3.0.0 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                    },
-                    "forever-agent": {
-                      "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.1 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                    },
-                    "form-data": {
-                      "version": "1.0.0-rc3",
-                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                      "dependencies": {
-                        "async": {
-                          "version": "1.5.0",
-                          "from": "async@>=1.4.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                        }
-                      }
-                    },
-                    "json-stringify-safe": {
-                      "version": "5.0.1",
-                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                    },
-                    "mime-types": {
-                      "version": "2.1.7",
-                      "from": "mime-types@>=2.1.7 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
-                      "dependencies": {
-                        "mime-db": {
-                          "version": "1.19.0",
-                          "from": "mime-db@>=1.19.0 <1.20.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-                        }
-                      }
-                    },
-                    "node-uuid": {
-                      "version": "1.4.3",
-                      "from": "node-uuid@>=1.4.3 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-                    },
-                    "qs": {
-                      "version": "5.2.0",
-                      "from": "qs@>=5.2.0 <5.3.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                    },
-                    "tunnel-agent": {
-                      "version": "0.4.1",
-                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                    },
-                    "tough-cookie": {
-                      "version": "2.2.0",
-                      "from": "tough-cookie@>=2.2.0 <2.3.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
-                    },
-                    "http-signature": {
-                      "version": "0.11.0",
-                      "from": "http-signature@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "from": "assert-plus@>=0.1.5 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        },
-                        "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                        },
-                        "ctype": {
-                          "version": "0.5.3",
-                          "from": "ctype@0.5.3",
-                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                        }
-                      }
-                    },
-                    "oauth-sign": {
-                      "version": "0.8.0",
-                      "from": "oauth-sign@>=0.8.0 <0.9.0",
-                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                    },
-                    "hawk": {
-                      "version": "3.1.0",
-                      "from": "hawk@>=3.1.0 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "2.16.3",
-                          "from": "hoek@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                        },
-                        "boom": {
-                          "version": "2.10.0",
-                          "from": "boom@>=2.8.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
-                        },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
-                        "sntp": {
-                          "version": "1.0.9",
-                          "from": "sntp@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                        }
-                      }
-                    },
-                    "aws-sign2": {
-                      "version": "0.6.0",
-                      "from": "aws-sign2@>=0.6.0 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                    },
-                    "stringstream": {
-                      "version": "0.0.5",
-                      "from": "stringstream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                    },
-                    "combined-stream": {
-                      "version": "1.0.5",
-                      "from": "combined-stream@>=1.0.5 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                      "dependencies": {
-                        "delayed-stream": {
-                          "version": "1.0.0",
-                          "from": "delayed-stream@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "isstream": {
-                      "version": "0.1.2",
-                      "from": "isstream@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                    },
-                    "har-validator": {
-                      "version": "2.0.2",
-                      "from": "har-validator@>=2.0.2 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
-                      "dependencies": {
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@>=1.1.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                          "dependencies": {
-                            "ansi-styles": {
-                              "version": "2.1.0",
-                              "from": "ansi-styles@>=2.1.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                            },
-                            "escape-string-regexp": {
-                              "version": "1.0.3",
-                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                            },
-                            "has-ansi": {
-                              "version": "2.0.0",
-                              "from": "has-ansi@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                            },
-                            "supports-color": {
-                              "version": "2.0.0",
-                              "from": "supports-color@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "commander": {
-                          "version": "2.9.0",
-                          "from": "commander@>=2.8.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                          "dependencies": {
-                            "graceful-readlink": {
-                              "version": "1.0.1",
-                              "from": "graceful-readlink@>=1.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "is-my-json-valid": {
-                          "version": "2.12.2",
-                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
-                          "dependencies": {
-                            "generate-function": {
-                              "version": "2.0.0",
-                              "from": "generate-function@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                            },
-                            "generate-object-property": {
-                              "version": "1.2.0",
-                              "from": "generate-object-property@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                              "dependencies": {
-                                "is-property": {
-                                  "version": "1.0.2",
-                                  "from": "is-property@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "jsonpointer": {
-                              "version": "2.0.0",
-                              "from": "jsonpointer@2.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                            },
-                            "xtend": {
-                              "version": "4.0.0",
-                              "from": "xtend@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
-                            }
-                          }
-                        },
-                        "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "1.0.0",
-                              "from": "pinkie@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "retry": {
-                  "version": "0.8.0",
-                  "from": "retry@0.8.0",
-                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
-                },
-                "rimraf": {
-                  "version": "2.4.3",
-                  "from": "rimraf@2.4.3",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
-                },
-                "semver": {
-                  "version": "5.0.3",
-                  "from": "semver@5.0.3",
-                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
-                },
-                "sha": {
-                  "version": "2.0.1",
-                  "from": "sha@2.0.1",
-                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.2",
-                      "from": "readable-stream@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.3",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.1",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "slide": {
-                  "version": "1.1.6",
-                  "from": "slide@>=1.1.6 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
-                },
-                "sorted-object": {
-                  "version": "1.0.0",
-                  "from": "sorted-object@"
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@2.2.1"
-                },
-                "text-table": {
-                  "version": "0.2.0",
-                  "from": "text-table@~0.2.0"
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "from": "uid-number@>=0.0.6 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-                },
-                "umask": {
-                  "version": "1.1.0",
-                  "from": "umask@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@2.2.2",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@1.0.1",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                },
-                "write-file-atomic": {
-                  "version": "1.1.3",
-                  "from": "write-file-atomic@1.1.3",
-                  "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
-                },
-                "ansi-regex": {
-                  "version": "2.0.0",
-                  "from": "ansi-regex@2.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                },
-                "spdx-license-ids": {
-                  "version": "1.1.0",
-                  "from": "spdx-license-ids@1.1.0",
-                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@3.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-                }
-              }
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "osenv": {
-              "version": "0.1.0",
-              "from": "osenv@0.1.0",
-              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
-            },
-            "plist": {
-              "version": "1.1.0",
-              "from": "plist@1.1.0",
-              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
-              "dependencies": {
-                "base64-js": {
-                  "version": "0.0.6",
-                  "from": "base64-js@0.0.6",
-                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
-                },
-                "xmlbuilder": {
-                  "version": "2.2.1",
-                  "from": "xmlbuilder@2.2.1",
-                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
-                  "dependencies": {
-                    "lodash-node": {
-                      "version": "2.4.1",
-                      "from": "lodash-node@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
-                    }
-                  }
-                },
-                "xmldom": {
-                  "version": "0.1.19",
-                  "from": "xmldom@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
-                },
-                "util-deprecate": {
-                  "version": "1.0.0",
-                  "from": "util-deprecate@1.0.0",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
-                }
-              }
-            },
-            "properties-parser": {
-              "version": "0.2.3",
-              "from": "properties-parser@0.2.3",
-              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
-            },
-            "rc": {
-              "version": "0.5.2",
-              "from": "rc@0.5.2",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.10",
-                  "from": "minimist@>=0.0.7 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                },
-                "deep-extend": {
-                  "version": "0.2.11",
-                  "from": "deep-extend@>=0.2.5 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
-                },
-                "strip-json-comments": {
-                  "version": "0.1.3",
-                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                },
-                "ini": {
-                  "version": "1.1.0",
-                  "from": "ini@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                }
-              }
-            },
-            "request": {
-              "version": "2.47.0",
-              "from": "request@2.47.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "0.9.4",
-                  "from": "bl@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.0.33",
-                      "from": "readable-stream@>=1.0.26 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.6.0",
-                  "from": "caseless@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.5.2",
-                  "from": "forever-agent@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "1.0.2",
-                  "from": "mime-types@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.0 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "2.3.3",
-                  "from": "qs@>=2.3.1 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.1",
-                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "0.10.1",
-                  "from": "http-signature@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "asn1": {
-                      "version": "0.1.11",
-                      "from": "asn1@0.1.11",
-                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                    },
-                    "ctype": {
-                      "version": "0.5.3",
-                      "from": "ctype@0.5.3",
-                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.4.0",
-                  "from": "oauth-sign@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
-                },
-                "hawk": {
-                  "version": "1.1.1",
-                  "from": "hawk@1.1.1",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1",
-                      "from": "hoek@>=0.9.0 <0.10.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                    },
-                    "boom": {
-                      "version": "0.4.2",
-                      "from": "boom@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "0.2.2",
-                      "from": "cryptiles@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                    },
-                    "sntp": {
-                      "version": "0.2.4",
-                      "from": "sntp@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.5.0",
-                  "from": "aws-sign2@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "0.0.7",
-                  "from": "combined-stream@>=0.0.5 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "shelljs": {
-              "version": "0.3.0",
-              "from": "shelljs@0.3.0",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
-            },
-            "tar": {
-              "version": "1.0.2",
-              "from": "tar@1.0.2",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
-              "dependencies": {
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    },
-                    "mkdirp": {
-                      "version": "0.5.1",
-                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        }
-                      }
-                    },
-                    "rimraf": {
-                      "version": "2.4.4",
-                      "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                      "dependencies": {
-                        "glob": {
-                          "version": "5.0.15",
-                          "from": "glob@>=5.0.14 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                          "dependencies": {
-                            "inflight": {
-                              "version": "1.0.4",
-                              "from": "inflight@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                              "dependencies": {
-                                "brace-expansion": {
-                                  "version": "1.1.2",
-                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                                  "dependencies": {
-                                    "balanced-match": {
-                                      "version": "0.3.0",
-                                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                    },
-                                    "concat-map": {
-                                      "version": "0.0.1",
-                                      "from": "concat-map@0.0.1",
-                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "once": {
-                              "version": "1.3.3",
-                              "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "path-is-absolute": {
-                              "version": "1.0.0",
-                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.3",
-              "from": "through2@0.6.3",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "unorm": {
-              "version": "1.3.3",
-              "from": "unorm@1.3.3",
-              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
-            },
-            "valid-identifier": {
-              "version": "0.0.1",
-              "from": "valid-identifier@0.0.1",
-              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
-            },
-            "ionic-xcode": {
-              "version": "0.8.3",
-              "from": "ionic-xcode@0.8.3",
-              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
-              "dependencies": {
-                "pegjs": {
-                  "version": "0.6.2",
-                  "from": "pegjs@0.6.2",
-                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.3.3",
-                  "from": "node-uuid@1.3.3",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.10.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "node-sass": {
-          "version": "3.4.2",
-          "from": "node-sass@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
-          "dependencies": {
-            "async-foreach": {
-              "version": "0.1.3",
-              "from": "async-foreach@>=0.1.3 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.1.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "get-stdin": {
-              "version": "4.0.1",
-              "from": "get-stdin@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-            },
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.14 <6.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0",
-                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                }
-              }
-            },
-            "meow": {
-              "version": "3.6.0",
-              "from": "meow@>=3.3.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-              "dependencies": {
-                "camelcase-keys": {
-                  "version": "2.0.0",
-                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "2.0.1",
-                      "from": "camelcase@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                    },
-                    "map-obj": {
-                      "version": "1.0.1",
-                      "from": "map-obj@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                    }
-                  }
-                },
-                "loud-rejection": {
-                  "version": "1.2.0",
-                  "from": "loud-rejection@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                  "dependencies": {
-                    "signal-exit": {
-                      "version": "2.1.2",
-                      "from": "signal-exit@>=2.1.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                    }
-                  }
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "from": "minimist@>=1.1.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    },
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "validate-npm-package-license": {
-                      "version": "3.0.1",
-                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                      "dependencies": {
-                        "spdx-correct": {
-                          "version": "1.0.2",
-                          "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "spdx-expression-parse": {
-                          "version": "1.0.2",
-                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-exceptions": {
-                              "version": "1.0.4",
-                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                            },
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "object-assign": {
-                  "version": "4.0.1",
-                  "from": "object-assign@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                },
-                "read-pkg-up": {
-                  "version": "1.0.1",
-                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                  "dependencies": {
-                    "find-up": {
-                      "version": "1.1.0",
-                      "from": "find-up@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                      "dependencies": {
-                        "path-exists": {
-                          "version": "2.1.0",
-                          "from": "path-exists@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                        },
-                        "pinkie-promise": {
-                          "version": "2.0.0",
-                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "2.0.1",
-                              "from": "pinkie@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "read-pkg": {
-                      "version": "1.1.0",
-                      "from": "read-pkg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                      "dependencies": {
-                        "load-json-file": {
-                          "version": "1.1.0",
-                          "from": "load-json-file@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "parse-json": {
-                              "version": "2.2.0",
-                              "from": "parse-json@>=2.2.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                              "dependencies": {
-                                "error-ex": {
-                                  "version": "1.3.0",
-                                  "from": "error-ex@>=1.2.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                  "dependencies": {
-                                    "is-arrayish": {
-                                      "version": "0.2.1",
-                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "strip-bom": {
-                              "version": "2.0.0",
-                              "from": "strip-bom@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                              "dependencies": {
-                                "is-utf8": {
-                                  "version": "0.2.0",
-                                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "path-type": {
-                          "version": "1.1.0",
-                          "from": "path-type@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "redent": {
-                  "version": "1.0.0",
-                  "from": "redent@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                  "dependencies": {
-                    "indent-string": {
-                      "version": "2.1.0",
-                      "from": "indent-string@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                      "dependencies": {
-                        "repeating": {
-                          "version": "2.0.0",
-                          "from": "repeating@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                          "dependencies": {
-                            "is-finite": {
-                              "version": "1.0.1",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "strip-indent": {
-                      "version": "1.0.1",
-                      "from": "strip-indent@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                    }
-                  }
-                },
-                "trim-newlines": {
-                  "version": "1.0.0",
-                  "from": "trim-newlines@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "nan": {
-              "version": "2.1.0",
-              "from": "nan@>=2.0.8 <3.0.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.2 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "node-gyp": {
-              "version": "3.2.1",
-              "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
-              "dependencies": {
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "npmlog": {
-                  "version": "1.2.1",
-                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                  "dependencies": {
-                    "ansi": {
-                      "version": "0.3.0",
-                      "from": "ansi@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                    },
-                    "are-we-there-yet": {
-                      "version": "1.0.4",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.0.0 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-array": {
-                  "version": "1.0.0",
-                  "from": "path-array@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                  "dependencies": {
-                    "array-index": {
-                      "version": "0.1.1",
-                      "from": "array-index@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                      "dependencies": {
-                        "debug": {
-                          "version": "2.2.0",
-                          "from": "debug@*",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                          "dependencies": {
-                            "ms": {
-                              "version": "0.7.1",
-                              "from": "ms@0.7.1",
-                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-                  "dependencies": {
-                    "block-stream": {
-                      "version": "0.0.8",
-                      "from": "block-stream@*",
-                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "request": {
-              "version": "2.67.0",
-              "from": "request@>=2.61.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "1.0.0",
-                  "from": "bl@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.6",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.11.0",
-                  "from": "caseless@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                },
-                "extend": {
-                  "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.1 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                },
-                "form-data": {
-                  "version": "1.0.0-rc3",
-                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "1.5.0",
-                      "from": "async@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                    }
-                  }
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "2.1.8",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.20.0",
-                      "from": "mime-db@>=1.20.0 <1.21.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
-                    }
-                  }
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.7 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "5.2.0",
-                  "from": "qs@>=5.2.0 <5.3.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.1",
-                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "1.1.0",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "jsprim": {
-                      "version": "1.2.2",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
-                      "dependencies": {
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "from": "extsprintf@1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                        },
-                        "json-schema": {
-                          "version": "0.2.2",
-                          "from": "json-schema@0.2.2",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "from": "verror@1.3.6",
-                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.7.1",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "from": "asn1@>=0.2.3 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                        },
-                        "assert-plus": {
-                          "version": "0.2.0",
-                          "from": "assert-plus@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                        },
-                        "dashdash": {
-                          "version": "1.10.1",
-                          "from": "dashdash@>=1.10.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
-                          "dependencies": {
-                            "assert-plus": {
-                              "version": "0.1.5",
-                              "from": "assert-plus@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                            }
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.0",
-                          "from": "jsbn@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                        },
-                        "tweetnacl": {
-                          "version": "0.13.2",
-                          "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "from": "jodid25519@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.8.0",
-                  "from": "oauth-sign@>=0.8.0 <0.9.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                },
-                "hawk": {
-                  "version": "3.1.2",
-                  "from": "hawk@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "2.16.3",
-                      "from": "hoek@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                    },
-                    "boom": {
-                      "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "from": "cryptiles@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "from": "sntp@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "from": "isstream@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                },
-                "har-validator": {
-                  "version": "2.0.3",
-                  "from": "har-validator@>=2.0.2 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
-                  "dependencies": {
-                    "commander": {
-                      "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                      "dependencies": {
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "from": "graceful-readlink@>=1.0.0",
-                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "is-my-json-valid": {
-                      "version": "2.12.3",
-                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
-                      "dependencies": {
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "from": "generate-function@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "from": "generate-object-property@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                          "dependencies": {
-                            "is-property": {
-                              "version": "1.0.2",
-                              "from": "is-property@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "from": "jsonpointer@2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    },
-                    "pinkie-promise": {
-                      "version": "2.0.0",
-                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                      "dependencies": {
-                        "pinkie": {
-                          "version": "2.0.1",
-                          "from": "pinkie@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "sass-graph": {
-              "version": "2.0.1",
-              "from": "sass-graph@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
-              "dependencies": {
-                "yargs": {
-                  "version": "3.30.0",
-                  "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.30.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "1.2.1",
-                      "from": "camelcase@>=1.2.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                    },
-                    "cliui": {
-                      "version": "3.1.0",
-                      "from": "cliui@>=3.0.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
-                      "dependencies": {
-                        "string-width": {
-                          "version": "1.0.1",
-                          "from": "string-width@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
-                          "dependencies": {
-                            "code-point-at": {
-                              "version": "1.0.0",
-                              "from": "code-point-at@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            },
-                            "is-fullwidth-code-point": {
-                              "version": "1.0.0",
-                              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                          "dependencies": {
-                            "ansi-regex": {
-                              "version": "2.0.0",
-                              "from": "ansi-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "wrap-ansi": {
-                          "version": "1.0.0",
-                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "decamelize": {
-                      "version": "1.1.1",
-                      "from": "decamelize@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                    },
-                    "os-locale": {
-                      "version": "1.4.0",
-                      "from": "os-locale@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-                      "dependencies": {
-                        "lcid": {
-                          "version": "1.0.0",
-                          "from": "lcid@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                          "dependencies": {
-                            "invert-kv": {
-                              "version": "1.0.0",
-                              "from": "invert-kv@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "window-size": {
-                      "version": "0.1.4",
-                      "from": "window-size@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
-                    },
-                    "y18n": {
-                      "version": "3.2.0",
-                      "from": "y18n@>=3.2.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "5.0.12",
-          "from": "postcss@>=5.0.5 <6.0.0",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.12.tgz",
-          "dependencies": {
-            "supports-color": {
-              "version": "3.1.2",
-              "from": "supports-color@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-              "dependencies": {
-                "has-flag": {
-                  "version": "1.0.0",
-                  "from": "has-flag@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-                }
-              }
-            },
-            "source-map": {
-              "version": "0.5.3",
-              "from": "source-map@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-            },
-            "js-base64": {
-              "version": "2.1.9",
-              "from": "js-base64@>=2.1.9 <3.0.0",
-              "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
-            }
-          }
-        },
-        "request-progress": {
-          "version": "0.3.1",
-          "from": "request-progress@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-          "dependencies": {
-            "throttleit": {
-              "version": "0.0.2",
-              "from": "throttleit@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-            }
-          }
-        },
-        "resolve-url-loader": {
-          "version": "1.4.2",
-          "from": "resolve-url-loader@1.4.2",
-          "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-1.4.2.tgz",
-          "dependencies": {
-            "camelcase": {
-              "version": "1.2.1",
-              "from": "camelcase@>=1.2.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-            },
-            "convert-source-map": {
-              "version": "1.1.2",
-              "from": "convert-source-map@>=1.1.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.7 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "lodash.defaults": {
-              "version": "3.1.2",
-              "from": "lodash.defaults@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-              "dependencies": {
-                "lodash.assign": {
-                  "version": "3.2.0",
-                  "from": "lodash.assign@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-                  "dependencies": {
-                    "lodash._baseassign": {
-                      "version": "3.2.0",
-                      "from": "lodash._baseassign@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-                      "dependencies": {
-                        "lodash._basecopy": {
-                          "version": "3.0.1",
-                          "from": "lodash._basecopy@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._createassigner": {
-                      "version": "3.1.1",
-                      "from": "lodash._createassigner@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-                      "dependencies": {
-                        "lodash._bindcallback": {
-                          "version": "3.0.1",
-                          "from": "lodash._bindcallback@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
-                        },
-                        "lodash._isiterateecall": {
-                          "version": "3.0.9",
-                          "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-                        }
-                      }
-                    },
-                    "lodash.keys": {
-                      "version": "3.1.2",
-                      "from": "lodash.keys@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-                      "dependencies": {
-                        "lodash._getnative": {
-                          "version": "3.9.1",
-                          "from": "lodash._getnative@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-                        },
-                        "lodash.isarguments": {
-                          "version": "3.0.4",
-                          "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
-                        },
-                        "lodash.isarray": {
-                          "version": "3.0.4",
-                          "from": "lodash.isarray@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "lodash.restparam": {
-                  "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-                }
-              }
-            },
-            "rework": {
-              "version": "1.0.1",
-              "from": "rework@>=1.0.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-              "dependencies": {
-                "css": {
-                  "version": "2.2.1",
-                  "from": "css@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-                  "dependencies": {
-                    "source-map-resolve": {
-                      "version": "0.3.1",
-                      "from": "source-map-resolve@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-                      "dependencies": {
-                        "source-map-url": {
-                          "version": "0.3.0",
-                          "from": "source-map-url@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz"
-                        },
-                        "atob": {
-                          "version": "1.1.2",
-                          "from": "atob@>=1.1.0 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.2.tgz"
-                        },
-                        "resolve-url": {
-                          "version": "0.2.1",
-                          "from": "resolve-url@>=0.2.1 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
-                        }
-                      }
-                    },
-                    "urix": {
-                      "version": "0.1.0",
-                      "from": "urix@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "convert-source-map": {
-                  "version": "0.3.5",
-                  "from": "convert-source-map@>=0.3.3 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
-                }
-              }
-            },
-            "rework-visit": {
-              "version": "1.0.0",
-              "from": "rework-visit@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"
-            },
-            "source-map": {
-              "version": "0.1.43",
-              "from": "source-map@>=0.1.43 <0.2.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-              "dependencies": {
-                "amdefine": {
-                  "version": "1.0.0",
-                  "from": "amdefine@>=0.0.4",
-                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "sass-loader": {
-          "version": "3.1.1",
-          "from": "sass-loader@3.1.1",
-          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-3.1.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.5.0",
-              "from": "async@>=1.4.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "4.0.1",
-              "from": "object-assign@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-            }
-          }
-        },
-        "style-loader": {
-          "version": "0.13.0",
-          "from": "style-loader@>=0.13.0 <0.14.0",
-          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.0.tgz",
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.7 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "typescript": {
-          "version": "1.7.3",
-          "from": "typescript@>=1.5.3 <2.0.0",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz"
-        },
-        "unzip2": {
-          "version": "0.2.5",
-          "from": "unzip2@0.2.5",
-          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
-          "dependencies": {
-            "fstream": {
-              "version": "0.1.31",
-              "from": "fstream@>=0.1.21 <0.2.0",
-              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "pullstream": {
-              "version": "0.4.1",
-              "from": "pullstream@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-              "dependencies": {
-                "over": {
-                  "version": "0.0.5",
-                  "from": "over@>=0.0.5 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-                },
-                "slice-stream": {
-                  "version": "1.0.0",
-                  "from": "slice-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-                }
-              }
-            },
-            "binary": {
-              "version": "0.3.0",
-              "from": "binary@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-              "dependencies": {
-                "chainsaw": {
-                  "version": "0.1.0",
-                  "from": "chainsaw@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-                  "dependencies": {
-                    "traverse": {
-                      "version": "0.3.9",
-                      "from": "traverse@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                    }
-                  }
-                },
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "setimmediate": {
-              "version": "1.0.4",
-              "from": "setimmediate@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-            },
-            "match-stream": {
-              "version": "0.0.2",
-              "from": "match-stream@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-              "dependencies": {
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "url-loader": {
-          "version": "0.5.6",
-          "from": "url-loader@0.5.6",
-          "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.6.tgz",
-          "dependencies": {
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.5 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@>=1.2.0 <1.3.0",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            }
-          }
-        },
-        "vinyl-fs": {
-          "version": "1.0.0",
-          "from": "vinyl-fs@1.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
-          "dependencies": {
-            "duplexify": {
-              "version": "3.4.2",
-              "from": "duplexify@>=3.2.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
-              "dependencies": {
-                "end-of-stream": {
-                  "version": "1.0.0",
-                  "from": "end-of-stream@1.0.0",
-                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-                  "dependencies": {
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "glob-stream": {
-              "version": "4.1.1",
-              "from": "glob-stream@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=4.3.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "2.0.10",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "ordered-read-streams": {
-                  "version": "0.1.0",
-                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-                },
-                "glob2base": {
-                  "version": "0.0.12",
-                  "from": "glob2base@>=0.0.12 <0.0.13",
-                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-                  "dependencies": {
-                    "find-index": {
-                      "version": "0.1.1",
-                      "from": "find-index@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                    }
-                  }
-                },
-                "unique-stream": {
-                  "version": "2.2.0",
-                  "from": "unique-stream@>=2.0.2 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
-                  "dependencies": {
-                    "through2-filter": {
-                      "version": "2.0.0",
-                      "from": "through2-filter@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-                      "dependencies": {
-                        "through2": {
-                          "version": "2.0.0",
-                          "from": "through2@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "2.0.4",
-                              "from": "readable-stream@>=2.0.0 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@>=2.0.1 <2.1.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "process-nextick-args": {
-                                  "version": "1.0.6",
-                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                },
-                                "util-deprecate": {
-                                  "version": "1.0.2",
-                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <4.1.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "glob-watcher": {
-              "version": "0.0.8",
-              "from": "glob-watcher@>=0.0.8 <0.0.9",
-              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
-              "dependencies": {
-                "gaze": {
-                  "version": "0.5.2",
-                  "from": "gaze@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-                  "dependencies": {
-                    "globule": {
-                      "version": "0.1.0",
-                      "from": "globule@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                      "dependencies": {
-                        "lodash": {
-                          "version": "1.0.2",
-                          "from": "lodash@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                        },
-                        "glob": {
-                          "version": "3.1.21",
-                          "from": "glob@>=3.1.21 <3.2.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "1.2.3",
-                              "from": "graceful-fs@>=1.2.0 <1.3.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                            },
-                            "inherits": {
-                              "version": "1.0.2",
-                              "from": "inherits@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "0.2.14",
-                          "from": "minimatch@>=0.2.11 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "merge-stream": {
-              "version": "0.1.8",
-              "from": "merge-stream@>=0.1.7 <0.2.0",
-              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "2.1.1",
-              "from": "object-assign@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
-            },
-            "strip-bom": {
-              "version": "1.0.0",
-              "from": "strip-bom@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-              "dependencies": {
-                "first-chunk-stream": {
-                  "version": "1.0.0",
-                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-                },
-                "is-utf8": {
-                  "version": "0.2.0",
-                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.5",
-              "from": "through2@>=0.6.1 <0.7.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "webpack": {
-          "version": "1.12.9",
-          "from": "webpack@>=1.12.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.12.9.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.5.0",
-              "from": "async@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-            },
-            "clone": {
-              "version": "1.0.2",
-              "from": "clone@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
-            },
-            "enhanced-resolve": {
-              "version": "0.9.1",
-              "from": "enhanced-resolve@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-              "dependencies": {
-                "memory-fs": {
-                  "version": "0.2.0",
-                  "from": "memory-fs@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                }
-              }
-            },
-            "esprima": {
-              "version": "2.7.0",
-              "from": "esprima@>=2.5.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.0.tgz"
-            },
-            "interpret": {
-              "version": "0.6.6",
-              "from": "interpret@>=0.6.4 <0.7.0",
-              "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.11 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "memory-fs": {
-              "version": "0.3.0",
-              "from": "memory-fs@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
-              "dependencies": {
-                "errno": {
-                  "version": "0.1.4",
-                  "from": "errno@>=0.1.3 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-                  "dependencies": {
-                    "prr": {
-                      "version": "0.0.0",
-                      "from": "prr@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "node-libs-browser": {
-              "version": "0.5.3",
-              "from": "node-libs-browser@>=0.4.0 <=0.6.0",
-              "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz",
-              "dependencies": {
-                "assert": {
-                  "version": "1.3.0",
-                  "from": "assert@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
-                },
-                "browserify-zlib": {
-                  "version": "0.1.4",
-                  "from": "browserify-zlib@>=0.1.4 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-                  "dependencies": {
-                    "pako": {
-                      "version": "0.2.8",
-                      "from": "pako@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
-                    }
-                  }
-                },
-                "buffer": {
-                  "version": "3.5.3",
-                  "from": "buffer@>=3.0.3 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
-                  "dependencies": {
-                    "base64-js": {
-                      "version": "0.0.8",
-                      "from": "base64-js@0.0.8",
-                      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-                    },
-                    "ieee754": {
-                      "version": "1.1.6",
-                      "from": "ieee754@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
-                    },
-                    "is-array": {
-                      "version": "1.0.1",
-                      "from": "is-array@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
-                    }
-                  }
-                },
-                "console-browserify": {
-                  "version": "1.1.0",
-                  "from": "console-browserify@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-                  "dependencies": {
-                    "date-now": {
-                      "version": "0.1.4",
-                      "from": "date-now@>=0.1.4 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
-                    }
-                  }
-                },
-                "constants-browserify": {
-                  "version": "0.0.1",
-                  "from": "constants-browserify@0.0.1",
-                  "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
-                },
-                "crypto-browserify": {
-                  "version": "3.2.8",
-                  "from": "crypto-browserify@>=3.2.6 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz",
-                  "dependencies": {
-                    "pbkdf2-compat": {
-                      "version": "2.0.1",
-                      "from": "pbkdf2-compat@2.0.1",
-                      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
-                    },
-                    "ripemd160": {
-                      "version": "0.2.0",
-                      "from": "ripemd160@0.2.0",
-                      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
-                    },
-                    "sha.js": {
-                      "version": "2.2.6",
-                      "from": "sha.js@2.2.6",
-                      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
-                    }
-                  }
-                },
-                "domain-browser": {
-                  "version": "1.1.4",
-                  "from": "domain-browser@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
-                },
-                "events": {
-                  "version": "1.1.0",
-                  "from": "events@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/events/-/events-1.1.0.tgz"
-                },
-                "http-browserify": {
-                  "version": "1.7.0",
-                  "from": "http-browserify@>=1.3.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-                  "dependencies": {
-                    "Base64": {
-                      "version": "0.2.1",
-                      "from": "Base64@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "https-browserify": {
-                  "version": "0.0.0",
-                  "from": "https-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
-                },
-                "os-browserify": {
-                  "version": "0.1.2",
-                  "from": "os-browserify@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
-                },
-                "path-browserify": {
-                  "version": "0.0.0",
-                  "from": "path-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
-                },
-                "process": {
-                  "version": "0.11.2",
-                  "from": "process@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
-                },
-                "punycode": {
-                  "version": "1.3.2",
-                  "from": "punycode@>=1.2.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                },
-                "querystring-es3": {
-                  "version": "0.2.1",
-                  "from": "querystring-es3@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.13 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "stream-browserify": {
-                  "version": "1.0.0",
-                  "from": "stream-browserify@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.25 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "timers-browserify": {
-                  "version": "1.4.1",
-                  "from": "timers-browserify@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
-                },
-                "tty-browserify": {
-                  "version": "0.0.0",
-                  "from": "tty-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
-                },
-                "url": {
-                  "version": "0.10.3",
-                  "from": "url@>=0.10.1 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-                  "dependencies": {
-                    "querystring": {
-                      "version": "0.2.0",
-                      "from": "querystring@0.2.0",
-                      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-                    }
-                  }
-                },
-                "util": {
-                  "version": "0.10.3",
-                  "from": "util@>=0.10.3 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "vm-browserify": {
-                  "version": "0.0.4",
-                  "from": "vm-browserify@0.0.4",
-                  "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-                  "dependencies": {
-                    "indexof": {
-                      "version": "0.0.1",
-                      "from": "indexof@0.0.1",
-                      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "supports-color": {
-              "version": "3.1.2",
-              "from": "supports-color@>=3.1.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-              "dependencies": {
-                "has-flag": {
-                  "version": "1.0.0",
-                  "from": "has-flag@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-                }
-              }
-            },
-            "tapable": {
-              "version": "0.1.10",
-              "from": "tapable@>=0.1.8 <0.2.0",
-              "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
-            },
-            "uglify-js": {
-              "version": "2.6.1",
-              "from": "uglify-js@>=2.6.0 <2.7.0",
-              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
-              "dependencies": {
-                "async": {
-                  "version": "0.2.10",
-                  "from": "async@>=0.2.6 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                },
-                "source-map": {
-                  "version": "0.5.3",
-                  "from": "source-map@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-                },
-                "uglify-to-browserify": {
-                  "version": "1.0.2",
-                  "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-                },
-                "yargs": {
-                  "version": "3.10.0",
-                  "from": "yargs@>=3.10.0 <3.11.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "1.2.1",
-                      "from": "camelcase@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                    },
-                    "cliui": {
-                      "version": "2.1.0",
-                      "from": "cliui@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-                      "dependencies": {
-                        "center-align": {
-                          "version": "0.1.2",
-                          "from": "center-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
-                          "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                              "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                }
-                              }
-                            },
-                            "lazy-cache": {
-                              "version": "0.2.4",
-                              "from": "lazy-cache@>=0.2.4 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
-                            }
-                          }
-                        },
-                        "right-align": {
-                          "version": "0.1.3",
-                          "from": "right-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-                          "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                              "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "wordwrap": {
-                          "version": "0.0.2",
-                          "from": "wordwrap@0.0.2",
-                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-                        }
-                      }
-                    },
-                    "decamelize": {
-                      "version": "1.1.1",
-                      "from": "decamelize@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                    },
-                    "window-size": {
-                      "version": "0.1.0",
-                      "from": "window-size@0.1.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "watchpack": {
-              "version": "0.2.9",
-              "from": "watchpack@>=0.2.1 <0.3.0",
-              "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
-              "dependencies": {
-                "async": {
-                  "version": "0.9.2",
-                  "from": "async@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-                },
-                "chokidar": {
-                  "version": "1.3.0",
-                  "from": "chokidar@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.3.0.tgz",
-                  "dependencies": {
-                    "anymatch": {
-                      "version": "1.3.0",
-                      "from": "anymatch@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-                      "dependencies": {
-                        "arrify": {
-                          "version": "1.0.0",
-                          "from": "arrify@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz"
-                        },
-                        "micromatch": {
-                          "version": "2.3.3",
-                          "from": "micromatch@>=2.1.5 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.3.tgz",
-                          "dependencies": {
-                            "arr-diff": {
-                              "version": "1.1.0",
-                              "from": "arr-diff@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-                              "dependencies": {
-                                "arr-flatten": {
-                                  "version": "1.0.1",
-                                  "from": "arr-flatten@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-                                },
-                                "array-slice": {
-                                  "version": "0.2.3",
-                                  "from": "array-slice@>=0.2.3 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
-                                }
-                              }
-                            },
-                            "array-unique": {
-                              "version": "0.2.1",
-                              "from": "array-unique@>=0.2.1 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
-                            },
-                            "braces": {
-                              "version": "1.8.2",
-                              "from": "braces@>=1.8.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.2.tgz",
-                              "dependencies": {
-                                "expand-range": {
-                                  "version": "1.8.1",
-                                  "from": "expand-range@>=1.8.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
-                                  "dependencies": {
-                                    "fill-range": {
-                                      "version": "2.2.2",
-                                      "from": "fill-range@>=2.1.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz",
-                                      "dependencies": {
-                                        "is-number": {
-                                          "version": "1.1.2",
-                                          "from": "is-number@>=1.1.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz"
-                                        },
-                                        "isobject": {
-                                          "version": "1.0.2",
-                                          "from": "isobject@>=1.0.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
-                                        },
-                                        "randomatic": {
-                                          "version": "1.1.3",
-                                          "from": "randomatic@>=1.1.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.3.tgz",
-                                          "dependencies": {
-                                            "is-number": {
-                                              "version": "2.1.0",
-                                              "from": "is-number@>=2.0.2 <3.0.0",
-                                              "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-                                              "dependencies": {
-                                                "kind-of": {
-                                                  "version": "3.0.2",
-                                                  "from": "kind-of@>=3.0.2 <4.0.0",
-                                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
-                                                  "dependencies": {
-                                                    "is-buffer": {
-                                                      "version": "1.1.0",
-                                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        },
-                                        "repeat-string": {
-                                          "version": "1.5.2",
-                                          "from": "repeat-string@>=1.5.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "preserve": {
-                                  "version": "0.2.0",
-                                  "from": "preserve@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
-                                },
-                                "repeat-element": {
-                                  "version": "1.1.2",
-                                  "from": "repeat-element@>=1.1.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-                                }
-                              }
-                            },
-                            "expand-brackets": {
-                              "version": "0.1.4",
-                              "from": "expand-brackets@>=0.1.4 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.4.tgz"
-                            },
-                            "extglob": {
-                              "version": "0.3.1",
-                              "from": "extglob@>=0.3.1 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.1.tgz",
-                              "dependencies": {
-                                "ansi-green": {
-                                  "version": "0.1.1",
-                                  "from": "ansi-green@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
-                                  "dependencies": {
-                                    "ansi-wrap": {
-                                      "version": "0.1.0",
-                                      "from": "ansi-wrap@0.1.0",
-                                      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "success-symbol": {
-                                  "version": "0.1.0",
-                                  "from": "success-symbol@>=0.1.0 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz"
-                                }
-                              }
-                            },
-                            "filename-regex": {
-                              "version": "2.0.0",
-                              "from": "filename-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
-                            },
-                            "is-extglob": {
-                              "version": "1.0.0",
-                              "from": "is-extglob@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-                            },
-                            "kind-of": {
-                              "version": "2.0.1",
-                              "from": "kind-of@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                              "dependencies": {
-                                "is-buffer": {
-                                  "version": "1.1.0",
-                                  "from": "is-buffer@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                }
-                              }
-                            },
-                            "lazy-cache": {
-                              "version": "0.2.4",
-                              "from": "lazy-cache@>=0.2.3 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
-                            },
-                            "normalize-path": {
-                              "version": "2.0.1",
-                              "from": "normalize-path@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
-                            },
-                            "object.omit": {
-                              "version": "2.0.0",
-                              "from": "object.omit@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
-                              "dependencies": {
-                                "for-own": {
-                                  "version": "0.1.3",
-                                  "from": "for-own@>=0.1.3 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
-                                  "dependencies": {
-                                    "for-in": {
-                                      "version": "0.1.4",
-                                      "from": "for-in@>=0.1.4 <0.2.0",
-                                      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
-                                    }
-                                  }
-                                },
-                                "is-extendable": {
-                                  "version": "0.1.1",
-                                  "from": "is-extendable@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-                                }
-                              }
-                            },
-                            "parse-glob": {
-                              "version": "3.0.4",
-                              "from": "parse-glob@>=3.0.4 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-                              "dependencies": {
-                                "glob-base": {
-                                  "version": "0.3.0",
-                                  "from": "glob-base@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
-                                },
-                                "is-dotfile": {
-                                  "version": "1.0.2",
-                                  "from": "is-dotfile@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "regex-cache": {
-                              "version": "0.4.2",
-                              "from": "regex-cache@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
-                              "dependencies": {
-                                "is-equal-shallow": {
-                                  "version": "0.1.3",
-                                  "from": "is-equal-shallow@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
-                                },
-                                "is-primitive": {
-                                  "version": "2.0.0",
-                                  "from": "is-primitive@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "async-each": {
-                      "version": "0.1.6",
-                      "from": "async-each@>=0.1.6 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
-                    },
-                    "glob-parent": {
-                      "version": "2.0.0",
-                      "from": "glob-parent@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
-                    },
-                    "is-binary-path": {
-                      "version": "1.0.1",
-                      "from": "is-binary-path@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-                      "dependencies": {
-                        "binary-extensions": {
-                          "version": "1.4.0",
-                          "from": "binary-extensions@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz"
-                        }
-                      }
-                    },
-                    "is-glob": {
-                      "version": "2.0.1",
-                      "from": "is-glob@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-                      "dependencies": {
-                        "is-extglob": {
-                          "version": "1.0.0",
-                          "from": "is-extglob@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    },
-                    "readdirp": {
-                      "version": "2.0.0",
-                      "from": "readdirp@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.0.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "2.0.10",
-                          "from": "minimatch@>=2.0.10 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.6",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "fsevents": {
-                      "version": "1.0.5",
-                      "from": "fsevents@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.5.tgz",
-                      "dependencies": {
-                        "nan": {
-                          "version": "2.1.0",
-                          "from": "nan@>=2.0.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-                        },
-                        "node-pre-gyp": {
-                          "version": "0.6.15",
-                          "from": "node-pre-gyp@latest",
-                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.15.tgz",
-                          "dependencies": {
-                            "nopt": {
-                              "version": "3.0.4",
-                              "from": "nopt@>=3.0.1 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
-                            }
-                          }
-                        },
-                        "abbrev": {
-                          "version": "1.0.7",
-                          "from": "abbrev@1",
-                          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                        },
-                        "ansi": {
-                          "version": "0.3.0",
-                          "from": "ansi@~0.3.0",
-                          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                        },
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        },
-                        "ansi-styles": {
-                          "version": "2.1.0",
-                          "from": "ansi-styles@^2.1.0",
-                          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                        },
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
-                        },
-                        "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                        },
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "from": "assert-plus@^0.1.5",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        },
-                        "async": {
-                          "version": "1.5.0",
-                          "from": "async@^1.4.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                        },
-                        "aws-sign2": {
-                          "version": "0.6.0",
-                          "from": "aws-sign2@~0.6.0",
-                          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                        },
-                        "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                        },
-                        "block-stream": {
-                          "version": "0.0.8",
-                          "from": "block-stream@*",
-                          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                        },
-                        "boom": {
-                          "version": "2.10.1",
-                          "from": "boom@^2.8.x",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                        },
-                        "brace-expansion": {
-                          "version": "1.1.1",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
-                        },
-                        "caseless": {
-                          "version": "0.11.0",
-                          "from": "caseless@~0.11.0",
-                          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                        },
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@^1.1.1",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
-                        },
-                        "combined-stream": {
-                          "version": "1.0.5",
-                          "from": "combined-stream@~1.0.5",
-                          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-                        },
-                        "commander": {
-                          "version": "2.9.0",
-                          "from": "commander@^2.8.1",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        },
-                        "core-util-is": {
-                          "version": "1.0.1",
-                          "from": "core-util-is@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                        },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@2.x.x",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
-                        "ctype": {
-                          "version": "0.5.3",
-                          "from": "ctype@0.5.3",
-                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                        },
-                        "debug": {
-                          "version": "0.7.4",
-                          "from": "debug@~0.7.2",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-                        },
-                        "deep-extend": {
-                          "version": "0.2.11",
-                          "from": "deep-extend@~0.2.5",
-                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
-                        },
-                        "delayed-stream": {
-                          "version": "1.0.0",
-                          "from": "delayed-stream@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                        },
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@^0.1.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        },
-                        "escape-string-regexp": {
-                          "version": "1.0.3",
-                          "from": "escape-string-regexp@^1.0.2",
-                          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                        },
-                        "extend": {
-                          "version": "3.0.0",
-                          "from": "extend@~3.0.0",
-                          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                        },
-                        "forever-agent": {
-                          "version": "0.6.1",
-                          "from": "forever-agent@~0.6.1",
-                          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                        },
-                        "form-data": {
-                          "version": "1.0.0-rc3",
-                          "from": "form-data@~1.0.0-rc3",
-                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
-                        },
-                        "fstream": {
-                          "version": "1.0.8",
-                          "from": "fstream@^1.0.2",
-                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@~1.2.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
-                        },
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "from": "generate-function@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "from": "generate-object-property@^1.1.0",
-                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                        },
-                        "graceful-fs": {
-                          "version": "4.1.2",
-                          "from": "graceful-fs@4.1",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                        },
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "from": "graceful-readlink@>= 1.0.0",
-                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                        },
-                        "har-validator": {
-                          "version": "2.0.2",
-                          "from": "har-validator@~2.0.2",
-                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz"
-                        },
-                        "has-ansi": {
-                          "version": "2.0.0",
-                          "from": "has-ansi@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                        },
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "hawk": {
-                          "version": "3.1.0",
-                          "from": "hawk@~3.1.0",
-                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
-                        },
-                        "hoek": {
-                          "version": "2.16.3",
-                          "from": "hoek@2.x.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                        },
-                        "http-signature": {
-                          "version": "0.11.0",
-                          "from": "http-signature@~0.11.0",
-                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@*",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "ini": {
-                          "version": "1.3.4",
-                          "from": "ini@~1.3.0",
-                          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                        },
-                        "is-my-json-valid": {
-                          "version": "2.12.2",
-                          "from": "is-my-json-valid@^2.12.2",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
-                        },
-                        "is-property": {
-                          "version": "1.0.2",
-                          "from": "is-property@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "isstream": {
-                          "version": "0.1.2",
-                          "from": "isstream@~0.1.2",
-                          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                        },
-                        "json-stringify-safe": {
-                          "version": "5.0.1",
-                          "from": "json-stringify-safe@~5.0.1",
-                          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "from": "jsonpointer@2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                        },
-                        "lodash._basetostring": {
-                          "version": "3.0.1",
-                          "from": "lodash._basetostring@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                        },
-                        "lodash._createpadding": {
-                          "version": "3.6.1",
-                          "from": "lodash._createpadding@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
-                        },
-                        "lodash.repeat": {
-                          "version": "3.0.1",
-                          "from": "lodash.repeat@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                        },
-                        "mime-db": {
-                          "version": "1.19.0",
-                          "from": "mime-db@~1.19.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-                        },
-                        "mime-types": {
-                          "version": "2.1.7",
-                          "from": "mime-types@~2.1.7",
-                          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
-                        },
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        },
-                        "mkdirp": {
-                          "version": "0.5.1",
-                          "from": "mkdirp@>=0.3.0 <0.4.0||>=0.4.0 <0.5.0||>=0.5.0 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-                        },
-                        "node-uuid": {
-                          "version": "1.4.3",
-                          "from": "node-uuid@~1.4.3",
-                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-                        },
-                        "npmlog": {
-                          "version": "1.2.1",
-                          "from": "npmlog@~1.2.0",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
-                        },
-                        "oauth-sign": {
-                          "version": "0.8.0",
-                          "from": "oauth-sign@~0.8.0",
-                          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                        },
-                        "once": {
-                          "version": "1.1.1",
-                          "from": "once@~1.1.1",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        },
-                        "pinkie": {
-                          "version": "1.0.0",
-                          "from": "pinkie@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
-                        },
-                        "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
-                        },
-                        "qs": {
-                          "version": "5.2.0",
-                          "from": "qs@~5.2.0",
-                          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@^1.1.13",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
-                        },
-                        "request": {
-                          "version": "2.65.0",
-                          "from": "request@2.x",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz"
-                        },
-                        "semver": {
-                          "version": "5.0.3",
-                          "from": "semver@~5.0.1",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
-                        },
-                        "sntp": {
-                          "version": "1.0.9",
-                          "from": "sntp@1.x.x",
-                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@~0.10.x",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "stringstream": {
-                          "version": "0.0.5",
-                          "from": "stringstream@~0.0.4",
-                          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-                        },
-                        "strip-json-comments": {
-                          "version": "0.1.3",
-                          "from": "strip-json-comments@0.1.x",
-                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                        },
-                        "supports-color": {
-                          "version": "2.0.0",
-                          "from": "supports-color@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                        },
-                        "tar": {
-                          "version": "2.2.1",
-                          "from": "tar@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
-                        },
-                        "tough-cookie": {
-                          "version": "2.2.0",
-                          "from": "tough-cookie@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
-                        },
-                        "tunnel-agent": {
-                          "version": "0.4.1",
-                          "from": "tunnel-agent@~0.4.1",
-                          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                        },
-                        "uid-number": {
-                          "version": "0.0.3",
-                          "from": "uid-number@0.0.3",
-                          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
-                        },
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@^4.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        },
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "once": {
-                              "version": "1.3.2",
-                              "from": "once@>=1.3.0 <2.0.0"
-                            }
-                          }
-                        },
-                        "rc": {
-                          "version": "1.1.2",
-                          "from": "rc@~1.1.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.2.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "1.2.0",
-                              "from": "minimist@^1.1.2",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                            }
-                          }
-                        },
-                        "fstream-ignore": {
-                          "version": "1.0.3",
-                          "from": "fstream-ignore@~1.0.3",
-                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
-                          "dependencies": {
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=3.0.0 <4.0.0"
-                            }
-                          }
-                        },
-                        "rimraf": {
-                          "version": "2.4.3",
-                          "from": "rimraf@~2.4.0",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
-                          "dependencies": {
-                            "glob": {
-                              "version": "5.0.15",
-                              "from": "glob@>=5.0.14 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-                            },
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
-                            },
-                            "once": {
-                              "version": "1.3.2",
-                              "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
-                            }
-                          }
-                        },
-                        "bl": {
-                          "version": "1.0.0",
-                          "from": "bl@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "2.0.4",
-                              "from": "readable-stream@~2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.1",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.1",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "process-nextick-args": {
-                                  "version": "1.0.3",
-                                  "from": "process-nextick-args@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                },
-                                "util-deprecate": {
-                                  "version": "1.0.2",
-                                  "from": "util-deprecate@~1.0.1",
-                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "tar-pack": {
-                          "version": "3.1.0",
-                          "from": "tar-pack@~3.1.0",
-                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "1.0.33",
-                              "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.1",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.1",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                }
-                              }
-                            },
-                            "rimraf": {
-                              "version": "2.2.8",
-                              "from": "rimraf@~2.2.0",
-                              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                }
-              }
-            },
-            "webpack-core": {
-              "version": "0.6.8",
-              "from": "webpack-core@>=0.6.0 <0.7.0",
-              "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz",
-              "dependencies": {
-                "source-map": {
-                  "version": "0.4.4",
-                  "from": "source-map@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                  "dependencies": {
-                    "amdefine": {
-                      "version": "1.0.0",
-                      "from": "amdefine@>=0.0.4",
-                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                    }
-                  }
-                },
-                "source-list-map": {
-                  "version": "0.1.5",
-                  "from": "source-list-map@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "1.1.2",
-          "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.0.0",
-              "from": "async@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
-            },
-            "colors": {
-              "version": "1.0.3",
-              "from": "colors@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "isstream": {
-              "version": "0.1.2",
-              "from": "isstream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-            },
-            "pkginfo": {
-              "version": "0.3.1",
-              "from": "pkginfo@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "moment": {
-      "version": "2.10.6",
-      "from": "moment@>=2.10.6 <3.0.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
-    },
-    "ncp": {
-      "version": "0.4.2",
-      "from": "ncp@0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
-    },
-    "open": {
-      "version": "0.0.5",
-      "from": "open@0.0.5",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
-    },
-    "optimist": {
-      "version": "0.6.0",
-      "from": "optimist@0.6.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-        },
-        "minimist": {
-          "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-        }
-      }
-    },
-    "progress": {
-      "version": "1.1.7",
-      "from": "progress@1.1.7",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
-    },
-    "prompt": {
-      "version": "0.2.12",
-      "from": "prompt@0.2.12",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
-      "dependencies": {
-        "pkginfo": {
-          "version": "0.3.1",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-        },
-        "read": {
-          "version": "1.0.7",
-          "from": "read@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-          "dependencies": {
-            "mute-stream": {
-              "version": "0.0.5",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "revalidator": {
-          "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
-        },
-        "utile": {
-          "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-            },
-            "deep-equal": {
-              "version": "1.0.1",
-              "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-            },
-            "i": {
-              "version": "0.3.3",
-              "from": "i@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "pkginfo": {
-              "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
-            },
-            "request": {
-              "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "proxy-middleware": {
-      "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
-      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
-    },
-    "q": {
-      "version": "1.0.1",
-      "from": "q@1.0.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
-    },
-    "request": {
-      "version": "2.51.0",
-      "from": "request@2.51.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
-      "dependencies": {
-        "bl": {
-          "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "caseless": {
-          "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-        },
-        "form-data": {
-          "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-          "dependencies": {
-            "mime-types": {
-              "version": "2.0.14",
-              "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-              "dependencies": {
-                "mime-db": {
-                  "version": "1.12.0",
-                  "from": "mime-db@>=1.12.0 <1.13.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-        },
-        "mime-types": {
-          "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-        },
-        "node-uuid": {
-          "version": "1.4.7",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-        },
-        "qs": {
-          "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-        },
-        "tunnel-agent": {
-          "version": "0.4.1",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-        },
-        "tough-cookie": {
-          "version": "2.2.1",
-          "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-        },
-        "http-signature": {
-          "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-            },
-            "asn1": {
-              "version": "0.1.11",
-              "from": "asn1@0.1.11",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-            },
-            "ctype": {
-              "version": "0.5.3",
-              "from": "ctype@0.5.3",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-            }
-          }
-        },
-        "oauth-sign": {
-          "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
-        },
-        "hawk": {
-          "version": "1.1.1",
-          "from": "hawk@1.1.1",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-          "dependencies": {
-            "hoek": {
-              "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-            },
-            "boom": {
-              "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-            },
-            "cryptiles": {
-              "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-            },
-            "sntp": {
-              "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-            }
-          }
-        },
-        "aws-sign2": {
-          "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "from": "stringstream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-        },
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        }
-      }
-    },
-    "semver": {
-      "version": "4.3.6",
-      "from": "semver@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-    },
-    "serve-static": {
-      "version": "1.7.1",
-      "from": "serve-static@1.7.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
-      "dependencies": {
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "send": {
-          "version": "0.10.1",
-          "from": "send@0.10.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "2.1.3",
-              "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.7.0",
-                  "from": "ms@0.7.0",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
-                }
-              }
-            },
-            "depd": {
-              "version": "1.0.1",
-              "from": "depd@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
-            },
-            "destroy": {
-              "version": "1.0.3",
-              "from": "destroy@1.0.3",
-              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
-            },
-            "etag": {
-              "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
-            },
-            "fresh": {
-              "version": "0.2.4",
-              "from": "fresh@0.2.4",
-              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            },
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            },
-            "on-finished": {
-              "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-              "dependencies": {
-                "ee-first": {
-                  "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
-                }
-              }
-            },
-            "range-parser": {
-              "version": "1.0.3",
-              "from": "range-parser@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
-            }
-          }
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "shelljs": {
-      "version": "0.2.6",
-      "from": "shelljs@0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
-    },
-    "tiny-lr-fork": {
-      "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
-      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
-      "dependencies": {
-        "qs": {
-          "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
-        },
-        "faye-websocket": {
-          "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
-        },
-        "noptify": {
-          "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
-          "dependencies": {
-            "nopt": {
-              "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                }
-              }
-            }
-          }
-        },
-        "debug": {
-          "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-        }
-      }
-    },
-    "underscore": {
-      "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-    },
-    "unzip": {
-      "version": "0.1.9",
-      "from": "unzip@0.1.9",
-      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
-      "dependencies": {
-        "fstream": {
-          "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-          "dependencies": {
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "pullstream": {
-          "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-          "dependencies": {
-            "over": {
-              "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
-              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-            },
-            "slice-stream": {
-              "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "binary": {
-          "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-          "dependencies": {
-            "chainsaw": {
-              "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-              "dependencies": {
-                "traverse": {
-                  "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                }
-              }
-            },
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.2",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "setimmediate": {
-          "version": "1.0.4",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-        },
-        "match-stream": {
-          "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-          "dependencies": {
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "vinyl-fs": {
-      "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-      "dependencies": {
-        "glob-stream": {
-          "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "4.5.3",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "minimatch": {
-              "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.2",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.3.0",
-                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "ordered-read-streams": {
-              "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-            },
-            "glob2base": {
-              "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "dependencies": {
-                "find-index": {
-                  "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                }
-              }
-            },
-            "unique-stream": {
-              "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "glob-watcher": {
-          "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
-          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-          "dependencies": {
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "3.0.8",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "from": "minimist@0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-            }
-          }
-        },
-        "strip-bom": {
-          "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-          "dependencies": {
-            "first-chunk-stream": {
-              "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-            },
-            "is-utf8": {
-              "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-            }
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "xtend": {
-              "version": "4.0.1",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "dependencies": {
-            "clone": {
-              "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-            },
-            "clone-stats": {
-              "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
-              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "xml2js": {
-      "version": "0.4.4",
-      "from": "xml2js@0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-      "dependencies": {
-        "sax": {
-          "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
-        },
-        "xmlbuilder": {
-          "version": "4.1.0",
-          "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index 30bcfb7d5d..b9b5329742 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 51a83f83066c4be9edc9af7291100b03cd0df88b Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 4 Dec 2015 13:32:12 -0600
Subject: [PATCH 0864/1100] bump version to beta.10

---
 npm-shrinkwrap.json | 9276 +++++++++++++++++++++++++++++++++++++++++++
 package.json        |    4 +-
 2 files changed, 9278 insertions(+), 2 deletions(-)
 create mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 0000000000..bc56cb53c0
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,9276 @@
+{
+  "name": "ionic",
+  "version": "2.0.0-beta.10",
+  "dependencies": {
+    "async": {
+      "version": "0.9.2",
+      "from": "async@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+    },
+    "cheerio": {
+      "version": "0.19.0",
+      "from": "cheerio@>=0.19.0 <0.20.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
+      "dependencies": {
+        "css-select": {
+          "version": "1.0.0",
+          "from": "css-select@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
+          "dependencies": {
+            "css-what": {
+              "version": "1.0.0",
+              "from": "css-what@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "from": "domutils@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.3.0",
+                  "from": "domelementtype@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+                }
+              }
+            },
+            "boolbase": {
+              "version": "1.0.0",
+              "from": "boolbase@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+            },
+            "nth-check": {
+              "version": "1.0.1",
+              "from": "nth-check@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1",
+          "from": "entities@>=1.1.1 <1.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+        },
+        "htmlparser2": {
+          "version": "3.8.3",
+          "from": "htmlparser2@>=3.8.1 <3.9.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.3.0",
+              "from": "domhandler@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+            },
+            "domutils": {
+              "version": "1.5.1",
+              "from": "domutils@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+            },
+            "domelementtype": {
+              "version": "1.3.0",
+              "from": "domelementtype@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "from": "readable-stream@>=1.1.0 <1.2.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0",
+              "from": "entities@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.1.0",
+          "from": "dom-serializer@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.3",
+              "from": "domelementtype@>=1.1.1 <1.2.0",
+              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        }
+      }
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "from": "cli-table@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "dependencies": {
+        "colors": {
+          "version": "1.0.3",
+          "from": "colors@1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+        }
+      }
+    },
+    "colors": {
+      "version": "0.6.2",
+      "from": "colors@0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
+    },
+    "connect": {
+      "version": "3.1.1",
+      "from": "connect@3.1.1",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "1.0.4",
+          "from": "debug@1.0.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "finalhandler": {
+          "version": "0.1.0",
+          "from": "finalhandler@0.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
+          "dependencies": {
+            "escape-html": {
+              "version": "1.0.1",
+              "from": "escape-html@1.0.1",
+              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+            }
+          }
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "connect-livereload": {
+      "version": "0.5.2",
+      "from": "connect-livereload@0.5.2",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
+    },
+    "crc": {
+      "version": "3.2.1",
+      "from": "crc@3.2.1",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
+    },
+    "cross-spawn": {
+      "version": "0.2.3",
+      "from": "cross-spawn@0.2.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.7.3",
+          "from": "lru-cache@>=2.5.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+        }
+      }
+    },
+    "event-stream": {
+      "version": "3.0.20",
+      "from": "event-stream@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
+      "dependencies": {
+        "through": {
+          "version": "2.3.8",
+          "from": "through@>=2.3.6 <3.0.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+        },
+        "duplexer": {
+          "version": "0.1.1",
+          "from": "duplexer@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
+        },
+        "from": {
+          "version": "0.1.3",
+          "from": "from@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
+        },
+        "map-stream": {
+          "version": "0.0.6",
+          "from": "map-stream@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
+        },
+        "pause-stream": {
+          "version": "0.0.11",
+          "from": "pause-stream@0.0.11",
+          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
+        },
+        "split": {
+          "version": "0.2.10",
+          "from": "split@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
+        },
+        "stream-combiner": {
+          "version": "0.0.4",
+          "from": "stream-combiner@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "1.2.0",
+      "from": "expand-tilde@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
+      "dependencies": {
+        "user-home": {
+          "version": "1.1.1",
+          "from": "user-home@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "0.2.0",
+      "from": "finalhandler@0.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "2.0.0",
+          "from": "debug@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
+          "dependencies": {
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            }
+          }
+        },
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        }
+      }
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "from": "form-data@0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "dependencies": {
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "from": "mime@>=1.2.11 <1.3.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+        }
+      }
+    },
+    "gulp": {
+      "version": "3.8.8",
+      "from": "gulp@3.8.8",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
+      "dependencies": {
+        "archy": {
+          "version": "0.0.2",
+          "from": "archy@>=0.0.2 <0.0.3",
+          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "from": "chalk@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0",
+              "from": "ansi-styles@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "from": "has-ansi@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "from": "strip-ansi@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1",
+                  "from": "ansi-regex@>=0.2.1 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0",
+              "from": "supports-color@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+            }
+          }
+        },
+        "deprecated": {
+          "version": "0.0.1",
+          "from": "deprecated@>=0.0.1 <0.0.2",
+          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
+        },
+        "gulp-util": {
+          "version": "3.0.7",
+          "from": "gulp-util@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+          "dependencies": {
+            "array-differ": {
+              "version": "1.0.0",
+              "from": "array-differ@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+            },
+            "array-uniq": {
+              "version": "1.0.2",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
+            },
+            "beeper": {
+              "version": "1.1.0",
+              "from": "beeper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "dateformat": {
+              "version": "1.0.12",
+              "from": "dateformat@>=1.0.11 <2.0.0",
+              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+              "dependencies": {
+                "get-stdin": {
+                  "version": "4.0.1",
+                  "from": "get-stdin@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                },
+                "meow": {
+                  "version": "3.6.0",
+                  "from": "meow@>=3.3.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
+                  "dependencies": {
+                    "camelcase-keys": {
+                      "version": "2.0.0",
+                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "2.0.1",
+                          "from": "camelcase@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
+                        },
+                        "map-obj": {
+                          "version": "1.0.1",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "loud-rejection": {
+                      "version": "1.2.0",
+                      "from": "loud-rejection@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                      "dependencies": {
+                        "signal-exit": {
+                          "version": "2.1.2",
+                          "from": "signal-exit@>=2.1.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.5",
+                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "validate-npm-package-license": {
+                          "version": "3.0.1",
+                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                          "dependencies": {
+                            "spdx-correct": {
+                              "version": "1.0.2",
+                              "from": "spdx-correct@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                              "dependencies": {
+                                "spdx-license-ids": {
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                                }
+                              }
+                            },
+                            "spdx-expression-parse": {
+                              "version": "1.0.2",
+                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                              "dependencies": {
+                                "spdx-exceptions": {
+                                  "version": "1.0.4",
+                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                                },
+                                "spdx-license-ids": {
+                                  "version": "1.1.0",
+                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "object-assign": {
+                      "version": "4.0.1",
+                      "from": "object-assign@>=4.0.1 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                    },
+                    "read-pkg-up": {
+                      "version": "1.0.1",
+                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                      "dependencies": {
+                        "find-up": {
+                          "version": "1.1.0",
+                          "from": "find-up@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
+                          "dependencies": {
+                            "path-exists": {
+                              "version": "2.1.0",
+                              "from": "path-exists@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "read-pkg": {
+                          "version": "1.1.0",
+                          "from": "read-pkg@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                          "dependencies": {
+                            "load-json-file": {
+                              "version": "1.1.0",
+                              "from": "load-json-file@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "parse-json": {
+                                  "version": "2.2.0",
+                                  "from": "parse-json@>=2.2.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                                  "dependencies": {
+                                    "error-ex": {
+                                      "version": "1.3.0",
+                                      "from": "error-ex@>=1.2.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                      "dependencies": {
+                                        "is-arrayish": {
+                                          "version": "0.2.1",
+                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "pify": {
+                                  "version": "2.3.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "strip-bom": {
+                                  "version": "2.0.0",
+                                  "from": "strip-bom@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                                  "dependencies": {
+                                    "is-utf8": {
+                                      "version": "0.2.0",
+                                      "from": "is-utf8@>=0.2.0 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "path-type": {
+                              "version": "1.1.0",
+                              "from": "path-type@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.2",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                                },
+                                "pify": {
+                                  "version": "2.3.0",
+                                  "from": "pify@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                                },
+                                "pinkie-promise": {
+                                  "version": "2.0.0",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "2.0.1",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "redent": {
+                      "version": "1.0.0",
+                      "from": "redent@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                      "dependencies": {
+                        "indent-string": {
+                          "version": "2.1.0",
+                          "from": "indent-string@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                          "dependencies": {
+                            "repeating": {
+                              "version": "2.0.0",
+                              "from": "repeating@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                              "dependencies": {
+                                "is-finite": {
+                                  "version": "1.0.1",
+                                  "from": "is-finite@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                                  "dependencies": {
+                                    "number-is-nan": {
+                                      "version": "1.0.0",
+                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "strip-indent": {
+                          "version": "1.0.1",
+                          "from": "strip-indent@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "trim-newlines": {
+                      "version": "1.0.0",
+                      "from": "trim-newlines@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "fancy-log": {
+              "version": "1.1.0",
+              "from": "fancy-log@>=1.1.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
+            },
+            "gulplog": {
+              "version": "1.0.0",
+              "from": "gulplog@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+              "dependencies": {
+                "glogg": {
+                  "version": "1.0.0",
+                  "from": "glogg@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+                  "dependencies": {
+                    "sparkles": {
+                      "version": "1.0.0",
+                      "from": "sparkles@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "has-gulplog": {
+              "version": "0.1.0",
+              "from": "has-gulplog@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+              "dependencies": {
+                "sparkles": {
+                  "version": "1.0.0",
+                  "from": "sparkles@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
+                }
+              }
+            },
+            "lodash._reescape": {
+              "version": "3.0.0",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+            },
+            "lodash._reevaluate": {
+              "version": "3.0.0",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+            },
+            "lodash._reinterpolate": {
+              "version": "3.0.0",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+            },
+            "lodash.template": {
+              "version": "3.6.2",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+              "dependencies": {
+                "lodash._basecopy": {
+                  "version": "3.0.1",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+                },
+                "lodash._basetostring": {
+                  "version": "3.0.1",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                },
+                "lodash._basevalues": {
+                  "version": "3.0.0",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+                },
+                "lodash._isiterateecall": {
+                  "version": "3.0.9",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+                },
+                "lodash.escape": {
+                  "version": "3.0.0",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
+                },
+                "lodash.keys": {
+                  "version": "3.1.2",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                  "dependencies": {
+                    "lodash._getnative": {
+                      "version": "3.9.1",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+                    },
+                    "lodash.isarguments": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
+                    },
+                    "lodash.isarray": {
+                      "version": "3.0.4",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+                    }
+                  }
+                },
+                "lodash.restparam": {
+                  "version": "3.6.1",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+                },
+                "lodash.templatesettings": {
+                  "version": "3.1.0",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
+                }
+              }
+            },
+            "multipipe": {
+              "version": "0.1.2",
+              "from": "multipipe@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "dependencies": {
+                "duplexer2": {
+                  "version": "0.0.2",
+                  "from": "duplexer2@0.0.2",
+                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "object-assign": {
+              "version": "3.0.0",
+              "from": "object-assign@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+            },
+            "replace-ext": {
+              "version": "0.0.1",
+              "from": "replace-ext@0.0.1",
+              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+            },
+            "through2": {
+              "version": "2.0.0",
+              "from": "through2@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.6",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.5.3",
+              "from": "vinyl@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "1.0.2",
+                  "from": "clone@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "interpret": {
+          "version": "0.3.10",
+          "from": "interpret@>=0.3.2 <0.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
+        },
+        "liftoff": {
+          "version": "0.12.1",
+          "from": "liftoff@>=0.12.0 <0.13.0",
+          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
+          "dependencies": {
+            "findup-sync": {
+              "version": "0.1.3",
+              "from": "findup-sync@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.9 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "lodash": {
+                  "version": "2.4.2",
+                  "from": "lodash@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                }
+              }
+            },
+            "resolve": {
+              "version": "0.7.4",
+              "from": "resolve@>=0.7.0 <0.8.0",
+              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
+            },
+            "minimist": {
+              "version": "0.2.0",
+              "from": "minimist@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
+            },
+            "extend": {
+              "version": "1.3.0",
+              "from": "extend@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "from": "minimist@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+        },
+        "orchestrator": {
+          "version": "0.3.7",
+          "from": "orchestrator@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
+          "dependencies": {
+            "end-of-stream": {
+              "version": "0.1.5",
+              "from": "end-of-stream@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+              "dependencies": {
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "sequencify": {
+              "version": "0.0.7",
+              "from": "sequencify@>=0.0.7 <0.1.0",
+              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
+            },
+            "stream-consume": {
+              "version": "0.1.0",
+              "from": "stream-consume@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
+            }
+          }
+        },
+        "pretty-hrtime": {
+          "version": "0.2.2",
+          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
+        },
+        "semver": {
+          "version": "3.0.1",
+          "from": "semver@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
+        },
+        "tildify": {
+          "version": "1.1.2",
+          "from": "tildify@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
+          "dependencies": {
+            "os-homedir": {
+              "version": "1.0.1",
+              "from": "os-homedir@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "inquirer": {
+      "version": "0.11.0",
+      "from": "inquirer@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz",
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "1.1.0",
+          "from": "ansi-escapes@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.1.0.tgz"
+        },
+        "ansi-regex": {
+          "version": "2.0.0",
+          "from": "ansi-regex@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+        },
+        "chalk": {
+          "version": "1.1.1",
+          "from": "chalk@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "2.1.0",
+              "from": "ansi-styles@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.3",
+              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+            },
+            "has-ansi": {
+              "version": "2.0.0",
+              "from": "has-ansi@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+            },
+            "supports-color": {
+              "version": "2.0.0",
+              "from": "supports-color@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+            }
+          }
+        },
+        "cli-cursor": {
+          "version": "1.0.2",
+          "from": "cli-cursor@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "dependencies": {
+            "restore-cursor": {
+              "version": "1.0.1",
+              "from": "restore-cursor@>=1.0.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+              "dependencies": {
+                "exit-hook": {
+                  "version": "1.1.1",
+                  "from": "exit-hook@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"
+                },
+                "onetime": {
+                  "version": "1.0.0",
+                  "from": "onetime@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "cli-width": {
+          "version": "1.1.0",
+          "from": "cli-width@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.0.tgz"
+        },
+        "figures": {
+          "version": "1.4.0",
+          "from": "figures@>=1.3.5 <2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.4.0.tgz"
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.3.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        },
+        "readline2": {
+          "version": "1.0.1",
+          "from": "readline2@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+          "dependencies": {
+            "code-point-at": {
+              "version": "1.0.0",
+              "from": "code-point-at@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
+              "dependencies": {
+                "number-is-nan": {
+                  "version": "1.0.0",
+                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                }
+              }
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "dependencies": {
+                "number-is-nan": {
+                  "version": "1.0.0",
+                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                }
+              }
+            },
+            "mute-stream": {
+              "version": "0.0.5",
+              "from": "mute-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "run-async": {
+          "version": "0.1.0",
+          "from": "run-async@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+          "dependencies": {
+            "once": {
+              "version": "1.3.3",
+              "from": "once@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+              "dependencies": {
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "rx-lite": {
+          "version": "3.1.2",
+          "from": "rx-lite@>=3.1.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"
+        },
+        "strip-ansi": {
+          "version": "3.0.0",
+          "from": "strip-ansi@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+        },
+        "through": {
+          "version": "2.3.8",
+          "from": "through@>=2.3.6 <3.0.0",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+        }
+      }
+    },
+    "ionic-app-lib": {
+      "version": "2.0.0-beta.4",
+      "from": "ionic-app-lib@2.0.0-beta.4",
+      "dependencies": {
+        "archiver": {
+          "version": "0.5.2",
+          "from": "archiver@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.24 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "zip-stream": {
+              "version": "0.1.4",
+              "from": "zip-stream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
+              "dependencies": {
+                "lodash.defaults": {
+                  "version": "2.4.1",
+                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+                  "dependencies": {
+                    "lodash.keys": {
+                      "version": "2.4.1",
+                      "from": "lodash.keys@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
+                      "dependencies": {
+                        "lodash._isnative": {
+                          "version": "2.4.1",
+                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+                        },
+                        "lodash.isobject": {
+                          "version": "2.4.1",
+                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
+                        },
+                        "lodash._shimkeys": {
+                          "version": "2.4.1",
+                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
+                        }
+                      }
+                    },
+                    "lodash._objecttypes": {
+                      "version": "2.4.1",
+                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "lazystream": {
+              "version": "0.1.0",
+              "from": "lazystream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
+            },
+            "file-utils": {
+              "version": "0.1.5",
+              "from": "file-utils@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
+              "dependencies": {
+                "lodash": {
+                  "version": "2.1.0",
+                  "from": "lodash@>=2.1.0 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
+                },
+                "iconv-lite": {
+                  "version": "0.2.11",
+                  "from": "iconv-lite@>=0.2.11 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+                },
+                "rimraf": {
+                  "version": "2.2.8",
+                  "from": "rimraf@>=2.2.2 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                },
+                "glob": {
+                  "version": "3.2.11",
+                  "from": "glob@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "0.3.0",
+                      "from": "minimatch@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "0.2.14",
+                  "from": "minimatch@>=0.2.12 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "findup-sync": {
+                  "version": "0.1.3",
+                  "from": "findup-sync@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "2.4.2",
+                      "from": "lodash@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+                    }
+                  }
+                },
+                "isbinaryfile": {
+                  "version": "0.1.9",
+                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
+                }
+              }
+            },
+            "lodash": {
+              "version": "2.4.2",
+              "from": "lodash@>=2.4.1 <2.5.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+            }
+          }
+        },
+        "autoprefixer": {
+          "version": "6.1.2",
+          "from": "autoprefixer@>=6.0.2 <7.0.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.1.2.tgz",
+          "dependencies": {
+            "postcss-value-parser": {
+              "version": "3.1.3",
+              "from": "postcss-value-parser@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
+            },
+            "num2fraction": {
+              "version": "1.2.2",
+              "from": "num2fraction@>=1.2.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
+            },
+            "browserslist": {
+              "version": "1.0.1",
+              "from": "browserslist@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.0.1.tgz"
+            },
+            "caniuse-db": {
+              "version": "1.0.30000374",
+              "from": "caniuse-db@>=1.0.30000372 <2.0.0",
+              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000374.tgz"
+            }
+          }
+        },
+        "cross-spawn": {
+          "version": "2.0.0",
+          "from": "cross-spawn@2.0.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
+          "dependencies": {
+            "cross-spawn-async": {
+              "version": "2.0.1",
+              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "3.2.0",
+                  "from": "lru-cache@>=3.2.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+                  "dependencies": {
+                    "pseudomap": {
+                      "version": "1.0.1",
+                      "from": "pseudomap@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "spawn-sync": {
+              "version": "1.0.14",
+              "from": "spawn-sync@>=1.0.13 <2.0.0",
+              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
+              "dependencies": {
+                "concat-stream": {
+                  "version": "1.5.1",
+                  "from": "concat-stream@>=1.4.7 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "typedarray": {
+                      "version": "0.0.6",
+                      "from": "typedarray@>=0.0.5 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                    },
+                    "readable-stream": {
+                      "version": "2.0.4",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.6",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "os-shim": {
+                  "version": "0.1.3",
+                  "from": "os-shim@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "ionic-cordova-lib": {
+          "version": "5.1.10",
+          "from": "ionic-cordova-lib@5.1.10",
+          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
+          "dependencies": {
+            "bplist-parser": {
+              "version": "0.0.6",
+              "from": "bplist-parser@0.0.6",
+              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
+            },
+            "cordova-app-hello-world": {
+              "version": "3.9.0",
+              "from": "cordova-app-hello-world@3.9.0",
+              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
+            },
+            "cordova-js": {
+              "version": "4.0.0",
+              "from": "cordova-js@4.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
+              "dependencies": {
+                "browserify": {
+                  "version": "10.1.3",
+                  "from": "browserify@10.1.3",
+                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
+                  "dependencies": {
+                    "JSONStream": {
+                      "version": "1.0.7",
+                      "from": "JSONStream@>=1.0.3 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
+                      "dependencies": {
+                        "jsonparse": {
+                          "version": "1.2.0",
+                          "from": "jsonparse@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "assert": {
+                      "version": "1.3.0",
+                      "from": "assert@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
+                    },
+                    "browser-pack": {
+                      "version": "4.0.4",
+                      "from": "browser-pack@>=4.0.3 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.3.0",
+                          "from": "combine-source-map@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+                          "dependencies": {
+                            "inline-source-map": {
+                              "version": "0.3.1",
+                              "from": "inline-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+                              "dependencies": {
+                                "source-map": {
+                                  "version": "0.3.0",
+                                  "from": "source-map@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+                                  "dependencies": {
+                                    "amdefine": {
+                                      "version": "1.0.0",
+                                      "from": "amdefine@>=0.0.4",
+                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "convert-source-map": {
+                              "version": "0.3.5",
+                              "from": "convert-source-map@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.1.43",
+                              "from": "source-map@>=0.1.31 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "through2": {
+                          "version": "0.5.1",
+                          "from": "through2@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@>=1.0.17 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.2",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "xtend": {
+                              "version": "3.0.0",
+                              "from": "xtend@>=3.0.0 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                            }
+                          }
+                        },
+                        "umd": {
+                          "version": "3.0.1",
+                          "from": "umd@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
+                        }
+                      }
+                    },
+                    "browser-resolve": {
+                      "version": "1.10.1",
+                      "from": "browser-resolve@>=1.7.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
+                    },
+                    "browserify-zlib": {
+                      "version": "0.1.4",
+                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                      "dependencies": {
+                        "pako": {
+                          "version": "0.2.8",
+                          "from": "pako@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
+                        }
+                      }
+                    },
+                    "buffer": {
+                      "version": "3.5.3",
+                      "from": "buffer@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                      "dependencies": {
+                        "base64-js": {
+                          "version": "0.0.8",
+                          "from": "base64-js@0.0.8",
+                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                        },
+                        "ieee754": {
+                          "version": "1.1.6",
+                          "from": "ieee754@>=1.1.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
+                        },
+                        "is-array": {
+                          "version": "1.0.1",
+                          "from": "is-array@>=1.0.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@>=0.0.3 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    },
+                    "commondir": {
+                      "version": "0.0.1",
+                      "from": "commondir@0.0.1",
+                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
+                    },
+                    "concat-stream": {
+                      "version": "1.4.10",
+                      "from": "concat-stream@>=1.4.1 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        }
+                      }
+                    },
+                    "console-browserify": {
+                      "version": "1.1.0",
+                      "from": "console-browserify@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                      "dependencies": {
+                        "date-now": {
+                          "version": "0.1.4",
+                          "from": "date-now@>=0.1.4 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                        }
+                      }
+                    },
+                    "constants-browserify": {
+                      "version": "0.0.1",
+                      "from": "constants-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                    },
+                    "crypto-browserify": {
+                      "version": "3.11.0",
+                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
+                      "dependencies": {
+                        "browserify-cipher": {
+                          "version": "1.0.0",
+                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+                          "dependencies": {
+                            "browserify-aes": {
+                              "version": "1.0.5",
+                              "from": "browserify-aes@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                              "dependencies": {
+                                "buffer-xor": {
+                                  "version": "1.0.3",
+                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                },
+                                "cipher-base": {
+                                  "version": "1.0.2",
+                                  "from": "cipher-base@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "browserify-des": {
+                              "version": "1.0.0",
+                              "from": "browserify-des@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+                              "dependencies": {
+                                "cipher-base": {
+                                  "version": "1.0.2",
+                                  "from": "cipher-base@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                },
+                                "des.js": {
+                                  "version": "1.0.0",
+                                  "from": "des.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "evp_bytestokey": {
+                              "version": "1.0.0",
+                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "browserify-sign": {
+                          "version": "4.0.0",
+                          "from": "browserify-sign@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.5.0",
+                              "from": "bn.js@>=4.1.1 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "6.0.2",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            },
+                            "parse-asn1": {
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "4.2.1",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.2",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-ecdh": {
+                          "version": "4.0.0",
+                          "from": "create-ecdh@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.5.0",
+                              "from": "bn.js@>=4.1.1 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                            },
+                            "elliptic": {
+                              "version": "6.0.2",
+                              "from": "elliptic@>=6.0.0 <7.0.0",
+                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                },
+                                "hash.js": {
+                                  "version": "1.0.3",
+                                  "from": "hash.js@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "create-hash": {
+                          "version": "1.1.2",
+                          "from": "create-hash@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
+                          "dependencies": {
+                            "cipher-base": {
+                              "version": "1.0.2",
+                              "from": "cipher-base@>=1.0.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                            },
+                            "ripemd160": {
+                              "version": "1.0.1",
+                              "from": "ripemd160@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
+                            },
+                            "sha.js": {
+                              "version": "2.4.4",
+                              "from": "sha.js@>=2.3.6 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                            }
+                          }
+                        },
+                        "create-hmac": {
+                          "version": "1.1.4",
+                          "from": "create-hmac@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
+                        },
+                        "diffie-hellman": {
+                          "version": "5.0.0",
+                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.5.0",
+                              "from": "bn.js@>=4.1.1 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                            },
+                            "miller-rabin": {
+                              "version": "4.0.0",
+                              "from": "miller-rabin@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+                              "dependencies": {
+                                "brorand": {
+                                  "version": "1.0.5",
+                                  "from": "brorand@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "pbkdf2": {
+                          "version": "3.0.4",
+                          "from": "pbkdf2@>=3.0.3 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
+                        },
+                        "public-encrypt": {
+                          "version": "4.0.0",
+                          "from": "public-encrypt@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+                          "dependencies": {
+                            "bn.js": {
+                              "version": "4.5.0",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                            },
+                            "browserify-rsa": {
+                              "version": "4.0.0",
+                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
+                            },
+                            "parse-asn1": {
+                              "version": "5.0.0",
+                              "from": "parse-asn1@>=5.0.0 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
+                              "dependencies": {
+                                "asn1.js": {
+                                  "version": "4.2.1",
+                                  "from": "asn1.js@>=4.0.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
+                                  "dependencies": {
+                                    "minimalistic-assert": {
+                                      "version": "1.0.0",
+                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "browserify-aes": {
+                                  "version": "1.0.5",
+                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
+                                  "dependencies": {
+                                    "buffer-xor": {
+                                      "version": "1.0.3",
+                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+                                    },
+                                    "cipher-base": {
+                                      "version": "1.0.2",
+                                      "from": "cipher-base@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "evp_bytestokey": {
+                                  "version": "1.0.0",
+                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "randombytes": {
+                          "version": "2.0.1",
+                          "from": "randombytes@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
+                        }
+                      }
+                    },
+                    "deep-equal": {
+                      "version": "1.0.1",
+                      "from": "deep-equal@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+                    },
+                    "defined": {
+                      "version": "1.0.0",
+                      "from": "defined@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
+                    },
+                    "deps-sort": {
+                      "version": "1.3.9",
+                      "from": "deps-sort@>=1.3.7 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
+                    },
+                    "domain-browser": {
+                      "version": "1.1.4",
+                      "from": "domain-browser@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                    },
+                    "duplexer2": {
+                      "version": "0.0.2",
+                      "from": "duplexer2@>=0.0.2 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
+                    },
+                    "events": {
+                      "version": "1.0.2",
+                      "from": "events@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
+                    },
+                    "has": {
+                      "version": "1.0.1",
+                      "from": "has@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+                      "dependencies": {
+                        "function-bind": {
+                          "version": "1.0.2",
+                          "from": "function-bind@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "htmlescape": {
+                      "version": "1.1.0",
+                      "from": "htmlescape@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
+                    },
+                    "http-browserify": {
+                      "version": "1.7.0",
+                      "from": "http-browserify@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                      "dependencies": {
+                        "Base64": {
+                          "version": "0.2.1",
+                          "from": "Base64@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                        }
+                      }
+                    },
+                    "https-browserify": {
+                      "version": "0.0.1",
+                      "from": "https-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "insert-module-globals": {
+                      "version": "6.6.3",
+                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
+                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+                      "dependencies": {
+                        "combine-source-map": {
+                          "version": "0.6.1",
+                          "from": "combine-source-map@>=0.6.1 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+                          "dependencies": {
+                            "convert-source-map": {
+                              "version": "1.1.2",
+                              "from": "convert-source-map@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
+                            },
+                            "inline-source-map": {
+                              "version": "0.5.0",
+                              "from": "inline-source-map@>=0.5.0 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
+                            },
+                            "lodash.memoize": {
+                              "version": "3.0.4",
+                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
+                            },
+                            "source-map": {
+                              "version": "0.4.4",
+                              "from": "source-map@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                              "dependencies": {
+                                "amdefine": {
+                                  "version": "1.0.0",
+                                  "from": "amdefine@>=0.0.4",
+                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "is-buffer": {
+                          "version": "1.1.0",
+                          "from": "is-buffer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                        },
+                        "lexical-scope": {
+                          "version": "1.2.0",
+                          "from": "lexical-scope@>=1.2.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+                          "dependencies": {
+                            "astw": {
+                              "version": "2.0.0",
+                              "from": "astw@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
+                              "dependencies": {
+                                "acorn": {
+                                  "version": "1.2.2",
+                                  "from": "acorn@>=1.0.3 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "labeled-stream-splicer": {
+                      "version": "1.0.2",
+                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+                      "dependencies": {
+                        "stream-splicer": {
+                          "version": "1.3.2",
+                          "from": "stream-splicer@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+                          "dependencies": {
+                            "readable-wrap": {
+                              "version": "1.0.0",
+                              "from": "readable-wrap@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                            },
+                            "indexof": {
+                              "version": "0.0.1",
+                              "from": "indexof@0.0.1",
+                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "module-deps": {
+                      "version": "3.9.1",
+                      "from": "module-deps@>=3.7.11 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+                      "dependencies": {
+                        "detective": {
+                          "version": "4.3.1",
+                          "from": "detective@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
+                          "dependencies": {
+                            "acorn": {
+                              "version": "1.2.2",
+                              "from": "acorn@>=1.0.3 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                            }
+                          }
+                        },
+                        "stream-combiner2": {
+                          "version": "1.0.2",
+                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+                          "dependencies": {
+                            "through2": {
+                              "version": "0.5.1",
+                              "from": "through2@>=0.5.1 <0.6.0",
+                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@>=1.0.17 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.2",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "xtend": {
+                                  "version": "3.0.0",
+                                  "from": "xtend@>=3.0.0 <3.1.0",
+                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "os-browserify": {
+                      "version": "0.1.2",
+                      "from": "os-browserify@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                    },
+                    "parents": {
+                      "version": "1.0.1",
+                      "from": "parents@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+                      "dependencies": {
+                        "path-platform": {
+                          "version": "0.11.15",
+                          "from": "path-platform@>=0.11.15 <0.12.0",
+                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+                        }
+                      }
+                    },
+                    "path-browserify": {
+                      "version": "0.0.0",
+                      "from": "path-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                    },
+                    "process": {
+                      "version": "0.11.2",
+                      "from": "process@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
+                    },
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "punycode@>=1.3.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    },
+                    "querystring-es3": {
+                      "version": "0.2.1",
+                      "from": "querystring-es3@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                    },
+                    "read-only-stream": {
+                      "version": "1.1.1",
+                      "from": "read-only-stream@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
+                      "dependencies": {
+                        "readable-wrap": {
+                          "version": "1.0.0",
+                          "from": "readable-wrap@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.1.13",
+                      "from": "readable-stream@>=1.1.13 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "resolve": {
+                      "version": "1.1.6",
+                      "from": "resolve@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
+                    },
+                    "shallow-copy": {
+                      "version": "0.0.1",
+                      "from": "shallow-copy@0.0.1",
+                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
+                    },
+                    "shasum": {
+                      "version": "1.0.2",
+                      "from": "shasum@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+                      "dependencies": {
+                        "json-stable-stringify": {
+                          "version": "0.0.1",
+                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "from": "jsonify@>=0.0.0 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+                            }
+                          }
+                        },
+                        "sha.js": {
+                          "version": "2.4.4",
+                          "from": "sha.js@>=2.4.4 <2.5.0",
+                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
+                        }
+                      }
+                    },
+                    "shell-quote": {
+                      "version": "0.0.1",
+                      "from": "shell-quote@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
+                    },
+                    "stream-browserify": {
+                      "version": "1.0.0",
+                      "from": "stream-browserify@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "subarg": {
+                      "version": "1.0.0",
+                      "from": "subarg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "1.2.0",
+                          "from": "minimist@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                        }
+                      }
+                    },
+                    "syntax-error": {
+                      "version": "1.1.4",
+                      "from": "syntax-error@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
+                      "dependencies": {
+                        "acorn": {
+                          "version": "1.2.2",
+                          "from": "acorn@>=1.0.3 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
+                        }
+                      }
+                    },
+                    "through2": {
+                      "version": "1.1.1",
+                      "from": "through2@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
+                    },
+                    "timers-browserify": {
+                      "version": "1.4.1",
+                      "from": "timers-browserify@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                    },
+                    "tty-browserify": {
+                      "version": "0.0.0",
+                      "from": "tty-browserify@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                    },
+                    "url": {
+                      "version": "0.10.3",
+                      "from": "url@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                      "dependencies": {
+                        "querystring": {
+                          "version": "0.2.0",
+                          "from": "querystring@0.2.0",
+                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                        }
+                      }
+                    },
+                    "util": {
+                      "version": "0.10.3",
+                      "from": "util@>=0.10.1 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+                    },
+                    "vm-browserify": {
+                      "version": "0.0.4",
+                      "from": "vm-browserify@>=0.0.1 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                      "dependencies": {
+                        "indexof": {
+                          "version": "0.0.1",
+                          "from": "indexof@0.0.1",
+                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                        }
+                      }
+                    },
+                    "xtend": {
+                      "version": "4.0.1",
+                      "from": "xtend@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                    }
+                  }
+                },
+                "through": {
+                  "version": "2.3.4",
+                  "from": "through@2.3.4",
+                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
+                },
+                "uglify-js": {
+                  "version": "2.6.1",
+                  "from": "uglify-js@>=2.4.15 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "0.2.10",
+                      "from": "async@>=0.2.6 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                    },
+                    "source-map": {
+                      "version": "0.5.3",
+                      "from": "source-map@>=0.5.1 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+                    },
+                    "uglify-to-browserify": {
+                      "version": "1.0.2",
+                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                    },
+                    "yargs": {
+                      "version": "3.10.0",
+                      "from": "yargs@>=3.10.0 <3.11.0",
+                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+                      "dependencies": {
+                        "camelcase": {
+                          "version": "1.2.1",
+                          "from": "camelcase@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                        },
+                        "cliui": {
+                          "version": "2.1.0",
+                          "from": "cliui@>=2.1.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                          "dependencies": {
+                            "center-align": {
+                              "version": "0.1.2",
+                              "from": "center-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                },
+                                "lazy-cache": {
+                                  "version": "0.2.4",
+                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                                }
+                              }
+                            },
+                            "right-align": {
+                              "version": "0.1.3",
+                              "from": "right-align@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                              "dependencies": {
+                                "align-text": {
+                                  "version": "0.1.3",
+                                  "from": "align-text@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                                  "dependencies": {
+                                    "kind-of": {
+                                      "version": "2.0.1",
+                                      "from": "kind-of@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                      "dependencies": {
+                                        "is-buffer": {
+                                          "version": "1.1.0",
+                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "longest": {
+                                      "version": "1.0.1",
+                                      "from": "longest@>=1.0.1 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                    },
+                                    "repeat-string": {
+                                      "version": "1.5.2",
+                                      "from": "repeat-string@>=1.5.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "wordwrap": {
+                              "version": "0.0.2",
+                              "from": "wordwrap@0.0.2",
+                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                            }
+                          }
+                        },
+                        "decamelize": {
+                          "version": "1.1.1",
+                          "from": "decamelize@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                        },
+                        "window-size": {
+                          "version": "0.1.0",
+                          "from": "window-size@0.1.0",
+                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-registry-mapper": {
+              "version": "1.1.13",
+              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
+              "dependencies": {
+                "tape": {
+                  "version": "3.5.0",
+                  "from": "tape@>=3.5.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
+                  "dependencies": {
+                    "deep-equal": {
+                      "version": "0.2.2",
+                      "from": "deep-equal@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
+                    },
+                    "defined": {
+                      "version": "0.0.0",
+                      "from": "defined@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
+                    },
+                    "glob": {
+                      "version": "3.2.11",
+                      "from": "glob@>=3.2.9 <3.3.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "0.3.0",
+                          "from": "minimatch@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "object-inspect": {
+                      "version": "0.4.0",
+                      "from": "object-inspect@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
+                    },
+                    "resumer": {
+                      "version": "0.0.0",
+                      "from": "resumer@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
+                    },
+                    "through": {
+                      "version": "2.3.8",
+                      "from": "through@>=2.3.4 <2.4.0",
+                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "cordova-serve": {
+              "version": "0.1.3",
+              "from": "cordova-serve@>=0.1.2 <0.2.0",
+              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
+              "dependencies": {
+                "chalk": {
+                  "version": "1.1.1",
+                  "from": "chalk@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                  "dependencies": {
+                    "ansi-styles": {
+                      "version": "2.1.0",
+                      "from": "ansi-styles@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                    },
+                    "escape-string-regexp": {
+                      "version": "1.0.3",
+                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                    },
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "supports-color": {
+                      "version": "2.0.0",
+                      "from": "supports-color@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                    }
+                  }
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "d8": {
+                  "version": "0.4.4",
+                  "from": "d8@>=0.4.4 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
+                  "dependencies": {
+                    "m8": {
+                      "version": "0.4.4",
+                      "from": "m8@>=0.4.3",
+                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
+                    }
+                  }
+                },
+                "mime": {
+                  "version": "1.3.4",
+                  "from": "mime@>=1.2.11 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+                },
+                "q": {
+                  "version": "1.4.1",
+                  "from": "q@>=1.4.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+                },
+                "shelljs": {
+                  "version": "0.5.3",
+                  "from": "shelljs@>=0.5.3 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
+                }
+              }
+            },
+            "dep-graph": {
+              "version": "1.1.0",
+              "from": "dep-graph@1.1.0",
+              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+              "dependencies": {
+                "underscore": {
+                  "version": "1.2.1",
+                  "from": "underscore@1.2.1",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
+                }
+              }
+            },
+            "elementtree": {
+              "version": "0.1.6",
+              "from": "elementtree@0.1.6",
+              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+              "dependencies": {
+                "sax": {
+                  "version": "0.3.5",
+                  "from": "sax@0.3.5",
+                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
+                }
+              }
+            },
+            "glob": {
+              "version": "4.0.6",
+              "from": "glob@4.0.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "init-package-json": {
+              "version": "1.9.1",
+              "from": "init-package-json@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.3 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.1.0",
+                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    }
+                  }
+                },
+                "promzard": {
+                  "version": "0.3.0",
+                  "from": "promzard@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.2",
+                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.1",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+                        }
+                      }
+                    },
+                    "normalize-package-data": {
+                      "version": "2.3.5",
+                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                      "dependencies": {
+                        "hosted-git-info": {
+                          "version": "2.1.4",
+                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                        },
+                        "is-builtin-module": {
+                          "version": "1.0.0",
+                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                          "dependencies": {
+                            "builtin-modules": {
+                              "version": "1.1.0",
+                              "from": "builtin-modules@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    }
+                  }
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.2",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-license-ids": {
+                          "version": "1.1.0",
+                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.2",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                        },
+                        "spdx-license-ids": {
+                          "version": "1.1.0",
+                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7",
+                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "npm": {
+              "version": "2.14.14",
+              "from": "npm@>=2.10.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.14.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.7 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                },
+                "ansi": {
+                  "version": "0.3.0",
+                  "from": "ansi@latest",
+                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                },
+                "ansicolors": {
+                  "version": "0.3.2",
+                  "from": "ansicolors@latest"
+                },
+                "ansistyles": {
+                  "version": "0.1.3",
+                  "from": "ansistyles@0.1.3",
+                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+                },
+                "archy": {
+                  "version": "1.0.0",
+                  "from": "archy@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+                },
+                "async-some": {
+                  "version": "1.0.2",
+                  "from": "async-some@>=1.0.2 <1.1.0"
+                },
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@0.0.8",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "char-spinner": {
+                  "version": "1.0.1",
+                  "from": "char-spinner@latest",
+                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
+                },
+                "chmodr": {
+                  "version": "1.0.2",
+                  "from": "chmodr@>=1.0.2 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
+                },
+                "chownr": {
+                  "version": "1.0.1",
+                  "from": "chownr@1.0.1",
+                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
+                },
+                "cmd-shim": {
+                  "version": "2.0.1",
+                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
+                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "3.0.8",
+                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                    }
+                  }
+                },
+                "columnify": {
+                  "version": "1.5.2",
+                  "from": "columnify@1.5.2",
+                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+                  "dependencies": {
+                    "wcwidth": {
+                      "version": "1.0.0",
+                      "from": "wcwidth@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+                      "dependencies": {
+                        "defaults": {
+                          "version": "1.0.2",
+                          "from": "defaults@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+                          "dependencies": {
+                            "clone": {
+                              "version": "0.1.19",
+                              "from": "clone@>=0.1.5 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.9 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "dezalgo": {
+                  "version": "1.0.3",
+                  "from": "dezalgo@>=1.0.3 <1.1.0",
+                  "dependencies": {
+                    "asap": {
+                      "version": "2.0.3",
+                      "from": "asap@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+                    }
+                  }
+                },
+                "editor": {
+                  "version": "1.0.0",
+                  "from": "editor@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
+                },
+                "fs-vacuum": {
+                  "version": "1.2.7",
+                  "from": "fs-vacuum@1.2.7"
+                },
+                "fs-write-stream-atomic": {
+                  "version": "1.0.5",
+                  "from": "fs-write-stream-atomic@>=1.0.5 <1.1.0"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@1.0.8"
+                },
+                "fstream-npm": {
+                  "version": "1.0.7",
+                  "from": "fstream-npm@>=1.0.7 <1.1.0",
+                  "dependencies": {
+                    "fstream-ignore": {
+                      "version": "1.0.3",
+                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
+                    }
+                  }
+                },
+                "github-url-from-git": {
+                  "version": "1.4.0",
+                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
+                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
+                },
+                "github-url-from-username-repo": {
+                  "version": "1.0.2",
+                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
+                },
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@5.0.15",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                },
+                "hosted-git-info": {
+                  "version": "2.1.4",
+                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                },
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <1.1.0"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@latest",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@latest",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "init-package-json": {
+                  "version": "1.9.1",
+                  "from": "init-package-json@1.9.1",
+                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+                  "dependencies": {
+                    "promzard": {
+                      "version": "0.3.0",
+                      "from": "promzard@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+                    }
+                  }
+                },
+                "lockfile": {
+                  "version": "1.0.1",
+                  "from": "lockfile@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+                },
+                "lru-cache": {
+                  "version": "2.7.0",
+                  "from": "lru-cache@2.7.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.0",
+                  "from": "minimatch@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.1",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.2.1",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "node-gyp": {
+                  "version": "3.2.1",
+                  "from": "node-gyp@3.2.1",
+                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "4.5.3",
+                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.10",
+                          "from": "minimatch@>=2.0.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "1.0.0",
+                      "from": "minimatch@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                      "dependencies": {
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "path-array": {
+                      "version": "1.0.0",
+                      "from": "path-array@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                      "dependencies": {
+                        "array-index": {
+                          "version": "0.1.1",
+                          "from": "array-index@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                          "dependencies": {
+                            "debug": {
+                              "version": "2.2.0",
+                              "from": "debug@*",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                              "dependencies": {
+                                "ms": {
+                                  "version": "0.7.1",
+                                  "from": "ms@0.7.1",
+                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.6 <3.1.0"
+                },
+                "normalize-git-url": {
+                  "version": "3.0.1",
+                  "from": "normalize-git-url@latest"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.5",
+                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                  "dependencies": {
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-cache-filename": {
+                  "version": "1.0.2",
+                  "from": "npm-cache-filename@1.0.2",
+                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
+                },
+                "npm-install-checks": {
+                  "version": "1.0.6",
+                  "from": "npm-install-checks@1.0.6",
+                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
+                  "dependencies": {
+                    "npmlog": {
+                      "version": "1.2.1",
+                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                      "dependencies": {
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "dependencies": {
+                            "delegates": {
+                              "version": "0.1.0",
+                              "from": "delegates@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                            }
+                          }
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                          "dependencies": {
+                            "has-unicode": {
+                              "version": "1.0.1",
+                              "from": "has-unicode@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                            },
+                            "lodash.pad": {
+                              "version": "3.1.1",
+                              "from": "lodash.pad@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padleft": {
+                              "version": "3.1.1",
+                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "lodash.padright": {
+                              "version": "3.1.1",
+                              "from": "lodash.padright@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                              "dependencies": {
+                                "lodash._basetostring": {
+                                  "version": "3.0.1",
+                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                                },
+                                "lodash._createpadding": {
+                                  "version": "3.6.1",
+                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                                  "dependencies": {
+                                    "lodash.repeat": {
+                                      "version": "3.0.1",
+                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-package-arg": {
+                  "version": "4.1.0",
+                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
+                },
+                "npm-registry-client": {
+                  "version": "7.0.8",
+                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
+                  "dependencies": {
+                    "concat-stream": {
+                      "version": "1.5.1",
+                      "from": "concat-stream@>=1.4.6 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+                      "dependencies": {
+                        "typedarray": {
+                          "version": "0.0.6",
+                          "from": "typedarray@>=0.0.5 <0.1.0",
+                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "2.0.4",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "npm-user-validate": {
+                  "version": "0.1.2",
+                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
+                },
+                "npmlog": {
+                  "version": "2.0.0",
+                  "from": "npmlog@>=2.0.0 <2.1.0",
+                  "dependencies": {
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.2",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.2 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                },
+                "opener": {
+                  "version": "1.4.1",
+                  "from": "opener@>=1.4.1 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@0.1.3",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.0",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-inside": {
+                  "version": "1.0.1",
+                  "from": "path-is-inside@1.0.1",
+                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+                },
+                "read": {
+                  "version": "1.0.7",
+                  "from": "read@1.0.7",
+                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+                  "dependencies": {
+                    "mute-stream": {
+                      "version": "0.0.5",
+                      "from": "mute-stream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+                    }
+                  }
+                },
+                "read-installed": {
+                  "version": "4.0.3",
+                  "from": "read-installed@4.0.3",
+                  "dependencies": {
+                    "debuglog": {
+                      "version": "1.0.1",
+                      "from": "debuglog@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+                    },
+                    "readdir-scoped-modules": {
+                      "version": "1.0.2",
+                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
+                    },
+                    "util-extend": {
+                      "version": "1.0.1",
+                      "from": "util-extend@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
+                    }
+                  }
+                },
+                "read-package-json": {
+                  "version": "2.0.2",
+                  "from": "read-package-json@>=2.0.2 <2.1.0",
+                  "dependencies": {
+                    "json-parse-helpfulerror": {
+                      "version": "1.0.3",
+                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+                      "dependencies": {
+                        "jju": {
+                          "version": "1.2.1",
+                          "from": "jju@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    }
+                  }
+                },
+                "realize-package-specifier": {
+                  "version": "3.0.1",
+                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
+                },
+                "request": {
+                  "version": "2.65.0",
+                  "from": "request@>=2.65.0 <2.66.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
+                  "dependencies": {
+                    "bl": {
+                      "version": "1.0.0",
+                      "from": "bl@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.3",
+                          "from": "readable-stream@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.1",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.3",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                    },
+                    "forever-agent": {
+                      "version": "0.6.1",
+                      "from": "forever-agent@>=0.6.1 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                    },
+                    "form-data": {
+                      "version": "1.0.0-rc3",
+                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                      "dependencies": {
+                        "async": {
+                          "version": "1.5.0",
+                          "from": "async@>=1.4.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                        }
+                      }
+                    },
+                    "json-stringify-safe": {
+                      "version": "5.0.1",
+                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                    },
+                    "mime-types": {
+                      "version": "2.1.7",
+                      "from": "mime-types@>=2.1.7 <2.2.0",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                      "dependencies": {
+                        "mime-db": {
+                          "version": "1.19.0",
+                          "from": "mime-db@>=1.19.0 <1.20.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                        }
+                      }
+                    },
+                    "node-uuid": {
+                      "version": "1.4.3",
+                      "from": "node-uuid@>=1.4.3 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                    },
+                    "qs": {
+                      "version": "5.2.0",
+                      "from": "qs@>=5.2.0 <5.3.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                    },
+                    "tunnel-agent": {
+                      "version": "0.4.1",
+                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                    },
+                    "tough-cookie": {
+                      "version": "2.2.0",
+                      "from": "tough-cookie@>=2.2.0 <2.3.0",
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                    },
+                    "http-signature": {
+                      "version": "0.11.0",
+                      "from": "http-signature@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "0.1.5",
+                          "from": "assert-plus@>=0.1.5 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                        },
+                        "ctype": {
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        }
+                      }
+                    },
+                    "oauth-sign": {
+                      "version": "0.8.0",
+                      "from": "oauth-sign@>=0.8.0 <0.9.0",
+                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                    },
+                    "hawk": {
+                      "version": "3.1.0",
+                      "from": "hawk@>=3.1.0 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                      "dependencies": {
+                        "hoek": {
+                          "version": "2.16.3",
+                          "from": "hoek@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                        },
+                        "boom": {
+                          "version": "2.10.0",
+                          "from": "boom@>=2.8.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        }
+                      }
+                    },
+                    "aws-sign2": {
+                      "version": "0.6.0",
+                      "from": "aws-sign2@>=0.6.0 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                    },
+                    "stringstream": {
+                      "version": "0.0.5",
+                      "from": "stringstream@>=0.0.4 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                    },
+                    "combined-stream": {
+                      "version": "1.0.5",
+                      "from": "combined-stream@>=1.0.5 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                      "dependencies": {
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "isstream": {
+                      "version": "0.1.2",
+                      "from": "isstream@>=0.1.2 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                    },
+                    "har-validator": {
+                      "version": "2.0.2",
+                      "from": "har-validator@>=2.0.2 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
+                      "dependencies": {
+                        "chalk": {
+                          "version": "1.1.1",
+                          "from": "chalk@>=1.1.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                          "dependencies": {
+                            "ansi-styles": {
+                              "version": "2.1.0",
+                              "from": "ansi-styles@>=2.1.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                            },
+                            "escape-string-regexp": {
+                              "version": "1.0.3",
+                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                            },
+                            "has-ansi": {
+                              "version": "2.0.0",
+                              "from": "has-ansi@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+                            },
+                            "supports-color": {
+                              "version": "2.0.0",
+                              "from": "supports-color@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "commander": {
+                          "version": "2.9.0",
+                          "from": "commander@>=2.8.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                          "dependencies": {
+                            "graceful-readlink": {
+                              "version": "1.0.1",
+                              "from": "graceful-readlink@>=1.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.2",
+                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                          "dependencies": {
+                            "generate-function": {
+                              "version": "2.0.0",
+                              "from": "generate-function@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                            },
+                            "generate-object-property": {
+                              "version": "1.2.0",
+                              "from": "generate-object-property@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                              "dependencies": {
+                                "is-property": {
+                                  "version": "1.0.2",
+                                  "from": "is-property@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "jsonpointer": {
+                              "version": "2.0.0",
+                              "from": "jsonpointer@2.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                            },
+                            "xtend": {
+                              "version": "4.0.0",
+                              "from": "xtend@>=4.0.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                            }
+                          }
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "1.0.0",
+                              "from": "pinkie@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "retry": {
+                  "version": "0.8.0",
+                  "from": "retry@0.8.0",
+                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+                },
+                "rimraf": {
+                  "version": "2.4.3",
+                  "from": "rimraf@2.4.3",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+                },
+                "semver": {
+                  "version": "5.0.3",
+                  "from": "semver@5.0.3",
+                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                },
+                "sha": {
+                  "version": "2.0.1",
+                  "from": "sha@2.0.1",
+                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.2",
+                      "from": "readable-stream@>=2.0.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.3",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.1",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "slide": {
+                  "version": "1.1.6",
+                  "from": "slide@>=1.1.6 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+                },
+                "sorted-object": {
+                  "version": "1.0.0",
+                  "from": "sorted-object@"
+                },
+                "tar": {
+                  "version": "2.2.1",
+                  "from": "tar@2.2.1"
+                },
+                "text-table": {
+                  "version": "0.2.0",
+                  "from": "text-table@~0.2.0"
+                },
+                "uid-number": {
+                  "version": "0.0.6",
+                  "from": "uid-number@>=0.0.6 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+                },
+                "umask": {
+                  "version": "1.1.0",
+                  "from": "umask@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+                },
+                "validate-npm-package-license": {
+                  "version": "3.0.1",
+                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                  "dependencies": {
+                    "spdx-correct": {
+                      "version": "1.0.2",
+                      "from": "spdx-correct@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
+                    },
+                    "spdx-expression-parse": {
+                      "version": "1.0.2",
+                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                      "dependencies": {
+                        "spdx-exceptions": {
+                          "version": "1.0.4",
+                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "validate-npm-package-name": {
+                  "version": "2.2.2",
+                  "from": "validate-npm-package-name@2.2.2",
+                  "dependencies": {
+                    "builtins": {
+                      "version": "0.0.7",
+                      "from": "builtins@0.0.7"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.2.0 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "wrappy": {
+                  "version": "1.0.1",
+                  "from": "wrappy@1.0.1",
+                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                },
+                "write-file-atomic": {
+                  "version": "1.1.4",
+                  "from": "write-file-atomic@>=1.1.4 <1.2.0"
+                },
+                "ansi-regex": {
+                  "version": "2.0.0",
+                  "from": "ansi-regex@2.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                },
+                "imurmurhash": {
+                  "version": "0.1.4",
+                  "from": "imurmurhash@0.1.4",
+                  "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+                },
+                "spdx-license-ids": {
+                  "version": "1.1.0",
+                  "from": "spdx-license-ids@1.1.0",
+                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@3.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+                }
+              }
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "osenv": {
+              "version": "0.1.0",
+              "from": "osenv@0.1.0",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
+            },
+            "plist": {
+              "version": "1.1.0",
+              "from": "plist@1.1.0",
+              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
+              "dependencies": {
+                "base64-js": {
+                  "version": "0.0.6",
+                  "from": "base64-js@0.0.6",
+                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
+                },
+                "xmlbuilder": {
+                  "version": "2.2.1",
+                  "from": "xmlbuilder@2.2.1",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
+                  "dependencies": {
+                    "lodash-node": {
+                      "version": "2.4.1",
+                      "from": "lodash-node@>=2.4.1 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
+                    }
+                  }
+                },
+                "xmldom": {
+                  "version": "0.1.19",
+                  "from": "xmldom@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
+                },
+                "util-deprecate": {
+                  "version": "1.0.0",
+                  "from": "util-deprecate@1.0.0",
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
+                }
+              }
+            },
+            "properties-parser": {
+              "version": "0.2.3",
+              "from": "properties-parser@0.2.3",
+              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
+            },
+            "rc": {
+              "version": "0.5.2",
+              "from": "rc@0.5.2",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "minimist@>=0.0.7 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                },
+                "deep-extend": {
+                  "version": "0.2.11",
+                  "from": "deep-extend@>=0.2.5 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                },
+                "strip-json-comments": {
+                  "version": "0.1.3",
+                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                },
+                "ini": {
+                  "version": "1.1.0",
+                  "from": "ini@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                }
+              }
+            },
+            "request": {
+              "version": "2.47.0",
+              "from": "request@2.47.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "0.9.4",
+                  "from": "bl@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "1.0.33",
+                      "from": "readable-stream@>=1.0.26 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.6.0",
+                  "from": "caseless@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.5.2",
+                  "from": "forever-agent@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "1.0.2",
+                  "from": "mime-types@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.4.7",
+                  "from": "node-uuid@>=1.4.0 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                },
+                "qs": {
+                  "version": "2.3.3",
+                  "from": "qs@>=2.3.1 <2.4.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.1",
+                  "from": "tough-cookie@>=0.12.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+                },
+                "http-signature": {
+                  "version": "0.10.1",
+                  "from": "http-signature@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "asn1": {
+                      "version": "0.1.11",
+                      "from": "asn1@0.1.11",
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                    },
+                    "ctype": {
+                      "version": "0.5.3",
+                      "from": "ctype@0.5.3",
+                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.4.0",
+                  "from": "oauth-sign@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+                },
+                "hawk": {
+                  "version": "1.1.1",
+                  "from": "hawk@1.1.1",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "0.9.1",
+                      "from": "hoek@>=0.9.0 <0.10.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                    },
+                    "boom": {
+                      "version": "0.4.2",
+                      "from": "boom@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "0.2.2",
+                      "from": "cryptiles@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                    },
+                    "sntp": {
+                      "version": "0.2.4",
+                      "from": "sntp@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.5.0",
+                  "from": "aws-sign2@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@>=0.0.5 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "0.0.5",
+                      "from": "delayed-stream@0.0.5",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "shelljs": {
+              "version": "0.3.0",
+              "from": "shelljs@0.3.0",
+              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+            },
+            "tar": {
+              "version": "1.0.2",
+              "from": "tar@1.0.2",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+              "dependencies": {
+                "block-stream": {
+                  "version": "0.0.8",
+                  "from": "block-stream@*",
+                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                },
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.2",
+                      "from": "graceful-fs@>=4.1.2 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                    },
+                    "mkdirp": {
+                      "version": "0.5.1",
+                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                      "dependencies": {
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        }
+                      }
+                    },
+                    "rimraf": {
+                      "version": "2.4.4",
+                      "from": "rimraf@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                      "dependencies": {
+                        "glob": {
+                          "version": "5.0.15",
+                          "from": "glob@>=5.0.14 <6.0.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                          "dependencies": {
+                            "inflight": {
+                              "version": "1.0.4",
+                              "from": "inflight@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                              "dependencies": {
+                                "brace-expansion": {
+                                  "version": "1.1.2",
+                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                                  "dependencies": {
+                                    "balanced-match": {
+                                      "version": "0.3.0",
+                                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                    },
+                                    "concat-map": {
+                                      "version": "0.0.1",
+                                      "from": "concat-map@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "once": {
+                              "version": "1.3.3",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.1",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                }
+                              }
+                            },
+                            "path-is-absolute": {
+                              "version": "1.0.0",
+                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.3",
+              "from": "through2@0.6.3",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "unorm": {
+              "version": "1.3.3",
+              "from": "unorm@1.3.3",
+              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
+            },
+            "valid-identifier": {
+              "version": "0.0.1",
+              "from": "valid-identifier@0.0.1",
+              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
+            },
+            "ionic-xcode": {
+              "version": "0.8.3",
+              "from": "ionic-xcode@0.8.3",
+              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
+              "dependencies": {
+                "pegjs": {
+                  "version": "0.6.2",
+                  "from": "pegjs@0.6.2",
+                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
+                },
+                "node-uuid": {
+                  "version": "1.3.3",
+                  "from": "node-uuid@1.3.3",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
+                }
+              }
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "from": "lodash@>=3.10.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+        },
+        "node-sass": {
+          "version": "3.4.2",
+          "from": "node-sass@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
+          "dependencies": {
+            "async-foreach": {
+              "version": "0.1.3",
+              "from": "async-foreach@>=0.1.3 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
+            },
+            "chalk": {
+              "version": "1.1.1",
+              "from": "chalk@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.1.0",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.3",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.0",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "get-stdin": {
+              "version": "4.0.1",
+              "from": "get-stdin@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+            },
+            "glob": {
+              "version": "5.0.15",
+              "from": "glob@>=5.0.14 <6.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.0",
+                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.2",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            },
+            "meow": {
+              "version": "3.6.0",
+              "from": "meow@>=3.3.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
+              "dependencies": {
+                "camelcase-keys": {
+                  "version": "2.0.0",
+                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "2.0.1",
+                      "from": "camelcase@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
+                    },
+                    "map-obj": {
+                      "version": "1.0.1",
+                      "from": "map-obj@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+                    }
+                  }
+                },
+                "loud-rejection": {
+                  "version": "1.2.0",
+                  "from": "loud-rejection@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
+                  "dependencies": {
+                    "signal-exit": {
+                      "version": "2.1.2",
+                      "from": "signal-exit@>=2.1.2 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
+                    }
+                  }
+                },
+                "minimist": {
+                  "version": "1.2.0",
+                  "from": "minimist@>=1.1.3 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                },
+                "normalize-package-data": {
+                  "version": "2.3.5",
+                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
+                  "dependencies": {
+                    "hosted-git-info": {
+                      "version": "2.1.4",
+                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+                    },
+                    "is-builtin-module": {
+                      "version": "1.0.0",
+                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                      "dependencies": {
+                        "builtin-modules": {
+                          "version": "1.1.0",
+                          "from": "builtin-modules@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+                        }
+                      }
+                    },
+                    "validate-npm-package-license": {
+                      "version": "3.0.1",
+                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+                      "dependencies": {
+                        "spdx-correct": {
+                          "version": "1.0.2",
+                          "from": "spdx-correct@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+                          "dependencies": {
+                            "spdx-license-ids": {
+                              "version": "1.1.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "spdx-expression-parse": {
+                          "version": "1.0.2",
+                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
+                          "dependencies": {
+                            "spdx-exceptions": {
+                              "version": "1.0.4",
+                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
+                            },
+                            "spdx-license-ids": {
+                              "version": "1.1.0",
+                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "object-assign": {
+                  "version": "4.0.1",
+                  "from": "object-assign@>=4.0.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+                },
+                "read-pkg-up": {
+                  "version": "1.0.1",
+                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+                  "dependencies": {
+                    "find-up": {
+                      "version": "1.1.0",
+                      "from": "find-up@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
+                      "dependencies": {
+                        "path-exists": {
+                          "version": "2.1.0",
+                          "from": "path-exists@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+                        },
+                        "pinkie-promise": {
+                          "version": "2.0.0",
+                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                          "dependencies": {
+                            "pinkie": {
+                              "version": "2.0.1",
+                              "from": "pinkie@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "read-pkg": {
+                      "version": "1.1.0",
+                      "from": "read-pkg@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+                      "dependencies": {
+                        "load-json-file": {
+                          "version": "1.1.0",
+                          "from": "load-json-file@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "parse-json": {
+                              "version": "2.2.0",
+                              "from": "parse-json@>=2.2.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                              "dependencies": {
+                                "error-ex": {
+                                  "version": "1.3.0",
+                                  "from": "error-ex@>=1.2.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
+                                  "dependencies": {
+                                    "is-arrayish": {
+                                      "version": "0.2.1",
+                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "pify": {
+                              "version": "2.3.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "strip-bom": {
+                              "version": "2.0.0",
+                              "from": "strip-bom@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+                              "dependencies": {
+                                "is-utf8": {
+                                  "version": "0.2.0",
+                                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "path-type": {
+                          "version": "1.1.0",
+                          "from": "path-type@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "4.1.2",
+                              "from": "graceful-fs@>=4.1.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                            },
+                            "pify": {
+                              "version": "2.3.0",
+                              "from": "pify@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+                            },
+                            "pinkie-promise": {
+                              "version": "2.0.0",
+                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                              "dependencies": {
+                                "pinkie": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "redent": {
+                  "version": "1.0.0",
+                  "from": "redent@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+                  "dependencies": {
+                    "indent-string": {
+                      "version": "2.1.0",
+                      "from": "indent-string@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+                      "dependencies": {
+                        "repeating": {
+                          "version": "2.0.0",
+                          "from": "repeating@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
+                          "dependencies": {
+                            "is-finite": {
+                              "version": "1.0.1",
+                              "from": "is-finite@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+                              "dependencies": {
+                                "number-is-nan": {
+                                  "version": "1.0.0",
+                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "strip-indent": {
+                      "version": "1.0.1",
+                      "from": "strip-indent@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+                    }
+                  }
+                },
+                "trim-newlines": {
+                  "version": "1.0.0",
+                  "from": "trim-newlines@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "nan": {
+              "version": "2.1.0",
+              "from": "nan@>=2.0.8 <3.0.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
+            },
+            "npmconf": {
+              "version": "2.1.2",
+              "from": "npmconf@>=2.1.2 <3.0.0",
+              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
+              "dependencies": {
+                "config-chain": {
+                  "version": "1.1.9",
+                  "from": "config-chain@>=1.1.8 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+                  "dependencies": {
+                    "proto-list": {
+                      "version": "1.2.4",
+                      "from": "proto-list@>=1.2.1 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "from": "ini@>=1.2.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=3.0.1 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.5",
+                  "from": "uid-number@0.0.5",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
+                }
+              }
+            },
+            "node-gyp": {
+              "version": "3.2.1",
+              "from": "node-gyp@>=3.0.1 <4.0.0",
+              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
+              "dependencies": {
+                "fstream": {
+                  "version": "1.0.8",
+                  "from": "fstream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "2.0.10",
+                      "from": "minimatch@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                },
+                "minimatch": {
+                  "version": "1.0.0",
+                  "from": "minimatch@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "lru-cache@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "sigmund@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.7",
+                      "from": "abbrev@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                    }
+                  }
+                },
+                "npmlog": {
+                  "version": "1.2.1",
+                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+                  "dependencies": {
+                    "ansi": {
+                      "version": "0.3.0",
+                      "from": "ansi@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                    },
+                    "are-we-there-yet": {
+                      "version": "1.0.4",
+                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "dependencies": {
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.2",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "gauge": {
+                      "version": "1.2.2",
+                      "from": "gauge@>=1.2.0 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+                      "dependencies": {
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+                          "dependencies": {
+                            "lodash._basetostring": {
+                              "version": "3.0.1",
+                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                            },
+                            "lodash._createpadding": {
+                              "version": "3.6.1",
+                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+                              "dependencies": {
+                                "lodash.repeat": {
+                                  "version": "3.0.1",
+                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "osenv": {
+                  "version": "0.1.3",
+                  "from": "osenv@>=0.0.0 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+                  "dependencies": {
+                    "os-homedir": {
+                      "version": "1.0.1",
+                      "from": "os-homedir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+                    },
+                    "os-tmpdir": {
+                      "version": "1.0.1",
+                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+                    }
+                  }
+                },
+                "path-array": {
+                  "version": "1.0.0",
+                  "from": "path-array@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+                  "dependencies": {
+                    "array-index": {
+                      "version": "0.1.1",
+                      "from": "array-index@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+                      "dependencies": {
+                        "debug": {
+                          "version": "2.2.0",
+                          "from": "debug@*",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                          "dependencies": {
+                            "ms": {
+                              "version": "0.7.1",
+                              "from": "ms@0.7.1",
+                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "tar": {
+                  "version": "2.2.1",
+                  "from": "tar@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+                  "dependencies": {
+                    "block-stream": {
+                      "version": "0.0.8",
+                      "from": "block-stream@*",
+                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "which": {
+                  "version": "1.2.0",
+                  "from": "which@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+                  "dependencies": {
+                    "is-absolute": {
+                      "version": "0.1.7",
+                      "from": "is-absolute@>=0.1.7 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+                      "dependencies": {
+                        "is-relative": {
+                          "version": "0.1.3",
+                          "from": "is-relative@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "request": {
+              "version": "2.67.0",
+              "from": "request@>=2.61.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
+              "dependencies": {
+                "bl": {
+                  "version": "1.0.0",
+                  "from": "bl@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.4",
+                      "from": "readable-stream@>=2.0.0 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@>=2.0.1 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.6",
+                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "util-deprecate@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "caseless": {
+                  "version": "0.11.0",
+                  "from": "caseless@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                },
+                "extend": {
+                  "version": "3.0.0",
+                  "from": "extend@>=3.0.0 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                },
+                "forever-agent": {
+                  "version": "0.6.1",
+                  "from": "forever-agent@>=0.6.1 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                },
+                "form-data": {
+                  "version": "1.0.0-rc3",
+                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+                  "dependencies": {
+                    "async": {
+                      "version": "1.5.0",
+                      "from": "async@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                    }
+                  }
+                },
+                "json-stringify-safe": {
+                  "version": "5.0.1",
+                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                },
+                "mime-types": {
+                  "version": "2.1.8",
+                  "from": "mime-types@>=2.1.7 <2.2.0",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.20.0",
+                      "from": "mime-db@>=1.20.0 <1.21.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
+                    }
+                  }
+                },
+                "node-uuid": {
+                  "version": "1.4.7",
+                  "from": "node-uuid@>=1.4.7 <1.5.0",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                },
+                "qs": {
+                  "version": "5.2.0",
+                  "from": "qs@>=5.2.0 <5.3.0",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                },
+                "tunnel-agent": {
+                  "version": "0.4.1",
+                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                },
+                "tough-cookie": {
+                  "version": "2.2.1",
+                  "from": "tough-cookie@>=2.2.0 <2.3.0",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+                },
+                "http-signature": {
+                  "version": "1.1.0",
+                  "from": "http-signature@>=1.1.0 <1.2.0",
+                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
+                  "dependencies": {
+                    "assert-plus": {
+                      "version": "0.1.5",
+                      "from": "assert-plus@>=0.1.5 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                    },
+                    "jsprim": {
+                      "version": "1.2.2",
+                      "from": "jsprim@>=1.2.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
+                      "dependencies": {
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "from": "extsprintf@1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                        },
+                        "json-schema": {
+                          "version": "0.2.2",
+                          "from": "json-schema@0.2.2",
+                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                        },
+                        "verror": {
+                          "version": "1.3.6",
+                          "from": "verror@1.3.6",
+                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                        }
+                      }
+                    },
+                    "sshpk": {
+                      "version": "1.7.1",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
+                      "dependencies": {
+                        "asn1": {
+                          "version": "0.2.3",
+                          "from": "asn1@>=0.2.3 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                        },
+                        "assert-plus": {
+                          "version": "0.2.0",
+                          "from": "assert-plus@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                        },
+                        "dashdash": {
+                          "version": "1.10.1",
+                          "from": "dashdash@>=1.10.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
+                          "dependencies": {
+                            "assert-plus": {
+                              "version": "0.1.5",
+                              "from": "assert-plus@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                            }
+                          }
+                        },
+                        "jsbn": {
+                          "version": "0.1.0",
+                          "from": "jsbn@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                        },
+                        "tweetnacl": {
+                          "version": "0.13.2",
+                          "from": "tweetnacl@>=0.13.0 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                        },
+                        "jodid25519": {
+                          "version": "1.0.2",
+                          "from": "jodid25519@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                        },
+                        "ecc-jsbn": {
+                          "version": "0.1.1",
+                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "oauth-sign": {
+                  "version": "0.8.0",
+                  "from": "oauth-sign@>=0.8.0 <0.9.0",
+                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                },
+                "hawk": {
+                  "version": "3.1.2",
+                  "from": "hawk@>=3.1.0 <3.2.0",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
+                  "dependencies": {
+                    "hoek": {
+                      "version": "2.16.3",
+                      "from": "hoek@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                    },
+                    "boom": {
+                      "version": "2.10.1",
+                      "from": "boom@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                    },
+                    "cryptiles": {
+                      "version": "2.0.5",
+                      "from": "cryptiles@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                    },
+                    "sntp": {
+                      "version": "1.0.9",
+                      "from": "sntp@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                    }
+                  }
+                },
+                "aws-sign2": {
+                  "version": "0.6.0",
+                  "from": "aws-sign2@>=0.6.0 <0.7.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                },
+                "combined-stream": {
+                  "version": "1.0.5",
+                  "from": "combined-stream@>=1.0.5 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                  "dependencies": {
+                    "delayed-stream": {
+                      "version": "1.0.0",
+                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                    }
+                  }
+                },
+                "isstream": {
+                  "version": "0.1.2",
+                  "from": "isstream@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                },
+                "is-typedarray": {
+                  "version": "1.0.0",
+                  "from": "is-typedarray@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                },
+                "har-validator": {
+                  "version": "2.0.3",
+                  "from": "har-validator@>=2.0.2 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
+                  "dependencies": {
+                    "commander": {
+                      "version": "2.9.0",
+                      "from": "commander@>=2.9.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                      "dependencies": {
+                        "graceful-readlink": {
+                          "version": "1.0.1",
+                          "from": "graceful-readlink@>=1.0.0",
+                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "is-my-json-valid": {
+                      "version": "2.12.3",
+                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
+                      "dependencies": {
+                        "generate-function": {
+                          "version": "2.0.0",
+                          "from": "generate-function@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                        },
+                        "generate-object-property": {
+                          "version": "1.2.0",
+                          "from": "generate-object-property@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                          "dependencies": {
+                            "is-property": {
+                              "version": "1.0.2",
+                              "from": "is-property@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "jsonpointer": {
+                          "version": "2.0.0",
+                          "from": "jsonpointer@2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@>=4.0.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        }
+                      }
+                    },
+                    "pinkie-promise": {
+                      "version": "2.0.0",
+                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
+                      "dependencies": {
+                        "pinkie": {
+                          "version": "2.0.1",
+                          "from": "pinkie@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "sass-graph": {
+              "version": "2.0.1",
+              "from": "sass-graph@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
+              "dependencies": {
+                "yargs": {
+                  "version": "3.31.0",
+                  "from": "yargs@>=3.8.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.31.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "2.0.1",
+                      "from": "camelcase@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
+                    },
+                    "cliui": {
+                      "version": "3.1.0",
+                      "from": "cliui@>=3.0.3 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
+                      "dependencies": {
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                          "dependencies": {
+                            "ansi-regex": {
+                              "version": "2.0.0",
+                              "from": "ansi-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "wrap-ansi": {
+                          "version": "1.0.0",
+                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "decamelize": {
+                      "version": "1.1.1",
+                      "from": "decamelize@>=1.1.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                    },
+                    "os-locale": {
+                      "version": "1.4.0",
+                      "from": "os-locale@>=1.4.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+                      "dependencies": {
+                        "lcid": {
+                          "version": "1.0.0",
+                          "from": "lcid@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+                          "dependencies": {
+                            "invert-kv": {
+                              "version": "1.0.0",
+                              "from": "invert-kv@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "string-width": {
+                      "version": "1.0.1",
+                      "from": "string-width@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
+                      "dependencies": {
+                        "code-point-at": {
+                          "version": "1.0.0",
+                          "from": "code-point-at@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
+                          "dependencies": {
+                            "number-is-nan": {
+                              "version": "1.0.0",
+                              "from": "number-is-nan@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "is-fullwidth-code-point": {
+                          "version": "1.0.0",
+                          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                          "dependencies": {
+                            "number-is-nan": {
+                              "version": "1.0.0",
+                              "from": "number-is-nan@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+                            }
+                          }
+                        },
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                          "dependencies": {
+                            "ansi-regex": {
+                              "version": "2.0.0",
+                              "from": "ansi-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "window-size": {
+                      "version": "0.1.4",
+                      "from": "window-size@>=0.1.4 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
+                    },
+                    "y18n": {
+                      "version": "3.2.0",
+                      "from": "y18n@>=3.2.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "5.0.12",
+          "from": "postcss@>=5.0.5 <6.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.12.tgz",
+          "dependencies": {
+            "supports-color": {
+              "version": "3.1.2",
+              "from": "supports-color@>=3.1.2 <4.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+              "dependencies": {
+                "has-flag": {
+                  "version": "1.0.0",
+                  "from": "has-flag@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+                }
+              }
+            },
+            "source-map": {
+              "version": "0.5.3",
+              "from": "source-map@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+            },
+            "js-base64": {
+              "version": "2.1.9",
+              "from": "js-base64@>=2.1.9 <3.0.0",
+              "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
+            }
+          }
+        },
+        "request-progress": {
+          "version": "0.3.1",
+          "from": "request-progress@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+          "dependencies": {
+            "throttleit": {
+              "version": "0.0.2",
+              "from": "throttleit@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+            }
+          }
+        },
+        "unzip2": {
+          "version": "0.2.5",
+          "from": "unzip2@0.2.5",
+          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
+          "dependencies": {
+            "fstream": {
+              "version": "0.1.31",
+              "from": "fstream@>=0.1.21 <0.2.0",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "3.0.8",
+                  "from": "graceful-fs@>=3.0.2 <3.1.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "mkdirp": {
+                  "version": "0.5.1",
+                  "from": "mkdirp@>=0.5.0 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                  "dependencies": {
+                    "glob": {
+                      "version": "5.0.15",
+                      "from": "glob@>=5.0.14 <6.0.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                      "dependencies": {
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "3.0.0",
+                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "once": {
+                          "version": "1.3.3",
+                          "from": "once@>=1.3.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                          "dependencies": {
+                            "wrappy": {
+                              "version": "1.0.1",
+                              "from": "wrappy@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                            }
+                          }
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "pullstream": {
+              "version": "0.4.1",
+              "from": "pullstream@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+              "dependencies": {
+                "over": {
+                  "version": "0.0.5",
+                  "from": "over@>=0.0.5 <1.0.0",
+                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+                },
+                "slice-stream": {
+                  "version": "1.0.0",
+                  "from": "slice-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+                }
+              }
+            },
+            "binary": {
+              "version": "0.3.0",
+              "from": "binary@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+              "dependencies": {
+                "chainsaw": {
+                  "version": "0.1.0",
+                  "from": "chainsaw@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+                  "dependencies": {
+                    "traverse": {
+                      "version": "0.3.9",
+                      "from": "traverse@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                    }
+                  }
+                },
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "setimmediate": {
+              "version": "1.0.4",
+              "from": "setimmediate@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+            },
+            "match-stream": {
+              "version": "0.0.2",
+              "from": "match-stream@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+              "dependencies": {
+                "buffers": {
+                  "version": "0.1.1",
+                  "from": "buffers@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "vinyl-fs": {
+          "version": "1.0.0",
+          "from": "vinyl-fs@1.0.0",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
+          "dependencies": {
+            "duplexify": {
+              "version": "3.4.2",
+              "from": "duplexify@>=3.2.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
+              "dependencies": {
+                "end-of-stream": {
+                  "version": "1.0.0",
+                  "from": "end-of-stream@1.0.0",
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "dependencies": {
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.6",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "glob-stream": {
+              "version": "4.1.1",
+              "from": "glob-stream@>=4.0.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "4.5.3",
+                  "from": "glob@>=4.3.1 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <1.4.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "minimatch": {
+                  "version": "2.0.10",
+                  "from": "minimatch@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.2",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.3.0",
+                          "from": "balanced-match@>=0.3.0 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "ordered-read-streams": {
+                  "version": "0.1.0",
+                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+                },
+                "glob2base": {
+                  "version": "0.0.12",
+                  "from": "glob2base@>=0.0.12 <0.0.13",
+                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "dependencies": {
+                    "find-index": {
+                      "version": "0.1.1",
+                      "from": "find-index@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                    }
+                  }
+                },
+                "unique-stream": {
+                  "version": "2.2.0",
+                  "from": "unique-stream@>=2.0.2 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
+                  "dependencies": {
+                    "through2-filter": {
+                      "version": "2.0.0",
+                      "from": "through2-filter@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+                      "dependencies": {
+                        "through2": {
+                          "version": "2.0.0",
+                          "from": "through2@>=2.0.0 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.4",
+                              "from": "readable-stream@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.2",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.6",
+                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@>=4.0.0 <4.1.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "glob-watcher": {
+              "version": "0.0.8",
+              "from": "glob-watcher@>=0.0.8 <0.0.9",
+              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
+              "dependencies": {
+                "gaze": {
+                  "version": "0.5.2",
+                  "from": "gaze@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+                  "dependencies": {
+                    "globule": {
+                      "version": "0.1.0",
+                      "from": "globule@>=0.1.0 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "dependencies": {
+                        "lodash": {
+                          "version": "1.0.2",
+                          "from": "lodash@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                        },
+                        "glob": {
+                          "version": "3.1.21",
+                          "from": "glob@>=3.1.21 <3.2.0",
+                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "dependencies": {
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@>=1.2.0 <1.3.0",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            },
+                            "inherits": {
+                              "version": "1.0.2",
+                              "from": "inherits@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                            }
+                          }
+                        },
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "from": "minimatch@>=0.2.11 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.7.3",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                            },
+                            "sigmund": {
+                              "version": "1.0.1",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "merge-stream": {
+              "version": "0.1.8",
+              "from": "merge-stream@>=0.1.7 <0.2.0",
+              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "object-assign": {
+              "version": "2.1.1",
+              "from": "object-assign@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+            },
+            "strip-bom": {
+              "version": "1.0.0",
+              "from": "strip-bom@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "dependencies": {
+                "first-chunk-stream": {
+                  "version": "1.0.0",
+                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+                },
+                "is-utf8": {
+                  "version": "0.2.0",
+                  "from": "is-utf8@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+                }
+              }
+            },
+            "through2": {
+              "version": "0.6.5",
+              "from": "through2@>=0.6.1 <0.7.0",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <4.1.0-0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "vinyl": {
+              "version": "0.4.6",
+              "from": "vinyl@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+              "dependencies": {
+                "clone": {
+                  "version": "0.2.0",
+                  "from": "clone@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+                },
+                "clone-stats": {
+                  "version": "0.0.1",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
+                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "webpack": {
+          "version": "1.12.9",
+          "from": "webpack@>=1.12.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.12.9.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.5.0",
+              "from": "async@>=1.3.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+            },
+            "clone": {
+              "version": "1.0.2",
+              "from": "clone@>=1.0.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+            },
+            "enhanced-resolve": {
+              "version": "0.9.1",
+              "from": "enhanced-resolve@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+              "dependencies": {
+                "memory-fs": {
+                  "version": "0.2.0",
+                  "from": "memory-fs@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                }
+              }
+            },
+            "esprima": {
+              "version": "2.7.0",
+              "from": "esprima@>=2.5.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.0.tgz"
+            },
+            "interpret": {
+              "version": "0.6.6",
+              "from": "interpret@>=0.6.4 <0.7.0",
+              "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
+            },
+            "loader-utils": {
+              "version": "0.2.12",
+              "from": "loader-utils@>=0.2.11 <0.3.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
+              "dependencies": {
+                "big.js": {
+                  "version": "3.1.3",
+                  "from": "big.js@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+                },
+                "json5": {
+                  "version": "0.4.0",
+                  "from": "json5@>=0.4.0 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
+                }
+              }
+            },
+            "memory-fs": {
+              "version": "0.3.0",
+              "from": "memory-fs@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
+              "dependencies": {
+                "errno": {
+                  "version": "0.1.4",
+                  "from": "errno@>=0.1.3 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+                  "dependencies": {
+                    "prr": {
+                      "version": "0.0.0",
+                      "from": "prr@>=0.0.0 <0.1.0",
+                      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.0.4",
+                  "from": "readable-stream@>=2.0.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "process-nextick-args": {
+                      "version": "1.0.6",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "node-libs-browser": {
+              "version": "0.5.3",
+              "from": "node-libs-browser@>=0.4.0 <=0.6.0",
+              "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz",
+              "dependencies": {
+                "assert": {
+                  "version": "1.3.0",
+                  "from": "assert@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
+                },
+                "browserify-zlib": {
+                  "version": "0.1.4",
+                  "from": "browserify-zlib@>=0.1.4 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+                  "dependencies": {
+                    "pako": {
+                      "version": "0.2.8",
+                      "from": "pako@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
+                    }
+                  }
+                },
+                "buffer": {
+                  "version": "3.5.3",
+                  "from": "buffer@>=3.0.3 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                  "dependencies": {
+                    "base64-js": {
+                      "version": "0.0.8",
+                      "from": "base64-js@0.0.8",
+                      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
+                    },
+                    "ieee754": {
+                      "version": "1.1.6",
+                      "from": "ieee754@>=1.1.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
+                    },
+                    "is-array": {
+                      "version": "1.0.1",
+                      "from": "is-array@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                    }
+                  }
+                },
+                "console-browserify": {
+                  "version": "1.1.0",
+                  "from": "console-browserify@>=1.1.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+                  "dependencies": {
+                    "date-now": {
+                      "version": "0.1.4",
+                      "from": "date-now@>=0.1.4 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+                    }
+                  }
+                },
+                "constants-browserify": {
+                  "version": "0.0.1",
+                  "from": "constants-browserify@0.0.1",
+                  "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+                },
+                "crypto-browserify": {
+                  "version": "3.2.8",
+                  "from": "crypto-browserify@>=3.2.6 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz",
+                  "dependencies": {
+                    "pbkdf2-compat": {
+                      "version": "2.0.1",
+                      "from": "pbkdf2-compat@2.0.1",
+                      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
+                    },
+                    "ripemd160": {
+                      "version": "0.2.0",
+                      "from": "ripemd160@0.2.0",
+                      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
+                    },
+                    "sha.js": {
+                      "version": "2.2.6",
+                      "from": "sha.js@2.2.6",
+                      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
+                    }
+                  }
+                },
+                "domain-browser": {
+                  "version": "1.1.4",
+                  "from": "domain-browser@>=1.1.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                },
+                "events": {
+                  "version": "1.1.0",
+                  "from": "events@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/events/-/events-1.1.0.tgz"
+                },
+                "http-browserify": {
+                  "version": "1.7.0",
+                  "from": "http-browserify@>=1.3.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+                  "dependencies": {
+                    "Base64": {
+                      "version": "0.2.1",
+                      "from": "Base64@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "https-browserify": {
+                  "version": "0.0.0",
+                  "from": "https-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+                },
+                "os-browserify": {
+                  "version": "0.1.2",
+                  "from": "os-browserify@>=0.1.2 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+                },
+                "path-browserify": {
+                  "version": "0.0.0",
+                  "from": "path-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+                },
+                "process": {
+                  "version": "0.11.2",
+                  "from": "process@>=0.11.0 <0.12.0",
+                  "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
+                },
+                "punycode": {
+                  "version": "1.3.2",
+                  "from": "punycode@>=1.2.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                },
+                "querystring-es3": {
+                  "version": "0.2.1",
+                  "from": "querystring-es3@>=0.2.0 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+                },
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "from": "readable-stream@>=1.1.13 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "stream-browserify": {
+                  "version": "1.0.0",
+                  "from": "stream-browserify@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.25 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "timers-browserify": {
+                  "version": "1.4.1",
+                  "from": "timers-browserify@>=1.0.1 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                },
+                "tty-browserify": {
+                  "version": "0.0.0",
+                  "from": "tty-browserify@0.0.0",
+                  "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+                },
+                "url": {
+                  "version": "0.10.3",
+                  "from": "url@>=0.10.1 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+                  "dependencies": {
+                    "querystring": {
+                      "version": "0.2.0",
+                      "from": "querystring@0.2.0",
+                      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+                    }
+                  }
+                },
+                "util": {
+                  "version": "0.10.3",
+                  "from": "util@>=0.10.3 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@2.0.1",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                },
+                "vm-browserify": {
+                  "version": "0.0.4",
+                  "from": "vm-browserify@0.0.4",
+                  "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+                  "dependencies": {
+                    "indexof": {
+                      "version": "0.0.1",
+                      "from": "indexof@0.0.1",
+                      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "supports-color": {
+              "version": "3.1.2",
+              "from": "supports-color@>=3.1.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+              "dependencies": {
+                "has-flag": {
+                  "version": "1.0.0",
+                  "from": "has-flag@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+                }
+              }
+            },
+            "tapable": {
+              "version": "0.1.10",
+              "from": "tapable@>=0.1.8 <0.2.0",
+              "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
+            },
+            "uglify-js": {
+              "version": "2.6.1",
+              "from": "uglify-js@>=2.6.0 <2.7.0",
+              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.2.10",
+                  "from": "async@>=0.2.6 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+                },
+                "source-map": {
+                  "version": "0.5.3",
+                  "from": "source-map@>=0.5.1 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+                },
+                "uglify-to-browserify": {
+                  "version": "1.0.2",
+                  "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+                },
+                "yargs": {
+                  "version": "3.10.0",
+                  "from": "yargs@>=3.10.0 <3.11.0",
+                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+                  "dependencies": {
+                    "camelcase": {
+                      "version": "1.2.1",
+                      "from": "camelcase@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+                    },
+                    "cliui": {
+                      "version": "2.1.0",
+                      "from": "cliui@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+                      "dependencies": {
+                        "center-align": {
+                          "version": "0.1.2",
+                          "from": "center-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            },
+                            "lazy-cache": {
+                              "version": "0.2.4",
+                              "from": "lazy-cache@>=0.2.4 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                            }
+                          }
+                        },
+                        "right-align": {
+                          "version": "0.1.3",
+                          "from": "right-align@>=0.1.1 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+                          "dependencies": {
+                            "align-text": {
+                              "version": "0.1.3",
+                              "from": "align-text@>=0.1.1 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
+                              "dependencies": {
+                                "kind-of": {
+                                  "version": "2.0.1",
+                                  "from": "kind-of@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                                  "dependencies": {
+                                    "is-buffer": {
+                                      "version": "1.1.0",
+                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "longest": {
+                                  "version": "1.0.1",
+                                  "from": "longest@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+                                },
+                                "repeat-string": {
+                                  "version": "1.5.2",
+                                  "from": "repeat-string@>=1.5.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "wordwrap": {
+                          "version": "0.0.2",
+                          "from": "wordwrap@0.0.2",
+                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                        }
+                      }
+                    },
+                    "decamelize": {
+                      "version": "1.1.1",
+                      "from": "decamelize@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
+                    },
+                    "window-size": {
+                      "version": "0.1.0",
+                      "from": "window-size@0.1.0",
+                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "watchpack": {
+              "version": "0.2.9",
+              "from": "watchpack@>=0.2.1 <0.3.0",
+              "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
+              "dependencies": {
+                "async": {
+                  "version": "0.9.2",
+                  "from": "async@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+                },
+                "chokidar": {
+                  "version": "1.4.0",
+                  "from": "chokidar@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.0.tgz",
+                  "dependencies": {
+                    "anymatch": {
+                      "version": "1.3.0",
+                      "from": "anymatch@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
+                      "dependencies": {
+                        "arrify": {
+                          "version": "1.0.0",
+                          "from": "arrify@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz"
+                        },
+                        "micromatch": {
+                          "version": "2.3.3",
+                          "from": "micromatch@>=2.1.5 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.3.tgz",
+                          "dependencies": {
+                            "arr-diff": {
+                              "version": "1.1.0",
+                              "from": "arr-diff@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+                              "dependencies": {
+                                "arr-flatten": {
+                                  "version": "1.0.1",
+                                  "from": "arr-flatten@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
+                                },
+                                "array-slice": {
+                                  "version": "0.2.3",
+                                  "from": "array-slice@>=0.2.3 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
+                                }
+                              }
+                            },
+                            "array-unique": {
+                              "version": "0.2.1",
+                              "from": "array-unique@>=0.2.1 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
+                            },
+                            "braces": {
+                              "version": "1.8.2",
+                              "from": "braces@>=1.8.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.2.tgz",
+                              "dependencies": {
+                                "expand-range": {
+                                  "version": "1.8.1",
+                                  "from": "expand-range@>=1.8.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
+                                  "dependencies": {
+                                    "fill-range": {
+                                      "version": "2.2.2",
+                                      "from": "fill-range@>=2.1.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz",
+                                      "dependencies": {
+                                        "is-number": {
+                                          "version": "1.1.2",
+                                          "from": "is-number@>=1.1.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz"
+                                        },
+                                        "isobject": {
+                                          "version": "1.0.2",
+                                          "from": "isobject@>=1.0.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
+                                        },
+                                        "randomatic": {
+                                          "version": "1.1.3",
+                                          "from": "randomatic@>=1.1.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.3.tgz",
+                                          "dependencies": {
+                                            "is-number": {
+                                              "version": "2.1.0",
+                                              "from": "is-number@>=2.0.2 <3.0.0",
+                                              "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+                                              "dependencies": {
+                                                "kind-of": {
+                                                  "version": "3.0.2",
+                                                  "from": "kind-of@>=3.0.2 <4.0.0",
+                                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
+                                                  "dependencies": {
+                                                    "is-buffer": {
+                                                      "version": "1.1.0",
+                                                      "from": "is-buffer@>=1.0.2 <2.0.0",
+                                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "repeat-string": {
+                                          "version": "1.5.2",
+                                          "from": "repeat-string@>=1.5.2 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "preserve": {
+                                  "version": "0.2.0",
+                                  "from": "preserve@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
+                                },
+                                "repeat-element": {
+                                  "version": "1.1.2",
+                                  "from": "repeat-element@>=1.1.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
+                                }
+                              }
+                            },
+                            "expand-brackets": {
+                              "version": "0.1.4",
+                              "from": "expand-brackets@>=0.1.4 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.4.tgz"
+                            },
+                            "extglob": {
+                              "version": "0.3.1",
+                              "from": "extglob@>=0.3.1 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.1.tgz",
+                              "dependencies": {
+                                "ansi-green": {
+                                  "version": "0.1.1",
+                                  "from": "ansi-green@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
+                                  "dependencies": {
+                                    "ansi-wrap": {
+                                      "version": "0.1.0",
+                                      "from": "ansi-wrap@0.1.0",
+                                      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
+                                    }
+                                  }
+                                },
+                                "success-symbol": {
+                                  "version": "0.1.0",
+                                  "from": "success-symbol@>=0.1.0 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz"
+                                }
+                              }
+                            },
+                            "filename-regex": {
+                              "version": "2.0.0",
+                              "from": "filename-regex@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
+                            },
+                            "is-extglob": {
+                              "version": "1.0.0",
+                              "from": "is-extglob@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+                            },
+                            "kind-of": {
+                              "version": "2.0.1",
+                              "from": "kind-of@>=2.0.1 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                              "dependencies": {
+                                "is-buffer": {
+                                  "version": "1.1.0",
+                                  "from": "is-buffer@>=1.0.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
+                                }
+                              }
+                            },
+                            "lazy-cache": {
+                              "version": "0.2.4",
+                              "from": "lazy-cache@>=0.2.3 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                            },
+                            "normalize-path": {
+                              "version": "2.0.1",
+                              "from": "normalize-path@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
+                            },
+                            "object.omit": {
+                              "version": "2.0.0",
+                              "from": "object.omit@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
+                              "dependencies": {
+                                "for-own": {
+                                  "version": "0.1.3",
+                                  "from": "for-own@>=0.1.3 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
+                                  "dependencies": {
+                                    "for-in": {
+                                      "version": "0.1.4",
+                                      "from": "for-in@>=0.1.4 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
+                                    }
+                                  }
+                                },
+                                "is-extendable": {
+                                  "version": "0.1.1",
+                                  "from": "is-extendable@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
+                                }
+                              }
+                            },
+                            "parse-glob": {
+                              "version": "3.0.4",
+                              "from": "parse-glob@>=3.0.4 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+                              "dependencies": {
+                                "glob-base": {
+                                  "version": "0.3.0",
+                                  "from": "glob-base@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
+                                },
+                                "is-dotfile": {
+                                  "version": "1.0.2",
+                                  "from": "is-dotfile@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "regex-cache": {
+                              "version": "0.4.2",
+                              "from": "regex-cache@>=0.4.2 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
+                              "dependencies": {
+                                "is-equal-shallow": {
+                                  "version": "0.1.3",
+                                  "from": "is-equal-shallow@>=0.1.1 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
+                                },
+                                "is-primitive": {
+                                  "version": "2.0.0",
+                                  "from": "is-primitive@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "async-each": {
+                      "version": "0.1.6",
+                      "from": "async-each@>=0.1.6 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
+                    },
+                    "glob-parent": {
+                      "version": "2.0.0",
+                      "from": "glob-parent@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
+                    },
+                    "is-binary-path": {
+                      "version": "1.0.1",
+                      "from": "is-binary-path@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+                      "dependencies": {
+                        "binary-extensions": {
+                          "version": "1.4.0",
+                          "from": "binary-extensions@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz"
+                        }
+                      }
+                    },
+                    "is-glob": {
+                      "version": "2.0.1",
+                      "from": "is-glob@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+                      "dependencies": {
+                        "is-extglob": {
+                          "version": "1.0.0",
+                          "from": "is-extglob@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    },
+                    "readdirp": {
+                      "version": "2.0.0",
+                      "from": "readdirp@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.0.tgz",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "2.0.10",
+                          "from": "minimatch@>=2.0.10 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+                          "dependencies": {
+                            "brace-expansion": {
+                              "version": "1.1.2",
+                              "from": "brace-expansion@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                              "dependencies": {
+                                "balanced-match": {
+                                  "version": "0.3.0",
+                                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                                },
+                                "concat-map": {
+                                  "version": "0.0.1",
+                                  "from": "concat-map@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "readable-stream": {
+                          "version": "2.0.4",
+                          "from": "readable-stream@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                          "dependencies": {
+                            "core-util-is": {
+                              "version": "1.0.2",
+                              "from": "core-util-is@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            },
+                            "isarray": {
+                              "version": "0.0.1",
+                              "from": "isarray@0.0.1",
+                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                            },
+                            "process-nextick-args": {
+                              "version": "1.0.6",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                            },
+                            "string_decoder": {
+                              "version": "0.10.31",
+                              "from": "string_decoder@>=0.10.0 <0.11.0",
+                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                            },
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "fsevents": {
+                      "version": "1.0.5",
+                      "from": "fsevents@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.5.tgz",
+                      "dependencies": {
+                        "nan": {
+                          "version": "2.1.0",
+                          "from": "nan@>=2.0.2 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
+                        },
+                        "node-pre-gyp": {
+                          "version": "0.6.15",
+                          "from": "node-pre-gyp@latest",
+                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.15.tgz",
+                          "dependencies": {
+                            "nopt": {
+                              "version": "3.0.4",
+                              "from": "nopt@>=3.0.1 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
+                            }
+                          }
+                        },
+                        "abbrev": {
+                          "version": "1.0.7",
+                          "from": "abbrev@1",
+                          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                        },
+                        "ansi": {
+                          "version": "0.3.0",
+                          "from": "ansi@~0.3.0",
+                          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                        },
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        },
+                        "ansi-styles": {
+                          "version": "2.1.0",
+                          "from": "ansi-styles@^2.1.0",
+                          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                        },
+                        "are-we-there-yet": {
+                          "version": "1.0.4",
+                          "from": "are-we-there-yet@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
+                        },
+                        "asn1": {
+                          "version": "0.1.11",
+                          "from": "asn1@0.1.11",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                        },
+                        "assert-plus": {
+                          "version": "0.1.5",
+                          "from": "assert-plus@^0.1.5",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                        },
+                        "async": {
+                          "version": "1.5.0",
+                          "from": "async@^1.4.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                        },
+                        "aws-sign2": {
+                          "version": "0.6.0",
+                          "from": "aws-sign2@~0.6.0",
+                          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                        },
+                        "balanced-match": {
+                          "version": "0.2.1",
+                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                        },
+                        "block-stream": {
+                          "version": "0.0.8",
+                          "from": "block-stream@*",
+                          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+                        },
+                        "boom": {
+                          "version": "2.10.1",
+                          "from": "boom@^2.8.x",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                        },
+                        "brace-expansion": {
+                          "version": "1.1.1",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
+                        },
+                        "caseless": {
+                          "version": "0.11.0",
+                          "from": "caseless@~0.11.0",
+                          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                        },
+                        "chalk": {
+                          "version": "1.1.1",
+                          "from": "chalk@^1.1.1",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
+                        },
+                        "combined-stream": {
+                          "version": "1.0.5",
+                          "from": "combined-stream@~1.0.5",
+                          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+                        },
+                        "commander": {
+                          "version": "2.9.0",
+                          "from": "commander@^2.8.1",
+                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        },
+                        "core-util-is": {
+                          "version": "1.0.1",
+                          "from": "core-util-is@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                        },
+                        "cryptiles": {
+                          "version": "2.0.5",
+                          "from": "cryptiles@2.x.x",
+                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                        },
+                        "ctype": {
+                          "version": "0.5.3",
+                          "from": "ctype@0.5.3",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        },
+                        "debug": {
+                          "version": "0.7.4",
+                          "from": "debug@~0.7.2",
+                          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                        },
+                        "deep-extend": {
+                          "version": "0.2.11",
+                          "from": "deep-extend@~0.2.5",
+                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                        },
+                        "delayed-stream": {
+                          "version": "1.0.0",
+                          "from": "delayed-stream@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                        },
+                        "delegates": {
+                          "version": "0.1.0",
+                          "from": "delegates@^0.1.0",
+                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                        },
+                        "escape-string-regexp": {
+                          "version": "1.0.3",
+                          "from": "escape-string-regexp@^1.0.2",
+                          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                        },
+                        "extend": {
+                          "version": "3.0.0",
+                          "from": "extend@~3.0.0",
+                          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                        },
+                        "forever-agent": {
+                          "version": "0.6.1",
+                          "from": "forever-agent@~0.6.1",
+                          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                        },
+                        "form-data": {
+                          "version": "1.0.0-rc3",
+                          "from": "form-data@~1.0.0-rc3",
+                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
+                        },
+                        "fstream": {
+                          "version": "1.0.8",
+                          "from": "fstream@^1.0.2",
+                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
+                        },
+                        "gauge": {
+                          "version": "1.2.2",
+                          "from": "gauge@~1.2.0",
+                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
+                        },
+                        "generate-function": {
+                          "version": "2.0.0",
+                          "from": "generate-function@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                        },
+                        "generate-object-property": {
+                          "version": "1.2.0",
+                          "from": "generate-object-property@^1.1.0",
+                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+                        },
+                        "graceful-fs": {
+                          "version": "4.1.2",
+                          "from": "graceful-fs@4.1",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                        },
+                        "graceful-readlink": {
+                          "version": "1.0.1",
+                          "from": "graceful-readlink@>= 1.0.0",
+                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                        },
+                        "har-validator": {
+                          "version": "2.0.2",
+                          "from": "har-validator@~2.0.2",
+                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz"
+                        },
+                        "has-ansi": {
+                          "version": "2.0.0",
+                          "from": "has-ansi@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+                        },
+                        "has-unicode": {
+                          "version": "1.0.1",
+                          "from": "has-unicode@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                        },
+                        "hawk": {
+                          "version": "3.1.0",
+                          "from": "hawk@~3.1.0",
+                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
+                        },
+                        "hoek": {
+                          "version": "2.16.3",
+                          "from": "hoek@2.x.x",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                        },
+                        "http-signature": {
+                          "version": "0.11.0",
+                          "from": "http-signature@~0.11.0",
+                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "inherits@*",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "ini": {
+                          "version": "1.3.4",
+                          "from": "ini@~1.3.0",
+                          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                        },
+                        "is-my-json-valid": {
+                          "version": "2.12.2",
+                          "from": "is-my-json-valid@^2.12.2",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
+                        },
+                        "is-property": {
+                          "version": "1.0.2",
+                          "from": "is-property@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                        },
+                        "isarray": {
+                          "version": "0.0.1",
+                          "from": "isarray@0.0.1",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                        },
+                        "isstream": {
+                          "version": "0.1.2",
+                          "from": "isstream@~0.1.2",
+                          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                        },
+                        "json-stringify-safe": {
+                          "version": "5.0.1",
+                          "from": "json-stringify-safe@~5.0.1",
+                          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                        },
+                        "jsonpointer": {
+                          "version": "2.0.0",
+                          "from": "jsonpointer@2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                        },
+                        "lodash._basetostring": {
+                          "version": "3.0.1",
+                          "from": "lodash._basetostring@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+                        },
+                        "lodash._createpadding": {
+                          "version": "3.6.1",
+                          "from": "lodash._createpadding@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
+                        },
+                        "lodash.pad": {
+                          "version": "3.1.1",
+                          "from": "lodash.pad@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
+                        },
+                        "lodash.padleft": {
+                          "version": "3.1.1",
+                          "from": "lodash.padleft@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+                        },
+                        "lodash.padright": {
+                          "version": "3.1.1",
+                          "from": "lodash.padright@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+                        },
+                        "lodash.repeat": {
+                          "version": "3.0.1",
+                          "from": "lodash.repeat@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                        },
+                        "mime-db": {
+                          "version": "1.19.0",
+                          "from": "mime-db@~1.19.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                        },
+                        "mime-types": {
+                          "version": "2.1.7",
+                          "from": "mime-types@~2.1.7",
+                          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
+                        },
+                        "minimist": {
+                          "version": "0.0.8",
+                          "from": "minimist@0.0.8",
+                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                        },
+                        "mkdirp": {
+                          "version": "0.5.1",
+                          "from": "mkdirp@>=0.3.0 <0.4.0||>=0.4.0 <0.5.0||>=0.5.0 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+                        },
+                        "node-uuid": {
+                          "version": "1.4.3",
+                          "from": "node-uuid@~1.4.3",
+                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                        },
+                        "npmlog": {
+                          "version": "1.2.1",
+                          "from": "npmlog@~1.2.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
+                        },
+                        "oauth-sign": {
+                          "version": "0.8.0",
+                          "from": "oauth-sign@~0.8.0",
+                          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+                        },
+                        "once": {
+                          "version": "1.1.1",
+                          "from": "once@~1.1.1",
+                          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
+                        },
+                        "path-is-absolute": {
+                          "version": "1.0.0",
+                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                        },
+                        "pinkie": {
+                          "version": "1.0.0",
+                          "from": "pinkie@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                        },
+                        "pinkie-promise": {
+                          "version": "1.0.0",
+                          "from": "pinkie-promise@^1.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
+                        },
+                        "qs": {
+                          "version": "5.2.0",
+                          "from": "qs@~5.2.0",
+                          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+                        },
+                        "readable-stream": {
+                          "version": "1.1.13",
+                          "from": "readable-stream@^1.1.13",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+                        },
+                        "request": {
+                          "version": "2.65.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz"
+                        },
+                        "semver": {
+                          "version": "5.0.3",
+                          "from": "semver@~5.0.1",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                        },
+                        "sntp": {
+                          "version": "1.0.9",
+                          "from": "sntp@1.x.x",
+                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "string_decoder@~0.10.x",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "stringstream": {
+                          "version": "0.0.5",
+                          "from": "stringstream@~0.0.4",
+                          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                        },
+                        "strip-ansi": {
+                          "version": "3.0.0",
+                          "from": "strip-ansi@^3.0.0",
+                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+                        },
+                        "strip-json-comments": {
+                          "version": "0.1.3",
+                          "from": "strip-json-comments@0.1.x",
+                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                        },
+                        "supports-color": {
+                          "version": "2.0.0",
+                          "from": "supports-color@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                        },
+                        "tar": {
+                          "version": "2.2.1",
+                          "from": "tar@~2.2.0",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+                        },
+                        "tough-cookie": {
+                          "version": "2.2.0",
+                          "from": "tough-cookie@~2.2.0",
+                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                        },
+                        "tunnel-agent": {
+                          "version": "0.4.1",
+                          "from": "tunnel-agent@~0.4.1",
+                          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                        },
+                        "uid-number": {
+                          "version": "0.0.3",
+                          "from": "uid-number@0.0.3",
+                          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
+                        },
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        },
+                        "xtend": {
+                          "version": "4.0.1",
+                          "from": "xtend@^4.0.0",
+                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                        },
+                        "fstream-ignore": {
+                          "version": "1.0.3",
+                          "from": "fstream-ignore@~1.0.3",
+                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
+                          "dependencies": {
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=3.0.0 <4.0.0"
+                            }
+                          }
+                        },
+                        "inflight": {
+                          "version": "1.0.4",
+                          "from": "inflight@>=1.0.4 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                          "dependencies": {
+                            "once": {
+                              "version": "1.3.2",
+                              "from": "once@>=1.3.0 <2.0.0"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "1.1.2",
+                          "from": "rc@~1.1.0",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.2.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "1.2.0",
+                              "from": "minimist@^1.1.2",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.4.3",
+                          "from": "rimraf@~2.4.0",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                          "dependencies": {
+                            "glob": {
+                              "version": "5.0.15",
+                              "from": "glob@>=5.0.14 <6.0.0",
+                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+                            },
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+                            },
+                            "once": {
+                              "version": "1.3.2",
+                              "from": "once@>=1.3.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                            }
+                          }
+                        },
+                        "bl": {
+                          "version": "1.0.0",
+                          "from": "bl@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "2.0.4",
+                              "from": "readable-stream@~2.0.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.3",
+                                  "from": "process-nextick-args@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@~1.0.1",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "tar-pack": {
+                          "version": "3.1.0",
+                          "from": "tar-pack@~3.1.0",
+                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.0.tgz",
+                          "dependencies": {
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@~1.0.2",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                }
+                              }
+                            },
+                            "rimraf": {
+                              "version": "2.2.8",
+                              "from": "rimraf@~2.2.0",
+                              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "graceful-fs": {
+                  "version": "4.1.2",
+                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+                }
+              }
+            },
+            "webpack-core": {
+              "version": "0.6.8",
+              "from": "webpack-core@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz",
+              "dependencies": {
+                "source-map": {
+                  "version": "0.4.4",
+                  "from": "source-map@>=0.4.1 <0.5.0",
+                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+                  "dependencies": {
+                    "amdefine": {
+                      "version": "1.0.0",
+                      "from": "amdefine@>=0.0.4",
+                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                    }
+                  }
+                },
+                "source-list-map": {
+                  "version": "0.1.5",
+                  "from": "source-list-map@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "1.1.2",
+          "from": "winston@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "1.0.0",
+              "from": "async@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
+            },
+            "colors": {
+              "version": "1.0.3",
+              "from": "colors@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "from": "isstream@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+            },
+            "pkginfo": {
+              "version": "0.3.1",
+              "from": "pkginfo@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        }
+      }
+    },
+    "moment": {
+      "version": "2.10.6",
+      "from": "moment@>=2.10.6 <3.0.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
+    },
+    "ncp": {
+      "version": "0.4.2",
+      "from": "ncp@0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
+    },
+    "open": {
+      "version": "0.0.5",
+      "from": "open@0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+    },
+    "optimist": {
+      "version": "0.6.0",
+      "from": "optimist@0.6.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "from": "minimist@>=0.0.1 <0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+        }
+      }
+    },
+    "progress": {
+      "version": "1.1.7",
+      "from": "progress@1.1.7",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+    },
+    "prompt": {
+      "version": "0.2.12",
+      "from": "prompt@0.2.12",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
+      "dependencies": {
+        "pkginfo": {
+          "version": "0.3.1",
+          "from": "pkginfo@>=0.0.0 <1.0.0",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+        },
+        "read": {
+          "version": "1.0.7",
+          "from": "read@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+          "dependencies": {
+            "mute-stream": {
+              "version": "0.0.5",
+              "from": "mute-stream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+            }
+          }
+        },
+        "revalidator": {
+          "version": "0.1.8",
+          "from": "revalidator@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
+        },
+        "utile": {
+          "version": "0.2.1",
+          "from": "utile@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "from": "async@>=0.2.9 <0.3.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+            },
+            "deep-equal": {
+              "version": "1.0.1",
+              "from": "deep-equal@*",
+              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
+            },
+            "i": {
+              "version": "0.3.3",
+              "from": "i@>=0.3.0 <0.4.0",
+              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.0.0 <1.0.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "winston": {
+          "version": "0.6.2",
+          "from": "winston@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
+          "dependencies": {
+            "async": {
+              "version": "0.1.22",
+              "from": "async@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+            },
+            "cycle": {
+              "version": "1.0.3",
+              "from": "cycle@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
+            },
+            "eyes": {
+              "version": "0.1.8",
+              "from": "eyes@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
+            },
+            "pkginfo": {
+              "version": "0.2.3",
+              "from": "pkginfo@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
+            },
+            "request": {
+              "version": "2.9.203",
+              "from": "request@>=2.9.0 <2.10.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
+            },
+            "stack-trace": {
+              "version": "0.0.9",
+              "from": "stack-trace@>=0.0.0 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+            }
+          }
+        }
+      }
+    },
+    "proxy-middleware": {
+      "version": "0.7.0",
+      "from": "proxy-middleware@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
+    },
+    "q": {
+      "version": "1.0.1",
+      "from": "q@1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
+    },
+    "request": {
+      "version": "2.51.0",
+      "from": "request@2.51.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+      "dependencies": {
+        "bl": {
+          "version": "0.9.4",
+          "from": "bl@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.26 <1.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "caseless": {
+          "version": "0.8.0",
+          "from": "caseless@>=0.8.0 <0.9.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "from": "forever-agent@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "from": "form-data@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "dependencies": {
+            "mime-types": {
+              "version": "2.0.14",
+              "from": "mime-types@>=2.0.3 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.12.0",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "from": "mime-types@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+        },
+        "node-uuid": {
+          "version": "1.4.7",
+          "from": "node-uuid@>=1.4.0 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+        },
+        "qs": {
+          "version": "2.3.3",
+          "from": "qs@>=2.3.1 <2.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.4.1",
+          "from": "tunnel-agent@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.2.1",
+          "from": "tough-cookie@>=0.12.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "from": "http-signature@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "0.1.5",
+              "from": "assert-plus@>=0.1.5 <0.2.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+            },
+            "asn1": {
+              "version": "0.1.11",
+              "from": "asn1@0.1.11",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+            },
+            "ctype": {
+              "version": "0.5.3",
+              "from": "ctype@0.5.3",
+              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+            }
+          }
+        },
+        "oauth-sign": {
+          "version": "0.5.0",
+          "from": "oauth-sign@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+        },
+        "hawk": {
+          "version": "1.1.1",
+          "from": "hawk@1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "from": "hoek@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+            },
+            "boom": {
+              "version": "0.4.2",
+              "from": "boom@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+            },
+            "cryptiles": {
+              "version": "0.2.2",
+              "from": "cryptiles@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+            },
+            "sntp": {
+              "version": "0.2.4",
+              "from": "sntp@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+            }
+          }
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "from": "aws-sign2@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "from": "combined-stream@>=0.0.5 <0.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "0.0.5",
+              "from": "delayed-stream@0.0.5",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+            }
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "4.3.6",
+      "from": "semver@>=4.2.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+    },
+    "serve-static": {
+      "version": "1.7.1",
+      "from": "serve-static@1.7.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
+      "dependencies": {
+        "escape-html": {
+          "version": "1.0.1",
+          "from": "escape-html@1.0.1",
+          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
+        },
+        "parseurl": {
+          "version": "1.3.0",
+          "from": "parseurl@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
+        },
+        "send": {
+          "version": "0.10.1",
+          "from": "send@0.10.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "2.1.3",
+              "from": "debug@>=2.1.0 <2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
+              "dependencies": {
+                "ms": {
+                  "version": "0.7.0",
+                  "from": "ms@0.7.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
+                }
+              }
+            },
+            "depd": {
+              "version": "1.0.1",
+              "from": "depd@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
+            },
+            "destroy": {
+              "version": "1.0.3",
+              "from": "destroy@1.0.3",
+              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
+            },
+            "etag": {
+              "version": "1.5.1",
+              "from": "etag@>=1.5.0 <1.6.0",
+              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
+            },
+            "fresh": {
+              "version": "0.2.4",
+              "from": "fresh@0.2.4",
+              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            },
+            "ms": {
+              "version": "0.6.2",
+              "from": "ms@0.6.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
+            },
+            "on-finished": {
+              "version": "2.1.1",
+              "from": "on-finished@>=2.1.1 <2.2.0",
+              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
+              "dependencies": {
+                "ee-first": {
+                  "version": "1.1.0",
+                  "from": "ee-first@1.1.0",
+                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
+                }
+              }
+            },
+            "range-parser": {
+              "version": "1.0.3",
+              "from": "range-parser@>=1.0.2 <1.1.0",
+              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
+            }
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "from": "utils-merge@1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+        }
+      }
+    },
+    "shelljs": {
+      "version": "0.2.6",
+      "from": "shelljs@0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
+    },
+    "tiny-lr-fork": {
+      "version": "0.0.5",
+      "from": "tiny-lr-fork@0.0.5",
+      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "0.5.6",
+          "from": "qs@>=0.5.2 <0.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
+        },
+        "faye-websocket": {
+          "version": "0.4.4",
+          "from": "faye-websocket@>=0.4.3 <0.5.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
+        },
+        "noptify": {
+          "version": "0.0.3",
+          "from": "noptify@>=0.0.3 <0.1.0",
+          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
+          "dependencies": {
+            "nopt": {
+              "version": "2.0.0",
+              "from": "nopt@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.0.7",
+                  "from": "abbrev@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                }
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+        }
+      }
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+    },
+    "unzip": {
+      "version": "0.1.9",
+      "from": "unzip@0.1.9",
+      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
+      "dependencies": {
+        "fstream": {
+          "version": "0.1.31",
+          "from": "fstream@>=0.1.21 <0.2.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+          "dependencies": {
+            "graceful-fs": {
+              "version": "3.0.8",
+              "from": "graceful-fs@>=3.0.2 <3.1.0",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.0 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "dependencies": {
+                "minimist": {
+                  "version": "0.0.8",
+                  "from": "minimist@0.0.8",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                }
+              }
+            },
+            "rimraf": {
+              "version": "2.4.4",
+              "from": "rimraf@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+              "dependencies": {
+                "glob": {
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                  "dependencies": {
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                      "dependencies": {
+                        "brace-expansion": {
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                            },
+                            "concat-map": {
+                              "version": "0.0.1",
+                              "from": "concat-map@0.0.1",
+                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "once": {
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                        }
+                      }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "pullstream": {
+          "version": "0.4.1",
+          "from": "pullstream@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
+          "dependencies": {
+            "over": {
+              "version": "0.0.5",
+              "from": "over@>=0.0.5 <1.0.0",
+              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
+            },
+            "slice-stream": {
+              "version": "1.0.0",
+              "from": "slice-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "binary": {
+          "version": "0.3.0",
+          "from": "binary@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+          "dependencies": {
+            "chainsaw": {
+              "version": "0.1.0",
+              "from": "chainsaw@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+              "dependencies": {
+                "traverse": {
+                  "version": "0.3.9",
+                  "from": "traverse@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
+                }
+              }
+            },
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "1.0.33",
+          "from": "readable-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.2",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            }
+          }
+        },
+        "setimmediate": {
+          "version": "1.0.4",
+          "from": "setimmediate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
+        },
+        "match-stream": {
+          "version": "0.0.2",
+          "from": "match-stream@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
+          "dependencies": {
+            "buffers": {
+              "version": "0.1.1",
+              "from": "buffers@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "0.3.7",
+      "from": "vinyl-fs@0.3.7",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
+      "dependencies": {
+        "glob-stream": {
+          "version": "3.1.18",
+          "from": "glob-stream@>=3.1.5 <4.0.0",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "4.5.3",
+              "from": "glob@>=4.3.1 <5.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "minimatch": {
+              "version": "2.0.10",
+              "from": "minimatch@>=2.0.1 <3.0.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+              "dependencies": {
+                "brace-expansion": {
+                  "version": "1.1.2",
+                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+                  "dependencies": {
+                    "balanced-match": {
+                      "version": "0.3.0",
+                      "from": "balanced-match@>=0.3.0 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                    },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            },
+            "ordered-read-streams": {
+              "version": "0.1.0",
+              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
+              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
+            },
+            "glob2base": {
+              "version": "0.0.12",
+              "from": "glob2base@>=0.0.12 <0.0.13",
+              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+              "dependencies": {
+                "find-index": {
+                  "version": "0.1.1",
+                  "from": "find-index@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
+                }
+              }
+            },
+            "unique-stream": {
+              "version": "1.0.0",
+              "from": "unique-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "glob-watcher": {
+          "version": "0.0.6",
+          "from": "glob-watcher@>=0.0.6 <0.0.7",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "dependencies": {
+            "gaze": {
+              "version": "0.5.2",
+              "from": "gaze@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+              "dependencies": {
+                "globule": {
+                  "version": "0.1.0",
+                  "from": "globule@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                  "dependencies": {
+                    "lodash": {
+                      "version": "1.0.2",
+                      "from": "lodash@>=1.0.1 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
+                    },
+                    "glob": {
+                      "version": "3.1.21",
+                      "from": "glob@>=3.1.21 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "1.2.3",
+                          "from": "graceful-fs@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                        },
+                        "inherits": {
+                          "version": "1.0.2",
+                          "from": "inherits@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "minimatch": {
+                      "version": "0.2.14",
+                      "from": "minimatch@>=0.2.11 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                      "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
+                        "sigmund": {
+                          "version": "1.0.1",
+                          "from": "sigmund@>=1.0.0 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.8",
+          "from": "graceful-fs@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "0.0.8",
+              "from": "minimist@0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "1.0.0",
+          "from": "strip-bom@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "dependencies": {
+            "first-chunk-stream": {
+              "version": "1.0.0",
+              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+            },
+            "is-utf8": {
+              "version": "0.2.0",
+              "from": "is-utf8@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.5",
+          "from": "through2@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.33",
+              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "isarray": {
+                  "version": "0.0.1",
+                  "from": "isarray@0.0.1",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.1",
+              "from": "xtend@>=4.0.0 <4.1.0-0",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "from": "vinyl@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "dependencies": {
+            "clone": {
+              "version": "0.2.0",
+              "from": "clone@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+            },
+            "clone-stats": {
+              "version": "0.0.1",
+              "from": "clone-stats@>=0.0.1 <0.0.2",
+              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+            }
+          }
+        }
+      }
+    },
+    "xml2js": {
+      "version": "0.4.4",
+      "from": "xml2js@0.4.4",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+      "dependencies": {
+        "sax": {
+          "version": "0.6.1",
+          "from": "sax@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+        },
+        "xmlbuilder": {
+          "version": "4.1.0",
+          "from": "xmlbuilder@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "from": "lodash@>=3.5.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index b9b5329742..77de354f04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.0-beta.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.3",
+    "ionic-app-lib": "2.0.0-beta.4",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From f970019c91217475d4e0a8a936c84408f423ad33 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 11 Dec 2015 11:41:32 -0600
Subject: [PATCH 0865/1100] bump to beta.11

---
 npm-shrinkwrap.json | 916 +++++++++++++++++++++++++++-----------------
 package.json        |   4 +-
 2 files changed, 571 insertions(+), 349 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index bc56cb53c0..453a2c0b47 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "dependencies": {
     "async": {
       "version": "0.9.2",
@@ -211,7 +211,7 @@
       "dependencies": {
         "through": {
           "version": "2.3.8",
-          "from": "through@>=2.3.6 <3.0.0",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
         },
         "duplexer": {
@@ -511,7 +511,7 @@
                               "dependencies": {
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -528,7 +528,7 @@
                                 },
                                 "spdx-license-ids": {
                                   "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
                                 }
                               }
@@ -1110,7 +1110,7 @@
             },
             "escape-string-regexp": {
               "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
+              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
             },
             "has-ansi": {
@@ -1207,7 +1207,7 @@
           "dependencies": {
             "once": {
               "version": "1.3.3",
-              "from": "once@>=1.3.0 <2.0.0",
+              "from": "once@>=1.3.0 <1.4.0",
               "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
               "dependencies": {
                 "wrappy": {
@@ -1231,14 +1231,15 @@
         },
         "through": {
           "version": "2.3.8",
-          "from": "through@>=2.3.6 <3.0.0",
+          "from": "through@>=2.3.1 <2.4.0",
           "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
         }
       }
     },
     "ionic-app-lib": {
-      "version": "2.0.0-beta.4",
-      "from": "ionic-app-lib@2.0.0-beta.4",
+      "version": "2.0.0-beta.5",
+      "from": "ionic-app-lib@2.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-2.0.0-beta.5.tgz",
       "dependencies": {
         "archiver": {
           "version": "0.5.2",
@@ -1431,9 +1432,9 @@
               "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.0.1.tgz"
             },
             "caniuse-db": {
-              "version": "1.0.30000374",
+              "version": "1.0.30000377",
               "from": "caniuse-db@>=1.0.30000372 <2.0.0",
-              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000374.tgz"
+              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000377.tgz"
             }
           }
         },
@@ -1443,9 +1444,9 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
           "dependencies": {
             "cross-spawn-async": {
-              "version": "2.0.1",
+              "version": "2.1.1",
               "from": "cross-spawn-async@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.1.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "3.2.0",
@@ -1665,9 +1666,9 @@
                       }
                     },
                     "browser-resolve": {
-                      "version": "1.10.1",
+                      "version": "1.11.0",
                       "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.10.1.tgz"
+                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.0.tgz"
                     },
                     "browserify-zlib": {
                       "version": "0.1.4",
@@ -1682,9 +1683,9 @@
                       }
                     },
                     "buffer": {
-                      "version": "3.5.3",
+                      "version": "3.5.5",
                       "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.5.tgz",
                       "dependencies": {
                         "base64-js": {
                           "version": "0.0.8",
@@ -1696,10 +1697,10 @@
                           "from": "ieee754@>=1.1.4 <2.0.0",
                           "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
                         },
-                        "is-array": {
-                          "version": "1.0.1",
-                          "from": "is-array@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                        "isarray": {
+                          "version": "1.0.0",
+                          "from": "isarray@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                         }
                       }
                     },
@@ -1806,9 +1807,9 @@
                           "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.5.0",
-                              "from": "bn.js@>=4.1.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                              "version": "4.5.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
                             },
                             "browserify-rsa": {
                               "version": "4.0.0",
@@ -1881,9 +1882,9 @@
                           "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.5.0",
-                              "from": "bn.js@>=4.1.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                              "version": "4.5.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
                             },
                             "elliptic": {
                               "version": "6.0.2",
@@ -1937,9 +1938,9 @@
                           "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.5.0",
-                              "from": "bn.js@>=4.1.1 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                              "version": "4.5.1",
+                              "from": "bn.js@>=4.1.0 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
                             },
                             "miller-rabin": {
                               "version": "4.0.0",
@@ -1966,9 +1967,9 @@
                           "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
                           "dependencies": {
                             "bn.js": {
-                              "version": "4.5.0",
+                              "version": "4.5.1",
                               "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.0.tgz"
+                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
                             },
                             "browserify-rsa": {
                               "version": "4.0.0",
@@ -2041,9 +2042,33 @@
                       "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
                     },
                     "domain-browser": {
-                      "version": "1.1.4",
+                      "version": "1.1.5",
                       "from": "domain-browser@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.5.tgz",
+                      "dependencies": {
+                        "assert-helpers": {
+                          "version": "4.1.0",
+                          "from": "assert-helpers@>=4.1.0 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-helpers/-/assert-helpers-4.1.0.tgz",
+                          "dependencies": {
+                            "ansicolors": {
+                              "version": "0.3.2",
+                              "from": "ansicolors@>=0.3.2 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
+                            },
+                            "diff": {
+                              "version": "2.2.1",
+                              "from": "diff@>=2.1.1 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"
+                            },
+                            "esnextguardian": {
+                              "version": "1.2.0",
+                              "from": "esnextguardian@>=1.1.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/esnextguardian/-/esnextguardian-1.2.0.tgz"
+                            }
+                          }
+                        }
+                      }
                     },
                     "duplexer2": {
                       "version": "0.0.2",
@@ -2266,9 +2291,9 @@
                       "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
                     },
                     "punycode": {
-                      "version": "1.3.2",
+                      "version": "1.4.0",
                       "from": "punycode@>=1.3.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.0.tgz"
                     },
                     "querystring-es3": {
                       "version": "0.2.1",
@@ -2378,9 +2403,9 @@
                       "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
                     },
                     "timers-browserify": {
-                      "version": "1.4.1",
+                      "version": "1.4.2",
                       "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"
                     },
                     "tty-browserify": {
                       "version": "0.0.0",
@@ -2392,6 +2417,11 @@
                       "from": "url@>=0.10.1 <0.11.0",
                       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
                       "dependencies": {
+                        "punycode": {
+                          "version": "1.3.2",
+                          "from": "punycode@1.3.2",
+                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                        },
                         "querystring": {
                           "version": "0.2.0",
                           "from": "querystring@0.2.0",
@@ -2480,7 +2510,7 @@
                                       "dependencies": {
                                         "is-buffer": {
                                           "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "from": "is-buffer@>=1.1.0 <2.0.0",
                                           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
                                         }
                                       }
@@ -2498,9 +2528,9 @@
                                   }
                                 },
                                 "lazy-cache": {
-                                  "version": "0.2.4",
+                                  "version": "0.2.7",
                                   "from": "lazy-cache@>=0.2.4 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
                                 }
                               }
                             },
@@ -2521,7 +2551,7 @@
                                       "dependencies": {
                                         "is-buffer": {
                                           "version": "1.1.0",
-                                          "from": "is-buffer@>=1.0.2 <2.0.0",
+                                          "from": "is-buffer@>=1.1.0 <2.0.0",
                                           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
                                         }
                                       }
@@ -2991,9 +3021,9 @@
               }
             },
             "npm": {
-              "version": "2.14.14",
+              "version": "2.14.15",
               "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.14.tgz",
+              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.15.tgz",
               "dependencies": {
                 "abbrev": {
                   "version": "1.0.7",
@@ -3195,9 +3225,16 @@
                   "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
                 },
                 "lru-cache": {
-                  "version": "2.7.0",
-                  "from": "lru-cache@2.7.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+                  "version": "3.2.0",
+                  "from": "lru-cache@>=3.2.0 <3.3.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+                  "dependencies": {
+                    "pseudomap": {
+                      "version": "1.0.1",
+                      "from": "pseudomap@>=1.0.1 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
+                    }
+                  }
                 },
                 "minimatch": {
                   "version": "3.0.0",
@@ -3237,7 +3274,7 @@
                 },
                 "node-gyp": {
                   "version": "3.2.1",
-                  "from": "node-gyp@3.2.1",
+                  "from": "node-gyp@>=3.2.1 <3.3.0",
                   "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
                   "dependencies": {
                     "glob": {
@@ -3276,6 +3313,11 @@
                       "from": "minimatch@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
                       "dependencies": {
+                        "lru-cache": {
+                          "version": "2.7.3",
+                          "from": "lru-cache@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                        },
                         "sigmund": {
                           "version": "1.0.1",
                           "from": "sigmund@>=1.0.0 <1.1.0",
@@ -3289,9 +3331,9 @@
                       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
                       "dependencies": {
                         "are-we-there-yet": {
-                          "version": "1.0.4",
+                          "version": "1.0.5",
                           "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.5.tgz",
                           "dependencies": {
                             "delegates": {
                               "version": "0.1.0",
@@ -3562,8 +3604,9 @@
                   "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
                 },
                 "npm-registry-client": {
-                  "version": "7.0.8",
-                  "from": "npm-registry-client@>=7.0.8 <7.1.0",
+                  "version": "7.0.9",
+                  "from": "npm-registry-client@>=7.0.9 <7.1.0",
+                  "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.9.tgz",
                   "dependencies": {
                     "concat-stream": {
                       "version": "1.5.1",
@@ -3581,9 +3624,9 @@
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                           "dependencies": {
                             "core-util-is": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                             },
                             "isarray": {
                               "version": "0.0.1",
@@ -3591,9 +3634,9 @@
                               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                             },
                             "process-nextick-args": {
-                              "version": "1.0.3",
+                              "version": "1.0.6",
                               "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                             },
                             "string_decoder": {
                               "version": "0.10.31",
@@ -3719,9 +3762,9 @@
                   }
                 },
                 "once": {
-                  "version": "1.3.2",
-                  "from": "once@>=1.3.2 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.3 <1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
                 },
                 "opener": {
                   "version": "1.4.1",
@@ -3828,9 +3871,9 @@
                   "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
                 },
                 "request": {
-                  "version": "2.65.0",
-                  "from": "request@>=2.65.0 <2.66.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
+                  "version": "2.67.0",
+                  "from": "request@>=2.67.0 <2.68.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
                   "dependencies": {
                     "bl": {
                       "version": "1.0.0",
@@ -3838,14 +3881,14 @@
                       "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
                       "dependencies": {
                         "readable-stream": {
-                          "version": "2.0.3",
+                          "version": "2.0.4",
                           "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                           "dependencies": {
                             "core-util-is": {
-                              "version": "1.0.1",
+                              "version": "1.0.2",
                               "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                             },
                             "isarray": {
                               "version": "0.0.1",
@@ -3853,9 +3896,9 @@
                               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                             },
                             "process-nextick-args": {
-                              "version": "1.0.3",
+                              "version": "1.0.6",
                               "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
                             },
                             "string_decoder": {
                               "version": "0.10.31",
@@ -3904,21 +3947,21 @@
                       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                     },
                     "mime-types": {
-                      "version": "2.1.7",
+                      "version": "2.1.8",
                       "from": "mime-types@>=2.1.7 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
                       "dependencies": {
                         "mime-db": {
-                          "version": "1.19.0",
-                          "from": "mime-db@>=1.19.0 <1.20.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+                          "version": "1.20.0",
+                          "from": "mime-db@>=1.20.0 <1.21.0",
+                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
                         }
                       }
                     },
                     "node-uuid": {
-                      "version": "1.4.3",
-                      "from": "node-uuid@>=1.4.3 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                      "version": "1.4.7",
+                      "from": "node-uuid@>=1.4.7 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                     },
                     "qs": {
                       "version": "5.2.0",
@@ -3926,34 +3969,95 @@
                       "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
                     },
                     "tunnel-agent": {
-                      "version": "0.4.1",
+                      "version": "0.4.2",
                       "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
                     },
                     "tough-cookie": {
-                      "version": "2.2.0",
+                      "version": "2.2.1",
                       "from": "tough-cookie@>=2.2.0 <2.3.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
                     },
                     "http-signature": {
-                      "version": "0.11.0",
-                      "from": "http-signature@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+                      "version": "1.1.0",
+                      "from": "http-signature@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
                       "dependencies": {
                         "assert-plus": {
                           "version": "0.1.5",
                           "from": "assert-plus@>=0.1.5 <0.2.0",
                           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                         },
-                        "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                        },
-                        "ctype": {
-                          "version": "0.5.3",
-                          "from": "ctype@0.5.3",
-                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+                        "jsprim": {
+                          "version": "1.2.2",
+                          "from": "jsprim@>=1.2.2 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
+                          "dependencies": {
+                            "extsprintf": {
+                              "version": "1.0.2",
+                              "from": "extsprintf@1.0.2",
+                              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                            },
+                            "json-schema": {
+                              "version": "0.2.2",
+                              "from": "json-schema@0.2.2",
+                              "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                            },
+                            "verror": {
+                              "version": "1.3.6",
+                              "from": "verror@1.3.6",
+                              "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                            }
+                          }
+                        },
+                        "sshpk": {
+                          "version": "1.7.1",
+                          "from": "sshpk@>=1.7.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
+                          "dependencies": {
+                            "asn1": {
+                              "version": "0.2.3",
+                              "from": "asn1@>=0.2.3 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                            },
+                            "assert-plus": {
+                              "version": "0.2.0",
+                              "from": "assert-plus@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                            },
+                            "dashdash": {
+                              "version": "1.10.1",
+                              "from": "dashdash@>=1.10.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
+                              "dependencies": {
+                                "assert-plus": {
+                                  "version": "0.1.5",
+                                  "from": "assert-plus@>=0.1.0 <0.2.0",
+                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                                }
+                              }
+                            },
+                            "jsbn": {
+                              "version": "0.1.0",
+                              "from": "jsbn@>=0.1.0 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                            },
+                            "tweetnacl": {
+                              "version": "0.13.2",
+                              "from": "tweetnacl@>=0.13.0 <1.0.0",
+                              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                            },
+                            "jodid25519": {
+                              "version": "1.0.2",
+                              "from": "jodid25519@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                            },
+                            "ecc-jsbn": {
+                              "version": "0.1.1",
+                              "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+                              "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                            }
+                          }
                         }
                       }
                     },
@@ -3963,9 +4067,9 @@
                       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
                     },
                     "hawk": {
-                      "version": "3.1.0",
+                      "version": "3.1.2",
                       "from": "hawk@>=3.1.0 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
                       "dependencies": {
                         "hoek": {
                           "version": "2.16.3",
@@ -3973,9 +4077,9 @@
                           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                         },
                         "boom": {
-                          "version": "2.10.0",
-                          "from": "boom@>=2.8.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz"
+                          "version": "2.10.1",
+                          "from": "boom@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                         },
                         "cryptiles": {
                           "version": "2.0.5",
@@ -4016,10 +4120,15 @@
                       "from": "isstream@>=0.1.2 <0.2.0",
                       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                     },
+                    "is-typedarray": {
+                      "version": "1.0.0",
+                      "from": "is-typedarray@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                    },
                     "har-validator": {
-                      "version": "2.0.2",
+                      "version": "2.0.3",
                       "from": "har-validator@>=2.0.2 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
                       "dependencies": {
                         "chalk": {
                           "version": "1.1.1",
@@ -4050,7 +4159,7 @@
                         },
                         "commander": {
                           "version": "2.9.0",
-                          "from": "commander@>=2.8.1 <3.0.0",
+                          "from": "commander@>=2.9.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                           "dependencies": {
                             "graceful-readlink": {
@@ -4061,9 +4170,9 @@
                           }
                         },
                         "is-my-json-valid": {
-                          "version": "2.12.2",
-                          "from": "is-my-json-valid@>=2.12.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+                          "version": "2.12.3",
+                          "from": "is-my-json-valid@>=2.12.3 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
                           "dependencies": {
                             "generate-function": {
                               "version": "2.0.0",
@@ -4088,21 +4197,21 @@
                               "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
                             },
                             "xtend": {
-                              "version": "4.0.0",
+                              "version": "4.0.1",
                               "from": "xtend@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                             }
                           }
                         },
                         "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+                          "version": "2.0.0",
+                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                           "dependencies": {
                             "pinkie": {
-                              "version": "1.0.0",
-                              "from": "pinkie@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                              "version": "2.0.1",
+                              "from": "pinkie@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                             }
                           }
                         }
@@ -4116,14 +4225,14 @@
                   "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
                 },
                 "rimraf": {
-                  "version": "2.4.3",
-                  "from": "rimraf@2.4.3",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+                  "version": "2.4.4",
+                  "from": "rimraf@>=2.4.4 <2.5.0",
+                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"
                 },
                 "semver": {
-                  "version": "5.0.3",
-                  "from": "semver@5.0.3",
-                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                  "version": "5.1.0",
+                  "from": "semver@>=5.1.0 <5.2.0",
+                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
                 },
                 "sha": {
                   "version": "2.0.1",
@@ -4486,9 +4595,9 @@
                   "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
                 },
                 "tunnel-agent": {
-                  "version": "0.4.1",
+                  "version": "0.4.2",
                   "from": "tunnel-agent@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
                 },
                 "tough-cookie": {
                   "version": "2.2.1",
@@ -5428,9 +5537,9 @@
                       "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
                     },
                     "are-we-there-yet": {
-                      "version": "1.0.4",
+                      "version": "1.0.5",
                       "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.5.tgz",
                       "dependencies": {
                         "delegates": {
                           "version": "0.1.0",
@@ -5438,29 +5547,39 @@
                           "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
                         },
                         "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                          "version": "2.0.4",
+                          "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                           "dependencies": {
                             "core-util-is": {
                               "version": "1.0.2",
                               "from": "core-util-is@>=1.0.0 <1.1.0",
                               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                             },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@>=2.0.1 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            },
                             "isarray": {
                               "version": "0.0.1",
                               "from": "isarray@0.0.1",
                               "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                             },
+                            "process-nextick-args": {
+                              "version": "1.0.6",
+                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+                            },
                             "string_decoder": {
                               "version": "0.10.31",
                               "from": "string_decoder@>=0.10.0 <0.11.0",
                               "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                             },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            "util-deprecate": {
+                              "version": "1.0.2",
+                              "from": "util-deprecate@>=1.0.1 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                             }
                           }
                         }
@@ -5679,7 +5798,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
+                      "from": "inherits@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -5809,9 +5928,9 @@
                   "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
                 },
                 "tunnel-agent": {
-                  "version": "0.4.1",
+                  "version": "0.4.2",
                   "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
                 },
                 "tough-cookie": {
                   "version": "2.2.1",
@@ -6475,12 +6594,12 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "once": {
                       "version": "1.3.3",
-                      "from": "once@>=1.3.0 <1.4.0",
+                      "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
@@ -6560,7 +6679,7 @@
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "from": "inherits@>=2.0.0 <3.0.0",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 },
                                 "isarray": {
@@ -6709,7 +6828,7 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
+                  "from": "readable-stream@>=1.0.24 <1.1.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
@@ -6793,9 +6912,9 @@
               }
             },
             "esprima": {
-              "version": "2.7.0",
+              "version": "2.7.1",
               "from": "esprima@>=2.5.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.0.tgz"
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.1.tgz"
             },
             "interpret": {
               "version": "0.6.6",
@@ -6910,9 +7029,9 @@
                   }
                 },
                 "buffer": {
-                  "version": "3.5.3",
+                  "version": "3.5.5",
                   "from": "buffer@>=3.0.3 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.3.tgz",
+                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.5.tgz",
                   "dependencies": {
                     "base64-js": {
                       "version": "0.0.8",
@@ -6924,10 +7043,10 @@
                       "from": "ieee754@>=1.1.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
                     },
-                    "is-array": {
-                      "version": "1.0.1",
-                      "from": "is-array@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz"
+                    "isarray": {
+                      "version": "1.0.0",
+                      "from": "isarray@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                     }
                   }
                 },
@@ -6971,9 +7090,33 @@
                   }
                 },
                 "domain-browser": {
-                  "version": "1.1.4",
+                  "version": "1.1.5",
                   "from": "domain-browser@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"
+                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.5.tgz",
+                  "dependencies": {
+                    "assert-helpers": {
+                      "version": "4.1.0",
+                      "from": "assert-helpers@>=4.1.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/assert-helpers/-/assert-helpers-4.1.0.tgz",
+                      "dependencies": {
+                        "ansicolors": {
+                          "version": "0.3.2",
+                          "from": "ansicolors@>=0.3.2 <0.4.0",
+                          "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
+                        },
+                        "diff": {
+                          "version": "2.2.1",
+                          "from": "diff@>=2.1.1 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"
+                        },
+                        "esnextguardian": {
+                          "version": "1.2.0",
+                          "from": "esnextguardian@>=1.1.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/esnextguardian/-/esnextguardian-1.2.0.tgz"
+                        }
+                      }
+                    }
+                  }
                 },
                 "events": {
                   "version": "1.1.0",
@@ -7018,9 +7161,9 @@
                   "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
                 },
                 "punycode": {
-                  "version": "1.3.2",
+                  "version": "1.4.0",
                   "from": "punycode@>=1.2.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.0.tgz"
                 },
                 "querystring-es3": {
                   "version": "0.2.1",
@@ -7067,9 +7210,9 @@
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "timers-browserify": {
-                  "version": "1.4.1",
+                  "version": "1.4.2",
                   "from": "timers-browserify@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.1.tgz"
+                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"
                 },
                 "tty-browserify": {
                   "version": "0.0.0",
@@ -7081,6 +7224,11 @@
                   "from": "url@>=0.10.1 <0.11.0",
                   "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
                   "dependencies": {
+                    "punycode": {
+                      "version": "1.3.2",
+                      "from": "punycode@1.3.2",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                    },
                     "querystring": {
                       "version": "0.2.0",
                       "from": "querystring@0.2.0",
@@ -7201,9 +7349,9 @@
                               }
                             },
                             "lazy-cache": {
-                              "version": "0.2.4",
+                              "version": "0.2.7",
                               "from": "lazy-cache@>=0.2.4 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
                             }
                           }
                         },
@@ -7275,9 +7423,9 @@
                   "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                 },
                 "chokidar": {
-                  "version": "1.4.0",
+                  "version": "1.4.1",
                   "from": "chokidar@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.0.tgz",
+                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.1.tgz",
                   "dependencies": {
                     "anymatch": {
                       "version": "1.3.0",
@@ -7285,29 +7433,24 @@
                       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
                       "dependencies": {
                         "arrify": {
-                          "version": "1.0.0",
+                          "version": "1.0.1",
                           "from": "arrify@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz"
+                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
                         },
                         "micromatch": {
-                          "version": "2.3.3",
+                          "version": "2.3.5",
                           "from": "micromatch@>=2.1.5 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.3.tgz",
+                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.5.tgz",
                           "dependencies": {
                             "arr-diff": {
-                              "version": "1.1.0",
-                              "from": "arr-diff@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+                              "version": "2.0.0",
+                              "from": "arr-diff@>=2.0.0 <3.0.0",
+                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
                               "dependencies": {
                                 "arr-flatten": {
                                   "version": "1.0.1",
                                   "from": "arr-flatten@>=1.0.1 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-                                },
-                                "array-slice": {
-                                  "version": "0.2.3",
-                                  "from": "array-slice@>=0.2.3 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
                                 }
                               }
                             },
@@ -7327,46 +7470,32 @@
                                   "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
                                   "dependencies": {
                                     "fill-range": {
-                                      "version": "2.2.2",
+                                      "version": "2.2.3",
                                       "from": "fill-range@>=2.1.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz",
+                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
                                       "dependencies": {
                                         "is-number": {
-                                          "version": "1.1.2",
-                                          "from": "is-number@>=1.1.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz"
+                                          "version": "2.1.0",
+                                          "from": "is-number@>=2.1.0 <3.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
                                         },
                                         "isobject": {
-                                          "version": "1.0.2",
-                                          "from": "isobject@>=1.0.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-1.0.2.tgz"
-                                        },
-                                        "randomatic": {
-                                          "version": "1.1.3",
-                                          "from": "randomatic@>=1.1.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.3.tgz",
+                                          "version": "2.0.0",
+                                          "from": "isobject@>=2.0.0 <3.0.0",
+                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz",
                                           "dependencies": {
-                                            "is-number": {
-                                              "version": "2.1.0",
-                                              "from": "is-number@>=2.0.2 <3.0.0",
-                                              "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-                                              "dependencies": {
-                                                "kind-of": {
-                                                  "version": "3.0.2",
-                                                  "from": "kind-of@>=3.0.2 <4.0.0",
-                                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
-                                                  "dependencies": {
-                                                    "is-buffer": {
-                                                      "version": "1.1.0",
-                                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                                    }
-                                                  }
-                                                }
-                                              }
+                                            "isarray": {
+                                              "version": "0.0.1",
+                                              "from": "isarray@0.0.1",
+                                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                             }
                                           }
                                         },
+                                        "randomatic": {
+                                          "version": "1.1.5",
+                                          "from": "randomatic@>=1.1.3 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
+                                        },
                                         "repeat-string": {
                                           "version": "1.5.2",
                                           "from": "repeat-string@>=1.5.2 <2.0.0",
@@ -7428,9 +7557,9 @@
                               "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
                             },
                             "kind-of": {
-                              "version": "2.0.1",
-                              "from": "kind-of@>=2.0.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+                              "version": "3.0.2",
+                              "from": "kind-of@>=3.0.2 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
                               "dependencies": {
                                 "is-buffer": {
                                   "version": "1.1.0",
@@ -7440,9 +7569,9 @@
                               }
                             },
                             "lazy-cache": {
-                              "version": "0.2.4",
+                              "version": "0.2.7",
                               "from": "lazy-cache@>=0.2.3 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.4.tgz"
+                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
                             },
                             "normalize-path": {
                               "version": "2.0.1",
@@ -7521,6 +7650,11 @@
                       "from": "glob-parent@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
                     },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
                     "is-binary-path": {
                       "version": "1.0.1",
                       "from": "is-binary-path@>=1.0.0 <2.0.0",
@@ -7589,11 +7723,6 @@
                               "from": "core-util-is@>=1.0.0 <1.1.0",
                               "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                             },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
                             "isarray": {
                               "version": "0.0.1",
                               "from": "isarray@0.0.1",
@@ -7619,32 +7748,34 @@
                       }
                     },
                     "fsevents": {
-                      "version": "1.0.5",
+                      "version": "1.0.6",
                       "from": "fsevents@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.5.tgz",
+                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.6.tgz",
                       "dependencies": {
                         "nan": {
                           "version": "2.1.0",
-                          "from": "nan@>=2.0.2 <3.0.0",
+                          "from": "nan@>=2.1.0 <3.0.0",
                           "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
                         },
                         "node-pre-gyp": {
-                          "version": "0.6.15",
-                          "from": "node-pre-gyp@latest",
-                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.15.tgz",
+                          "version": "0.6.17",
+                          "from": "node-pre-gyp@>=0.6.17 <0.7.0",
+                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.17.tgz",
                           "dependencies": {
                             "nopt": {
-                              "version": "3.0.4",
-                              "from": "nopt@>=3.0.1 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
+                              "version": "3.0.6",
+                              "from": "nopt@~3.0.1",
+                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                              "dependencies": {
+                                "abbrev": {
+                                  "version": "1.0.7",
+                                  "from": "abbrev@1",
+                                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+                                }
+                              }
                             }
                           }
                         },
-                        "abbrev": {
-                          "version": "1.0.7",
-                          "from": "abbrev@1",
-                          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                        },
                         "ansi": {
                           "version": "0.3.0",
                           "from": "ansi@~0.3.0",
@@ -7666,9 +7797,9 @@
                           "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
                         },
                         "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                          "version": "0.2.3",
+                          "from": "asn1@>=0.2.3 <0.3.0",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
                         },
                         "assert-plus": {
                           "version": "0.1.5",
@@ -7685,11 +7816,6 @@
                           "from": "aws-sign2@~0.6.0",
                           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                         },
-                        "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                        },
                         "block-stream": {
                           "version": "0.0.8",
                           "from": "block-stream@*",
@@ -7697,24 +7823,19 @@
                         },
                         "boom": {
                           "version": "2.10.1",
-                          "from": "boom@^2.8.x",
+                          "from": "boom@2.x.x",
                           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                         },
-                        "brace-expansion": {
+                        "chalk": {
                           "version": "1.1.1",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
+                          "from": "chalk@^1.1.1",
+                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
                         },
                         "caseless": {
                           "version": "0.11.0",
                           "from": "caseless@~0.11.0",
                           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
                         },
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@^1.1.1",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
-                        },
                         "combined-stream": {
                           "version": "1.0.5",
                           "from": "combined-stream@~1.0.5",
@@ -7722,38 +7843,33 @@
                         },
                         "commander": {
                           "version": "2.9.0",
-                          "from": "commander@^2.8.1",
+                          "from": "commander@^2.9.0",
                           "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
                         },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        },
                         "core-util-is": {
-                          "version": "1.0.1",
+                          "version": "1.0.2",
                           "from": "core-util-is@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                         },
                         "cryptiles": {
                           "version": "2.0.5",
                           "from": "cryptiles@2.x.x",
                           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
                         },
-                        "ctype": {
-                          "version": "0.5.3",
-                          "from": "ctype@0.5.3",
-                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                        },
                         "debug": {
                           "version": "0.7.4",
                           "from": "debug@~0.7.2",
                           "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
                         },
+                        "dashdash": {
+                          "version": "1.10.1",
+                          "from": "dashdash@>=1.10.1 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"
+                        },
                         "deep-extend": {
-                          "version": "0.2.11",
-                          "from": "deep-extend@~0.2.5",
-                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                          "version": "0.4.0",
+                          "from": "deep-extend@~0.4.0",
+                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.0.tgz"
                         },
                         "delayed-stream": {
                           "version": "1.0.0",
@@ -7765,6 +7881,11 @@
                           "from": "delegates@^0.1.0",
                           "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
                         },
+                        "ecc-jsbn": {
+                          "version": "0.1.1",
+                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                        },
                         "escape-string-regexp": {
                           "version": "1.0.3",
                           "from": "escape-string-regexp@^1.0.2",
@@ -7775,6 +7896,11 @@
                           "from": "extend@~3.0.0",
                           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                         },
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "from": "extsprintf@1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                        },
                         "forever-agent": {
                           "version": "0.6.1",
                           "from": "forever-agent@~0.6.1",
@@ -7816,9 +7942,9 @@
                           "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                         },
                         "har-validator": {
-                          "version": "2.0.2",
+                          "version": "2.0.3",
                           "from": "har-validator@~2.0.2",
-                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz"
+                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz"
                         },
                         "has-ansi": {
                           "version": "2.0.0",
@@ -7830,20 +7956,20 @@
                           "from": "has-unicode@^1.0.0",
                           "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
                         },
-                        "hawk": {
-                          "version": "3.1.0",
-                          "from": "hawk@~3.1.0",
-                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
-                        },
                         "hoek": {
                           "version": "2.16.3",
                           "from": "hoek@2.x.x",
                           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                         },
+                        "hawk": {
+                          "version": "3.1.2",
+                          "from": "hawk@~3.1.0",
+                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz"
+                        },
                         "http-signature": {
-                          "version": "0.11.0",
-                          "from": "http-signature@~0.11.0",
-                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+                          "version": "1.1.0",
+                          "from": "http-signature@~1.1.0",
+                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
@@ -7856,15 +7982,20 @@
                           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
                         },
                         "is-my-json-valid": {
-                          "version": "2.12.2",
-                          "from": "is-my-json-valid@^2.12.2",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
+                          "version": "2.12.3",
+                          "from": "is-my-json-valid@^2.12.3",
+                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz"
                         },
                         "is-property": {
                           "version": "1.0.2",
                           "from": "is-property@^1.0.0",
                           "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
                         },
+                        "is-typedarray": {
+                          "version": "1.0.0",
+                          "from": "is-typedarray@~1.0.0",
+                          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                        },
                         "isarray": {
                           "version": "0.0.1",
                           "from": "isarray@0.0.1",
@@ -7875,6 +8006,21 @@
                           "from": "isstream@~0.1.2",
                           "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                         },
+                        "jodid25519": {
+                          "version": "1.0.2",
+                          "from": "jodid25519@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                        },
+                        "jsbn": {
+                          "version": "0.1.0",
+                          "from": "jsbn@>=0.1.0 <0.2.0",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                        },
+                        "json-schema": {
+                          "version": "0.2.2",
+                          "from": "json-schema@0.2.2",
+                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+                        },
                         "json-stringify-safe": {
                           "version": "5.0.1",
                           "from": "json-stringify-safe@~5.0.1",
@@ -7885,6 +8031,11 @@
                           "from": "jsonpointer@2.0.0",
                           "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
                         },
+                        "jsprim": {
+                          "version": "1.2.2",
+                          "from": "jsprim@^1.2.2",
+                          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
+                        },
                         "lodash._basetostring": {
                           "version": "3.0.1",
                           "from": "lodash._basetostring@^3.0.0",
@@ -7936,14 +8087,14 @@
                           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
                         },
                         "node-uuid": {
-                          "version": "1.4.3",
-                          "from": "node-uuid@~1.4.3",
-                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+                          "version": "1.4.7",
+                          "from": "node-uuid@~1.4.7",
+                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                         },
                         "npmlog": {
-                          "version": "1.2.1",
-                          "from": "npmlog@~1.2.0",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
+                          "version": "2.0.0",
+                          "from": "npmlog@~2.0.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.0.tgz"
                         },
                         "oauth-sign": {
                           "version": "0.8.0",
@@ -7955,20 +8106,15 @@
                           "from": "once@~1.1.1",
                           "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
                         },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        },
                         "pinkie": {
-                          "version": "1.0.0",
-                          "from": "pinkie@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
+                          "version": "2.0.1",
+                          "from": "pinkie@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
                         },
                         "pinkie-promise": {
-                          "version": "1.0.0",
-                          "from": "pinkie-promise@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
+                          "version": "2.0.0",
+                          "from": "pinkie-promise@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"
                         },
                         "qs": {
                           "version": "5.2.0",
@@ -7981,14 +8127,14 @@
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
                         },
                         "request": {
-                          "version": "2.65.0",
+                          "version": "2.67.0",
                           "from": "request@2.x",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz"
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz"
                         },
                         "semver": {
-                          "version": "5.0.3",
-                          "from": "semver@~5.0.1",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                          "version": "5.1.0",
+                          "from": "semver@~5.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
                         },
                         "sntp": {
                           "version": "1.0.9",
@@ -8011,9 +8157,9 @@
                           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
                         },
                         "strip-json-comments": {
-                          "version": "0.1.3",
-                          "from": "strip-json-comments@0.1.x",
-                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                          "version": "1.0.4",
+                          "from": "strip-json-comments@~1.0.4",
+                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
                         },
                         "supports-color": {
                           "version": "2.0.0",
@@ -8026,83 +8172,56 @@
                           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
                         },
                         "tough-cookie": {
-                          "version": "2.2.0",
+                          "version": "2.2.1",
                           "from": "tough-cookie@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
                         },
                         "tunnel-agent": {
                           "version": "0.4.1",
                           "from": "tunnel-agent@~0.4.1",
                           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
                         },
+                        "tweetnacl": {
+                          "version": "0.13.2",
+                          "from": "tweetnacl@>=0.13.0 <1.0.0",
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                        },
                         "uid-number": {
                           "version": "0.0.3",
                           "from": "uid-number@0.0.3",
                           "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
                         },
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        },
                         "xtend": {
                           "version": "4.0.1",
                           "from": "xtend@^4.0.0",
                           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                         },
-                        "fstream-ignore": {
-                          "version": "1.0.3",
-                          "from": "fstream-ignore@~1.0.3",
-                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
-                          "dependencies": {
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=3.0.0 <4.0.0"
-                            }
-                          }
-                        },
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "once": {
-                              "version": "1.3.2",
-                              "from": "once@>=1.3.0 <2.0.0"
-                            }
-                          }
+                        "verror": {
+                          "version": "1.3.6",
+                          "from": "verror@1.3.6",
+                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
                         },
                         "rc": {
-                          "version": "1.1.2",
+                          "version": "1.1.5",
                           "from": "rc@~1.1.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.2.tgz",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.5.tgz",
                           "dependencies": {
                             "minimist": {
                               "version": "1.2.0",
-                              "from": "minimist@^1.1.2",
+                              "from": "minimist@^1.2.0",
                               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
                             }
                           }
                         },
-                        "rimraf": {
-                          "version": "2.4.3",
-                          "from": "rimraf@~2.4.0",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+                        "sshpk": {
+                          "version": "1.7.0",
+                          "from": "sshpk@^1.7.0",
+                          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.0.tgz",
                           "dependencies": {
-                            "glob": {
-                              "version": "5.0.15",
-                              "from": "glob@>=5.0.14 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-                            },
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
-                            },
-                            "once": {
-                              "version": "1.3.2",
-                              "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz"
+                            "assert-plus": {
+                              "version": "0.2.0",
+                              "from": "assert-plus@>=0.2.0 <0.3.0",
+                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
                             }
                           }
                         },
@@ -8117,9 +8236,9 @@
                               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
                               "dependencies": {
                                 "core-util-is": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
@@ -8161,13 +8280,13 @@
                               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                               "dependencies": {
                                 "core-util-is": {
-                                  "version": "1.0.1",
+                                  "version": "1.0.2",
                                   "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@~2.0.1",
+                                  "from": "inherits@~2.0.0",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 },
                                 "isarray": {
@@ -8188,6 +8307,109 @@
                               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
                             }
                           }
+                        },
+                        "fstream-ignore": {
+                          "version": "1.0.3",
+                          "from": "fstream-ignore@~1.0.3",
+                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
+                          "dependencies": {
+                            "minimatch": {
+                              "version": "3.0.0",
+                              "from": "minimatch@^3.0.0",
+                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                              "dependencies": {
+                                "brace-expansion": {
+                                  "version": "1.1.1",
+                                  "from": "brace-expansion@^1.0.0",
+                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                                  "dependencies": {
+                                    "balanced-match": {
+                                      "version": "0.2.1",
+                                      "from": "balanced-match@^0.2.0",
+                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                    },
+                                    "concat-map": {
+                                      "version": "0.0.1",
+                                      "from": "concat-map@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.4.4",
+                          "from": "rimraf@~2.4.0",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
+                          "dependencies": {
+                            "glob": {
+                              "version": "5.0.15",
+                              "from": "glob@^5.0.14",
+                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                              "dependencies": {
+                                "inflight": {
+                                  "version": "1.0.4",
+                                  "from": "inflight@^1.0.4",
+                                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.1",
+                                      "from": "wrappy@1",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "minimatch": {
+                                  "version": "3.0.0",
+                                  "from": "minimatch@2 || 3",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+                                  "dependencies": {
+                                    "brace-expansion": {
+                                      "version": "1.1.1",
+                                      "from": "brace-expansion@^1.0.0",
+                                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+                                      "dependencies": {
+                                        "balanced-match": {
+                                          "version": "0.2.1",
+                                          "from": "balanced-match@^0.2.0",
+                                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
+                                        },
+                                        "concat-map": {
+                                          "version": "0.0.1",
+                                          "from": "concat-map@0.0.1",
+                                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "once": {
+                                  "version": "1.3.3",
+                                  "from": "once@^1.3.0",
+                                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.1",
+                                      "from": "wrappy@1",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "path-is-absolute": {
+                                  "version": "1.0.0",
+                                  "from": "path-is-absolute@^1.0.0",
+                                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                                }
+                              }
+                            }
+                          }
                         }
                       }
                     }
@@ -8578,9 +8800,9 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
         },
         "tunnel-agent": {
-          "version": "0.4.1",
+          "version": "0.4.2",
           "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
         },
         "tough-cookie": {
           "version": "2.2.1",
diff --git a/package.json b/package.json
index 77de354f04..a38b6ff79e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.4",
+    "ionic-app-lib": "2.0.0-beta.5",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 9761c7ac0d7f0d728f2b55278d25a12de92fdf0f Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Sun, 13 Dec 2015 19:06:53 -0600
Subject: [PATCH 0866/1100] add --ts flag to v2 start

---
 lib/tasks/cliTasks.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 7eb890471c..c450f58f58 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -61,6 +61,10 @@ var TASKS = [
         boolean: true,
         title: 'Start a Ionic v2 project'
       },
+      '--typescript|--ts': {
+        boolean: true,
+        title: '(with --v2 only) Use TypeScript in starter'
+      },
       '--zip-file|-z': 'URL to download zipfile for starter template'
     },
     module: './ionic/start',

From 6e387362523f9834e5a1485decd57828299d9562 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 14 Dec 2015 11:03:46 -0600
Subject: [PATCH 0867/1100] use bundledDependencies

---
 npm-shrinkwrap.json | 9498 -------------------------------------------
 package.json        |    1 +
 2 files changed, 1 insertion(+), 9498 deletions(-)
 delete mode 100644 npm-shrinkwrap.json

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index 453a2c0b47..0000000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,9498 +0,0 @@
-{
-  "name": "ionic",
-  "version": "2.0.0-beta.11",
-  "dependencies": {
-    "async": {
-      "version": "0.9.2",
-      "from": "async@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-    },
-    "cheerio": {
-      "version": "0.19.0",
-      "from": "cheerio@>=0.19.0 <0.20.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz",
-      "dependencies": {
-        "css-select": {
-          "version": "1.0.0",
-          "from": "css-select@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz",
-          "dependencies": {
-            "css-what": {
-              "version": "1.0.0",
-              "from": "css-what@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
-            },
-            "domutils": {
-              "version": "1.4.3",
-              "from": "domutils@>=1.4.0 <1.5.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
-              "dependencies": {
-                "domelementtype": {
-                  "version": "1.3.0",
-                  "from": "domelementtype@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-                }
-              }
-            },
-            "boolbase": {
-              "version": "1.0.0",
-              "from": "boolbase@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
-            },
-            "nth-check": {
-              "version": "1.0.1",
-              "from": "nth-check@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
-            }
-          }
-        },
-        "entities": {
-          "version": "1.1.1",
-          "from": "entities@>=1.1.1 <1.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
-        },
-        "htmlparser2": {
-          "version": "3.8.3",
-          "from": "htmlparser2@>=3.8.1 <3.9.0",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-          "dependencies": {
-            "domhandler": {
-              "version": "2.3.0",
-              "from": "domhandler@>=2.3.0 <2.4.0",
-              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
-            },
-            "domutils": {
-              "version": "1.5.1",
-              "from": "domutils@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
-            },
-            "domelementtype": {
-              "version": "1.3.0",
-              "from": "domelementtype@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
-            },
-            "readable-stream": {
-              "version": "1.1.13",
-              "from": "readable-stream@>=1.1.0 <1.2.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "entities": {
-              "version": "1.0.0",
-              "from": "entities@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
-            }
-          }
-        },
-        "dom-serializer": {
-          "version": "0.1.0",
-          "from": "dom-serializer@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.1.3",
-              "from": "domelementtype@>=1.1.1 <1.2.0",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
-            }
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.2.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        }
-      }
-    },
-    "cli-table": {
-      "version": "0.3.1",
-      "from": "cli-table@>=0.3.1 <0.4.0",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "from": "colors@1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-        }
-      }
-    },
-    "colors": {
-      "version": "0.6.2",
-      "from": "colors@0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
-    },
-    "connect": {
-      "version": "3.1.1",
-      "from": "connect@3.1.1",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.1.1.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "1.0.4",
-          "from": "debug@1.0.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "finalhandler": {
-          "version": "0.1.0",
-          "from": "finalhandler@0.1.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz",
-          "dependencies": {
-            "escape-html": {
-              "version": "1.0.1",
-              "from": "escape-html@1.0.1",
-              "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-            }
-          }
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "connect-livereload": {
-      "version": "0.5.2",
-      "from": "connect-livereload@0.5.2",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.2.tgz"
-    },
-    "crc": {
-      "version": "3.2.1",
-      "from": "crc@3.2.1",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
-    },
-    "cross-spawn": {
-      "version": "0.2.3",
-      "from": "cross-spawn@0.2.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.3.tgz",
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.7.3",
-          "from": "lru-cache@>=2.5.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-        }
-      }
-    },
-    "event-stream": {
-      "version": "3.0.20",
-      "from": "event-stream@>=3.0.0 <3.1.0",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.0.20.tgz",
-      "dependencies": {
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        },
-        "duplexer": {
-          "version": "0.1.1",
-          "from": "duplexer@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-        },
-        "from": {
-          "version": "0.1.3",
-          "from": "from@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz"
-        },
-        "map-stream": {
-          "version": "0.0.6",
-          "from": "map-stream@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.6.tgz"
-        },
-        "pause-stream": {
-          "version": "0.0.11",
-          "from": "pause-stream@0.0.11",
-          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"
-        },
-        "split": {
-          "version": "0.2.10",
-          "from": "split@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz"
-        },
-        "stream-combiner": {
-          "version": "0.0.4",
-          "from": "stream-combiner@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "1.2.0",
-      "from": "expand-tilde@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.0.tgz",
-      "dependencies": {
-        "user-home": {
-          "version": "1.1.1",
-          "from": "user-home@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "0.2.0",
-      "from": "finalhandler@0.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            }
-          }
-        },
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        }
-      }
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "from": "form-data@0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "dependencies": {
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-        }
-      }
-    },
-    "gulp": {
-      "version": "3.8.8",
-      "from": "gulp@3.8.8",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz",
-      "dependencies": {
-        "archy": {
-          "version": "0.0.2",
-          "from": "archy@>=0.0.2 <0.0.3",
-          "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "1.1.0",
-              "from": "ansi-styles@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-            },
-            "has-ansi": {
-              "version": "0.1.0",
-              "from": "has-ansi@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "strip-ansi": {
-              "version": "0.3.0",
-              "from": "strip-ansi@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "0.2.1",
-                  "from": "ansi-regex@>=0.2.1 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-                }
-              }
-            },
-            "supports-color": {
-              "version": "0.2.0",
-              "from": "supports-color@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
-            }
-          }
-        },
-        "deprecated": {
-          "version": "0.0.1",
-          "from": "deprecated@>=0.0.1 <0.0.2",
-          "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"
-        },
-        "gulp-util": {
-          "version": "3.0.7",
-          "from": "gulp-util@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
-          "dependencies": {
-            "array-differ": {
-              "version": "1.0.0",
-              "from": "array-differ@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
-            },
-            "array-uniq": {
-              "version": "1.0.2",
-              "from": "array-uniq@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
-            },
-            "beeper": {
-              "version": "1.1.0",
-              "from": "beeper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "dateformat": {
-              "version": "1.0.12",
-              "from": "dateformat@>=1.0.11 <2.0.0",
-              "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-              "dependencies": {
-                "get-stdin": {
-                  "version": "4.0.1",
-                  "from": "get-stdin@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-                },
-                "meow": {
-                  "version": "3.6.0",
-                  "from": "meow@>=3.3.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-                  "dependencies": {
-                    "camelcase-keys": {
-                      "version": "2.0.0",
-                      "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "2.0.1",
-                          "from": "camelcase@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                        },
-                        "map-obj": {
-                          "version": "1.0.1",
-                          "from": "map-obj@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "loud-rejection": {
-                      "version": "1.2.0",
-                      "from": "loud-rejection@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                      "dependencies": {
-                        "signal-exit": {
-                          "version": "2.1.2",
-                          "from": "signal-exit@>=2.1.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "validate-npm-package-license": {
-                          "version": "3.0.1",
-                          "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                          "dependencies": {
-                            "spdx-correct": {
-                              "version": "1.0.2",
-                              "from": "spdx-correct@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            },
-                            "spdx-expression-parse": {
-                              "version": "1.0.2",
-                              "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                              "dependencies": {
-                                "spdx-exceptions": {
-                                  "version": "1.0.4",
-                                  "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                                },
-                                "spdx-license-ids": {
-                                  "version": "1.1.0",
-                                  "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "object-assign": {
-                      "version": "4.0.1",
-                      "from": "object-assign@>=4.0.1 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                    },
-                    "read-pkg-up": {
-                      "version": "1.0.1",
-                      "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                      "dependencies": {
-                        "find-up": {
-                          "version": "1.1.0",
-                          "from": "find-up@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                          "dependencies": {
-                            "path-exists": {
-                              "version": "2.1.0",
-                              "from": "path-exists@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "read-pkg": {
-                          "version": "1.1.0",
-                          "from": "read-pkg@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                          "dependencies": {
-                            "load-json-file": {
-                              "version": "1.1.0",
-                              "from": "load-json-file@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "parse-json": {
-                                  "version": "2.2.0",
-                                  "from": "parse-json@>=2.2.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                                  "dependencies": {
-                                    "error-ex": {
-                                      "version": "1.3.0",
-                                      "from": "error-ex@>=1.2.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                      "dependencies": {
-                                        "is-arrayish": {
-                                          "version": "0.2.1",
-                                          "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                },
-                                "strip-bom": {
-                                  "version": "2.0.0",
-                                  "from": "strip-bom@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                                  "dependencies": {
-                                    "is-utf8": {
-                                      "version": "0.2.0",
-                                      "from": "is-utf8@>=0.2.0 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "path-type": {
-                              "version": "1.1.0",
-                              "from": "path-type@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                              "dependencies": {
-                                "graceful-fs": {
-                                  "version": "4.1.2",
-                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                                },
-                                "pify": {
-                                  "version": "2.3.0",
-                                  "from": "pify@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                                },
-                                "pinkie-promise": {
-                                  "version": "2.0.0",
-                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                                  "dependencies": {
-                                    "pinkie": {
-                                      "version": "2.0.1",
-                                      "from": "pinkie@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "redent": {
-                      "version": "1.0.0",
-                      "from": "redent@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                      "dependencies": {
-                        "indent-string": {
-                          "version": "2.1.0",
-                          "from": "indent-string@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                          "dependencies": {
-                            "repeating": {
-                              "version": "2.0.0",
-                              "from": "repeating@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                              "dependencies": {
-                                "is-finite": {
-                                  "version": "1.0.1",
-                                  "from": "is-finite@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                                  "dependencies": {
-                                    "number-is-nan": {
-                                      "version": "1.0.0",
-                                      "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "strip-indent": {
-                          "version": "1.0.1",
-                          "from": "strip-indent@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "trim-newlines": {
-                      "version": "1.0.0",
-                      "from": "trim-newlines@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "fancy-log": {
-              "version": "1.1.0",
-              "from": "fancy-log@>=1.1.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz"
-            },
-            "gulplog": {
-              "version": "1.0.0",
-              "from": "gulplog@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-              "dependencies": {
-                "glogg": {
-                  "version": "1.0.0",
-                  "from": "glogg@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-                  "dependencies": {
-                    "sparkles": {
-                      "version": "1.0.0",
-                      "from": "sparkles@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "has-gulplog": {
-              "version": "0.1.0",
-              "from": "has-gulplog@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-              "dependencies": {
-                "sparkles": {
-                  "version": "1.0.0",
-                  "from": "sparkles@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"
-                }
-              }
-            },
-            "lodash._reescape": {
-              "version": "3.0.0",
-              "from": "lodash._reescape@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-            },
-            "lodash._reevaluate": {
-              "version": "3.0.0",
-              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-            },
-            "lodash._reinterpolate": {
-              "version": "3.0.0",
-              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-            },
-            "lodash.template": {
-              "version": "3.6.2",
-              "from": "lodash.template@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-              "dependencies": {
-                "lodash._basecopy": {
-                  "version": "3.0.1",
-                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-                },
-                "lodash._basetostring": {
-                  "version": "3.0.1",
-                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                },
-                "lodash._basevalues": {
-                  "version": "3.0.0",
-                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
-                },
-                "lodash._isiterateecall": {
-                  "version": "3.0.9",
-                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-                },
-                "lodash.escape": {
-                  "version": "3.0.0",
-                  "from": "lodash.escape@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
-                },
-                "lodash.keys": {
-                  "version": "3.1.2",
-                  "from": "lodash.keys@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-                  "dependencies": {
-                    "lodash._getnative": {
-                      "version": "3.9.1",
-                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-                    },
-                    "lodash.isarguments": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
-                    },
-                    "lodash.isarray": {
-                      "version": "3.0.4",
-                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-                    }
-                  }
-                },
-                "lodash.restparam": {
-                  "version": "3.6.1",
-                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-                },
-                "lodash.templatesettings": {
-                  "version": "3.1.0",
-                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
-                }
-              }
-            },
-            "multipipe": {
-              "version": "0.1.2",
-              "from": "multipipe@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-              "dependencies": {
-                "duplexer2": {
-                  "version": "0.0.2",
-                  "from": "duplexer2@0.0.2",
-                  "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.9 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "object-assign": {
-              "version": "3.0.0",
-              "from": "object-assign@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
-            },
-            "replace-ext": {
-              "version": "0.0.1",
-              "from": "replace-ext@0.0.1",
-              "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
-            },
-            "through2": {
-              "version": "2.0.0",
-              "from": "through2@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.5.3",
-              "from": "vinyl@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "1.0.2",
-                  "from": "clone@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "interpret": {
-          "version": "0.3.10",
-          "from": "interpret@>=0.3.2 <0.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"
-        },
-        "liftoff": {
-          "version": "0.12.1",
-          "from": "liftoff@>=0.12.0 <0.13.0",
-          "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz",
-          "dependencies": {
-            "findup-sync": {
-              "version": "0.1.3",
-              "from": "findup-sync@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.9 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "lodash": {
-                  "version": "2.4.2",
-                  "from": "lodash@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                }
-              }
-            },
-            "resolve": {
-              "version": "0.7.4",
-              "from": "resolve@>=0.7.0 <0.8.0",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"
-            },
-            "minimist": {
-              "version": "0.2.0",
-              "from": "minimist@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
-            },
-            "extend": {
-              "version": "1.3.0",
-              "from": "extend@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz"
-            }
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "from": "minimist@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-        },
-        "orchestrator": {
-          "version": "0.3.7",
-          "from": "orchestrator@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz",
-          "dependencies": {
-            "end-of-stream": {
-              "version": "0.1.5",
-              "from": "end-of-stream@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-              "dependencies": {
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "sequencify": {
-              "version": "0.0.7",
-              "from": "sequencify@>=0.0.7 <0.1.0",
-              "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"
-            },
-            "stream-consume": {
-              "version": "0.1.0",
-              "from": "stream-consume@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
-            }
-          }
-        },
-        "pretty-hrtime": {
-          "version": "0.2.2",
-          "from": "pretty-hrtime@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz"
-        },
-        "semver": {
-          "version": "3.0.1",
-          "from": "semver@>=3.0.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
-        },
-        "tildify": {
-          "version": "1.1.2",
-          "from": "tildify@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz",
-          "dependencies": {
-            "os-homedir": {
-              "version": "1.0.1",
-              "from": "os-homedir@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "inquirer": {
-      "version": "0.11.0",
-      "from": "inquirer@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.0.tgz",
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "1.1.0",
-          "from": "ansi-escapes@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.1.0.tgz"
-        },
-        "ansi-regex": {
-          "version": "2.0.0",
-          "from": "ansi-regex@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-        },
-        "chalk": {
-          "version": "1.1.1",
-          "from": "chalk@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-          "dependencies": {
-            "ansi-styles": {
-              "version": "2.1.0",
-              "from": "ansi-styles@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-            },
-            "escape-string-regexp": {
-              "version": "1.0.3",
-              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-            },
-            "has-ansi": {
-              "version": "2.0.0",
-              "from": "has-ansi@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-            },
-            "supports-color": {
-              "version": "2.0.0",
-              "from": "supports-color@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-            }
-          }
-        },
-        "cli-cursor": {
-          "version": "1.0.2",
-          "from": "cli-cursor@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-          "dependencies": {
-            "restore-cursor": {
-              "version": "1.0.1",
-              "from": "restore-cursor@>=1.0.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-              "dependencies": {
-                "exit-hook": {
-                  "version": "1.1.1",
-                  "from": "exit-hook@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"
-                },
-                "onetime": {
-                  "version": "1.0.0",
-                  "from": "onetime@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "cli-width": {
-          "version": "1.1.0",
-          "from": "cli-width@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.0.tgz"
-        },
-        "figures": {
-          "version": "1.4.0",
-          "from": "figures@>=1.3.5 <2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.4.0.tgz"
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.3.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "readline2": {
-          "version": "1.0.1",
-          "from": "readline2@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-          "dependencies": {
-            "code-point-at": {
-              "version": "1.0.0",
-              "from": "code-point-at@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
-              "dependencies": {
-                "number-is-nan": {
-                  "version": "1.0.0",
-                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                }
-              }
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "dependencies": {
-                "number-is-nan": {
-                  "version": "1.0.0",
-                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                }
-              }
-            },
-            "mute-stream": {
-              "version": "0.0.5",
-              "from": "mute-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "run-async": {
-          "version": "0.1.0",
-          "from": "run-async@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-          "dependencies": {
-            "once": {
-              "version": "1.3.3",
-              "from": "once@>=1.3.0 <1.4.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-              "dependencies": {
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "rx-lite": {
-          "version": "3.1.2",
-          "from": "rx-lite@>=3.1.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"
-        },
-        "strip-ansi": {
-          "version": "3.0.0",
-          "from": "strip-ansi@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-        },
-        "through": {
-          "version": "2.3.8",
-          "from": "through@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-        }
-      }
-    },
-    "ionic-app-lib": {
-      "version": "2.0.0-beta.5",
-      "from": "ionic-app-lib@2.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/ionic-app-lib/-/ionic-app-lib-2.0.0-beta.5.tgz",
-      "dependencies": {
-        "archiver": {
-          "version": "0.5.2",
-          "from": "archiver@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.24 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "zip-stream": {
-              "version": "0.1.4",
-              "from": "zip-stream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz",
-              "dependencies": {
-                "lodash.defaults": {
-                  "version": "2.4.1",
-                  "from": "lodash.defaults@>=2.4.1 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-                  "dependencies": {
-                    "lodash.keys": {
-                      "version": "2.4.1",
-                      "from": "lodash.keys@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                      "dependencies": {
-                        "lodash._isnative": {
-                          "version": "2.4.1",
-                          "from": "lodash._isnative@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
-                        },
-                        "lodash.isobject": {
-                          "version": "2.4.1",
-                          "from": "lodash.isobject@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"
-                        },
-                        "lodash._shimkeys": {
-                          "version": "2.4.1",
-                          "from": "lodash._shimkeys@>=2.4.1 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"
-                        }
-                      }
-                    },
-                    "lodash._objecttypes": {
-                      "version": "2.4.1",
-                      "from": "lodash._objecttypes@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "lazystream": {
-              "version": "0.1.0",
-              "from": "lazystream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
-            },
-            "file-utils": {
-              "version": "0.1.5",
-              "from": "file-utils@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
-              "dependencies": {
-                "lodash": {
-                  "version": "2.1.0",
-                  "from": "lodash@>=2.1.0 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.1.0.tgz"
-                },
-                "iconv-lite": {
-                  "version": "0.2.11",
-                  "from": "iconv-lite@>=0.2.11 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
-                },
-                "rimraf": {
-                  "version": "2.2.8",
-                  "from": "rimraf@>=2.2.2 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                },
-                "glob": {
-                  "version": "3.2.11",
-                  "from": "glob@>=3.2.6 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "0.3.0",
-                      "from": "minimatch@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "0.2.14",
-                  "from": "minimatch@>=0.2.12 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "findup-sync": {
-                  "version": "0.1.3",
-                  "from": "findup-sync@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "2.4.2",
-                      "from": "lodash@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-                    }
-                  }
-                },
-                "isbinaryfile": {
-                  "version": "0.1.9",
-                  "from": "isbinaryfile@>=0.1.9 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-0.1.9.tgz"
-                }
-              }
-            },
-            "lodash": {
-              "version": "2.4.2",
-              "from": "lodash@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-            }
-          }
-        },
-        "autoprefixer": {
-          "version": "6.1.2",
-          "from": "autoprefixer@>=6.0.2 <7.0.0",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.1.2.tgz",
-          "dependencies": {
-            "postcss-value-parser": {
-              "version": "3.1.3",
-              "from": "postcss-value-parser@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.1.3.tgz"
-            },
-            "num2fraction": {
-              "version": "1.2.2",
-              "from": "num2fraction@>=1.2.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
-            },
-            "browserslist": {
-              "version": "1.0.1",
-              "from": "browserslist@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.0.1.tgz"
-            },
-            "caniuse-db": {
-              "version": "1.0.30000377",
-              "from": "caniuse-db@>=1.0.30000372 <2.0.0",
-              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000377.tgz"
-            }
-          }
-        },
-        "cross-spawn": {
-          "version": "2.0.0",
-          "from": "cross-spawn@2.0.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz",
-          "dependencies": {
-            "cross-spawn-async": {
-              "version": "2.1.1",
-              "from": "cross-spawn-async@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.1.1.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "3.2.0",
-                  "from": "lru-cache@>=3.2.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-                  "dependencies": {
-                    "pseudomap": {
-                      "version": "1.0.1",
-                      "from": "pseudomap@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "spawn-sync": {
-              "version": "1.0.14",
-              "from": "spawn-sync@>=1.0.13 <2.0.0",
-              "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz",
-              "dependencies": {
-                "concat-stream": {
-                  "version": "1.5.1",
-                  "from": "concat-stream@>=1.4.7 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "typedarray": {
-                      "version": "0.0.6",
-                      "from": "typedarray@>=0.0.5 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                    },
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.6",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "os-shim": {
-                  "version": "0.1.3",
-                  "from": "os-shim@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "ionic-cordova-lib": {
-          "version": "5.1.10",
-          "from": "ionic-cordova-lib@5.1.10",
-          "resolved": "https://registry.npmjs.org/ionic-cordova-lib/-/ionic-cordova-lib-5.1.10.tgz",
-          "dependencies": {
-            "bplist-parser": {
-              "version": "0.0.6",
-              "from": "bplist-parser@0.0.6",
-              "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"
-            },
-            "cordova-app-hello-world": {
-              "version": "3.9.0",
-              "from": "cordova-app-hello-world@3.9.0",
-              "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz"
-            },
-            "cordova-js": {
-              "version": "4.0.0",
-              "from": "cordova-js@4.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.0.0.tgz",
-              "dependencies": {
-                "browserify": {
-                  "version": "10.1.3",
-                  "from": "browserify@10.1.3",
-                  "resolved": "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz",
-                  "dependencies": {
-                    "JSONStream": {
-                      "version": "1.0.7",
-                      "from": "JSONStream@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.0.7.tgz",
-                      "dependencies": {
-                        "jsonparse": {
-                          "version": "1.2.0",
-                          "from": "jsonparse@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "assert": {
-                      "version": "1.3.0",
-                      "from": "assert@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
-                    },
-                    "browser-pack": {
-                      "version": "4.0.4",
-                      "from": "browser-pack@>=4.0.3 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.3.0",
-                          "from": "combine-source-map@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
-                          "dependencies": {
-                            "inline-source-map": {
-                              "version": "0.3.1",
-                              "from": "inline-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-                              "dependencies": {
-                                "source-map": {
-                                  "version": "0.3.0",
-                                  "from": "source-map@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-                                  "dependencies": {
-                                    "amdefine": {
-                                      "version": "1.0.0",
-                                      "from": "amdefine@>=0.0.4",
-                                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "convert-source-map": {
-                              "version": "0.3.5",
-                              "from": "convert-source-map@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.1.43",
-                              "from": "source-map@>=0.1.31 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "through2": {
-                          "version": "0.5.1",
-                          "from": "through2@>=0.5.1 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "1.0.33",
-                              "from": "readable-stream@>=1.0.17 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "xtend": {
-                              "version": "3.0.0",
-                              "from": "xtend@>=3.0.0 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                            }
-                          }
-                        },
-                        "umd": {
-                          "version": "3.0.1",
-                          "from": "umd@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
-                        }
-                      }
-                    },
-                    "browser-resolve": {
-                      "version": "1.11.0",
-                      "from": "browser-resolve@>=1.7.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.0.tgz"
-                    },
-                    "browserify-zlib": {
-                      "version": "0.1.4",
-                      "from": "browserify-zlib@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-                      "dependencies": {
-                        "pako": {
-                          "version": "0.2.8",
-                          "from": "pako@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
-                        }
-                      }
-                    },
-                    "buffer": {
-                      "version": "3.5.5",
-                      "from": "buffer@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.5.tgz",
-                      "dependencies": {
-                        "base64-js": {
-                          "version": "0.0.8",
-                          "from": "base64-js@0.0.8",
-                          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-                        },
-                        "ieee754": {
-                          "version": "1.1.6",
-                          "from": "ieee754@>=1.1.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "from": "isarray@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@>=0.0.3 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    },
-                    "commondir": {
-                      "version": "0.0.1",
-                      "from": "commondir@0.0.1",
-                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz"
-                    },
-                    "concat-stream": {
-                      "version": "1.4.10",
-                      "from": "concat-stream@>=1.4.1 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        }
-                      }
-                    },
-                    "console-browserify": {
-                      "version": "1.1.0",
-                      "from": "console-browserify@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-                      "dependencies": {
-                        "date-now": {
-                          "version": "0.1.4",
-                          "from": "date-now@>=0.1.4 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
-                        }
-                      }
-                    },
-                    "constants-browserify": {
-                      "version": "0.0.1",
-                      "from": "constants-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
-                    },
-                    "crypto-browserify": {
-                      "version": "3.11.0",
-                      "from": "crypto-browserify@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
-                      "dependencies": {
-                        "browserify-cipher": {
-                          "version": "1.0.0",
-                          "from": "browserify-cipher@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-                          "dependencies": {
-                            "browserify-aes": {
-                              "version": "1.0.5",
-                              "from": "browserify-aes@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                              "dependencies": {
-                                "buffer-xor": {
-                                  "version": "1.0.3",
-                                  "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                },
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "browserify-des": {
-                              "version": "1.0.0",
-                              "from": "browserify-des@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-                              "dependencies": {
-                                "cipher-base": {
-                                  "version": "1.0.2",
-                                  "from": "cipher-base@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                },
-                                "des.js": {
-                                  "version": "1.0.0",
-                                  "from": "des.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "evp_bytestokey": {
-                              "version": "1.0.0",
-                              "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "browserify-sign": {
-                          "version": "4.0.0",
-                          "from": "browserify-sign@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.5.1",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-ecdh": {
-                          "version": "4.0.0",
-                          "from": "create-ecdh@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.5.1",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
-                            },
-                            "elliptic": {
-                              "version": "6.0.2",
-                              "from": "elliptic@>=6.0.0 <7.0.0",
-                              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.0.2.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                },
-                                "hash.js": {
-                                  "version": "1.0.3",
-                                  "from": "hash.js@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "create-hash": {
-                          "version": "1.1.2",
-                          "from": "create-hash@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz",
-                          "dependencies": {
-                            "cipher-base": {
-                              "version": "1.0.2",
-                              "from": "cipher-base@>=1.0.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                            },
-                            "ripemd160": {
-                              "version": "1.0.1",
-                              "from": "ripemd160@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
-                            },
-                            "sha.js": {
-                              "version": "2.4.4",
-                              "from": "sha.js@>=2.3.6 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                            }
-                          }
-                        },
-                        "create-hmac": {
-                          "version": "1.1.4",
-                          "from": "create-hmac@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
-                        },
-                        "diffie-hellman": {
-                          "version": "5.0.0",
-                          "from": "diffie-hellman@>=5.0.0 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.5.1",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
-                            },
-                            "miller-rabin": {
-                              "version": "4.0.0",
-                              "from": "miller-rabin@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
-                              "dependencies": {
-                                "brorand": {
-                                  "version": "1.0.5",
-                                  "from": "brorand@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "pbkdf2": {
-                          "version": "3.0.4",
-                          "from": "pbkdf2@>=3.0.3 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"
-                        },
-                        "public-encrypt": {
-                          "version": "4.0.0",
-                          "from": "public-encrypt@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-                          "dependencies": {
-                            "bn.js": {
-                              "version": "4.5.1",
-                              "from": "bn.js@>=4.1.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.5.1.tgz"
-                            },
-                            "browserify-rsa": {
-                              "version": "4.0.0",
-                              "from": "browserify-rsa@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.0.tgz"
-                            },
-                            "parse-asn1": {
-                              "version": "5.0.0",
-                              "from": "parse-asn1@>=5.0.0 <6.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz",
-                              "dependencies": {
-                                "asn1.js": {
-                                  "version": "4.2.1",
-                                  "from": "asn1.js@>=4.0.0 <5.0.0",
-                                  "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.2.1.tgz",
-                                  "dependencies": {
-                                    "minimalistic-assert": {
-                                      "version": "1.0.0",
-                                      "from": "minimalistic-assert@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "browserify-aes": {
-                                  "version": "1.0.5",
-                                  "from": "browserify-aes@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.5.tgz",
-                                  "dependencies": {
-                                    "buffer-xor": {
-                                      "version": "1.0.3",
-                                      "from": "buffer-xor@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
-                                    },
-                                    "cipher-base": {
-                                      "version": "1.0.2",
-                                      "from": "cipher-base@>=1.0.0 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "evp_bytestokey": {
-                                  "version": "1.0.0",
-                                  "from": "evp_bytestokey@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "randombytes": {
-                          "version": "2.0.1",
-                          "from": "randombytes@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz"
-                        }
-                      }
-                    },
-                    "deep-equal": {
-                      "version": "1.0.1",
-                      "from": "deep-equal@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-                    },
-                    "defined": {
-                      "version": "1.0.0",
-                      "from": "defined@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
-                    },
-                    "deps-sort": {
-                      "version": "1.3.9",
-                      "from": "deps-sort@>=1.3.7 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz"
-                    },
-                    "domain-browser": {
-                      "version": "1.1.5",
-                      "from": "domain-browser@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.5.tgz",
-                      "dependencies": {
-                        "assert-helpers": {
-                          "version": "4.1.0",
-                          "from": "assert-helpers@>=4.1.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-helpers/-/assert-helpers-4.1.0.tgz",
-                          "dependencies": {
-                            "ansicolors": {
-                              "version": "0.3.2",
-                              "from": "ansicolors@>=0.3.2 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
-                            },
-                            "diff": {
-                              "version": "2.2.1",
-                              "from": "diff@>=2.1.1 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"
-                            },
-                            "esnextguardian": {
-                              "version": "1.2.0",
-                              "from": "esnextguardian@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/esnextguardian/-/esnextguardian-1.2.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "duplexer2": {
-                      "version": "0.0.2",
-                      "from": "duplexer2@>=0.0.2 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
-                    },
-                    "events": {
-                      "version": "1.0.2",
-                      "from": "events@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz"
-                    },
-                    "has": {
-                      "version": "1.0.1",
-                      "from": "has@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-                      "dependencies": {
-                        "function-bind": {
-                          "version": "1.0.2",
-                          "from": "function-bind@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "htmlescape": {
-                      "version": "1.1.0",
-                      "from": "htmlescape@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.0.tgz"
-                    },
-                    "http-browserify": {
-                      "version": "1.7.0",
-                      "from": "http-browserify@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-                      "dependencies": {
-                        "Base64": {
-                          "version": "0.2.1",
-                          "from": "Base64@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-                        }
-                      }
-                    },
-                    "https-browserify": {
-                      "version": "0.0.1",
-                      "from": "https-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "insert-module-globals": {
-                      "version": "6.6.3",
-                      "from": "insert-module-globals@>=6.4.1 <7.0.0",
-                      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
-                      "dependencies": {
-                        "combine-source-map": {
-                          "version": "0.6.1",
-                          "from": "combine-source-map@>=0.6.1 <0.7.0",
-                          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
-                          "dependencies": {
-                            "convert-source-map": {
-                              "version": "1.1.2",
-                              "from": "convert-source-map@>=1.1.0 <1.2.0",
-                              "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.2.tgz"
-                            },
-                            "inline-source-map": {
-                              "version": "0.5.0",
-                              "from": "inline-source-map@>=0.5.0 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz"
-                            },
-                            "lodash.memoize": {
-                              "version": "3.0.4",
-                              "from": "lodash.memoize@>=3.0.3 <3.1.0",
-                              "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"
-                            },
-                            "source-map": {
-                              "version": "0.4.4",
-                              "from": "source-map@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                              "dependencies": {
-                                "amdefine": {
-                                  "version": "1.0.0",
-                                  "from": "amdefine@>=0.0.4",
-                                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "is-buffer": {
-                          "version": "1.1.0",
-                          "from": "is-buffer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                        },
-                        "lexical-scope": {
-                          "version": "1.2.0",
-                          "from": "lexical-scope@>=1.2.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-                          "dependencies": {
-                            "astw": {
-                              "version": "2.0.0",
-                              "from": "astw@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz",
-                              "dependencies": {
-                                "acorn": {
-                                  "version": "1.2.2",
-                                  "from": "acorn@>=1.0.3 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "labeled-stream-splicer": {
-                      "version": "1.0.2",
-                      "from": "labeled-stream-splicer@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
-                      "dependencies": {
-                        "stream-splicer": {
-                          "version": "1.3.2",
-                          "from": "stream-splicer@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
-                          "dependencies": {
-                            "readable-wrap": {
-                              "version": "1.0.0",
-                              "from": "readable-wrap@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                            },
-                            "indexof": {
-                              "version": "0.0.1",
-                              "from": "indexof@0.0.1",
-                              "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "module-deps": {
-                      "version": "3.9.1",
-                      "from": "module-deps@>=3.7.11 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
-                      "dependencies": {
-                        "detective": {
-                          "version": "4.3.1",
-                          "from": "detective@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz",
-                          "dependencies": {
-                            "acorn": {
-                              "version": "1.2.2",
-                              "from": "acorn@>=1.0.3 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                            }
-                          }
-                        },
-                        "stream-combiner2": {
-                          "version": "1.0.2",
-                          "from": "stream-combiner2@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
-                          "dependencies": {
-                            "through2": {
-                              "version": "0.5.1",
-                              "from": "through2@>=0.5.1 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                              "dependencies": {
-                                "readable-stream": {
-                                  "version": "1.0.33",
-                                  "from": "readable-stream@>=1.0.17 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                                  "dependencies": {
-                                    "core-util-is": {
-                                      "version": "1.0.2",
-                                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                    }
-                                  }
-                                },
-                                "xtend": {
-                                  "version": "3.0.0",
-                                  "from": "xtend@>=3.0.0 <3.1.0",
-                                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "os-browserify": {
-                      "version": "0.1.2",
-                      "from": "os-browserify@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
-                    },
-                    "parents": {
-                      "version": "1.0.1",
-                      "from": "parents@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-                      "dependencies": {
-                        "path-platform": {
-                          "version": "0.11.15",
-                          "from": "path-platform@>=0.11.15 <0.12.0",
-                          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
-                        }
-                      }
-                    },
-                    "path-browserify": {
-                      "version": "0.0.0",
-                      "from": "path-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
-                    },
-                    "process": {
-                      "version": "0.11.2",
-                      "from": "process@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
-                    },
-                    "punycode": {
-                      "version": "1.4.0",
-                      "from": "punycode@>=1.3.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.0.tgz"
-                    },
-                    "querystring-es3": {
-                      "version": "0.2.1",
-                      "from": "querystring-es3@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
-                    },
-                    "read-only-stream": {
-                      "version": "1.1.1",
-                      "from": "read-only-stream@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz",
-                      "dependencies": {
-                        "readable-wrap": {
-                          "version": "1.0.0",
-                          "from": "readable-wrap@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "readable-stream": {
-                      "version": "1.1.13",
-                      "from": "readable-stream@>=1.1.13 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "resolve": {
-                      "version": "1.1.6",
-                      "from": "resolve@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
-                    },
-                    "shallow-copy": {
-                      "version": "0.0.1",
-                      "from": "shallow-copy@0.0.1",
-                      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
-                    },
-                    "shasum": {
-                      "version": "1.0.2",
-                      "from": "shasum@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-                      "dependencies": {
-                        "json-stable-stringify": {
-                          "version": "0.0.1",
-                          "from": "json-stable-stringify@>=0.0.0 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "from": "jsonify@>=0.0.0 <0.1.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-                            }
-                          }
-                        },
-                        "sha.js": {
-                          "version": "2.4.4",
-                          "from": "sha.js@>=2.4.4 <2.5.0",
-                          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.4.tgz"
-                        }
-                      }
-                    },
-                    "shell-quote": {
-                      "version": "0.0.1",
-                      "from": "shell-quote@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz"
-                    },
-                    "stream-browserify": {
-                      "version": "1.0.0",
-                      "from": "stream-browserify@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "subarg": {
-                      "version": "1.0.0",
-                      "from": "subarg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "1.2.0",
-                          "from": "minimist@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                        }
-                      }
-                    },
-                    "syntax-error": {
-                      "version": "1.1.4",
-                      "from": "syntax-error@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.4.tgz",
-                      "dependencies": {
-                        "acorn": {
-                          "version": "1.2.2",
-                          "from": "acorn@>=1.0.3 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
-                        }
-                      }
-                    },
-                    "through2": {
-                      "version": "1.1.1",
-                      "from": "through2@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz"
-                    },
-                    "timers-browserify": {
-                      "version": "1.4.2",
-                      "from": "timers-browserify@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"
-                    },
-                    "tty-browserify": {
-                      "version": "0.0.0",
-                      "from": "tty-browserify@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
-                    },
-                    "url": {
-                      "version": "0.10.3",
-                      "from": "url@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-                      "dependencies": {
-                        "punycode": {
-                          "version": "1.3.2",
-                          "from": "punycode@1.3.2",
-                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                        },
-                        "querystring": {
-                          "version": "0.2.0",
-                          "from": "querystring@0.2.0",
-                          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-                        }
-                      }
-                    },
-                    "util": {
-                      "version": "0.10.3",
-                      "from": "util@>=0.10.1 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
-                    },
-                    "vm-browserify": {
-                      "version": "0.0.4",
-                      "from": "vm-browserify@>=0.0.1 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-                      "dependencies": {
-                        "indexof": {
-                          "version": "0.0.1",
-                          "from": "indexof@0.0.1",
-                          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                        }
-                      }
-                    },
-                    "xtend": {
-                      "version": "4.0.1",
-                      "from": "xtend@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                    }
-                  }
-                },
-                "through": {
-                  "version": "2.3.4",
-                  "from": "through@2.3.4",
-                  "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz"
-                },
-                "uglify-js": {
-                  "version": "2.6.1",
-                  "from": "uglify-js@>=2.4.15 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "0.2.10",
-                      "from": "async@>=0.2.6 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                    },
-                    "source-map": {
-                      "version": "0.5.3",
-                      "from": "source-map@>=0.5.1 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-                    },
-                    "uglify-to-browserify": {
-                      "version": "1.0.2",
-                      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-                    },
-                    "yargs": {
-                      "version": "3.10.0",
-                      "from": "yargs@>=3.10.0 <3.11.0",
-                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                      "dependencies": {
-                        "camelcase": {
-                          "version": "1.2.1",
-                          "from": "camelcase@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                        },
-                        "cliui": {
-                          "version": "2.1.0",
-                          "from": "cliui@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-                          "dependencies": {
-                            "center-align": {
-                              "version": "0.1.2",
-                              "from": "center-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.1.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                },
-                                "lazy-cache": {
-                                  "version": "0.2.7",
-                                  "from": "lazy-cache@>=0.2.4 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
-                                }
-                              }
-                            },
-                            "right-align": {
-                              "version": "0.1.3",
-                              "from": "right-align@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-                              "dependencies": {
-                                "align-text": {
-                                  "version": "0.1.3",
-                                  "from": "align-text@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                                  "dependencies": {
-                                    "kind-of": {
-                                      "version": "2.0.1",
-                                      "from": "kind-of@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                      "dependencies": {
-                                        "is-buffer": {
-                                          "version": "1.1.0",
-                                          "from": "is-buffer@>=1.1.0 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                        }
-                                      }
-                                    },
-                                    "longest": {
-                                      "version": "1.0.1",
-                                      "from": "longest@>=1.0.1 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                    },
-                                    "repeat-string": {
-                                      "version": "1.5.2",
-                                      "from": "repeat-string@>=1.5.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "wordwrap": {
-                              "version": "0.0.2",
-                              "from": "wordwrap@0.0.2",
-                              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-                            }
-                          }
-                        },
-                        "decamelize": {
-                          "version": "1.1.1",
-                          "from": "decamelize@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                        },
-                        "window-size": {
-                          "version": "0.1.0",
-                          "from": "window-size@0.1.0",
-                          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-registry-mapper": {
-              "version": "1.1.13",
-              "from": "cordova-registry-mapper@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.13.tgz",
-              "dependencies": {
-                "tape": {
-                  "version": "3.5.0",
-                  "from": "tape@>=3.5.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/tape/-/tape-3.5.0.tgz",
-                  "dependencies": {
-                    "deep-equal": {
-                      "version": "0.2.2",
-                      "from": "deep-equal@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"
-                    },
-                    "defined": {
-                      "version": "0.0.0",
-                      "from": "defined@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
-                    },
-                    "glob": {
-                      "version": "3.2.11",
-                      "from": "glob@>=3.2.9 <3.3.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "0.3.0",
-                          "from": "minimatch@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "object-inspect": {
-                      "version": "0.4.0",
-                      "from": "object-inspect@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"
-                    },
-                    "resumer": {
-                      "version": "0.0.0",
-                      "from": "resumer@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"
-                    },
-                    "through": {
-                      "version": "2.3.8",
-                      "from": "through@>=2.3.4 <2.4.0",
-                      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "cordova-serve": {
-              "version": "0.1.3",
-              "from": "cordova-serve@>=0.1.2 <0.2.0",
-              "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-0.1.3.tgz",
-              "dependencies": {
-                "chalk": {
-                  "version": "1.1.1",
-                  "from": "chalk@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                  "dependencies": {
-                    "ansi-styles": {
-                      "version": "2.1.0",
-                      "from": "ansi-styles@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                    },
-                    "escape-string-regexp": {
-                      "version": "1.0.3",
-                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                    },
-                    "has-ansi": {
-                      "version": "2.0.0",
-                      "from": "has-ansi@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "strip-ansi": {
-                      "version": "3.0.0",
-                      "from": "strip-ansi@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        }
-                      }
-                    },
-                    "supports-color": {
-                      "version": "2.0.0",
-                      "from": "supports-color@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                    }
-                  }
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "d8": {
-                  "version": "0.4.4",
-                  "from": "d8@>=0.4.4 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/d8/-/d8-0.4.4.tgz",
-                  "dependencies": {
-                    "m8": {
-                      "version": "0.4.4",
-                      "from": "m8@>=0.4.3",
-                      "resolved": "https://registry.npmjs.org/m8/-/m8-0.4.4.tgz"
-                    }
-                  }
-                },
-                "mime": {
-                  "version": "1.3.4",
-                  "from": "mime@>=1.2.11 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
-                },
-                "q": {
-                  "version": "1.4.1",
-                  "from": "q@>=1.4.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-                },
-                "shelljs": {
-                  "version": "0.5.3",
-                  "from": "shelljs@>=0.5.3 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-                }
-              }
-            },
-            "dep-graph": {
-              "version": "1.1.0",
-              "from": "dep-graph@1.1.0",
-              "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
-              "dependencies": {
-                "underscore": {
-                  "version": "1.2.1",
-                  "from": "underscore@1.2.1",
-                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
-                }
-              }
-            },
-            "elementtree": {
-              "version": "0.1.6",
-              "from": "elementtree@0.1.6",
-              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
-              "dependencies": {
-                "sax": {
-                  "version": "0.3.5",
-                  "from": "sax@0.3.5",
-                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"
-                }
-              }
-            },
-            "glob": {
-              "version": "4.0.6",
-              "from": "glob@4.0.6",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "init-package-json": {
-              "version": "1.9.1",
-              "from": "init-package-json@>=1.2.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.3 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    }
-                  }
-                },
-                "promzard": {
-                  "version": "0.3.0",
-                  "from": "promzard@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    },
-                    "normalize-package-data": {
-                      "version": "2.3.5",
-                      "from": "normalize-package-data@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                      "dependencies": {
-                        "hosted-git-info": {
-                          "version": "2.1.4",
-                          "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                        },
-                        "is-builtin-module": {
-                          "version": "1.0.0",
-                          "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                          "dependencies": {
-                            "builtin-modules": {
-                              "version": "1.1.0",
-                              "from": "builtin-modules@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    }
-                  }
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        },
-                        "spdx-license-ids": {
-                          "version": "1.1.0",
-                          "from": "spdx-license-ids@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7",
-                      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "npm": {
-              "version": "2.14.15",
-              "from": "npm@>=2.10.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.15.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.7 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                },
-                "ansi": {
-                  "version": "0.3.0",
-                  "from": "ansi@latest",
-                  "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                },
-                "ansicolors": {
-                  "version": "0.3.2",
-                  "from": "ansicolors@latest"
-                },
-                "ansistyles": {
-                  "version": "0.1.3",
-                  "from": "ansistyles@0.1.3",
-                  "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
-                },
-                "archy": {
-                  "version": "1.0.0",
-                  "from": "archy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-                },
-                "async-some": {
-                  "version": "1.0.2",
-                  "from": "async-some@>=1.0.2 <1.1.0"
-                },
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@0.0.8",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "char-spinner": {
-                  "version": "1.0.1",
-                  "from": "char-spinner@latest",
-                  "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-                },
-                "chmodr": {
-                  "version": "1.0.2",
-                  "from": "chmodr@>=1.0.2 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"
-                },
-                "chownr": {
-                  "version": "1.0.1",
-                  "from": "chownr@1.0.1",
-                  "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
-                },
-                "cmd-shim": {
-                  "version": "2.0.1",
-                  "from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
-                  "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "3.0.8",
-                      "from": "graceful-fs@>3.0.1 <4.0.0-0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                    }
-                  }
-                },
-                "columnify": {
-                  "version": "1.5.2",
-                  "from": "columnify@1.5.2",
-                  "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
-                  "dependencies": {
-                    "wcwidth": {
-                      "version": "1.0.0",
-                      "from": "wcwidth@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
-                      "dependencies": {
-                        "defaults": {
-                          "version": "1.0.2",
-                          "from": "defaults@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
-                          "dependencies": {
-                            "clone": {
-                              "version": "0.1.19",
-                              "from": "clone@>=0.1.5 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.9 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "dezalgo": {
-                  "version": "1.0.3",
-                  "from": "dezalgo@>=1.0.3 <1.1.0",
-                  "dependencies": {
-                    "asap": {
-                      "version": "2.0.3",
-                      "from": "asap@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
-                    }
-                  }
-                },
-                "editor": {
-                  "version": "1.0.0",
-                  "from": "editor@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
-                },
-                "fs-vacuum": {
-                  "version": "1.2.7",
-                  "from": "fs-vacuum@1.2.7"
-                },
-                "fs-write-stream-atomic": {
-                  "version": "1.0.5",
-                  "from": "fs-write-stream-atomic@>=1.0.5 <1.1.0"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@1.0.8"
-                },
-                "fstream-npm": {
-                  "version": "1.0.7",
-                  "from": "fstream-npm@>=1.0.7 <1.1.0",
-                  "dependencies": {
-                    "fstream-ignore": {
-                      "version": "1.0.3",
-                      "from": "fstream-ignore@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz"
-                    }
-                  }
-                },
-                "github-url-from-git": {
-                  "version": "1.4.0",
-                  "from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
-                  "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-                },
-                "github-url-from-username-repo": {
-                  "version": "1.0.2",
-                  "from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
-                },
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@5.0.15",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "hosted-git-info": {
-                  "version": "2.1.4",
-                  "from": "hosted-git-info@>=2.1.2 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                },
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <1.1.0"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@latest",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@latest",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "init-package-json": {
-                  "version": "1.9.1",
-                  "from": "init-package-json@1.9.1",
-                  "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-                  "dependencies": {
-                    "promzard": {
-                      "version": "0.3.0",
-                      "from": "promzard@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
-                    }
-                  }
-                },
-                "lockfile": {
-                  "version": "1.0.1",
-                  "from": "lockfile@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
-                },
-                "lru-cache": {
-                  "version": "3.2.0",
-                  "from": "lru-cache@>=3.2.0 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-                  "dependencies": {
-                    "pseudomap": {
-                      "version": "1.0.1",
-                      "from": "pseudomap@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.1",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.2.1",
-                          "from": "balanced-match@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "node-gyp": {
-                  "version": "3.2.1",
-                  "from": "node-gyp@>=3.2.1 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "4.5.3",
-                      "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "2.0.10",
-                          "from": "minimatch@>=2.0.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "1.0.0",
-                      "from": "minimatch@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.5",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.5.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "path-array": {
-                      "version": "1.0.0",
-                      "from": "path-array@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                      "dependencies": {
-                        "array-index": {
-                          "version": "0.1.1",
-                          "from": "array-index@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                          "dependencies": {
-                            "debug": {
-                              "version": "2.2.0",
-                              "from": "debug@*",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                              "dependencies": {
-                                "ms": {
-                                  "version": "0.7.1",
-                                  "from": "ms@0.7.1",
-                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.6 <3.1.0"
-                },
-                "normalize-git-url": {
-                  "version": "3.0.1",
-                  "from": "normalize-git-url@latest"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.5 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-cache-filename": {
-                  "version": "1.0.2",
-                  "from": "npm-cache-filename@1.0.2",
-                  "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
-                },
-                "npm-install-checks": {
-                  "version": "1.0.6",
-                  "from": "npm-install-checks@1.0.6",
-                  "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.6.tgz",
-                  "dependencies": {
-                    "npmlog": {
-                      "version": "1.2.1",
-                      "from": "npmlog@>=0.1.0 <0.2.0||>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                      "dependencies": {
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                          "dependencies": {
-                            "delegates": {
-                              "version": "0.1.0",
-                              "from": "delegates@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                            }
-                          }
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                          "dependencies": {
-                            "has-unicode": {
-                              "version": "1.0.1",
-                              "from": "has-unicode@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                            },
-                            "lodash.pad": {
-                              "version": "3.1.1",
-                              "from": "lodash.pad@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padleft": {
-                              "version": "3.1.1",
-                              "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "lodash.padright": {
-                              "version": "3.1.1",
-                              "from": "lodash.padright@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                              "dependencies": {
-                                "lodash._basetostring": {
-                                  "version": "3.0.1",
-                                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                                },
-                                "lodash._createpadding": {
-                                  "version": "3.6.1",
-                                  "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                                  "dependencies": {
-                                    "lodash.repeat": {
-                                      "version": "3.0.1",
-                                      "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-package-arg": {
-                  "version": "4.1.0",
-                  "from": "npm-package-arg@>=4.1.0 <4.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz"
-                },
-                "npm-registry-client": {
-                  "version": "7.0.9",
-                  "from": "npm-registry-client@>=7.0.9 <7.1.0",
-                  "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.9.tgz",
-                  "dependencies": {
-                    "concat-stream": {
-                      "version": "1.5.1",
-                      "from": "concat-stream@>=1.4.6 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-                      "dependencies": {
-                        "typedarray": {
-                          "version": "0.0.6",
-                          "from": "typedarray@>=0.0.5 <0.1.0",
-                          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.6",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "npm-user-validate": {
-                  "version": "0.1.2",
-                  "from": "npm-user-validate@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
-                },
-                "npmlog": {
-                  "version": "2.0.0",
-                  "from": "npmlog@>=2.0.0 <2.1.0",
-                  "dependencies": {
-                    "are-we-there-yet": {
-                      "version": "1.0.4",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.3 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
-                },
-                "opener": {
-                  "version": "1.4.1",
-                  "from": "opener@>=1.4.1 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@0.1.3",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.0",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-inside": {
-                  "version": "1.0.1",
-                  "from": "path-is-inside@1.0.1",
-                  "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
-                },
-                "read": {
-                  "version": "1.0.7",
-                  "from": "read@1.0.7",
-                  "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-                  "dependencies": {
-                    "mute-stream": {
-                      "version": "0.0.5",
-                      "from": "mute-stream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-                    }
-                  }
-                },
-                "read-installed": {
-                  "version": "4.0.3",
-                  "from": "read-installed@4.0.3",
-                  "dependencies": {
-                    "debuglog": {
-                      "version": "1.0.1",
-                      "from": "debuglog@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
-                    },
-                    "readdir-scoped-modules": {
-                      "version": "1.0.2",
-                      "from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
-                    },
-                    "util-extend": {
-                      "version": "1.0.1",
-                      "from": "util-extend@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
-                    }
-                  }
-                },
-                "read-package-json": {
-                  "version": "2.0.2",
-                  "from": "read-package-json@>=2.0.2 <2.1.0",
-                  "dependencies": {
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.2.1",
-                          "from": "jju@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.13 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    }
-                  }
-                },
-                "realize-package-specifier": {
-                  "version": "3.0.1",
-                  "from": "realize-package-specifier@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
-                },
-                "request": {
-                  "version": "2.67.0",
-                  "from": "request@>=2.67.0 <2.68.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
-                  "dependencies": {
-                    "bl": {
-                      "version": "1.0.0",
-                      "from": "bl@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                      "dependencies": {
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.6",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "caseless": {
-                      "version": "0.11.0",
-                      "from": "caseless@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                    },
-                    "extend": {
-                      "version": "3.0.0",
-                      "from": "extend@>=3.0.0 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                    },
-                    "forever-agent": {
-                      "version": "0.6.1",
-                      "from": "forever-agent@>=0.6.1 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                    },
-                    "form-data": {
-                      "version": "1.0.0-rc3",
-                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                      "dependencies": {
-                        "async": {
-                          "version": "1.5.0",
-                          "from": "async@>=1.4.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                        }
-                      }
-                    },
-                    "json-stringify-safe": {
-                      "version": "5.0.1",
-                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                    },
-                    "mime-types": {
-                      "version": "2.1.8",
-                      "from": "mime-types@>=2.1.7 <2.2.0",
-                      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
-                      "dependencies": {
-                        "mime-db": {
-                          "version": "1.20.0",
-                          "from": "mime-db@>=1.20.0 <1.21.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
-                        }
-                      }
-                    },
-                    "node-uuid": {
-                      "version": "1.4.7",
-                      "from": "node-uuid@>=1.4.7 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                    },
-                    "qs": {
-                      "version": "5.2.0",
-                      "from": "qs@>=5.2.0 <5.3.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                    },
-                    "tunnel-agent": {
-                      "version": "0.4.2",
-                      "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
-                    },
-                    "tough-cookie": {
-                      "version": "2.2.1",
-                      "from": "tough-cookie@>=2.2.0 <2.3.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                    },
-                    "http-signature": {
-                      "version": "1.1.0",
-                      "from": "http-signature@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "from": "assert-plus@>=0.1.5 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        },
-                        "jsprim": {
-                          "version": "1.2.2",
-                          "from": "jsprim@>=1.2.2 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
-                          "dependencies": {
-                            "extsprintf": {
-                              "version": "1.0.2",
-                              "from": "extsprintf@1.0.2",
-                              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                            },
-                            "json-schema": {
-                              "version": "0.2.2",
-                              "from": "json-schema@0.2.2",
-                              "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                            },
-                            "verror": {
-                              "version": "1.3.6",
-                              "from": "verror@1.3.6",
-                              "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                            }
-                          }
-                        },
-                        "sshpk": {
-                          "version": "1.7.1",
-                          "from": "sshpk@>=1.7.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
-                          "dependencies": {
-                            "asn1": {
-                              "version": "0.2.3",
-                              "from": "asn1@>=0.2.3 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                            },
-                            "assert-plus": {
-                              "version": "0.2.0",
-                              "from": "assert-plus@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                            },
-                            "dashdash": {
-                              "version": "1.10.1",
-                              "from": "dashdash@>=1.10.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
-                              "dependencies": {
-                                "assert-plus": {
-                                  "version": "0.1.5",
-                                  "from": "assert-plus@>=0.1.0 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                                }
-                              }
-                            },
-                            "jsbn": {
-                              "version": "0.1.0",
-                              "from": "jsbn@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                            },
-                            "tweetnacl": {
-                              "version": "0.13.2",
-                              "from": "tweetnacl@>=0.13.0 <1.0.0",
-                              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
-                            },
-                            "jodid25519": {
-                              "version": "1.0.2",
-                              "from": "jodid25519@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                            },
-                            "ecc-jsbn": {
-                              "version": "0.1.1",
-                              "from": "ecc-jsbn@>=0.0.1 <1.0.0",
-                              "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "oauth-sign": {
-                      "version": "0.8.0",
-                      "from": "oauth-sign@>=0.8.0 <0.9.0",
-                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                    },
-                    "hawk": {
-                      "version": "3.1.2",
-                      "from": "hawk@>=3.1.0 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "2.16.3",
-                          "from": "hoek@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                        },
-                        "boom": {
-                          "version": "2.10.1",
-                          "from": "boom@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                        },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
-                        "sntp": {
-                          "version": "1.0.9",
-                          "from": "sntp@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                        }
-                      }
-                    },
-                    "aws-sign2": {
-                      "version": "0.6.0",
-                      "from": "aws-sign2@>=0.6.0 <0.7.0",
-                      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                    },
-                    "stringstream": {
-                      "version": "0.0.5",
-                      "from": "stringstream@>=0.0.4 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                    },
-                    "combined-stream": {
-                      "version": "1.0.5",
-                      "from": "combined-stream@>=1.0.5 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                      "dependencies": {
-                        "delayed-stream": {
-                          "version": "1.0.0",
-                          "from": "delayed-stream@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "isstream": {
-                      "version": "0.1.2",
-                      "from": "isstream@>=0.1.2 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                    },
-                    "is-typedarray": {
-                      "version": "1.0.0",
-                      "from": "is-typedarray@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                    },
-                    "har-validator": {
-                      "version": "2.0.3",
-                      "from": "har-validator@>=2.0.2 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
-                      "dependencies": {
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@>=1.1.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-                          "dependencies": {
-                            "ansi-styles": {
-                              "version": "2.1.0",
-                              "from": "ansi-styles@>=2.1.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                            },
-                            "escape-string-regexp": {
-                              "version": "1.0.3",
-                              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                            },
-                            "has-ansi": {
-                              "version": "2.0.0",
-                              "from": "has-ansi@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                            },
-                            "supports-color": {
-                              "version": "2.0.0",
-                              "from": "supports-color@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "commander": {
-                          "version": "2.9.0",
-                          "from": "commander@>=2.9.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                          "dependencies": {
-                            "graceful-readlink": {
-                              "version": "1.0.1",
-                              "from": "graceful-readlink@>=1.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "is-my-json-valid": {
-                          "version": "2.12.3",
-                          "from": "is-my-json-valid@>=2.12.3 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
-                          "dependencies": {
-                            "generate-function": {
-                              "version": "2.0.0",
-                              "from": "generate-function@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                            },
-                            "generate-object-property": {
-                              "version": "1.2.0",
-                              "from": "generate-object-property@>=1.1.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                              "dependencies": {
-                                "is-property": {
-                                  "version": "1.0.2",
-                                  "from": "is-property@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "jsonpointer": {
-                              "version": "2.0.0",
-                              "from": "jsonpointer@2.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                            },
-                            "xtend": {
-                              "version": "4.0.1",
-                              "from": "xtend@>=4.0.0 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                            }
-                          }
-                        },
-                        "pinkie-promise": {
-                          "version": "2.0.0",
-                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "2.0.1",
-                              "from": "pinkie@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "retry": {
-                  "version": "0.8.0",
-                  "from": "retry@0.8.0",
-                  "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.4.4 <2.5.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"
-                },
-                "semver": {
-                  "version": "5.1.0",
-                  "from": "semver@>=5.1.0 <5.2.0",
-                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
-                },
-                "sha": {
-                  "version": "2.0.1",
-                  "from": "sha@2.0.1",
-                  "resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.2",
-                      "from": "readable-stream@>=2.0.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.1",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.3",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.1",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "slide": {
-                  "version": "1.1.6",
-                  "from": "slide@>=1.1.6 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
-                },
-                "sorted-object": {
-                  "version": "1.0.0",
-                  "from": "sorted-object@"
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@2.2.1"
-                },
-                "text-table": {
-                  "version": "0.2.0",
-                  "from": "text-table@~0.2.0"
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "from": "uid-number@>=0.0.6 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-                },
-                "umask": {
-                  "version": "1.1.0",
-                  "from": "umask@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
-                },
-                "validate-npm-package-license": {
-                  "version": "3.0.1",
-                  "from": "validate-npm-package-license@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                  "dependencies": {
-                    "spdx-correct": {
-                      "version": "1.0.2",
-                      "from": "spdx-correct@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
-                    },
-                    "spdx-expression-parse": {
-                      "version": "1.0.2",
-                      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                      "dependencies": {
-                        "spdx-exceptions": {
-                          "version": "1.0.4",
-                          "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "validate-npm-package-name": {
-                  "version": "2.2.2",
-                  "from": "validate-npm-package-name@2.2.2",
-                  "dependencies": {
-                    "builtins": {
-                      "version": "0.0.7",
-                      "from": "builtins@0.0.7"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.2.0 <1.3.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "wrappy": {
-                  "version": "1.0.1",
-                  "from": "wrappy@1.0.1",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                },
-                "write-file-atomic": {
-                  "version": "1.1.4",
-                  "from": "write-file-atomic@>=1.1.4 <1.2.0"
-                },
-                "ansi-regex": {
-                  "version": "2.0.0",
-                  "from": "ansi-regex@2.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                },
-                "imurmurhash": {
-                  "version": "0.1.4",
-                  "from": "imurmurhash@0.1.4",
-                  "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
-                },
-                "spdx-license-ids": {
-                  "version": "1.1.0",
-                  "from": "spdx-license-ids@1.1.0",
-                  "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@3.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-                }
-              }
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "osenv": {
-              "version": "0.1.0",
-              "from": "osenv@0.1.0",
-              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz"
-            },
-            "plist": {
-              "version": "1.1.0",
-              "from": "plist@1.1.0",
-              "resolved": "https://registry.npmjs.org/plist/-/plist-1.1.0.tgz",
-              "dependencies": {
-                "base64-js": {
-                  "version": "0.0.6",
-                  "from": "base64-js@0.0.6",
-                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz"
-                },
-                "xmlbuilder": {
-                  "version": "2.2.1",
-                  "from": "xmlbuilder@2.2.1",
-                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz",
-                  "dependencies": {
-                    "lodash-node": {
-                      "version": "2.4.1",
-                      "from": "lodash-node@>=2.4.1 <2.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
-                    }
-                  }
-                },
-                "xmldom": {
-                  "version": "0.1.19",
-                  "from": "xmldom@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
-                },
-                "util-deprecate": {
-                  "version": "1.0.0",
-                  "from": "util-deprecate@1.0.0",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz"
-                }
-              }
-            },
-            "properties-parser": {
-              "version": "0.2.3",
-              "from": "properties-parser@0.2.3",
-              "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"
-            },
-            "rc": {
-              "version": "0.5.2",
-              "from": "rc@0.5.2",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.2.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.10",
-                  "from": "minimist@>=0.0.7 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                },
-                "deep-extend": {
-                  "version": "0.2.11",
-                  "from": "deep-extend@>=0.2.5 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
-                },
-                "strip-json-comments": {
-                  "version": "0.1.3",
-                  "from": "strip-json-comments@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                },
-                "ini": {
-                  "version": "1.1.0",
-                  "from": "ini@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                }
-              }
-            },
-            "request": {
-              "version": "2.47.0",
-              "from": "request@2.47.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.47.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "0.9.4",
-                  "from": "bl@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "1.0.33",
-                      "from": "readable-stream@>=1.0.26 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.6.0",
-                  "from": "caseless@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.5.2",
-                  "from": "forever-agent@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "1.0.2",
-                  "from": "mime-types@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.0 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "2.3.3",
-                  "from": "qs@>=2.3.1 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.2",
-                  "from": "tunnel-agent@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=0.12.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "0.10.1",
-                  "from": "http-signature@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "asn1": {
-                      "version": "0.1.11",
-                      "from": "asn1@0.1.11",
-                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                    },
-                    "ctype": {
-                      "version": "0.5.3",
-                      "from": "ctype@0.5.3",
-                      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.4.0",
-                  "from": "oauth-sign@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
-                },
-                "hawk": {
-                  "version": "1.1.1",
-                  "from": "hawk@1.1.1",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1",
-                      "from": "hoek@>=0.9.0 <0.10.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                    },
-                    "boom": {
-                      "version": "0.4.2",
-                      "from": "boom@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "0.2.2",
-                      "from": "cryptiles@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                    },
-                    "sntp": {
-                      "version": "0.2.4",
-                      "from": "sntp@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.5.0",
-                  "from": "aws-sign2@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "0.0.7",
-                  "from": "combined-stream@>=0.0.5 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "shelljs": {
-              "version": "0.3.0",
-              "from": "shelljs@0.3.0",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
-            },
-            "tar": {
-              "version": "1.0.2",
-              "from": "tar@1.0.2",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
-              "dependencies": {
-                "block-stream": {
-                  "version": "0.0.8",
-                  "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                },
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.2",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                    },
-                    "mkdirp": {
-                      "version": "0.5.1",
-                      "from": "mkdirp@>=0.5.0 >=0.0.0 <1.0.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        }
-                      }
-                    },
-                    "rimraf": {
-                      "version": "2.4.4",
-                      "from": "rimraf@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                      "dependencies": {
-                        "glob": {
-                          "version": "5.0.15",
-                          "from": "glob@>=5.0.14 <6.0.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                          "dependencies": {
-                            "inflight": {
-                              "version": "1.0.4",
-                              "from": "inflight@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                              "dependencies": {
-                                "brace-expansion": {
-                                  "version": "1.1.2",
-                                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                                  "dependencies": {
-                                    "balanced-match": {
-                                      "version": "0.3.0",
-                                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                    },
-                                    "concat-map": {
-                                      "version": "0.0.1",
-                                      "from": "concat-map@0.0.1",
-                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "once": {
-                              "version": "1.3.3",
-                              "from": "once@>=1.3.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                              "dependencies": {
-                                "wrappy": {
-                                  "version": "1.0.1",
-                                  "from": "wrappy@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "path-is-absolute": {
-                              "version": "1.0.0",
-                              "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.3",
-              "from": "through2@0.6.3",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "unorm": {
-              "version": "1.3.3",
-              "from": "unorm@1.3.3",
-              "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"
-            },
-            "valid-identifier": {
-              "version": "0.0.1",
-              "from": "valid-identifier@0.0.1",
-              "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"
-            },
-            "ionic-xcode": {
-              "version": "0.8.3",
-              "from": "ionic-xcode@0.8.3",
-              "resolved": "https://registry.npmjs.org/ionic-xcode/-/ionic-xcode-0.8.3.tgz",
-              "dependencies": {
-                "pegjs": {
-                  "version": "0.6.2",
-                  "from": "pegjs@0.6.2",
-                  "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.3.3",
-                  "from": "node-uuid@1.3.3",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"
-                }
-              }
-            }
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.10.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-        },
-        "node-sass": {
-          "version": "3.4.2",
-          "from": "node-sass@>=3.3.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
-          "dependencies": {
-            "async-foreach": {
-              "version": "0.1.3",
-              "from": "async-foreach@>=0.1.3 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
-            },
-            "chalk": {
-              "version": "1.1.1",
-              "from": "chalk@>=1.1.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.1.0",
-                  "from": "ansi-styles@>=2.1.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.3",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.0",
-                  "from": "strip-ansi@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.0.0",
-                      "from": "ansi-regex@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                }
-              }
-            },
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "get-stdin": {
-              "version": "4.0.1",
-              "from": "get-stdin@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
-            },
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.14 <6.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.0",
-                  "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0",
-                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                }
-              }
-            },
-            "meow": {
-              "version": "3.6.0",
-              "from": "meow@>=3.3.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/meow/-/meow-3.6.0.tgz",
-              "dependencies": {
-                "camelcase-keys": {
-                  "version": "2.0.0",
-                  "from": "camelcase-keys@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "2.0.1",
-                      "from": "camelcase@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                    },
-                    "map-obj": {
-                      "version": "1.0.1",
-                      "from": "map-obj@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
-                    }
-                  }
-                },
-                "loud-rejection": {
-                  "version": "1.2.0",
-                  "from": "loud-rejection@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz",
-                  "dependencies": {
-                    "signal-exit": {
-                      "version": "2.1.2",
-                      "from": "signal-exit@>=2.1.2 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"
-                    }
-                  }
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "from": "minimist@>=1.1.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                },
-                "normalize-package-data": {
-                  "version": "2.3.5",
-                  "from": "normalize-package-data@>=2.3.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz",
-                  "dependencies": {
-                    "hosted-git-info": {
-                      "version": "2.1.4",
-                      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-                    },
-                    "is-builtin-module": {
-                      "version": "1.0.0",
-                      "from": "is-builtin-module@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-                      "dependencies": {
-                        "builtin-modules": {
-                          "version": "1.1.0",
-                          "from": "builtin-modules@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "validate-npm-package-license": {
-                      "version": "3.0.1",
-                      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-                      "dependencies": {
-                        "spdx-correct": {
-                          "version": "1.0.2",
-                          "from": "spdx-correct@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "spdx-expression-parse": {
-                          "version": "1.0.2",
-                          "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
-                          "dependencies": {
-                            "spdx-exceptions": {
-                              "version": "1.0.4",
-                              "from": "spdx-exceptions@>=1.0.4 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
-                            },
-                            "spdx-license-ids": {
-                              "version": "1.1.0",
-                              "from": "spdx-license-ids@>=1.0.2 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "object-assign": {
-                  "version": "4.0.1",
-                  "from": "object-assign@>=4.0.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
-                },
-                "read-pkg-up": {
-                  "version": "1.0.1",
-                  "from": "read-pkg-up@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                  "dependencies": {
-                    "find-up": {
-                      "version": "1.1.0",
-                      "from": "find-up@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz",
-                      "dependencies": {
-                        "path-exists": {
-                          "version": "2.1.0",
-                          "from": "path-exists@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-                        },
-                        "pinkie-promise": {
-                          "version": "2.0.0",
-                          "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                          "dependencies": {
-                            "pinkie": {
-                              "version": "2.0.1",
-                              "from": "pinkie@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "read-pkg": {
-                      "version": "1.1.0",
-                      "from": "read-pkg@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                      "dependencies": {
-                        "load-json-file": {
-                          "version": "1.1.0",
-                          "from": "load-json-file@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "parse-json": {
-                              "version": "2.2.0",
-                              "from": "parse-json@>=2.2.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                              "dependencies": {
-                                "error-ex": {
-                                  "version": "1.3.0",
-                                  "from": "error-ex@>=1.2.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
-                                  "dependencies": {
-                                    "is-arrayish": {
-                                      "version": "0.2.1",
-                                      "from": "is-arrayish@>=0.2.1 <0.3.0",
-                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "strip-bom": {
-                              "version": "2.0.0",
-                              "from": "strip-bom@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                              "dependencies": {
-                                "is-utf8": {
-                                  "version": "0.2.0",
-                                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "path-type": {
-                          "version": "1.1.0",
-                          "from": "path-type@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "4.1.2",
-                              "from": "graceful-fs@>=4.1.2 <5.0.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                            },
-                            "pify": {
-                              "version": "2.3.0",
-                              "from": "pify@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-                            },
-                            "pinkie-promise": {
-                              "version": "2.0.0",
-                              "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                              "dependencies": {
-                                "pinkie": {
-                                  "version": "2.0.1",
-                                  "from": "pinkie@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "redent": {
-                  "version": "1.0.0",
-                  "from": "redent@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-                  "dependencies": {
-                    "indent-string": {
-                      "version": "2.1.0",
-                      "from": "indent-string@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-                      "dependencies": {
-                        "repeating": {
-                          "version": "2.0.0",
-                          "from": "repeating@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz",
-                          "dependencies": {
-                            "is-finite": {
-                              "version": "1.0.1",
-                              "from": "is-finite@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
-                              "dependencies": {
-                                "number-is-nan": {
-                                  "version": "1.0.0",
-                                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "strip-indent": {
-                      "version": "1.0.1",
-                      "from": "strip-indent@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
-                    }
-                  }
-                },
-                "trim-newlines": {
-                  "version": "1.0.0",
-                  "from": "trim-newlines@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "nan": {
-              "version": "2.1.0",
-              "from": "nan@>=2.0.8 <3.0.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-            },
-            "npmconf": {
-              "version": "2.1.2",
-              "from": "npmconf@>=2.1.2 <3.0.0",
-              "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.9",
-                  "from": "config-chain@>=1.1.8 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.4",
-                      "from": "proto-list@>=1.2.1 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.5",
-                  "from": "uid-number@0.0.5",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-                }
-              }
-            },
-            "node-gyp": {
-              "version": "3.2.1",
-              "from": "node-gyp@>=3.0.1 <4.0.0",
-              "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.1.tgz",
-              "dependencies": {
-                "fstream": {
-                  "version": "1.0.8",
-                  "from": "fstream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "2.0.10",
-                      "from": "minimatch@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                },
-                "minimatch": {
-                  "version": "1.0.0",
-                  "from": "minimatch@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.7.3",
-                      "from": "lru-cache@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "from": "sigmund@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                  "dependencies": {
-                    "abbrev": {
-                      "version": "1.0.7",
-                      "from": "abbrev@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                    }
-                  }
-                },
-                "npmlog": {
-                  "version": "1.2.1",
-                  "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-                  "dependencies": {
-                    "ansi": {
-                      "version": "0.3.0",
-                      "from": "ansi@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                    },
-                    "are-we-there-yet": {
-                      "version": "1.0.5",
-                      "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.5.tgz",
-                      "dependencies": {
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.6",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "gauge": {
-                      "version": "1.2.2",
-                      "from": "gauge@>=1.2.0 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
-                      "dependencies": {
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-                          "dependencies": {
-                            "lodash._basetostring": {
-                              "version": "3.0.1",
-                              "from": "lodash._basetostring@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                            },
-                            "lodash._createpadding": {
-                              "version": "3.6.1",
-                              "from": "lodash._createpadding@>=3.0.0 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                              "dependencies": {
-                                "lodash.repeat": {
-                                  "version": "3.0.1",
-                                  "from": "lodash.repeat@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "osenv": {
-                  "version": "0.1.3",
-                  "from": "osenv@>=0.0.0 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-                  "dependencies": {
-                    "os-homedir": {
-                      "version": "1.0.1",
-                      "from": "os-homedir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-                    },
-                    "os-tmpdir": {
-                      "version": "1.0.1",
-                      "from": "os-tmpdir@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-                    }
-                  }
-                },
-                "path-array": {
-                  "version": "1.0.0",
-                  "from": "path-array@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-                  "dependencies": {
-                    "array-index": {
-                      "version": "0.1.1",
-                      "from": "array-index@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-                      "dependencies": {
-                        "debug": {
-                          "version": "2.2.0",
-                          "from": "debug@*",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-                          "dependencies": {
-                            "ms": {
-                              "version": "0.7.1",
-                              "from": "ms@0.7.1",
-                              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-                  "dependencies": {
-                    "block-stream": {
-                      "version": "0.0.8",
-                      "from": "block-stream@*",
-                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "which": {
-                  "version": "1.2.0",
-                  "from": "which@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
-                  "dependencies": {
-                    "is-absolute": {
-                      "version": "0.1.7",
-                      "from": "is-absolute@>=0.1.7 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-                      "dependencies": {
-                        "is-relative": {
-                          "version": "0.1.3",
-                          "from": "is-relative@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "request": {
-              "version": "2.67.0",
-              "from": "request@>=2.61.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
-              "dependencies": {
-                "bl": {
-                  "version": "1.0.0",
-                  "from": "bl@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.4",
-                      "from": "readable-stream@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.6",
-                          "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.11.0",
-                  "from": "caseless@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                },
-                "extend": {
-                  "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.1 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                },
-                "form-data": {
-                  "version": "1.0.0-rc3",
-                  "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-                  "dependencies": {
-                    "async": {
-                      "version": "1.5.0",
-                      "from": "async@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                    }
-                  }
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "mime-types": {
-                  "version": "2.1.8",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.20.0",
-                      "from": "mime-db@>=1.20.0 <1.21.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
-                    }
-                  }
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.7 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "qs": {
-                  "version": "5.2.0",
-                  "from": "qs@>=5.2.0 <5.3.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.2",
-                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.1",
-                  "from": "tough-cookie@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                },
-                "http-signature": {
-                  "version": "1.1.0",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.5",
-                      "from": "assert-plus@>=0.1.5 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                    },
-                    "jsprim": {
-                      "version": "1.2.2",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
-                      "dependencies": {
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "from": "extsprintf@1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                        },
-                        "json-schema": {
-                          "version": "0.2.2",
-                          "from": "json-schema@0.2.2",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "from": "verror@1.3.6",
-                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.7.1",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "from": "asn1@>=0.2.3 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                        },
-                        "assert-plus": {
-                          "version": "0.2.0",
-                          "from": "assert-plus@>=0.2.0 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                        },
-                        "dashdash": {
-                          "version": "1.10.1",
-                          "from": "dashdash@>=1.10.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
-                          "dependencies": {
-                            "assert-plus": {
-                              "version": "0.1.5",
-                              "from": "assert-plus@>=0.1.0 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                            }
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.0",
-                          "from": "jsbn@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                        },
-                        "tweetnacl": {
-                          "version": "0.13.2",
-                          "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "from": "jodid25519@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "oauth-sign": {
-                  "version": "0.8.0",
-                  "from": "oauth-sign@>=0.8.0 <0.9.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                },
-                "hawk": {
-                  "version": "3.1.2",
-                  "from": "hawk@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "2.16.3",
-                      "from": "hoek@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                    },
-                    "boom": {
-                      "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "from": "cryptiles@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "from": "sntp@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                    }
-                  }
-                },
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                    }
-                  }
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "from": "isstream@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                },
-                "har-validator": {
-                  "version": "2.0.3",
-                  "from": "har-validator@>=2.0.2 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
-                  "dependencies": {
-                    "commander": {
-                      "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-                      "dependencies": {
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "from": "graceful-readlink@>=1.0.0",
-                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "is-my-json-valid": {
-                      "version": "2.12.3",
-                      "from": "is-my-json-valid@>=2.12.3 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
-                      "dependencies": {
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "from": "generate-function@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "from": "generate-object-property@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                          "dependencies": {
-                            "is-property": {
-                              "version": "1.0.2",
-                              "from": "is-property@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "from": "jsonpointer@2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    },
-                    "pinkie-promise": {
-                      "version": "2.0.0",
-                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
-                      "dependencies": {
-                        "pinkie": {
-                          "version": "2.0.1",
-                          "from": "pinkie@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "sass-graph": {
-              "version": "2.0.1",
-              "from": "sass-graph@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.0.1.tgz",
-              "dependencies": {
-                "yargs": {
-                  "version": "3.31.0",
-                  "from": "yargs@>=3.8.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.31.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "2.0.1",
-                      "from": "camelcase@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"
-                    },
-                    "cliui": {
-                      "version": "3.1.0",
-                      "from": "cliui@>=3.0.3 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.1.0.tgz",
-                      "dependencies": {
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                          "dependencies": {
-                            "ansi-regex": {
-                              "version": "2.0.0",
-                              "from": "ansi-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                            }
-                          }
-                        },
-                        "wrap-ansi": {
-                          "version": "1.0.0",
-                          "from": "wrap-ansi@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "decamelize": {
-                      "version": "1.1.1",
-                      "from": "decamelize@>=1.1.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                    },
-                    "os-locale": {
-                      "version": "1.4.0",
-                      "from": "os-locale@>=1.4.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-                      "dependencies": {
-                        "lcid": {
-                          "version": "1.0.0",
-                          "from": "lcid@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                          "dependencies": {
-                            "invert-kv": {
-                              "version": "1.0.0",
-                              "from": "invert-kv@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "string-width": {
-                      "version": "1.0.1",
-                      "from": "string-width@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz",
-                      "dependencies": {
-                        "code-point-at": {
-                          "version": "1.0.0",
-                          "from": "code-point-at@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
-                          "dependencies": {
-                            "number-is-nan": {
-                              "version": "1.0.0",
-                              "from": "number-is-nan@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "is-fullwidth-code-point": {
-                          "version": "1.0.0",
-                          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                          "dependencies": {
-                            "number-is-nan": {
-                              "version": "1.0.0",
-                              "from": "number-is-nan@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                            }
-                          }
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-                          "dependencies": {
-                            "ansi-regex": {
-                              "version": "2.0.0",
-                              "from": "ansi-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "window-size": {
-                      "version": "0.1.4",
-                      "from": "window-size@>=0.1.4 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
-                    },
-                    "y18n": {
-                      "version": "3.2.0",
-                      "from": "y18n@>=3.2.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "5.0.12",
-          "from": "postcss@>=5.0.5 <6.0.0",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.12.tgz",
-          "dependencies": {
-            "supports-color": {
-              "version": "3.1.2",
-              "from": "supports-color@>=3.1.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-              "dependencies": {
-                "has-flag": {
-                  "version": "1.0.0",
-                  "from": "has-flag@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-                }
-              }
-            },
-            "source-map": {
-              "version": "0.5.3",
-              "from": "source-map@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-            },
-            "js-base64": {
-              "version": "2.1.9",
-              "from": "js-base64@>=2.1.9 <3.0.0",
-              "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
-            }
-          }
-        },
-        "request-progress": {
-          "version": "0.3.1",
-          "from": "request-progress@>=0.3.1 <0.4.0",
-          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-          "dependencies": {
-            "throttleit": {
-              "version": "0.0.2",
-              "from": "throttleit@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
-            }
-          }
-        },
-        "unzip2": {
-          "version": "0.2.5",
-          "from": "unzip2@0.2.5",
-          "resolved": "https://registry.npmjs.org/unzip2/-/unzip2-0.2.5.tgz",
-          "dependencies": {
-            "fstream": {
-              "version": "0.1.31",
-              "from": "fstream@>=0.1.21 <0.2.0",
-              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-              "dependencies": {
-                "graceful-fs": {
-                  "version": "3.0.8",
-                  "from": "graceful-fs@>=3.0.2 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "rimraf": {
-                  "version": "2.4.4",
-                  "from": "rimraf@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                  "dependencies": {
-                    "glob": {
-                      "version": "5.0.15",
-                      "from": "glob@>=5.0.14 <6.0.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                      "dependencies": {
-                        "inflight": {
-                          "version": "1.0.4",
-                          "from": "inflight@>=1.0.4 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "3.0.0",
-                          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "once": {
-                          "version": "1.3.3",
-                          "from": "once@>=1.3.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                          "dependencies": {
-                            "wrappy": {
-                              "version": "1.0.1",
-                              "from": "wrappy@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                            }
-                          }
-                        },
-                        "path-is-absolute": {
-                          "version": "1.0.0",
-                          "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "pullstream": {
-              "version": "0.4.1",
-              "from": "pullstream@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-              "dependencies": {
-                "over": {
-                  "version": "0.0.5",
-                  "from": "over@>=0.0.5 <1.0.0",
-                  "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-                },
-                "slice-stream": {
-                  "version": "1.0.0",
-                  "from": "slice-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-                }
-              }
-            },
-            "binary": {
-              "version": "0.3.0",
-              "from": "binary@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-              "dependencies": {
-                "chainsaw": {
-                  "version": "0.1.0",
-                  "from": "chainsaw@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-                  "dependencies": {
-                    "traverse": {
-                      "version": "0.3.9",
-                      "from": "traverse@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                    }
-                  }
-                },
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "setimmediate": {
-              "version": "1.0.4",
-              "from": "setimmediate@>=1.0.1 <1.1.0",
-              "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-            },
-            "match-stream": {
-              "version": "0.0.2",
-              "from": "match-stream@>=0.0.2 <0.1.0",
-              "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-              "dependencies": {
-                "buffers": {
-                  "version": "0.1.1",
-                  "from": "buffers@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "vinyl-fs": {
-          "version": "1.0.0",
-          "from": "vinyl-fs@1.0.0",
-          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
-          "dependencies": {
-            "duplexify": {
-              "version": "3.4.2",
-              "from": "duplexify@>=3.2.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
-              "dependencies": {
-                "end-of-stream": {
-                  "version": "1.0.0",
-                  "from": "end-of-stream@1.0.0",
-                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
-                  "dependencies": {
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <1.4.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "glob-stream": {
-              "version": "4.1.1",
-              "from": "glob-stream@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@>=4.3.1 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "minimatch": {
-                  "version": "2.0.10",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.2",
-                      "from": "brace-expansion@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "0.3.0",
-                          "from": "balanced-match@>=0.3.0 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "from": "concat-map@0.0.1",
-                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "ordered-read-streams": {
-                  "version": "0.1.0",
-                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-                },
-                "glob2base": {
-                  "version": "0.0.12",
-                  "from": "glob2base@>=0.0.12 <0.0.13",
-                  "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-                  "dependencies": {
-                    "find-index": {
-                      "version": "0.1.1",
-                      "from": "find-index@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                    }
-                  }
-                },
-                "unique-stream": {
-                  "version": "2.2.0",
-                  "from": "unique-stream@>=2.0.2 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
-                  "dependencies": {
-                    "through2-filter": {
-                      "version": "2.0.0",
-                      "from": "through2-filter@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-                      "dependencies": {
-                        "through2": {
-                          "version": "2.0.0",
-                          "from": "through2@>=2.0.0 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "2.0.4",
-                              "from": "readable-stream@>=2.0.0 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "process-nextick-args": {
-                                  "version": "1.0.6",
-                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                },
-                                "util-deprecate": {
-                                  "version": "1.0.2",
-                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
-                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <4.1.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "glob-watcher": {
-              "version": "0.0.8",
-              "from": "glob-watcher@>=0.0.8 <0.0.9",
-              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
-              "dependencies": {
-                "gaze": {
-                  "version": "0.5.2",
-                  "from": "gaze@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-                  "dependencies": {
-                    "globule": {
-                      "version": "0.1.0",
-                      "from": "globule@>=0.1.0 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                      "dependencies": {
-                        "lodash": {
-                          "version": "1.0.2",
-                          "from": "lodash@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                        },
-                        "glob": {
-                          "version": "3.1.21",
-                          "from": "glob@>=3.1.21 <3.2.0",
-                          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "1.2.3",
-                              "from": "graceful-fs@>=1.2.0 <1.3.0",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                            },
-                            "inherits": {
-                              "version": "1.0.2",
-                              "from": "inherits@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                            }
-                          }
-                        },
-                        "minimatch": {
-                          "version": "0.2.14",
-                          "from": "minimatch@>=0.2.11 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                          "dependencies": {
-                            "lru-cache": {
-                              "version": "2.7.3",
-                              "from": "lru-cache@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                            },
-                            "sigmund": {
-                              "version": "1.0.1",
-                              "from": "sigmund@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "merge-stream": {
-              "version": "0.1.8",
-              "from": "merge-stream@>=0.1.7 <0.2.0",
-              "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "object-assign": {
-              "version": "2.1.1",
-              "from": "object-assign@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
-            },
-            "strip-bom": {
-              "version": "1.0.0",
-              "from": "strip-bom@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-              "dependencies": {
-                "first-chunk-stream": {
-                  "version": "1.0.0",
-                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-                },
-                "is-utf8": {
-                  "version": "0.2.0",
-                  "from": "is-utf8@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-                }
-              }
-            },
-            "through2": {
-              "version": "0.6.5",
-              "from": "through2@>=0.6.1 <0.7.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.0.33",
-                  "from": "readable-stream@>=1.0.24 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <4.1.0-0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                }
-              }
-            },
-            "vinyl": {
-              "version": "0.4.6",
-              "from": "vinyl@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-              "dependencies": {
-                "clone": {
-                  "version": "0.2.0",
-                  "from": "clone@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-                },
-                "clone-stats": {
-                  "version": "0.0.1",
-                  "from": "clone-stats@>=0.0.1 <0.0.2",
-                  "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "webpack": {
-          "version": "1.12.9",
-          "from": "webpack@>=1.12.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.12.9.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.5.0",
-              "from": "async@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-            },
-            "clone": {
-              "version": "1.0.2",
-              "from": "clone@>=1.0.2 <2.0.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
-            },
-            "enhanced-resolve": {
-              "version": "0.9.1",
-              "from": "enhanced-resolve@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-              "dependencies": {
-                "memory-fs": {
-                  "version": "0.2.0",
-                  "from": "memory-fs@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                }
-              }
-            },
-            "esprima": {
-              "version": "2.7.1",
-              "from": "esprima@>=2.5.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.1.tgz"
-            },
-            "interpret": {
-              "version": "0.6.6",
-              "from": "interpret@>=0.6.4 <0.7.0",
-              "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
-            },
-            "loader-utils": {
-              "version": "0.2.12",
-              "from": "loader-utils@>=0.2.11 <0.3.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.12.tgz",
-              "dependencies": {
-                "big.js": {
-                  "version": "3.1.3",
-                  "from": "big.js@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
-                },
-                "json5": {
-                  "version": "0.4.0",
-                  "from": "json5@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
-                }
-              }
-            },
-            "memory-fs": {
-              "version": "0.3.0",
-              "from": "memory-fs@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
-              "dependencies": {
-                "errno": {
-                  "version": "0.1.4",
-                  "from": "errno@>=0.1.3 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-                  "dependencies": {
-                    "prr": {
-                      "version": "0.0.0",
-                      "from": "prr@>=0.0.0 <0.1.0",
-                      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.0.4",
-                  "from": "readable-stream@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.6",
-                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "node-libs-browser": {
-              "version": "0.5.3",
-              "from": "node-libs-browser@>=0.4.0 <=0.6.0",
-              "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz",
-              "dependencies": {
-                "assert": {
-                  "version": "1.3.0",
-                  "from": "assert@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"
-                },
-                "browserify-zlib": {
-                  "version": "0.1.4",
-                  "from": "browserify-zlib@>=0.1.4 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-                  "dependencies": {
-                    "pako": {
-                      "version": "0.2.8",
-                      "from": "pako@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz"
-                    }
-                  }
-                },
-                "buffer": {
-                  "version": "3.5.5",
-                  "from": "buffer@>=3.0.3 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.5.5.tgz",
-                  "dependencies": {
-                    "base64-js": {
-                      "version": "0.0.8",
-                      "from": "base64-js@0.0.8",
-                      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
-                    },
-                    "ieee754": {
-                      "version": "1.1.6",
-                      "from": "ieee754@>=1.1.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"
-                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "from": "isarray@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                    }
-                  }
-                },
-                "console-browserify": {
-                  "version": "1.1.0",
-                  "from": "console-browserify@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-                  "dependencies": {
-                    "date-now": {
-                      "version": "0.1.4",
-                      "from": "date-now@>=0.1.4 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
-                    }
-                  }
-                },
-                "constants-browserify": {
-                  "version": "0.0.1",
-                  "from": "constants-browserify@0.0.1",
-                  "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
-                },
-                "crypto-browserify": {
-                  "version": "3.2.8",
-                  "from": "crypto-browserify@>=3.2.6 <3.3.0",
-                  "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz",
-                  "dependencies": {
-                    "pbkdf2-compat": {
-                      "version": "2.0.1",
-                      "from": "pbkdf2-compat@2.0.1",
-                      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
-                    },
-                    "ripemd160": {
-                      "version": "0.2.0",
-                      "from": "ripemd160@0.2.0",
-                      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
-                    },
-                    "sha.js": {
-                      "version": "2.2.6",
-                      "from": "sha.js@2.2.6",
-                      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
-                    }
-                  }
-                },
-                "domain-browser": {
-                  "version": "1.1.5",
-                  "from": "domain-browser@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.5.tgz",
-                  "dependencies": {
-                    "assert-helpers": {
-                      "version": "4.1.0",
-                      "from": "assert-helpers@>=4.1.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/assert-helpers/-/assert-helpers-4.1.0.tgz",
-                      "dependencies": {
-                        "ansicolors": {
-                          "version": "0.3.2",
-                          "from": "ansicolors@>=0.3.2 <0.4.0",
-                          "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
-                        },
-                        "diff": {
-                          "version": "2.2.1",
-                          "from": "diff@>=2.1.1 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"
-                        },
-                        "esnextguardian": {
-                          "version": "1.2.0",
-                          "from": "esnextguardian@>=1.1.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/esnextguardian/-/esnextguardian-1.2.0.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "events": {
-                  "version": "1.1.0",
-                  "from": "events@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/events/-/events-1.1.0.tgz"
-                },
-                "http-browserify": {
-                  "version": "1.7.0",
-                  "from": "http-browserify@>=1.3.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-                  "dependencies": {
-                    "Base64": {
-                      "version": "0.2.1",
-                      "from": "Base64@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "https-browserify": {
-                  "version": "0.0.0",
-                  "from": "https-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
-                },
-                "os-browserify": {
-                  "version": "0.1.2",
-                  "from": "os-browserify@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
-                },
-                "path-browserify": {
-                  "version": "0.0.0",
-                  "from": "path-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
-                },
-                "process": {
-                  "version": "0.11.2",
-                  "from": "process@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/process/-/process-0.11.2.tgz"
-                },
-                "punycode": {
-                  "version": "1.4.0",
-                  "from": "punycode@>=1.2.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.0.tgz"
-                },
-                "querystring-es3": {
-                  "version": "0.2.1",
-                  "from": "querystring-es3@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
-                },
-                "readable-stream": {
-                  "version": "1.1.13",
-                  "from": "readable-stream@>=1.1.13 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "from": "isarray@0.0.1",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "stream-browserify": {
-                  "version": "1.0.0",
-                  "from": "stream-browserify@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.25 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "timers-browserify": {
-                  "version": "1.4.2",
-                  "from": "timers-browserify@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"
-                },
-                "tty-browserify": {
-                  "version": "0.0.0",
-                  "from": "tty-browserify@0.0.0",
-                  "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
-                },
-                "url": {
-                  "version": "0.10.3",
-                  "from": "url@>=0.10.1 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.3.2",
-                      "from": "punycode@1.3.2",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                    },
-                    "querystring": {
-                      "version": "0.2.0",
-                      "from": "querystring@0.2.0",
-                      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-                    }
-                  }
-                },
-                "util": {
-                  "version": "0.10.3",
-                  "from": "util@>=0.10.3 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    }
-                  }
-                },
-                "vm-browserify": {
-                  "version": "0.0.4",
-                  "from": "vm-browserify@0.0.4",
-                  "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-                  "dependencies": {
-                    "indexof": {
-                      "version": "0.0.1",
-                      "from": "indexof@0.0.1",
-                      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "supports-color": {
-              "version": "3.1.2",
-              "from": "supports-color@>=3.1.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-              "dependencies": {
-                "has-flag": {
-                  "version": "1.0.0",
-                  "from": "has-flag@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
-                }
-              }
-            },
-            "tapable": {
-              "version": "0.1.10",
-              "from": "tapable@>=0.1.8 <0.2.0",
-              "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
-            },
-            "uglify-js": {
-              "version": "2.6.1",
-              "from": "uglify-js@>=2.6.0 <2.7.0",
-              "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
-              "dependencies": {
-                "async": {
-                  "version": "0.2.10",
-                  "from": "async@>=0.2.6 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                },
-                "source-map": {
-                  "version": "0.5.3",
-                  "from": "source-map@>=0.5.1 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
-                },
-                "uglify-to-browserify": {
-                  "version": "1.0.2",
-                  "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-                },
-                "yargs": {
-                  "version": "3.10.0",
-                  "from": "yargs@>=3.10.0 <3.11.0",
-                  "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-                  "dependencies": {
-                    "camelcase": {
-                      "version": "1.2.1",
-                      "from": "camelcase@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
-                    },
-                    "cliui": {
-                      "version": "2.1.0",
-                      "from": "cliui@>=2.1.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-                      "dependencies": {
-                        "center-align": {
-                          "version": "0.1.2",
-                          "from": "center-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz",
-                          "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                              "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                }
-                              }
-                            },
-                            "lazy-cache": {
-                              "version": "0.2.7",
-                              "from": "lazy-cache@>=0.2.4 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
-                            }
-                          }
-                        },
-                        "right-align": {
-                          "version": "0.1.3",
-                          "from": "right-align@>=0.1.1 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-                          "dependencies": {
-                            "align-text": {
-                              "version": "0.1.3",
-                              "from": "align-text@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz",
-                              "dependencies": {
-                                "kind-of": {
-                                  "version": "2.0.1",
-                                  "from": "kind-of@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-                                  "dependencies": {
-                                    "is-buffer": {
-                                      "version": "1.1.0",
-                                      "from": "is-buffer@>=1.0.2 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "longest": {
-                                  "version": "1.0.1",
-                                  "from": "longest@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
-                                },
-                                "repeat-string": {
-                                  "version": "1.5.2",
-                                  "from": "repeat-string@>=1.5.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "wordwrap": {
-                          "version": "0.0.2",
-                          "from": "wordwrap@0.0.2",
-                          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-                        }
-                      }
-                    },
-                    "decamelize": {
-                      "version": "1.1.1",
-                      "from": "decamelize@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz"
-                    },
-                    "window-size": {
-                      "version": "0.1.0",
-                      "from": "window-size@0.1.0",
-                      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "watchpack": {
-              "version": "0.2.9",
-              "from": "watchpack@>=0.2.1 <0.3.0",
-              "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
-              "dependencies": {
-                "async": {
-                  "version": "0.9.2",
-                  "from": "async@>=0.9.0 <0.10.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-                },
-                "chokidar": {
-                  "version": "1.4.1",
-                  "from": "chokidar@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.4.1.tgz",
-                  "dependencies": {
-                    "anymatch": {
-                      "version": "1.3.0",
-                      "from": "anymatch@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-                      "dependencies": {
-                        "arrify": {
-                          "version": "1.0.1",
-                          "from": "arrify@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
-                        },
-                        "micromatch": {
-                          "version": "2.3.5",
-                          "from": "micromatch@>=2.1.5 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.5.tgz",
-                          "dependencies": {
-                            "arr-diff": {
-                              "version": "2.0.0",
-                              "from": "arr-diff@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-                              "dependencies": {
-                                "arr-flatten": {
-                                  "version": "1.0.1",
-                                  "from": "arr-flatten@>=1.0.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
-                                }
-                              }
-                            },
-                            "array-unique": {
-                              "version": "0.2.1",
-                              "from": "array-unique@>=0.2.1 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
-                            },
-                            "braces": {
-                              "version": "1.8.2",
-                              "from": "braces@>=1.8.1 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.2.tgz",
-                              "dependencies": {
-                                "expand-range": {
-                                  "version": "1.8.1",
-                                  "from": "expand-range@>=1.8.1 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz",
-                                  "dependencies": {
-                                    "fill-range": {
-                                      "version": "2.2.3",
-                                      "from": "fill-range@>=2.1.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-                                      "dependencies": {
-                                        "is-number": {
-                                          "version": "2.1.0",
-                                          "from": "is-number@>=2.1.0 <3.0.0",
-                                          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
-                                        },
-                                        "isobject": {
-                                          "version": "2.0.0",
-                                          "from": "isobject@>=2.0.0 <3.0.0",
-                                          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz",
-                                          "dependencies": {
-                                            "isarray": {
-                                              "version": "0.0.1",
-                                              "from": "isarray@0.0.1",
-                                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                            }
-                                          }
-                                        },
-                                        "randomatic": {
-                                          "version": "1.1.5",
-                                          "from": "randomatic@>=1.1.3 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
-                                        },
-                                        "repeat-string": {
-                                          "version": "1.5.2",
-                                          "from": "repeat-string@>=1.5.2 <2.0.0",
-                                          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "preserve": {
-                                  "version": "0.2.0",
-                                  "from": "preserve@>=0.2.0 <0.3.0",
-                                  "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
-                                },
-                                "repeat-element": {
-                                  "version": "1.1.2",
-                                  "from": "repeat-element@>=1.1.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
-                                }
-                              }
-                            },
-                            "expand-brackets": {
-                              "version": "0.1.4",
-                              "from": "expand-brackets@>=0.1.4 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.4.tgz"
-                            },
-                            "extglob": {
-                              "version": "0.3.1",
-                              "from": "extglob@>=0.3.1 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.1.tgz",
-                              "dependencies": {
-                                "ansi-green": {
-                                  "version": "0.1.1",
-                                  "from": "ansi-green@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
-                                  "dependencies": {
-                                    "ansi-wrap": {
-                                      "version": "0.1.0",
-                                      "from": "ansi-wrap@0.1.0",
-                                      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
-                                    }
-                                  }
-                                },
-                                "success-symbol": {
-                                  "version": "0.1.0",
-                                  "from": "success-symbol@>=0.1.0 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz"
-                                }
-                              }
-                            },
-                            "filename-regex": {
-                              "version": "2.0.0",
-                              "from": "filename-regex@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
-                            },
-                            "is-extglob": {
-                              "version": "1.0.0",
-                              "from": "is-extglob@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-                            },
-                            "kind-of": {
-                              "version": "3.0.2",
-                              "from": "kind-of@>=3.0.2 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz",
-                              "dependencies": {
-                                "is-buffer": {
-                                  "version": "1.1.0",
-                                  "from": "is-buffer@>=1.0.2 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz"
-                                }
-                              }
-                            },
-                            "lazy-cache": {
-                              "version": "0.2.7",
-                              "from": "lazy-cache@>=0.2.3 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"
-                            },
-                            "normalize-path": {
-                              "version": "2.0.1",
-                              "from": "normalize-path@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
-                            },
-                            "object.omit": {
-                              "version": "2.0.0",
-                              "from": "object.omit@>=2.0.0 <3.0.0",
-                              "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz",
-                              "dependencies": {
-                                "for-own": {
-                                  "version": "0.1.3",
-                                  "from": "for-own@>=0.1.3 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz",
-                                  "dependencies": {
-                                    "for-in": {
-                                      "version": "0.1.4",
-                                      "from": "for-in@>=0.1.4 <0.2.0",
-                                      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz"
-                                    }
-                                  }
-                                },
-                                "is-extendable": {
-                                  "version": "0.1.1",
-                                  "from": "is-extendable@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-                                }
-                              }
-                            },
-                            "parse-glob": {
-                              "version": "3.0.4",
-                              "from": "parse-glob@>=3.0.4 <4.0.0",
-                              "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-                              "dependencies": {
-                                "glob-base": {
-                                  "version": "0.3.0",
-                                  "from": "glob-base@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
-                                },
-                                "is-dotfile": {
-                                  "version": "1.0.2",
-                                  "from": "is-dotfile@>=1.0.0 <2.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
-                                }
-                              }
-                            },
-                            "regex-cache": {
-                              "version": "0.4.2",
-                              "from": "regex-cache@>=0.4.2 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
-                              "dependencies": {
-                                "is-equal-shallow": {
-                                  "version": "0.1.3",
-                                  "from": "is-equal-shallow@>=0.1.1 <0.2.0",
-                                  "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
-                                },
-                                "is-primitive": {
-                                  "version": "2.0.0",
-                                  "from": "is-primitive@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "async-each": {
-                      "version": "0.1.6",
-                      "from": "async-each@>=0.1.6 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
-                    },
-                    "glob-parent": {
-                      "version": "2.0.0",
-                      "from": "glob-parent@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "is-binary-path": {
-                      "version": "1.0.1",
-                      "from": "is-binary-path@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-                      "dependencies": {
-                        "binary-extensions": {
-                          "version": "1.4.0",
-                          "from": "binary-extensions@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz"
-                        }
-                      }
-                    },
-                    "is-glob": {
-                      "version": "2.0.1",
-                      "from": "is-glob@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-                      "dependencies": {
-                        "is-extglob": {
-                          "version": "1.0.0",
-                          "from": "is-extglob@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    },
-                    "readdirp": {
-                      "version": "2.0.0",
-                      "from": "readdirp@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.0.0.tgz",
-                      "dependencies": {
-                        "minimatch": {
-                          "version": "2.0.10",
-                          "from": "minimatch@>=2.0.10 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-                          "dependencies": {
-                            "brace-expansion": {
-                              "version": "1.1.2",
-                              "from": "brace-expansion@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                              "dependencies": {
-                                "balanced-match": {
-                                  "version": "0.3.0",
-                                  "from": "balanced-match@>=0.3.0 <0.4.0",
-                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                                },
-                                "concat-map": {
-                                  "version": "0.0.1",
-                                  "from": "concat-map@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "readable-stream": {
-                          "version": "2.0.4",
-                          "from": "readable-stream@>=2.0.2 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.2",
-                              "from": "core-util-is@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "process-nextick-args": {
-                              "version": "1.0.6",
-                              "from": "process-nextick-args@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@>=0.10.0 <0.11.0",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "util-deprecate": {
-                              "version": "1.0.2",
-                              "from": "util-deprecate@>=1.0.1 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "fsevents": {
-                      "version": "1.0.6",
-                      "from": "fsevents@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.6.tgz",
-                      "dependencies": {
-                        "nan": {
-                          "version": "2.1.0",
-                          "from": "nan@>=2.1.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
-                        },
-                        "node-pre-gyp": {
-                          "version": "0.6.17",
-                          "from": "node-pre-gyp@>=0.6.17 <0.7.0",
-                          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.17.tgz",
-                          "dependencies": {
-                            "nopt": {
-                              "version": "3.0.6",
-                              "from": "nopt@~3.0.1",
-                              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                              "dependencies": {
-                                "abbrev": {
-                                  "version": "1.0.7",
-                                  "from": "abbrev@1",
-                                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "ansi": {
-                          "version": "0.3.0",
-                          "from": "ansi@~0.3.0",
-                          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                        },
-                        "ansi-regex": {
-                          "version": "2.0.0",
-                          "from": "ansi-regex@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                        },
-                        "ansi-styles": {
-                          "version": "2.1.0",
-                          "from": "ansi-styles@^2.1.0",
-                          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-                        },
-                        "are-we-there-yet": {
-                          "version": "1.0.4",
-                          "from": "are-we-there-yet@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
-                        },
-                        "asn1": {
-                          "version": "0.2.3",
-                          "from": "asn1@>=0.2.3 <0.3.0",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                        },
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "from": "assert-plus@^0.1.5",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        },
-                        "async": {
-                          "version": "1.5.0",
-                          "from": "async@^1.4.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
-                        },
-                        "aws-sign2": {
-                          "version": "0.6.0",
-                          "from": "aws-sign2@~0.6.0",
-                          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                        },
-                        "block-stream": {
-                          "version": "0.0.8",
-                          "from": "block-stream@*",
-                          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
-                        },
-                        "boom": {
-                          "version": "2.10.1",
-                          "from": "boom@2.x.x",
-                          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                        },
-                        "chalk": {
-                          "version": "1.1.1",
-                          "from": "chalk@^1.1.1",
-                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
-                        },
-                        "caseless": {
-                          "version": "0.11.0",
-                          "from": "caseless@~0.11.0",
-                          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                        },
-                        "combined-stream": {
-                          "version": "1.0.5",
-                          "from": "combined-stream@~1.0.5",
-                          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-                        },
-                        "commander": {
-                          "version": "2.9.0",
-                          "from": "commander@^2.9.0",
-                          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-                        },
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "cryptiles": {
-                          "version": "2.0.5",
-                          "from": "cryptiles@2.x.x",
-                          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                        },
-                        "debug": {
-                          "version": "0.7.4",
-                          "from": "debug@~0.7.2",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-                        },
-                        "dashdash": {
-                          "version": "1.10.1",
-                          "from": "dashdash@>=1.10.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"
-                        },
-                        "deep-extend": {
-                          "version": "0.4.0",
-                          "from": "deep-extend@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.0.tgz"
-                        },
-                        "delayed-stream": {
-                          "version": "1.0.0",
-                          "from": "delayed-stream@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                        },
-                        "delegates": {
-                          "version": "0.1.0",
-                          "from": "delegates@^0.1.0",
-                          "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "from": "ecc-jsbn@>=0.0.1 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                        },
-                        "escape-string-regexp": {
-                          "version": "1.0.3",
-                          "from": "escape-string-regexp@^1.0.2",
-                          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-                        },
-                        "extend": {
-                          "version": "3.0.0",
-                          "from": "extend@~3.0.0",
-                          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                        },
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "from": "extsprintf@1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                        },
-                        "forever-agent": {
-                          "version": "0.6.1",
-                          "from": "forever-agent@~0.6.1",
-                          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                        },
-                        "form-data": {
-                          "version": "1.0.0-rc3",
-                          "from": "form-data@~1.0.0-rc3",
-                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
-                        },
-                        "fstream": {
-                          "version": "1.0.8",
-                          "from": "fstream@^1.0.2",
-                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
-                        },
-                        "gauge": {
-                          "version": "1.2.2",
-                          "from": "gauge@~1.2.0",
-                          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
-                        },
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "from": "generate-function@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "from": "generate-object-property@^1.1.0",
-                          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                        },
-                        "graceful-fs": {
-                          "version": "4.1.2",
-                          "from": "graceful-fs@4.1",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                        },
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "from": "graceful-readlink@>= 1.0.0",
-                          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                        },
-                        "har-validator": {
-                          "version": "2.0.3",
-                          "from": "har-validator@~2.0.2",
-                          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz"
-                        },
-                        "has-ansi": {
-                          "version": "2.0.0",
-                          "from": "has-ansi@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                        },
-                        "has-unicode": {
-                          "version": "1.0.1",
-                          "from": "has-unicode@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
-                        },
-                        "hoek": {
-                          "version": "2.16.3",
-                          "from": "hoek@2.x.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                        },
-                        "hawk": {
-                          "version": "3.1.2",
-                          "from": "hawk@~3.1.0",
-                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz"
-                        },
-                        "http-signature": {
-                          "version": "1.1.0",
-                          "from": "http-signature@~1.1.0",
-                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@*",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        },
-                        "ini": {
-                          "version": "1.3.4",
-                          "from": "ini@~1.3.0",
-                          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                        },
-                        "is-my-json-valid": {
-                          "version": "2.12.3",
-                          "from": "is-my-json-valid@^2.12.3",
-                          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz"
-                        },
-                        "is-property": {
-                          "version": "1.0.2",
-                          "from": "is-property@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                        },
-                        "is-typedarray": {
-                          "version": "1.0.0",
-                          "from": "is-typedarray@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                        },
-                        "isarray": {
-                          "version": "0.0.1",
-                          "from": "isarray@0.0.1",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                        },
-                        "isstream": {
-                          "version": "0.1.2",
-                          "from": "isstream@~0.1.2",
-                          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "from": "jodid25519@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                        },
-                        "jsbn": {
-                          "version": "0.1.0",
-                          "from": "jsbn@>=0.1.0 <0.2.0",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                        },
-                        "json-schema": {
-                          "version": "0.2.2",
-                          "from": "json-schema@0.2.2",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                        },
-                        "json-stringify-safe": {
-                          "version": "5.0.1",
-                          "from": "json-stringify-safe@~5.0.1",
-                          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "from": "jsonpointer@2.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                        },
-                        "jsprim": {
-                          "version": "1.2.2",
-                          "from": "jsprim@^1.2.2",
-                          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
-                        },
-                        "lodash._basetostring": {
-                          "version": "3.0.1",
-                          "from": "lodash._basetostring@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                        },
-                        "lodash._createpadding": {
-                          "version": "3.6.1",
-                          "from": "lodash._createpadding@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
-                        },
-                        "lodash.pad": {
-                          "version": "3.1.1",
-                          "from": "lodash.pad@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
-                        },
-                        "lodash.padleft": {
-                          "version": "3.1.1",
-                          "from": "lodash.padleft@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
-                        },
-                        "lodash.padright": {
-                          "version": "3.1.1",
-                          "from": "lodash.padright@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
-                        },
-                        "lodash.repeat": {
-                          "version": "3.0.1",
-                          "from": "lodash.repeat@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                        },
-                        "mime-db": {
-                          "version": "1.19.0",
-                          "from": "mime-db@~1.19.0",
-                          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-                        },
-                        "mime-types": {
-                          "version": "2.1.7",
-                          "from": "mime-types@~2.1.7",
-                          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
-                        },
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        },
-                        "mkdirp": {
-                          "version": "0.5.1",
-                          "from": "mkdirp@>=0.3.0 <0.4.0||>=0.4.0 <0.5.0||>=0.5.0 <0.6.0",
-                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-                        },
-                        "node-uuid": {
-                          "version": "1.4.7",
-                          "from": "node-uuid@~1.4.7",
-                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                        },
-                        "npmlog": {
-                          "version": "2.0.0",
-                          "from": "npmlog@~2.0.0",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.0.tgz"
-                        },
-                        "oauth-sign": {
-                          "version": "0.8.0",
-                          "from": "oauth-sign@~0.8.0",
-                          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-                        },
-                        "once": {
-                          "version": "1.1.1",
-                          "from": "once@~1.1.1",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
-                        },
-                        "pinkie": {
-                          "version": "2.0.1",
-                          "from": "pinkie@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
-                        },
-                        "pinkie-promise": {
-                          "version": "2.0.0",
-                          "from": "pinkie-promise@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"
-                        },
-                        "qs": {
-                          "version": "5.2.0",
-                          "from": "qs@~5.2.0",
-                          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
-                        },
-                        "readable-stream": {
-                          "version": "1.1.13",
-                          "from": "readable-stream@^1.1.13",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
-                        },
-                        "request": {
-                          "version": "2.67.0",
-                          "from": "request@2.x",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz"
-                        },
-                        "semver": {
-                          "version": "5.1.0",
-                          "from": "semver@~5.1.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
-                        },
-                        "sntp": {
-                          "version": "1.0.9",
-                          "from": "sntp@1.x.x",
-                          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@~0.10.x",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "stringstream": {
-                          "version": "0.0.5",
-                          "from": "stringstream@~0.0.4",
-                          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.0",
-                          "from": "strip-ansi@^3.0.0",
-                          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-                        },
-                        "strip-json-comments": {
-                          "version": "1.0.4",
-                          "from": "strip-json-comments@~1.0.4",
-                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
-                        },
-                        "supports-color": {
-                          "version": "2.0.0",
-                          "from": "supports-color@^2.0.0",
-                          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                        },
-                        "tar": {
-                          "version": "2.2.1",
-                          "from": "tar@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
-                        },
-                        "tough-cookie": {
-                          "version": "2.2.1",
-                          "from": "tough-cookie@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-                        },
-                        "tunnel-agent": {
-                          "version": "0.4.1",
-                          "from": "tunnel-agent@~0.4.1",
-                          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-                        },
-                        "tweetnacl": {
-                          "version": "0.13.2",
-                          "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
-                        },
-                        "uid-number": {
-                          "version": "0.0.3",
-                          "from": "uid-number@0.0.3",
-                          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "from": "xtend@^4.0.0",
-                          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "from": "verror@1.3.6",
-                          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                        },
-                        "rc": {
-                          "version": "1.1.5",
-                          "from": "rc@~1.1.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.5.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "1.2.0",
-                              "from": "minimist@^1.2.0",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                            }
-                          }
-                        },
-                        "sshpk": {
-                          "version": "1.7.0",
-                          "from": "sshpk@^1.7.0",
-                          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.0.tgz",
-                          "dependencies": {
-                            "assert-plus": {
-                              "version": "0.2.0",
-                              "from": "assert-plus@>=0.2.0 <0.3.0",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                            }
-                          }
-                        },
-                        "bl": {
-                          "version": "1.0.0",
-                          "from": "bl@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "2.0.4",
-                              "from": "readable-stream@~2.0.0",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.1",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "process-nextick-args": {
-                                  "version": "1.0.3",
-                                  "from": "process-nextick-args@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                },
-                                "util-deprecate": {
-                                  "version": "1.0.2",
-                                  "from": "util-deprecate@~1.0.1",
-                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "tar-pack": {
-                          "version": "3.1.0",
-                          "from": "tar-pack@~3.1.0",
-                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.0.tgz",
-                          "dependencies": {
-                            "readable-stream": {
-                              "version": "1.0.33",
-                              "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.2",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.31",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                                }
-                              }
-                            },
-                            "rimraf": {
-                              "version": "2.2.8",
-                              "from": "rimraf@~2.2.0",
-                              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                            }
-                          }
-                        },
-                        "fstream-ignore": {
-                          "version": "1.0.3",
-                          "from": "fstream-ignore@~1.0.3",
-                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz",
-                          "dependencies": {
-                            "minimatch": {
-                              "version": "3.0.0",
-                              "from": "minimatch@^3.0.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                              "dependencies": {
-                                "brace-expansion": {
-                                  "version": "1.1.1",
-                                  "from": "brace-expansion@^1.0.0",
-                                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                                  "dependencies": {
-                                    "balanced-match": {
-                                      "version": "0.2.1",
-                                      "from": "balanced-match@^0.2.0",
-                                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                                    },
-                                    "concat-map": {
-                                      "version": "0.0.1",
-                                      "from": "concat-map@0.0.1",
-                                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "rimraf": {
-                          "version": "2.4.4",
-                          "from": "rimraf@~2.4.0",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-                          "dependencies": {
-                            "glob": {
-                              "version": "5.0.15",
-                              "from": "glob@^5.0.14",
-                              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                              "dependencies": {
-                                "inflight": {
-                                  "version": "1.0.4",
-                                  "from": "inflight@^1.0.4",
-                                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                                  "dependencies": {
-                                    "wrappy": {
-                                      "version": "1.0.1",
-                                      "from": "wrappy@1",
-                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                    }
-                                  }
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@2",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                },
-                                "minimatch": {
-                                  "version": "3.0.0",
-                                  "from": "minimatch@2 || 3",
-                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                                  "dependencies": {
-                                    "brace-expansion": {
-                                      "version": "1.1.1",
-                                      "from": "brace-expansion@^1.0.0",
-                                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
-                                      "dependencies": {
-                                        "balanced-match": {
-                                          "version": "0.2.1",
-                                          "from": "balanced-match@^0.2.0",
-                                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
-                                        },
-                                        "concat-map": {
-                                          "version": "0.0.1",
-                                          "from": "concat-map@0.0.1",
-                                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                                        }
-                                      }
-                                    }
-                                  }
-                                },
-                                "once": {
-                                  "version": "1.3.3",
-                                  "from": "once@^1.3.0",
-                                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                                  "dependencies": {
-                                    "wrappy": {
-                                      "version": "1.0.1",
-                                      "from": "wrappy@1",
-                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                                    }
-                                  }
-                                },
-                                "path-is-absolute": {
-                                  "version": "1.0.0",
-                                  "from": "path-is-absolute@^1.0.0",
-                                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "graceful-fs": {
-                  "version": "4.1.2",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-                }
-              }
-            },
-            "webpack-core": {
-              "version": "0.6.8",
-              "from": "webpack-core@>=0.6.0 <0.7.0",
-              "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz",
-              "dependencies": {
-                "source-map": {
-                  "version": "0.4.4",
-                  "from": "source-map@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-                  "dependencies": {
-                    "amdefine": {
-                      "version": "1.0.0",
-                      "from": "amdefine@>=0.0.4",
-                      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-                    }
-                  }
-                },
-                "source-list-map": {
-                  "version": "0.1.5",
-                  "from": "source-list-map@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz"
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "1.1.2",
-          "from": "winston@>=1.0.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "1.0.0",
-              "from": "async@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
-            },
-            "colors": {
-              "version": "1.0.3",
-              "from": "colors@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "isstream": {
-              "version": "0.1.2",
-              "from": "isstream@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-            },
-            "pkginfo": {
-              "version": "0.3.1",
-              "from": "pkginfo@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "moment": {
-      "version": "2.10.6",
-      "from": "moment@>=2.10.6 <3.0.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
-    },
-    "ncp": {
-      "version": "0.4.2",
-      "from": "ncp@0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"
-    },
-    "open": {
-      "version": "0.0.5",
-      "from": "open@0.0.5",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
-    },
-    "optimist": {
-      "version": "0.6.0",
-      "from": "optimist@0.6.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz",
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "from": "wordwrap@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
-        },
-        "minimist": {
-          "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-        }
-      }
-    },
-    "progress": {
-      "version": "1.1.7",
-      "from": "progress@1.1.7",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
-    },
-    "prompt": {
-      "version": "0.2.12",
-      "from": "prompt@0.2.12",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.12.tgz",
-      "dependencies": {
-        "pkginfo": {
-          "version": "0.3.1",
-          "from": "pkginfo@>=0.0.0 <1.0.0",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
-        },
-        "read": {
-          "version": "1.0.7",
-          "from": "read@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-          "dependencies": {
-            "mute-stream": {
-              "version": "0.0.5",
-              "from": "mute-stream@>=0.0.4 <0.1.0",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-            }
-          }
-        },
-        "revalidator": {
-          "version": "0.1.8",
-          "from": "revalidator@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"
-        },
-        "utile": {
-          "version": "0.2.1",
-          "from": "utile@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "from": "async@>=0.2.9 <0.3.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-            },
-            "deep-equal": {
-              "version": "1.0.1",
-              "from": "deep-equal@*",
-              "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"
-            },
-            "i": {
-              "version": "0.3.3",
-              "from": "i@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/i/-/i-0.3.3.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.0.0 <1.0.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "winston": {
-          "version": "0.6.2",
-          "from": "winston@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz",
-          "dependencies": {
-            "async": {
-              "version": "0.1.22",
-              "from": "async@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
-            },
-            "cycle": {
-              "version": "1.0.3",
-              "from": "cycle@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"
-            },
-            "eyes": {
-              "version": "0.1.8",
-              "from": "eyes@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
-            },
-            "pkginfo": {
-              "version": "0.2.3",
-              "from": "pkginfo@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"
-            },
-            "request": {
-              "version": "2.9.203",
-              "from": "request@>=2.9.0 <2.10.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
-            },
-            "stack-trace": {
-              "version": "0.0.9",
-              "from": "stack-trace@>=0.0.0 <0.1.0",
-              "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
-            }
-          }
-        }
-      }
-    },
-    "proxy-middleware": {
-      "version": "0.7.0",
-      "from": "proxy-middleware@>=0.7.0 <0.8.0",
-      "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.7.0.tgz"
-    },
-    "q": {
-      "version": "1.0.1",
-      "from": "q@1.0.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz"
-    },
-    "request": {
-      "version": "2.51.0",
-      "from": "request@2.51.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
-      "dependencies": {
-        "bl": {
-          "version": "0.9.4",
-          "from": "bl@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.26 <1.1.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "caseless": {
-          "version": "0.8.0",
-          "from": "caseless@>=0.8.0 <0.9.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "from": "forever-agent@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-        },
-        "form-data": {
-          "version": "0.2.0",
-          "from": "form-data@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-          "dependencies": {
-            "mime-types": {
-              "version": "2.0.14",
-              "from": "mime-types@>=2.0.3 <2.1.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-              "dependencies": {
-                "mime-db": {
-                  "version": "1.12.0",
-                  "from": "mime-db@>=1.12.0 <1.13.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
-                }
-              }
-            }
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-        },
-        "mime-types": {
-          "version": "1.0.2",
-          "from": "mime-types@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-        },
-        "node-uuid": {
-          "version": "1.4.7",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-        },
-        "qs": {
-          "version": "2.3.3",
-          "from": "qs@>=2.3.1 <2.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
-        },
-        "tunnel-agent": {
-          "version": "0.4.2",
-          "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
-        },
-        "tough-cookie": {
-          "version": "2.2.1",
-          "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
-        },
-        "http-signature": {
-          "version": "0.10.1",
-          "from": "http-signature@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "dependencies": {
-            "assert-plus": {
-              "version": "0.1.5",
-              "from": "assert-plus@>=0.1.5 <0.2.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-            },
-            "asn1": {
-              "version": "0.1.11",
-              "from": "asn1@0.1.11",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-            },
-            "ctype": {
-              "version": "0.5.3",
-              "from": "ctype@0.5.3",
-              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-            }
-          }
-        },
-        "oauth-sign": {
-          "version": "0.5.0",
-          "from": "oauth-sign@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
-        },
-        "hawk": {
-          "version": "1.1.1",
-          "from": "hawk@1.1.1",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-          "dependencies": {
-            "hoek": {
-              "version": "0.9.1",
-              "from": "hoek@>=0.9.0 <0.10.0",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-            },
-            "boom": {
-              "version": "0.4.2",
-              "from": "boom@>=0.4.0 <0.5.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-            },
-            "cryptiles": {
-              "version": "0.2.2",
-              "from": "cryptiles@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-            },
-            "sntp": {
-              "version": "0.2.4",
-              "from": "sntp@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-            }
-          }
-        },
-        "aws-sign2": {
-          "version": "0.5.0",
-          "from": "aws-sign2@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "from": "stringstream@>=0.0.4 <0.1.0",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-        },
-        "combined-stream": {
-          "version": "0.0.7",
-          "from": "combined-stream@>=0.0.5 <0.1.0",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "dependencies": {
-            "delayed-stream": {
-              "version": "0.0.5",
-              "from": "delayed-stream@0.0.5",
-              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-            }
-          }
-        }
-      }
-    },
-    "semver": {
-      "version": "4.3.6",
-      "from": "semver@>=4.2.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-    },
-    "serve-static": {
-      "version": "1.7.1",
-      "from": "serve-static@1.7.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz",
-      "dependencies": {
-        "escape-html": {
-          "version": "1.0.1",
-          "from": "escape-html@1.0.1",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
-        },
-        "parseurl": {
-          "version": "1.3.0",
-          "from": "parseurl@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"
-        },
-        "send": {
-          "version": "0.10.1",
-          "from": "send@0.10.1",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz",
-          "dependencies": {
-            "debug": {
-              "version": "2.1.3",
-              "from": "debug@>=2.1.0 <2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.7.0",
-                  "from": "ms@0.7.0",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
-                }
-              }
-            },
-            "depd": {
-              "version": "1.0.1",
-              "from": "depd@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
-            },
-            "destroy": {
-              "version": "1.0.3",
-              "from": "destroy@1.0.3",
-              "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"
-            },
-            "etag": {
-              "version": "1.5.1",
-              "from": "etag@>=1.5.0 <1.6.0",
-              "resolved": "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"
-            },
-            "fresh": {
-              "version": "0.2.4",
-              "from": "fresh@0.2.4",
-              "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-            },
-            "ms": {
-              "version": "0.6.2",
-              "from": "ms@0.6.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-            },
-            "on-finished": {
-              "version": "2.1.1",
-              "from": "on-finished@>=2.1.1 <2.2.0",
-              "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz",
-              "dependencies": {
-                "ee-first": {
-                  "version": "1.1.0",
-                  "from": "ee-first@1.1.0",
-                  "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"
-                }
-              }
-            },
-            "range-parser": {
-              "version": "1.0.3",
-              "from": "range-parser@>=1.0.2 <1.1.0",
-              "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
-            }
-          }
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "from": "utils-merge@1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
-        }
-      }
-    },
-    "shelljs": {
-      "version": "0.2.6",
-      "from": "shelljs@0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz"
-    },
-    "tiny-lr-fork": {
-      "version": "0.0.5",
-      "from": "tiny-lr-fork@0.0.5",
-      "resolved": "https://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz",
-      "dependencies": {
-        "qs": {
-          "version": "0.5.6",
-          "from": "qs@>=0.5.2 <0.6.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"
-        },
-        "faye-websocket": {
-          "version": "0.4.4",
-          "from": "faye-websocket@>=0.4.3 <0.5.0",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"
-        },
-        "noptify": {
-          "version": "0.0.3",
-          "from": "noptify@>=0.0.3 <0.1.0",
-          "resolved": "https://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz",
-          "dependencies": {
-            "nopt": {
-              "version": "2.0.0",
-              "from": "nopt@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.0.7",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
-                }
-              }
-            }
-          }
-        },
-        "debug": {
-          "version": "0.7.4",
-          "from": "debug@>=0.7.0 <0.8.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-        }
-      }
-    },
-    "underscore": {
-      "version": "1.7.0",
-      "from": "underscore@>=1.7.0 <1.8.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
-    },
-    "unzip": {
-      "version": "0.1.9",
-      "from": "unzip@0.1.9",
-      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz",
-      "dependencies": {
-        "fstream": {
-          "version": "0.1.31",
-          "from": "fstream@>=0.1.21 <0.2.0",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-          "dependencies": {
-            "graceful-fs": {
-              "version": "3.0.8",
-              "from": "graceful-fs@>=3.0.2 <3.1.0",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.4.4",
-              "from": "rimraf@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "5.0.15",
-                  "from": "glob@>=5.0.14 <6.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                  "dependencies": {
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "3.0.0",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.2",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.3.0",
-                              "from": "balanced-match@>=0.3.0 <0.4.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.3.3",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.1",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "pullstream": {
-          "version": "0.4.1",
-          "from": "pullstream@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-          "dependencies": {
-            "over": {
-              "version": "0.0.5",
-              "from": "over@>=0.0.5 <1.0.0",
-              "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz"
-            },
-            "slice-stream": {
-              "version": "1.0.0",
-              "from": "slice-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "binary": {
-          "version": "0.3.0",
-          "from": "binary@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-          "dependencies": {
-            "chainsaw": {
-              "version": "0.1.0",
-              "from": "chainsaw@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-              "dependencies": {
-                "traverse": {
-                  "version": "0.3.9",
-                  "from": "traverse@>=0.3.0 <0.4.0",
-                  "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"
-                }
-              }
-            },
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.2",
-              "from": "core-util-is@>=1.0.0 <1.1.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "from": "string_decoder@>=0.10.0 <0.11.0",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@>=2.0.1 <2.1.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            }
-          }
-        },
-        "setimmediate": {
-          "version": "1.0.4",
-          "from": "setimmediate@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz"
-        },
-        "match-stream": {
-          "version": "0.0.2",
-          "from": "match-stream@>=0.0.2 <0.1.0",
-          "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-          "dependencies": {
-            "buffers": {
-              "version": "0.1.1",
-              "from": "buffers@>=0.1.1 <0.2.0",
-              "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "vinyl-fs": {
-      "version": "0.3.7",
-      "from": "vinyl-fs@0.3.7",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.7.tgz",
-      "dependencies": {
-        "glob-stream": {
-          "version": "3.1.18",
-          "from": "glob-stream@>=3.1.5 <4.0.0",
-          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "4.5.3",
-              "from": "glob@>=4.3.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-              "dependencies": {
-                "inflight": {
-                  "version": "1.0.4",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "minimatch": {
-              "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.2",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.3.0",
-                      "from": "balanced-match@>=0.3.0 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "ordered-read-streams": {
-              "version": "0.1.0",
-              "from": "ordered-read-streams@>=0.1.0 <0.2.0",
-              "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
-            },
-            "glob2base": {
-              "version": "0.0.12",
-              "from": "glob2base@>=0.0.12 <0.0.13",
-              "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-              "dependencies": {
-                "find-index": {
-                  "version": "0.1.1",
-                  "from": "find-index@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
-                }
-              }
-            },
-            "unique-stream": {
-              "version": "1.0.0",
-              "from": "unique-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"
-            }
-          }
-        },
-        "glob-watcher": {
-          "version": "0.0.6",
-          "from": "glob-watcher@>=0.0.6 <0.0.7",
-          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-          "dependencies": {
-            "gaze": {
-              "version": "0.5.2",
-              "from": "gaze@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-              "dependencies": {
-                "globule": {
-                  "version": "0.1.0",
-                  "from": "globule@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-                  "dependencies": {
-                    "lodash": {
-                      "version": "1.0.2",
-                      "from": "lodash@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-                    },
-                    "glob": {
-                      "version": "3.1.21",
-                      "from": "glob@>=3.1.21 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-                      "dependencies": {
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@>=1.2.0 <1.3.0",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        },
-                        "inherits": {
-                          "version": "1.0.2",
-                          "from": "inherits@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "minimatch": {
-                      "version": "0.2.14",
-                      "from": "minimatch@>=0.2.11 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                      "dependencies": {
-                        "lru-cache": {
-                          "version": "2.7.3",
-                          "from": "lru-cache@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-                        },
-                        "sigmund": {
-                          "version": "1.0.1",
-                          "from": "sigmund@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "3.0.8",
-          "from": "graceful-fs@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "from": "lodash@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "from": "mkdirp@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "from": "minimist@0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-            }
-          }
-        },
-        "strip-bom": {
-          "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-          "dependencies": {
-            "first-chunk-stream": {
-              "version": "1.0.0",
-              "from": "first-chunk-stream@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-            },
-            "is-utf8": {
-              "version": "0.2.0",
-              "from": "is-utf8@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
-            }
-          }
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.33",
-              "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "isarray@0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "xtend": {
-              "version": "4.0.1",
-              "from": "xtend@>=4.0.0 <4.1.0-0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.4.6",
-          "from": "vinyl@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "dependencies": {
-            "clone": {
-              "version": "0.2.0",
-              "from": "clone@>=0.2.0 <0.3.0",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
-            },
-            "clone-stats": {
-              "version": "0.0.1",
-              "from": "clone-stats@>=0.0.1 <0.0.2",
-              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-            }
-          }
-        }
-      }
-    },
-    "xml2js": {
-      "version": "0.4.4",
-      "from": "xml2js@0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-      "dependencies": {
-        "sax": {
-          "version": "0.6.1",
-          "from": "sax@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
-        },
-        "xmlbuilder": {
-          "version": "4.1.0",
-          "from": "xmlbuilder@>=1.0.0",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.1.0.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "3.10.1",
-              "from": "lodash@>=3.5.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index a38b6ff79e..58768d752d 100644
--- a/package.json
+++ b/package.json
@@ -104,6 +104,7 @@
     "finalhandler",
     "form-data",
     "gulp",
+    "inquirer",
     "ionic-app-lib",
     "moment",
     "ncp",

From a4f3f5ac489e200a5297be9b62b390753d822ce7 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 14 Dec 2015 11:11:19 -0600
Subject: [PATCH 0868/1100] bump to beta.12

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 58768d752d..5cf451c102 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.5",
+    "ionic-app-lib": "2.0.0-beta.6",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From c8930b870553e711a23f2485a68dab21355e982b Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Dec 2015 13:35:41 -0600
Subject: [PATCH 0869/1100] fix(): bundle before build, emulate, run and upload

---
 lib/ionic/cordova.js  |  5 ++++-
 lib/tasks/cliTasks.js | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index bcd2e5c116..5e2191b434 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -127,7 +127,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     })
     .then(function(){
       // TODO :(
-      if (argv.v2 && cmdName === 'build'){
+      if (  argv.v2 &&
+            !argv.b && !argv.nobundle &&
+            (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
+      {
         var Build = IonicAppLib.v2.build;
         var buildOptions = {
           appDirectory: process.cwd(),
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index c450f58f58..14fb6f83af 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -23,7 +23,11 @@ var cordovaRunEmulateOptions = {
     title: '',
     boolean: true
   },
-  '--device|--emulator|--target=FOO': ''
+  '--device|--emulator|--target=FOO': '',
+  '--nobundle|-b': {
+    title: '(v2 only) don\'t bundle JS/Sass before running.',
+    boolean: true
+  }
 };
 
 var TASKS = [
@@ -170,8 +174,7 @@ var TASKS = [
   {
     title: 'build',
     name: 'build',
-    summary: 'Locally build an Ionic project for a given platform.\n' +
-             '(v2 only) does webpack build before given platform.',
+    summary: 'Build (prepare + compile) an Ionic project for a given platform.\n',
     args: {
       '[options]': '',
       '<PLATFORM>': ''
@@ -180,6 +183,10 @@ var TASKS = [
       '--nohooks|-n': {
         title: 'Do not add default Ionic hooks for Cordova',
         boolean: true
+      },
+      '--nobundle|-b': {
+        title: '(v2 only) don\'t bundle JS/Sass before building.',
+        boolean: true
       }
     },
     module: './ionic/cordova'
@@ -238,7 +245,11 @@ var TASKS = [
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password',
       '--note': 'The note to signify the upload',
-      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
+      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel',
+      '--nobundle|-b': {
+        title: '(v2 only) don\'t bundle JS/Sass before uploading.',
+        boolean: true
+      }
     },
     alt: ['up'],
     module: './ionic/upload'

From d3a16730a675270920a68c9a7088ec3f91f9a89c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 18 Dec 2015 15:34:49 -0600
Subject: [PATCH 0870/1100] feat(): run Sass before build commands

---
 lib/ionic/cordova.js | 10 +++++++++-
 lib/ionic/serve.js   |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5e2191b434..5e5ebb89ee 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -132,13 +132,21 @@ IonicTask.prototype.run = function(ionic, argv) {
             (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
       {
         var Build = IonicAppLib.v2.build;
+        var config = null;
+        try {
+          config = require(process.cwd() + path.sep + 'ionic.config.js');
+        } catch (e) {}
         var buildOptions = {
           appDirectory: process.cwd(),
           callback: function() {
             console.log('√ Compiling files complete.'.green.bold);
           },
-          watch: false
+          watch: false,
+          config: config
         };
+        // can happen parallel to webpack bundle
+        Build.sass(buildOptions);
+        Build.fonts(buildOptions);
         return Build.bundle(buildOptions);
       }
     })
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 7c67c9bbbd..d0d1c14c01 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -13,6 +13,7 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
+
   var self = this;
   this.ionic = ionic;
   this.port = argv._[1];
@@ -82,6 +83,9 @@ IonicTask.prototype.run = function(ionic, argv) {
       }
     })
     .then(function() {
+      if (isIonicV2) {
+        options.config = project.get();
+      }
       return Serve.start(options);
     })
     .then(function() {

From cc1cc111bb77dd1c610b8a5cfc1783a59aac08de Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 18 Dec 2015 18:59:53 -0600
Subject: [PATCH 0871/1100] fix(run): fix livereload option for v2 run

---
 lib/ionic/cordova.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 5e5ebb89ee..dd7e6877e4 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -9,12 +9,10 @@ var Task = require('./task').Task,
     shelljs = require('shelljs'),
     prompt = require('prompt'),
     IonicAppLib = require('ionic-app-lib'),
-    IonicProject = IonicAppLib.project,
     IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
     Hooks = IonicAppLib.hooks,
-    Serve = IonicAppLib.serve,
     State = IonicAppLib.state,
     Utils = IonicAppLib.utils,
     Logging = IonicAppLib.logging;
@@ -30,6 +28,14 @@ IonicTask.prototype.run = function(ionic, argv) {
       appDirectory = process.cwd(),
       q;
 
+  if (argv.v2) {
+    Serve = IonicAppLib.v2.serve;
+    IonicProject = IonicAppLib.v2.project;
+  } else {
+    Serve = IonicAppLib.serve;
+    IonicProject = IonicAppLib.project;
+  }
+
   try {
     // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
     // if not, try to install it.
@@ -128,6 +134,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     .then(function(){
       // TODO :(
       if (  argv.v2 &&
+            !self.isLiveReload &&
             !argv.b && !argv.nobundle &&
             (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
       {
@@ -367,7 +374,8 @@ IonicTask.prototype.setupLiveReload = function(argv) {
   var project = null;
 
   try {
-    project = IonicProject.load(process.cwd());
+    var cwd = process.cwd();
+    project = argv.v2 ? IonicProject.loadConfig(cwd) : IonicProject.load(cwd);
   } catch (ex) {
     console.log('Error occured', ex);
     return Utils.fail(ex.message);
@@ -415,6 +423,9 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     }).then(function(){
       d.resolve();
     });
+    if (argv.v2) {
+      options.config = project.get();
+    }
     return Serve.start(options);
   })
   .then(function() {

From af2db9011d93d541d1e6fa87a82177d74d83286c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 18 Dec 2015 19:00:17 -0600
Subject: [PATCH 0872/1100] chore(): update to beta.13

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5cf451c102..58c2d41b33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.6",
+    "ionic-app-lib": "2.0.0-beta.7",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From dfa3b0357e9bd3eeb6cb69cd8286c3324935d3c6 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Dec 2015 11:13:49 -0600
Subject: [PATCH 0873/1100] fix(bundle): rebuild native bindings postinstall

---
 lib/tasks/postinstall.js | 11 +++++++++++
 package.json             |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 lib/tasks/postinstall.js

diff --git a/lib/tasks/postinstall.js b/lib/tasks/postinstall.js
new file mode 100644
index 0000000000..eefb5255ae
--- /dev/null
+++ b/lib/tasks/postinstall.js
@@ -0,0 +1,11 @@
+var execSync = require('child_process').execSync
+
+var previousGlobalConfig = process.env.npm_config_global;
+process.env.npm_config_global = 'false';
+
+var cmd = 'npm rebuild node-sass spawn-sync';
+cmd += process.platform === 'darwin' ? ' fsevents' : '';
+
+execSync(cmd, {stdio: [0,1,2]});
+process.env.npm_config_global = previousGlobalConfig;
+
diff --git a/package.json b/package.json
index 58c2d41b33..810cf1e2d4 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",
     "test": "npm run jasmine",
     "e2e": "jasmine-node --captureExceptions ./e2e",
-    "jasmine": "jasmine-node --captureExceptions  ./spec"
+    "jasmine": "jasmine-node --captureExceptions  ./spec",
+    "postinstall": "node lib/tasks/postinstall"
   },
   "keywords": [
     "ionic",

From 7245286f15848bda20f009c7ce4b0019c10890e6 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Dec 2015 11:14:24 -0600
Subject: [PATCH 0874/1100] chore(): bump version to beta.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 810cf1e2d4..5d960448c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e645fbafd6862d5997a07cb0691ed6fe601826d0 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Dec 2015 13:21:35 -0600
Subject: [PATCH 0875/1100] chore(): error if project file is missing

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index c2a430e34c..1f56bfd4d5 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -111,7 +111,7 @@ Cli.run = function run(processArgv) {
         isIonicV2 && logging.logger.debug('Ionic 2 project.')
         logging.logger.debug('ionic root now set pwd:', process.env.PWD);
       } catch (error) {
-        logging.logger.debug(error);
+        Utils.fail(error.message);
       }
     }
 

From ef84e59a9bd87be6278dd2bf6b1c62bdaa490757 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Dec 2015 15:33:14 -0600
Subject: [PATCH 0876/1100] feat(cordova): copy html before building

---
 lib/ionic/cordova.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index dd7e6877e4..9c2f5eff89 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -154,6 +154,7 @@ IonicTask.prototype.run = function(ionic, argv) {
         // can happen parallel to webpack bundle
         Build.sass(buildOptions);
         Build.fonts(buildOptions);
+        Build.html(buildOptions);
         return Build.bundle(buildOptions);
       }
     })

From b5489b3d19e10adfe42a753f3f47401034187e64 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Dec 2015 15:58:40 -0600
Subject: [PATCH 0877/1100] chore(): bump version to beta.15

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5d960448c0..a570db742b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.15",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -68,7 +68,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "^0.11.0",
-    "ionic-app-lib": "2.0.0-beta.7",
+    "ionic-app-lib": "2.0.0-beta.8",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "open": "0.0.5",

From f6133741d805546d36c8fe3e50032baf9ae71aa4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 7 Jan 2016 18:59:47 -0600
Subject: [PATCH 0878/1100] chore(generate): generate updates

---
 lib/ionic/generate.js | 71 +++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 46 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 17faaa776a..4832ad371f 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -12,66 +12,45 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
-  /*
-      Usage: `ionic generate` or `ionic g`
-      ionic generate <generator> <name>
-
-      ionic g page about             * generate page in pwd/www/app/about - about.html, about.js, about.scss
-      ionic g page about --tabs
-  */
   try {
-    var generator = argv._[1];
-    var listing = false;
+    if (!argv.list && argv._.length < 3) {
+      //TODO should have a mechanism for printing usage on invalid tasks
+      Utils.fail('Invalid arguments. Usage: ionic generate <generator> <name>');
+    }
 
-    if (!Utils.isIonicV2(process.cwd())) {
-      return Utils.fail('You do not appear to have a compatible version of Ionic v2 installed.\n' +
-      'Ionic Framework v2 version 2.0.0-alpha.31 or later is required to use the generators.\n' +
-      'Please run: "npm install ionic-framework"');
+    if (!argv.v2) {
+      return Utils.fail('Generators are only available for Ionic 2 projects');
     }
 
-    if (generator == 'help') {
-      logging.logger.info('Get started using generators right now!')
-      logging.logger.info('Generators help you set up code quickly to get running.');
-      logging.logger.info('List all the generators by passing the --list option: "ionic g --list"');
-      logging.logger.info('Or simply type "ionic g page MyPage" to generate a page!');
-      return;
+    var generator = argv._[1];
+    var name = argv._[2] //TODO support multiple names
+
+    try {
+      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
+    } catch (err) {
+      Utils.fail(err);
     }
 
     if (argv.list) {
-      logging.logger.info('Available generators:');
-      listing = true;
-      // return;
+      ionicModule.Generate.printAvailableGenerators();
+      return;
     }
 
-    var name = argv._[2];
     var promise;
-
-    var ionicFrameworkModuleName = 'ionic-framework';
-    // var ionicFrameworkModuleName = 'ionic2';
-    var ionicModulePath = path.join(process.cwd(), 'node_modules', ionicFrameworkModuleName);
-
     try {
-      ionicModule = require(ionicModulePath);
-
-      if (listing) {
-        for (gen in ionicModule.Generate.generators) {
-          console.log(' *'.blue , gen);
-        }
-        return;
-      } else {
-        return ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
-      }
-    } catch (ex) {
-      if (ex.message.indexOf('no generator available') != -1) {
-        return console.log('✗ '.red + ex.message.red);
+      promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
+    } catch (err) {
+      if (err.message.indexOf('no generator available') != -1) {
+        console.log('✗ '.red + err.message.red);
+        ionicModule.Generate.printAvailableGenerators();
+        return
       }
-      return Utils.fail('You do not appear to have a compatible version of Ionic v2 installed.\n' +
-      'Ionic Framework v2 version 2.0.0-alpha.31 or later is required to use the generators.\n' +
-      'Please run: "npm install ionic-framework"');
+      return Utils.fail(err);
     }
+    return promise;
 
-  } catch (ex) {
-    Utils.fail('There was an error generating your item:', ex);
+  } catch (err) {
+    Utils.fail('There was an error generating your item:', err);
   }
 }
 

From 8a14fecbbc6612cdbb614ca365d10c3b60b4e9ff Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 7 Jan 2016 19:05:08 -0600
Subject: [PATCH 0879/1100] chore(): bump to beta.16

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a570db742b..4100af0ca3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 4348e5831c2b265677e31c3eeee8fffdb3aa2baf Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 8 Jan 2016 14:12:36 -0600
Subject: [PATCH 0880/1100] Revert "chore(): error if project file is missing"

This reverts commit 56d51f52975f6c363eb4494c5b8d125e1459f5fe.
---
 lib/cli.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 1f56bfd4d5..522b49563a 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -111,7 +111,8 @@ Cli.run = function run(processArgv) {
         isIonicV2 && logging.logger.debug('Ionic 2 project.')
         logging.logger.debug('ionic root now set pwd:', process.env.PWD);
       } catch (error) {
-        Utils.fail(error.message);
+        //Hard fail here breaks plugin installation for v1 start task
+        logging.logger.debug(error);
       }
     }
 

From b8b2c9285d48ba6c0e05e8283b34e3124a8c6332 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 8 Jan 2016 14:24:10 -0600
Subject: [PATCH 0881/1100] chore(): bump to beta.17

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4100af0ca3..77efe63af4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ef790abfcf2755d83b1f5825616b930dc44b49f2 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tlancina@users.noreply.github.com>
Date: Fri, 15 Jan 2016 11:16:08 -0600
Subject: [PATCH 0882/1100] Remove carets and tildes from package.json

Since we're using bundledDeps, don't want to get burned by semver
---
 package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 77efe63af4..05ffff936d 100644
--- a/package.json
+++ b/package.json
@@ -54,42 +54,42 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "async": "^0.9.0",
-    "cheerio": "^0.19.0",
-    "cli-table": "^0.3.1",
+    "async": "0.9.2",
+    "cheerio": "0.19.0",
+    "cli-table": "0.3.1",
     "colors": "0.6.2",
     "connect": "3.1.1",
     "connect-livereload": "0.5.2",
     "crc": "3.2.1",
     "cross-spawn": "0.2.3",
-    "event-stream": "3.0.x",
-    "expand-tilde": "^1.2.0",
+    "event-stream": "3.0.20",
+    "expand-tilde": "1.2.0",
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "inquirer": "^0.11.0",
+    "inquirer": "0.11.2",
     "ionic-app-lib": "2.0.0-beta.8",
-    "moment": "^2.10.6",
+    "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",
     "optimist": "0.6.0",
     "progress": "1.1.7",
     "prompt": "0.2.12",
-    "proxy-middleware": "^0.7.0",
+    "proxy-middleware": "0.7.0",
     "q": "1.0.1",
     "request": "2.51.0",
-    "semver": "^4.2.0",
+    "semver": "4.3.6",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
     "tiny-lr-fork": "0.0.5",
-    "underscore": "~1.7.0",
+    "underscore": "1.7.0",
     "unzip": "0.1.9",
     "vinyl-fs": "0.3.7",
     "xml2js": "0.4.4"
   },
   "devDependencies": {
-    "jasmine-node": "^1.14.5",
-    "rewire": "^2.3.4"
+    "jasmine-node": "1.14.5",
+    "rewire": "2.5.1"
   },
   "bundledDependencies": [
     "async",

From 43a7f012bce0cc92223bcc4af7cb409f2e58a125 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tlancina@users.noreply.github.com>
Date: Fri, 15 Jan 2016 12:00:10 -0600
Subject: [PATCH 0883/1100] Update package.json

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 05ffff936d..ddf4262da1 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,10 @@
     {
       "name": "Josh Bavari",
       "web": "https://twitter.com/jbavari"
+    },
+    {
+      "name": "Tim Lancina",
+      "web": "https://twitter.com/timlancina"
     }
   ],
   "license": "MIT",

From 546d856b5c8da4be0f964731df6c88f659cf3491 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 25 Feb 2016 07:32:27 -0600
Subject: [PATCH 0884/1100] test(cli): fix start options test

Needs to be updated for --v2 and --ts flags.
---
 spec/cli.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index a6a0302396..03afa7f645 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -119,7 +119,7 @@ describe('Cli', function() {
         var task = IonicCli.getTaskWithName('start');
         var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
         //We expect 6 total = 3 options, each with short hand notation.
-        expect(booleanOptions.length).toBe(8);
+        expect(booleanOptions.length).toBe(10);
       });
 
       it('should track stats for cli', function() {

From e8f630c1efbbcbfafc65ea5cde05e07e66e8e0f1 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 25 Feb 2016 07:53:52 -0600
Subject: [PATCH 0885/1100] test(cli): fix race in command tests

---
 spec/cli.spec.js | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 03afa7f645..673dcf4f3d 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -159,10 +159,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
         expect(taskArgv._.length).toBe(2);
@@ -185,10 +186,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
         // console.log('taskArgv', taskArgv);
@@ -209,9 +211,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'upload', '--email', 'user@ionic.io', '--password', 'pass', '--note', note];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
+
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -228,10 +232,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -247,10 +252,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -270,10 +276,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
         //should only have serve in the command args
@@ -293,10 +300,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -313,10 +321,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'plugin', 'add', 'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -335,10 +344,11 @@ describe('Cli', function() {
       var processArgs = [ 'node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
 
       var promise = IonicCli.run(processArgs);
+      var _fakeTask = fakeTask;
 
       promise.then(function(){
-        expect(fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTask.prototype.run.mostRecentCall.args;
+        expect(_fakeTask.prototype.run).toHaveBeenCalled();
+        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 

From 96b79ec61f7007d03f28a916ce201dd0fa22dc2c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 25 Feb 2016 11:36:43 -0600
Subject: [PATCH 0886/1100] feat(browser): deprecate browser cmd

BREAKING CHANGE: The browser command is deprecated in favor of using the
Cordova Crosswalk plugin.
---
 lib/ionic/browser.js | 105 ++++---------------------------------------
 1 file changed, 8 insertions(+), 97 deletions(-)

diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 8c68a3f760..691cdb992f 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -1,105 +1,16 @@
-//Cross walk process
-
-//See the cordova-engine-crosswalk plugin for how to install the browser as a plugin
-//https://github.com/MobileChromeApps/cordova-crosswalk-engine
-
-//Find CrossWalk webviews here:
-//https://download.01.org/crosswalk/releases/crosswalk/android/stable/
-
-//Download the release for cordova-crosswalk-engine
-//Download the release for cordova-android with crosswalk
-//Ensure Android API 19 is installed
-//Run ionic platform rm android
-//Run ionic platform add ./engine/cordova-android-crosswalk
-//Run ionic plugin add ./engine/cordova-crosswalk-engine
-//Run android update project on android file
-//Run project - cordova run android BUILD_MULTIPLE_APKS=true
-
-var argv = require('optimist').argv,
-    Task = require('./task').Task,
-    _ = require('underscore'),
-    IonicProject = require('./project'),
-    IonicAppLib = require('ionic-app-lib'),
-    Info = IonicAppLib.info,
-    Browser = IonicAppLib.browser;
+//Deprecated
+var argv = Task = require('./task').Task;
 
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic) {
-  try {
-    var self = this;
-    this.ionic = ionic;
-
-    if(!Info.checkRuntime()) {
-      console.log('\nPlease update your runtime environment before running the browser command');
-      return
-    }
-
-    if(argv._.length < 2) {
-      return this.ionic.fail('Invalid command usage', 'browser');
-    }
-
-    var cmdArg, x, y, hasValidCmd = false;
-
-    cmdArg = argv._[1]
-
-    var validCommands = 'add remove rm list ls revert versions clean upgrade'.split(' ');
-    for(y=0; y<validCommands.length; y++) {
-      if(cmdArg == validCommands[y]) {
-        hasValidCmd = true;
-        break;
-      }
-    }
-
-    if(!hasValidCmd) {
-      return this.ionic.fail('You did not supply a valid command', 'browser');
-    }
-
-    var appDirectory = process.cwd();
-    var platform = argv._[2],
-        browserToInstall = argv._[2];
-
-    var dontSavePlatformsPlugins = !(argv.nosave || argv.n);
-
-    switch(cmdArg) {
-      case 'add':
-        Browser.addBrowser(appDirectory, browserToInstall, dontSavePlatformsPlugins);
-        break;
-      case 'clean':
-        Browser.clean(appDirectory);
-        break;
-      case 'remove':
-      case 'rm':
-        Browser.removeBrowser(appDirectory, browserToInstall);
-        break;
-      case 'revert':
-        Browser.revertBrowser(appDirectory, platform);
-        break;
-      case 'list':
-      case 'ls':
-        Browser.listBrowsers(appDirectory);
-        break;
-      case 'upgrade':
-        Browser.upgradeCrosswalk(appDirectory);
-        break;
-      case 'update':
-      case 'up':
-        Browser.addBrowser(appDirectory);
-        break;
-      case 'check':
-        console.log('Checking for engine');
-        break;
-      case 'info':
-      case 'versions':
-        Browser.listInstalledBrowsers(appDirectory);
-    }
-
-  } catch (ex) {
-    console.log(ex.stack);
-    console.log('Exception:', ex);
-  }
-
+  console.log(
+    'The browser task has been deprecated.\n' +
+    'Please use the Cordova Crosswalk plugin instead:\n\n' +
+    'ionic platform add android\n' +
+    'ionic plugin add cordova-plugin-crosswalk-webview\n'
+  );
 };
 
 exports.IonicTask = IonicTask;

From db3db0e5942f07b6c4f3e5ae5eb13cc26968ea1e Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 29 Feb 2016 09:19:35 -0600
Subject: [PATCH 0887/1100] feat(generate): support all 3 package locations

During the transition to ionic-angular package name, tooling could be
located in 3 places: ionic-framework, ionic-framework/tooling or
ionic-angular/tooling.
---
 lib/ionic/generate.js | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 4832ad371f..beb5a92b88 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -25,11 +25,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
 
-    try {
-      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
-    } catch (err) {
-      Utils.fail(err);
-    }
+    var ionicModule = loadToolingModule();
 
     if (argv.list) {
       ionicModule.Generate.printAvailableGenerators();
@@ -54,4 +50,39 @@ IonicTask.prototype.run = function(ionic, argv) {
   }
 }
 
+function loadToolingModule(){
+  //First try node_modules/ionic-angular/tooling
+  var toolingPath, ionicModule;
+  try {
+    toolingPath = path.join(process.cwd(), 'node_modules', 'ionic-angular', 'tooling');
+    ionicModule = require(toolingPath);
+  } catch (err) {
+    // if this isn't found, that's fine, check for ionic-framework
+    if (err.code !== 'MODULE_NOT_FOUND') {
+      Utils.fail('Error when requiring ' + toolingPath + ':\n  ' + err);
+    }
+  }
+
+  //Then try node_modules/ionic-framework/tooling
+  if (!ionicModule) {
+    try {
+      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework', 'tooling'));
+    } catch (err) {
+      if (err.code === 'MODULE_NOT_FOUND') {
+        Utils.fail('No ionic-angular or ionic-framework package found, do you have Ionic installed?');
+      }
+    }
+  }
+
+  //Last, try node_modules/ionic-framework (beta.1 and below)
+  if (!ionicModule) {
+    try {
+      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
+    } catch (err) {
+      Utils.fail(err);
+    }
+  }
+  return ionicModule;
+}
+
 exports.IonicTask = IonicTask;

From c3bc3d6868d94d680e1b580dae1d14fdf2e37258 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 29 Feb 2016 13:24:25 -0600
Subject: [PATCH 0888/1100] chore(generate): update missing package error

---
 lib/ionic/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index beb5a92b88..0b2329a5c2 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -69,7 +69,7 @@ function loadToolingModule(){
       ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework', 'tooling'));
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {
-        Utils.fail('No ionic-angular or ionic-framework package found, do you have Ionic installed?');
+        Utils.fail('No ionic-angular package found, do you have Ionic installed?');
       }
     }
   }

From ad194ec4bd816b088f4efd18414c1189765388d4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 29 Feb 2016 13:54:03 -0600
Subject: [PATCH 0889/1100] update to beta.18

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ddf4262da1..160824a909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.17",
+  "version": "2.0.0-beta.18",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -72,7 +72,7 @@
     "form-data": "0.1.4",
     "gulp": "3.8.8",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.8",
+    "ionic-app-lib": "2.0.0-beta.9",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",

From df8d02844bc753277686c78c3744d864a21caefe Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 1 Mar 2016 11:44:19 -0600
Subject: [PATCH 0890/1100] chore(): update to beta.19

There are issues with beta.18 being published with bundledDependencies
being deduped from npm3, so republish with npm2 module structure.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 160824a909..4cad358493 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.18",
+  "version": "2.0.0-beta.19",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From e6b844ee1ad12639bd382892a2791f5cf2acdd28 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 7 Mar 2016 13:04:09 -0600
Subject: [PATCH 0891/1100] chore(hooks): remove hooks

---
 lib/cli.js | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 522b49563a..17f3bc8391 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -128,17 +128,10 @@ Cli.run = function run(processArgv) {
       // probably a better way to do this, but to avoid changing run() for every
       // task for now
       argv.v2 = true;
-      var config = require(path.resolve(process.cwd() + path.sep + Ionic2Project.CONFIG_FILE));
-      Cli.runHook('before', taskSetting.name, config, argv);
     }
 
     // Only some tasks return promises
     var promise = Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-    if (isIonicV2){
-      promise.then(function(){
-        Cli.runHook('after', taskSetting.name, config, argv);
-      });
-    }
 
     return promise;
   } catch (ex) {
@@ -615,15 +608,3 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
     IonicConfig.save();
   }
 };
-
-Cli.runHook = function runBeforeTaskHook(hookType, taskName, projectConfig, argv) {
-  if (!hookType || !taskName || !projectConfig || !projectConfig.hooks) return;
-
-  var hookName = hookType + taskName[0].toUpperCase() + taskName.slice(1);
-  var hook = projectConfig.hooks[hookName];
-  if (hook) {
-    return hook(argv);
-  } else {
-    return null;
-  }
-}

From 33fc34ae53614090f6d9e2c42677f9345e7ca449 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 7 Mar 2016 16:48:30 -0600
Subject: [PATCH 0892/1100] feat(gulp): run gulp tasks

Following the convention cmd:before and cmd:after.

Example: `ionic serve`

Would execute tasks 'serve:before' and 'serve:after' before and after
the command, respectively.
---
 lib/cli.js   | 86 +++++++++++++++++++++++++++++++++++++++++++++++++---
 package.json |  3 ++
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 17f3bc8391..ecc44b6016 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -10,12 +10,16 @@ var Cli = module.exports,
     Ionitron = require('./ionic/ionitron'),
     optimist = require('optimist'),
     path = require('path'),
+    fs = require('fs'),
     settings = require('../package.json'),
     Tasks = require('./tasks/cliTasks'),
     Utils = IonicAppLib.utils,
     logging = IonicAppLib.logging,
     Q = require('q'),
-    semver = require('semver');
+    semver = require('semver'),
+    gutil = require('gulp-util'),
+    chalk = require('chalk'),
+    prettyTime = require('pretty-hrtime');
 
 Cli.Tasks = TASKS = Tasks;
 
@@ -130,16 +134,90 @@ Cli.run = function run(processArgv) {
       argv.v2 = true;
     }
 
-    // Only some tasks return promises
-    var promise = Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+    var gulpFound = loadGulp();
+    if (gulpFound) {
+      logging.logger.debug('Gulpfile found');
+      var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
+      logEvents(gulp);
+
+      return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':before').then(
+        function(){
+          // Only some tasks return promises
+          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+        }
+      ).then(function(){
+        return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
+      });
+    } else {
+      logging.logger.debug('No gulpfile found');
+      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+    }
 
-    return promise;
   } catch (ex) {
     logging.logger.debug('Cli.Run - Error', ex);
     return Utils.fail(ex);
   }
 };
 
+function loadGulp(){
+  var names = ['gulpfile.js', 'Gulpfile.js'];
+  var found = false;
+  for (var i = 0, ii = names.length; i < ii; i++) {
+    try {
+      require(path.resolve(process.cwd() + '/' + names[i]));
+      found = true;
+    } catch(e){
+      if (e instanceof SyntaxError) {
+        console.error('\nThere is a syntax error in your gulpfile:');
+        console.error(e.message)
+        process.exit(1);
+      }
+      if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(names[i]) === -1) {
+        console.log('\nLooks like you\'re missing a module in your gulpfile:');
+        console.error(e.message);
+        console.log('\nDo you need to `npm install`?\n');
+        process.exit(1);
+      }
+    }
+  }
+  return found;
+}
+
+function logEvents(gulpInst) {
+  gulpInst.on('task_start', function(e) {
+    // TODO: batch these
+    // so when 5 tasks start at once it only logs one time with all 5
+    gutil.log('Starting', '\'' + chalk.cyan(e.task) + '\'...');
+  });
+
+  gulpInst.on('task_stop', function(e) {
+    var time = prettyTime(e.hrDuration);
+    gutil.log(
+      'Finished', '\'' + chalk.cyan(e.task) + '\'',
+      'after', chalk.magenta(time)
+    );
+  });
+
+  gulpInst.on('task_err', function(e) {
+    var msg = formatError(e);
+    var time = prettyTime(e.hrDuration);
+    gutil.log(
+      '\'' + chalk.cyan(e.task) + '\'',
+      chalk.red('errored after'),
+      chalk.magenta(time)
+    );
+    gutil.log(msg);
+  });
+
+  gulpInst.on('task_not_found', function(err) {
+    gutil.log(
+      chalk.red('Task \'' + err.task + '\' is not in your gulpfile')
+    );
+    gutil.log('Please check the documentation for proper gulpfile formatting');
+    process.exit(1);
+  });
+}
+
 Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
   var availableTaskOptions = task.options;
   var booleanOptions = [];
diff --git a/package.json b/package.json
index 4cad358493..a8b1f37dfc 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
   "license": "MIT",
   "dependencies": {
     "async": "0.9.2",
+    "chalk": "^1.1.1",
     "cheerio": "0.19.0",
     "cli-table": "0.3.1",
     "colors": "0.6.2",
@@ -71,12 +72,14 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
+    "gulp-util": "^3.0.7",
     "inquirer": "0.11.2",
     "ionic-app-lib": "2.0.0-beta.9",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",
     "optimist": "0.6.0",
+    "pretty-hrtime": "^1.0.2",
     "progress": "1.1.7",
     "prompt": "0.2.12",
     "proxy-middleware": "0.7.0",

From 0e36814d7b61c2733b6ab135aa98b9fb5d56137a Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 7 Mar 2016 17:13:24 -0600
Subject: [PATCH 0893/1100] fix(gulp): don't error on missing hooks

---
 lib/cli.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index ecc44b6016..2a349ffb11 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -209,13 +209,13 @@ function logEvents(gulpInst) {
     gutil.log(msg);
   });
 
-  gulpInst.on('task_not_found', function(err) {
-    gutil.log(
-      chalk.red('Task \'' + err.task + '\' is not in your gulpfile')
-    );
-    gutil.log('Please check the documentation for proper gulpfile formatting');
-    process.exit(1);
-  });
+  // gulpInst.on('task_not_found', function(err) {
+  //   gutil.log(
+  //     chalk.red('Task \'' + err.task + '\' is not in your gulpfile')
+  //   );
+  //   gutil.log('Please check the documentation for proper gulpfile formatting');
+  //   process.exit(1);
+  // });
 }
 
 Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {

From 5695cfa8d906ae0a1ee5b03079fc6010c437bf3f Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 7 Mar 2016 17:13:49 -0600
Subject: [PATCH 0894/1100] fix(gulp): let gulp handle its own errors

---
 lib/cli.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 2a349ffb11..3a1ed951b8 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -142,7 +142,11 @@ Cli.run = function run(processArgv) {
 
       return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':before').then(
         function(){
-          // Only some tasks return promises
+          // Only some commands return promises
+          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+        },
+        function(e){ //task error, let gulp handle it
+          // Only some commands return promises
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         }
       ).then(function(){
@@ -199,7 +203,7 @@ function logEvents(gulpInst) {
   });
 
   gulpInst.on('task_err', function(e) {
-    var msg = formatError(e);
+    var msg = formatGulpError(e);
     var time = prettyTime(e.hrDuration);
     gutil.log(
       '\'' + chalk.cyan(e.task) + '\'',
@@ -218,6 +222,26 @@ function logEvents(gulpInst) {
   // });
 }
 
+// Format orchestrator errors
+function formatGulpError(e) {
+  if (!e.err) {
+    return e.message;
+  }
+
+  // PluginError
+  if (typeof e.err.showStack === 'boolean') {
+    return e.err.toString();
+  }
+
+  // Normal error
+  if (e.err.stack) {
+    return e.err.stack;
+  }
+
+  // Unknown (string, number, etc.)
+  return new Error(String(e.err)).stack;
+}
+
 Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
   var availableTaskOptions = task.options;
   var booleanOptions = [];

From b69907990aa8b3b97602372108fb4e1cd5f9b703 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 14:07:49 -0600
Subject: [PATCH 0895/1100] chore(start): remove v2 specific start task

---
 lib/ionic/serve.js |  1 -
 lib/ionic/start.js | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index d0d1c14c01..abf1cef20b 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -13,7 +13,6 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
-
   var self = this;
   this.ionic = ionic;
   this.port = argv._[1];
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 8f39864704..13c36f963f 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
+    Start = IonicAppLib.start,
     Utils = IonicAppLib.utils;
 
 var Start;
@@ -36,17 +37,9 @@ IonicTask.prototype.run = function run(ionic, argv) {
       startingApp = true;
   // Grab the app's relative directory name
 
-  var isV2Start = argv.v2 || argv.v;
 
   console.log('\nOne awesome Ionic app coming right up...\n'.yellow.bold);
 
-  if (isV2Start) {
-
-    Start = IonicAppLib.v2.start;
-  } else {
-    Start = IonicAppLib.start;
-  }
-
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
@@ -78,7 +71,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return Start.promptLogin(options);
   })
   .then(function() {
-    if (isV2Start) {
+    if (options.v2) {
       console.log('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
     }
   })

From 745a2598903aa336aa95715fcaa9f2eeaa768945 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 15:34:05 -0600
Subject: [PATCH 0896/1100] feat(): add console.warn colors

---
 lib/cli.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/cli.js b/lib/cli.js
index 3a1ed951b8..6f15aa1651 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -288,6 +288,16 @@ Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
     consoleInfo.call(console, msg.blue.bold);
   };
 
+  var consoleWarn = console.warn;
+  console.warn = function() {
+    if (arguments.length === 1 && !arguments[0]) return;
+    var msg = '';
+    for (var n in arguments) {
+      msg += arguments[n] + ' ';
+    }
+    consoleWarn.call(console, msg.yellow.bold);
+  };
+
   var consoleError = console.error;
   console.error = function() {
     if (arguments.length === 1 && !arguments[0]) return;

From 63b96ef4953bcd7275a88fa07e6dd59ab0bc2612 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 16:10:54 -0600
Subject: [PATCH 0897/1100] chore(): add ionic.config.js deprecation warning

---
 lib/cli.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/cli.js b/lib/cli.js
index 6f15aa1651..a435234caa 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -134,6 +134,10 @@ Cli.run = function run(processArgv) {
       argv.v2 = true;
     }
 
+    if (fs.existsSync('ionic.config.js')) {
+      console.warn('WARN: ionic.config.js is deprecated and no longer used for v2 projects\n');
+    }
+
     var gulpFound = loadGulp();
     if (gulpFound) {
       logging.logger.debug('Gulpfile found');

From 4aa71570cebe849a6de5810a73aa60ee1eb20c62 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 16:11:43 -0600
Subject: [PATCH 0898/1100] chore(): add build warning

---
 lib/cli.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index a435234caa..3039725c4f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -141,15 +141,21 @@ Cli.run = function run(processArgv) {
     var gulpFound = loadGulp();
     if (gulpFound) {
       logging.logger.debug('Gulpfile found');
+      var beforeHook = argv._[0] + ':before';
+      var afterHook = argv._[0] + ':after';
       var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
       logEvents(gulp);
 
-      return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':before').then(
+      return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
         function(){
           // Only some commands return promises
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         },
         function(e){ //task error, let gulp handle it
+          if (/serve|build|run|emulate|upload/.test(taskSetting.name)) {
+            console.warn('WARN: No ' + beforeHook + ' gulp task found!');
+            console.warn('If your app requires a build step, make sure it runs before ' + taskSetting.name + '\n');
+          }
           // Only some commands return promises
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         }

From 9219feea5ff9e4d26e919838e79c3f6e9abf71c8 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 16:17:18 -0600
Subject: [PATCH 0899/1100] chore(): add gulpfile warning

---
 lib/cli.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 3039725c4f..b122714be0 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -163,7 +163,8 @@ Cli.run = function run(processArgv) {
         return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
       });
     } else {
-      logging.logger.debug('No gulpfile found');
+      console.warn('WARN: No gulpfile found!');
+      console.warn('If your app requires a build step, make sure it runs before ' + taskSetting.name + '\n');
       return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
     }
 

From 83bbab6fa08d62f5fe1711f2f32478fd929908ef Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 16:23:57 -0600
Subject: [PATCH 0900/1100] fix(gulp): handle gulpfile edge case

---
 lib/cli.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index b122714be0..28722c9c81 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -143,7 +143,14 @@ Cli.run = function run(processArgv) {
       logging.logger.debug('Gulpfile found');
       var beforeHook = argv._[0] + ':before';
       var afterHook = argv._[0] + ':after';
-      var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
+      try {
+        var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
+      } catch(e) {
+        // Empty gulpfile (or one that doesn't require gulp?), and no gulp
+        console.error('Gulpfile detected, but gulp is not installed');
+        console.error('Do you need to npm install?\n');
+        process.exit(1);
+      }
       logEvents(gulp);
 
       return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(

From 9f9263ab4ca9e161c3d091bdc1042c1589c7b49c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 16:30:11 -0600
Subject: [PATCH 0901/1100] chore(): make error msgs/warnings clearer

---
 lib/cli.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 28722c9c81..41fc902b28 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -134,6 +134,7 @@ Cli.run = function run(processArgv) {
       argv.v2 = true;
     }
 
+    console.log();
     if (fs.existsSync('ionic.config.js')) {
       console.warn('WARN: ionic.config.js is deprecated and no longer used for v2 projects\n');
     }
@@ -147,8 +148,8 @@ Cli.run = function run(processArgv) {
         var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
       } catch(e) {
         // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-        console.error('Gulpfile detected, but gulp is not installed');
-        console.error('Do you need to npm install?\n');
+        console.error('\nGulpfile detected, but gulp is not installed');
+        console.error('Do you need to run `npm install`?\n');
         process.exit(1);
       }
       logEvents(gulp);
@@ -160,7 +161,7 @@ Cli.run = function run(processArgv) {
         },
         function(e){ //task error, let gulp handle it
           if (/serve|build|run|emulate|upload/.test(taskSetting.name)) {
-            console.warn('WARN: No ' + beforeHook + ' gulp task found!');
+            console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
             console.warn('If your app requires a build step, make sure it runs before ' + taskSetting.name + '\n');
           }
           // Only some commands return promises
@@ -195,9 +196,9 @@ function loadGulp(){
         process.exit(1);
       }
       if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(names[i]) === -1) {
-        console.log('\nLooks like you\'re missing a module in your gulpfile:');
+        console.log('Uh oh! Looks like you\'re missing a module in your gulpfile:');
         console.error(e.message);
-        console.log('\nDo you need to `npm install`?\n');
+        console.log('\nDo you need to run `npm install`?\n');
         process.exit(1);
       }
     }

From 12909199cfeff923339a69dafd40ab6557fdfb46 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 17:11:51 -0600
Subject: [PATCH 0902/1100] chore(gulp): print help if using old config and
 gulp

---
 lib/cli.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 41fc902b28..e55caade52 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -135,7 +135,8 @@ Cli.run = function run(processArgv) {
     }
 
     console.log();
-    if (fs.existsSync('ionic.config.js')) {
+    var oldConfig = fs.existsSync('ionic.config.js');
+    if (oldConfig) {
       console.warn('WARN: ionic.config.js is deprecated and no longer used for v2 projects\n');
     }
 
@@ -160,9 +161,17 @@ Cli.run = function run(processArgv) {
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         },
         function(e){ //task error, let gulp handle it
-          if (/serve|build|run|emulate|upload/.test(taskSetting.name)) {
+          var taskName = taskSetting.name;
+          if (/serve|build|run|emulate|upload/.test(taskName)) {
             console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
-            console.warn('If your app requires a build step, make sure it runs before ' + taskSetting.name + '\n');
+            if (oldConfig && gulp.tasks.build) {
+              console.info('Your gulpfile contains a \'build\' task already! Add:\n')
+              console.log('    gulp.task(\'' + taskName + ':before\', [\'build\']);\n');
+              console.info('to your gulpfile to have Ionic CLI run build before ' + taskName);
+            } else {
+              console.warn('If your app requires a build step, make sure it runs before ' + taskName + ';\n.');
+            }
+            console.log();
           }
           // Only some commands return promises
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);

From 1629fbdec9043d0a636f6ee3062a8b1cb4f9e0b4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 9 Mar 2016 17:44:40 -0600
Subject: [PATCH 0903/1100] chore(): make gulp build warnings more explicit

---
 lib/cli.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index e55caade52..0931dbc86f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -140,11 +140,12 @@ Cli.run = function run(processArgv) {
       console.warn('WARN: ionic.config.js is deprecated and no longer used for v2 projects\n');
     }
 
+    var cmdName = argv._[0];
     var gulpFound = loadGulp();
     if (gulpFound) {
       logging.logger.debug('Gulpfile found');
-      var beforeHook = argv._[0] + ':before';
-      var afterHook = argv._[0] + ':after';
+      var beforeHook = cmdName + ':before';
+      var afterHook = cmdName + ':after';
       try {
         var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
       } catch(e) {
@@ -161,15 +162,15 @@ Cli.run = function run(processArgv) {
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         },
         function(e){ //task error, let gulp handle it
-          var taskName = taskSetting.name;
-          if (/serve|build|run|emulate|upload/.test(taskName)) {
+          if (/serve|build|run|emulate|upload/.test(cmdName)) {
+            var taskName = (cmdName === 'serve') ? 'watch' : 'build';
             console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
-            if (oldConfig && gulp.tasks.build) {
-              console.info('Your gulpfile contains a \'build\' task already! Add:\n')
-              console.log('    gulp.task(\'' + taskName + ':before\', [\'build\']);\n');
-              console.info('to your gulpfile to have Ionic CLI run build before ' + taskName);
+            if (oldConfig && gulp.tasks[taskName]) {
+              console.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
+              console.log('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
+              console.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.');
             } else {
-              console.warn('If your app requires a build step, make sure it runs before ' + taskName + ';\n.');
+              console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
             }
             console.log();
           }
@@ -180,8 +181,10 @@ Cli.run = function run(processArgv) {
         return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
       });
     } else {
-      console.warn('WARN: No gulpfile found!');
-      console.warn('If your app requires a build step, make sure it runs before ' + taskSetting.name + '\n');
+      if (/serve|build|run|emulate|upload/.test(cmdName)) {
+        console.warn('WARN: No gulpfile found!');
+        console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+      }
       return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
     }
 

From 0c4f4336ca9c2941072a40a4deed8288bc0c8c33 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 11 Mar 2016 08:14:41 -0600
Subject: [PATCH 0904/1100] chore(): remove v2 cmd overrides from app-lib

---
 lib/cli.js            |  3 +--
 lib/ionic/cordova.js  | 44 ++++---------------------------------------
 lib/ionic/serve.js    | 20 ++++----------------
 lib/ionic/v2.js       | 33 --------------------------------
 lib/tasks/cliTasks.js | 29 +++-------------------------
 5 files changed, 12 insertions(+), 117 deletions(-)
 delete mode 100644 lib/ionic/v2.js

diff --git a/lib/cli.js b/lib/cli.js
index 0931dbc86f..0fb6555e3e 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -5,7 +5,6 @@ var Cli = module.exports,
     IonicStats = require('./ionic/stats').IonicStats,
     IonicStore = require('./ionic/store').IonicStore,
     IonicConfig = new IonicStore('ionic.config'),
-    Ionic2Project = IonicAppLib.v2.project,
     Info = IonicAppLib.info,
     Ionitron = require('./ionic/ionitron'),
     optimist = require('optimist'),
@@ -99,7 +98,7 @@ Cli.run = function run(processArgv) {
     logging.logger.debug('Task setting:', taskSetting);
 
     // assume false for tasks that can be run outside of Ionic projects
-    // start, help, docs, v2
+    // start, help, docs
     var isIonicV2 = false;
 
     // Addressing issue #471
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 9c2f5eff89..3b31b63d88 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -15,7 +15,9 @@ var Task = require('./task').Task,
     Hooks = IonicAppLib.hooks,
     State = IonicAppLib.state,
     Utils = IonicAppLib.utils,
-    Logging = IonicAppLib.logging;
+    Logging = IonicAppLib.logging,
+    Serve = IonicAppLib.serve,
+    IonicProject = IonicAppLib.project;
 
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
@@ -28,14 +30,6 @@ IonicTask.prototype.run = function(ionic, argv) {
       appDirectory = process.cwd(),
       q;
 
-  if (argv.v2) {
-    Serve = IonicAppLib.v2.serve;
-    IonicProject = IonicAppLib.v2.project;
-  } else {
-    Serve = IonicAppLib.serve;
-    IonicProject = IonicAppLib.project;
-  }
-
   try {
     // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
     // if not, try to install it.
@@ -131,33 +125,6 @@ IonicTask.prototype.run = function(ionic, argv) {
         return false;
       }
     })
-    .then(function(){
-      // TODO :(
-      if (  argv.v2 &&
-            !self.isLiveReload &&
-            !argv.b && !argv.nobundle &&
-            (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
-      {
-        var Build = IonicAppLib.v2.build;
-        var config = null;
-        try {
-          config = require(process.cwd() + path.sep + 'ionic.config.js');
-        } catch (e) {}
-        var buildOptions = {
-          appDirectory: process.cwd(),
-          callback: function() {
-            console.log('√ Compiling files complete.'.green.bold);
-          },
-          watch: false,
-          config: config
-        };
-        // can happen parallel to webpack bundle
-        Build.sass(buildOptions);
-        Build.fonts(buildOptions);
-        Build.html(buildOptions);
-        return Build.bundle(buildOptions);
-      }
-    })
     .then(function() {
       return self.runCordova(cmdName, argv);
     })
@@ -376,7 +343,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
 
   try {
     var cwd = process.cwd();
-    project = argv.v2 ? IonicProject.loadConfig(cwd) : IonicProject.load(cwd);
+    project = IonicProject.load(cwd);
   } catch (ex) {
     console.log('Error occured', ex);
     return Utils.fail(ex.message);
@@ -424,9 +391,6 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     }).then(function(){
       d.resolve();
     });
-    if (argv.v2) {
-      options.config = project.get();
-    }
     return Serve.start(options);
   })
   .then(function() {
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index abf1cef20b..9697799628 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -2,7 +2,9 @@ var IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     events = IonicAppLib.events,
     Q = require('q'),
-    Task = require('./task').Task;
+    Task = require('./task').Task,
+    Serve = IonicAppLib.serve,
+    IonicProject = IonicAppLib.project;
 
 var DEFAULT_HTTP_PORT = 8100;
 var DEFAULT_LIVE_RELOAD_PORT = 35729;
@@ -18,17 +20,6 @@ IonicTask.prototype.run = function(ionic, argv) {
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
-  var isIonicV2 = argv.v2;
-  var Serve, IonicProject;
-
-  if (isIonicV2) {
-    Serve = IonicAppLib.v2.serve;
-    IonicProject = IonicAppLib.v2.project;
-  } else {
-    Serve = IonicAppLib.serve;
-    IonicProject = IonicAppLib.project;
-  }
-
   if (argv._[0] == 'address') {
     // reset any address configs
     var ionicConfig = require('./config').load();
@@ -41,7 +32,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   var cwd = process.cwd();
 
   try {
-    project = isIonicV2 ? IonicProject.loadConfig(cwd) : IonicProject.load(cwd);
+    project = IonicProject.load(cwd);
   } catch (ex) {
     console.log('Error occured', ex);
     return Utils.fail(ex.message);
@@ -82,9 +73,6 @@ IonicTask.prototype.run = function(ionic, argv) {
       }
     })
     .then(function() {
-      if (isIonicV2) {
-        options.config = project.get();
-      }
       return Serve.start(options);
     })
     .then(function() {
diff --git a/lib/ionic/v2.js b/lib/ionic/v2.js
deleted file mode 100644
index ca5354e330..0000000000
--- a/lib/ionic/v2.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var fs = require('fs'),
-    path = require('path'),
-    // argv = require('optimist').argv,
-    Task = require('./task').Task,
-    ionicAppLib = require('ionic-app-lib'),
-    Info = ionicAppLib.info;
-
-var IonicTask = function() {};
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic, arv) {
-  this.ionic = ionic;
-
-  try {
-    console.log('**********************************************'.yellow)
-    console.log('Getting started with Ionic v2\n'.green)
-    console.log('Start a simple app: `ionic start MyIonicV2App --v2`\n');
-    console.log('That will download the files you need as well as install node modules and cordova plugins.\n');
-    console.log('Run `ionic serve` to serve the app in the browser.\n');
-    console.log('**********************************************'.yellow);
-    // console.log('* Transpiling files\n'.green);
-    // console.log('Ionic is built on TypeScript/ES6. Files must be compiled and translated (commonly called transpiled) to JavaScript.\n');
-    // console.log('When you make a change to your files with ionic serve, ionic cli will automatically transpile files and reload the browser.\n');
-    // console.log('You can also run `ionic transpile` to transpile the files manually.\n');
-    // console.log('Ionic cli also compiles sass for you `ionic transpile sass`.\n');
-    // console.log('**********************************************'.yellow);
-  } catch (ex) {
-    this.ionic.fail('Unidentified error');
-  }
-}
-
-exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 14fb6f83af..bf28f2f366 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -23,11 +23,7 @@ var cordovaRunEmulateOptions = {
     title: '',
     boolean: true
   },
-  '--device|--emulator|--target=FOO': '',
-  '--nobundle|-b': {
-    title: '(v2 only) don\'t bundle JS/Sass before running.',
-    boolean: true
-  }
+  '--device|--emulator|--target=FOO': ''
 };
 
 var TASKS = [
@@ -119,11 +115,7 @@ var TASKS = [
         title: 'Disable running gulp during serve',
         boolean: true
       },
-      '--platform|-t': 'Start serve with a specific platform (ios/android)',
-      '--nobuild|-i': {
-        boolean: true,
-        title: 'Do not run build before serve (v2)'
-      }
+      '--platform|-t': 'Start serve with a specific platform (ios/android)'
     },
     module: './ionic/serve'
   },
@@ -183,10 +175,6 @@ var TASKS = [
       '--nohooks|-n': {
         title: 'Do not add default Ionic hooks for Cordova',
         boolean: true
-      },
-      '--nobundle|-b': {
-        title: '(v2 only) don\'t bundle JS/Sass before building.',
-        boolean: true
       }
     },
     module: './ionic/cordova'
@@ -245,11 +233,7 @@ var TASKS = [
       '--email|-e': 'Ionic account email',
       '--password|-p': 'Ionic account password',
       '--note': 'The note to signify the upload',
-      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel',
-      '--nobundle|-b': {
-        title: '(v2 only) don\'t bundle JS/Sass before uploading.',
-        boolean: true
-      }
+      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
     },
     alt: ['up'],
     module: './ionic/upload'
@@ -515,13 +499,6 @@ var TASKS = [
     module: './ionic/docs',
     disableChangePwd: true
    },
-   {
-    title: 'v2',
-    name: 'v2',
-    summary: 'Gives simple information to get started with Ionic v2',
-    module: './ionic/v2',
-    disableChangePwd: true
-   },
    {
     title: 'generate',
     alt: ['g'],

From a98b785a331b309bd0015b9d8df66b46235fabbb Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 11 Mar 2016 09:13:20 -0600
Subject: [PATCH 0905/1100] fix(gulp): don't warn about gulp hooks in v1
 projects

---
 lib/cli.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 0fb6555e3e..e7381ba1ae 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -126,7 +126,6 @@ Cli.run = function run(processArgv) {
     var taskModule = Cli.lookupTask(taskSetting.module);
     var taskInstance = new taskModule();
 
-    var config;
     if (isIonicV2) {
       // probably a better way to do this, but to avoid changing run() for every
       // task for now
@@ -161,7 +160,7 @@ Cli.run = function run(processArgv) {
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         },
         function(e){ //task error, let gulp handle it
-          if (/serve|build|run|emulate|upload/.test(cmdName)) {
+          if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
             var taskName = (cmdName === 'serve') ? 'watch' : 'build';
             console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
             if (oldConfig && gulp.tasks[taskName]) {

From 9828347f1fa6b10027be70593060b7142777ef2d Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 15 Mar 2016 20:59:39 -0500
Subject: [PATCH 0906/1100] chore(): remove unused config task

This task was moved to Ionic App Lib.
---
 lib/ionic/config.js | 45 ---------------------------------------------
 lib/ionic/serve.js  |  2 +-
 lib/ionic/stats.js  |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 lib/ionic/config.js

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
deleted file mode 100644
index 77083a388d..0000000000
--- a/lib/ionic/config.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var fs = require('fs'),
-    path = require('path');
-    // ionic = require('../ionic');
-
-var home = process.env.HOME || process.env.USERPROFILE || process.env.HOMEPATH;
-
-module.exports = {
-  CONFIG_FILE: '.ionic/ionic.config',
-  load: function() {
-    this.file = this.CONFIG_FILE;
-    if (fs.existsSync(path.join(home,this.file))) {
-      this.data = JSON.parse(fs.readFileSync(path.join(home, this.file)));
-    } else {
-      this.data = {};
-    }
-    return this;
-  },
-  save: function() {
-    if (!this.data) {
-      return;
-    }
-    try {
-      var dirPath = path.join(home, path.dirname(this.CONFIG_FILE));
-      var p = path.join(home, this.CONFIG_FILE);
-
-      if (!fs.existsSync(dirPath)) {
-        fs.mkdirSync(dirPath);
-      }
-      fs.writeFileSync(p, JSON.stringify(this.data, null, 2));
-    } catch (e) {
-      console.error('Unable to save settings file: ' + e);
-    }
-  },
-  get: function(k) {
-    return this.data[k];
-  },
-  set: function(k, v) {
-    if (!this.data) {
-      this.data = {};
-    }
-    this.data[k] = v;
-
-    this.save();
-  }
-};
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 9697799628..3c1a4d48a0 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -22,7 +22,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   if (argv._[0] == 'address') {
     // reset any address configs
-    var ionicConfig = require('./config').load();
+    var ionicConfig = IonicAppLib.config.load();
     ionicConfig.set('ionicServeAddress', null);
     ionicConfig.set('platformServeAddress', null);
     return Serve.getAddress({isAddressCmd: true});
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 9eafaadba4..81e30b5a85 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -11,7 +11,7 @@ var path = require('path'),
     es = require('event-stream'),
     fs = require('fs'),
     os = require('os'),
-    IonicConfig = require('./config');
+    IonicConfig = require('ionic-app-lib').config;
 
 exports.getVersion = function getVersion() {
   var packageJson = require('../../package.json');

From 4a5e48609afaa106b7003614f35c14f4d5103637 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 16 Mar 2016 08:49:55 -0500
Subject: [PATCH 0907/1100] chore(): do runtime check

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index e7381ba1ae..98242efed0 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -62,7 +62,7 @@ Cli.run = function run(processArgv) {
 
     //Before taking any more steps, lets check their
     //environment and display any upgrade warnings
-    // Cli.doRuntimeCheck(settings.version);
+    Cli.doRuntimeCheck(settings.version);
 
     if ((argv.version || argv.v) && !argv._.length) {
       return Cli.version();

From b58ddceb7d1f81952dc371557d614415f7f0b768 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 16 Mar 2016 08:52:57 -0500
Subject: [PATCH 0908/1100] chore(): tweak ionic.config.js deprecation warning

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 98242efed0..2db94a5f6f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -135,7 +135,7 @@ Cli.run = function run(processArgv) {
     console.log();
     var oldConfig = fs.existsSync('ionic.config.js');
     if (oldConfig) {
-      console.warn('WARN: ionic.config.js is deprecated and no longer used for v2 projects\n');
+      console.warn('WARN: ionic.config.js has been deprecated. Please use ionic.json instead.\n');
     }
 
     var cmdName = argv._[0];

From 3d69f9d22c6fca3f2a74795a0231683808fa20d8 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 16 Mar 2016 08:53:29 -0500
Subject: [PATCH 0909/1100] fix(hooks): only print build warning for v2

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 2db94a5f6f..62ea4fb677 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -179,7 +179,7 @@ Cli.run = function run(processArgv) {
         return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
       });
     } else {
-      if (/serve|build|run|emulate|upload/.test(cmdName)) {
+      if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
         console.warn('WARN: No gulpfile found!');
         console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
       }

From 5fe8ffbedb1c723042c7ebf533ecd6432407f13a Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 16 Mar 2016 08:57:47 -0500
Subject: [PATCH 0910/1100] chore(): use app-lib project utility

---
 lib/ionic/docs.js      |  1 -
 lib/ionic/help.js      |  3 +-
 lib/ionic/hooks.js     |  1 -
 lib/ionic/io-config.js |  5 +--
 lib/ionic/io-init.js   |  7 +++--
 lib/ionic/link.js      |  2 +-
 lib/ionic/project.js   | 70 ------------------------------------------
 lib/ionic/push.js      |  2 +-
 8 files changed, 10 insertions(+), 81 deletions(-)
 delete mode 100644 lib/ionic/project.js

diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 3be8e4b155..858f28ea15 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -5,7 +5,6 @@ var fs = require('fs'),
     prompt = require('prompt'),
     Task = require('./task').Task,
     _ = require('underscore'),
-    IonicProject = require('./project'),
     IonicInfo = require('./info').IonicTask,
     IonicDocs = require('./resources/docs.json'),
     COLUMN_LIMIT = 3;
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 112771045b..4f725633b2 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,5 +1,4 @@
-var IonicProject = require('./project'),
-    IonicTask = require('./task').IonicTask,
+var IonicTask = require('./task').IonicTask,
     argv = require('optimist').argv,
     Task = require('./task').Task;
 
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 90d0d536f6..f0de6dff13 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -5,7 +5,6 @@ var fs = require('fs'),
     shelljs = require('shelljs'),
     Task = require('./task').Task,
     _ = require('underscore'),
-    IonicProject = require('./project'),
     IonicInfo = require('./info').IonicTask,
     IonicAppLib = require('ionic-app-lib'),
     Hooks = IonicAppLib.hooks;
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index e0f39c05ec..a8a5492e42 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -1,8 +1,9 @@
-var ioLib = require('ionic-app-lib').ioConfig,
+var IonicAppLib = require('ionic-app-lib'),
+    ioLib = IonicAppLib.ioConfig,
     argv = require('optimist').argv,
     fs = require('fs'),
     prompt = require('prompt'),
-    IonicProject = require('./project'),
+    IonicProject = IonicAppLib.project,
     IonicTask = require('./task').IonicTask,
     Task = require('./task').Task,
     IonicLoginTask = require('./login').IonicTask;
diff --git a/lib/ionic/io-init.js b/lib/ionic/io-init.js
index 327ab79719..023a024dee 100644
--- a/lib/ionic/io-init.js
+++ b/lib/ionic/io-init.js
@@ -1,10 +1,11 @@
-var ioLib = require('ionic-app-lib').ioConfig,
+var IonicAppLib = require('ionic-app-lib'),
+    ioLib = IonicAppLib.ioConfig,
     argv = require('optimist').argv,
     prompt = require('prompt'),
-    IonicProject = require('./project'),
+    IonicProject = IonicAppLib.project,
     IonicTask = require('./task').IonicTask,
     Task = require('./task').Task,
-    Login = require('ionic-app-lib').login,
+    Login = IonicAppLib.login,
     LoginTask = require('./login'),
     Utils = require('./utils');
 
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index ca2a3c0447..7330d65b98 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,7 +1,7 @@
 var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
-    IonicProject = require('./project'),
+    IonicProject = require('ionic-app-lib').project,
     Task = require('./task').Task;
 
 var IonicTask = function() {};
diff --git a/lib/ionic/project.js b/lib/ionic/project.js
deleted file mode 100644
index d72872a481..0000000000
--- a/lib/ionic/project.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var fs = require('fs'),
-    path = require('path');
-
-module.exports = {
-  PROJECT_FILE: 'ionic.project',
-  PROJECT_DEFAULT: {
-    name: '',
-    app_id: ''
-  },
-  load: function() {
-    this.file = this.PROJECT_FILE;
-
-    if(fs.existsSync(this.file)) {
-      try {
-        this.data = JSON.parse(fs.readFileSync(this.file));      
-      } catch(ex) {
-        throw new Error('There was an error loading your ionic.project file: ' + ex.message);
-      }
-    } else {
-      if(fs.existsSync('www')) {
-        var parts = path.resolve('./').split(path.sep);
-        var dirname = parts[parts.length-1];
-        this.create(dirname);
-        this.save('./');
-      }
-    }
-    return this;
-  },
-  create: function(name) {
-    this.file = this.PROJECT_FILE;
-    this.data = this.PROJECT_DEFAULT;
-    if(name) {
-      this.set('name', name);
-    }
-    return this;
-  },
-  save: function(targetPath) {
-    if(!this.data) {
-      console.trace();
-      console.error('This should never happen!');
-    }
-    try {
-      fs.writeFileSync((targetPath?targetPath + '/':'') + this.PROJECT_FILE, JSON.stringify(this.data, null, 2));
-    } catch(e) {
-      console.error('Unable to save settings file:', e);
-    }
-  },
-  get: function(k) {
-    if(!this.data) {
-      return null;
-    }
-    if(k) {
-      return this.data[k];
-    } else {
-      return this.data;
-    }
-  },
-  set: function(k, v) {
-    if(!this.data) {
-      this.data = this.PROJECT_DEFAULT;
-    }
-    this.data[k] = v;
-  },
-  remove: function(k) {
-    if(!this.data) {
-      this.data = this.PROJECT_DEFAULT;
-    }
-    this.data[k] = '';
-  }
-};
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index f5c10b7894..caf322d5ed 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -5,10 +5,10 @@ var fs = require('fs'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     FormData = require('form-data'),
-    IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
+    IonicProject = IonicAppLib.project,
     Login = IonicAppLib.login,
     LoginTask = require('./login');
     // IonicLoginTask = require('./login').IonicTask;

From a48e7b9c6d940509385a0c854a524d3a6adda6a7 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 16 Mar 2016 11:02:39 -0500
Subject: [PATCH 0911/1100] feat(setup): deprecate setup task

**BREAKING CHANGE**: the setup task is deprecated in favor of using gulp
hooks.
---
 lib/ionic/setup.js | 67 +++-------------------------------------------
 1 file changed, 4 insertions(+), 63 deletions(-)

diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 6ccbb4c5be..c246cdf889 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,71 +1,12 @@
-var Task = require('./task').Task,
-    fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    exec = require('child_process').exec,
-    Q = require('q'),
-    IonicProject = require('./project'),
-    IonicAppLib = require('ionic-app-lib'),
-    Setup = IonicAppLib.setup,
-    Utils = IonicAppLib.utils,
-    colors = require('colors');
+var Task = require('./task').Task;
 
 var IonicTask = function() {};
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
-  if( argv._.length < 2 ) {
-    return ionic.fail('Missing setup task command.', 'setup');
-  }
-
-  var self = this;
-  var tasks = argv._.slice(1);
-  var promises = [];
-
-  var promise = Q();
-
-  for (var x = 0; x < tasks.length; x++) {
-    try {
-      (function() {
-        //create closure for task
-        var task = self.runSetupTask(tasks[x]);
-        // console.log('Task: ', task);
-        promises.push(task);
-      })();
-    } catch (ex) {
-
-    }
-  }
-
-  promises.forEach(function(task) {
-    // console.log('Task foreach:', task);
-    promise = promise.then(function(){ return task(process.cwd()); });
-  });
-
-  promise
-  .fin(function() {
-    console.log('Ionic setup complete'.green.bold);
-  })
-  .catch(function(error) {
-    console.log('Error from setup - ' + error);
-  });
-  
-};
-
-IonicTask.prototype.runSetupTask = function runSetupTask(setupTask) {
-  switch (setupTask) {
-    case 'sass':
-      return Setup.sassSetup;
-      break;
-    case 'facebook':
-      return Setup.setupFacebook;
-      break;
-    default:
-      var errorMessage = 'Invalid setup task command: ' + setupTask;
-      console.log(errorMessage);
-      return Q(errorMessage);
-  }
+IonicTask.prototype.run = function() {
+  //TODO link to gulp hook docs
+  console.log('The setup task has been deprecated.\n');
 };
 
 exports.IonicTask = IonicTask;

From c17d268f86b9d708e5e9bdeeab8c7ff67a3a60ef Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 11:27:43 -0500
Subject: [PATCH 0912/1100] fix(hooks): don't require Gulpfile twice

---
 lib/cli.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 62ea4fb677..1daa61f6ab 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -194,11 +194,10 @@ Cli.run = function run(processArgv) {
 
 function loadGulp(){
   var names = ['gulpfile.js', 'Gulpfile.js'];
-  var found = false;
   for (var i = 0, ii = names.length; i < ii; i++) {
     try {
       require(path.resolve(process.cwd() + '/' + names[i]));
-      found = true;
+      return true;
     } catch(e){
       if (e instanceof SyntaxError) {
         console.error('\nThere is a syntax error in your gulpfile:');
@@ -213,7 +212,7 @@ function loadGulp(){
       }
     }
   }
-  return found;
+  return false;
 }
 
 function logEvents(gulpInst) {

From 52f1a8f81d83953944deb30a2add34d00e2c1bc9 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 11:47:55 -0500
Subject: [PATCH 0913/1100] feat(hooks): don't run gulp if node_modules doesn't
 exist

---
 lib/cli.js | 154 ++++++++++++++++++++++++-----------------------------
 1 file changed, 71 insertions(+), 83 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 1daa61f6ab..c1cfcafc0b 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -6,6 +6,7 @@ var Cli = module.exports,
     IonicStore = require('./ionic/store').IonicStore,
     IonicConfig = new IonicStore('ionic.config'),
     Info = IonicAppLib.info,
+    IonicProject = IonicAppLib.project,
     Ionitron = require('./ionic/ionitron'),
     optimist = require('optimist'),
     path = require('path'),
@@ -94,105 +95,92 @@ Cli.run = function run(processArgv) {
     if(!taskSetting) {
       return Cli.printAvailableTasks();
     }
-
     logging.logger.debug('Task setting:', taskSetting);
+    var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
+    argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
+    var taskModule = Cli.lookupTask(taskSetting.module);
+    var taskInstance = new taskModule();
 
-    // assume false for tasks that can be run outside of Ionic projects
-    // start, help, docs
-    var isIonicV2 = false;
-
-    // Addressing issue #471
-    // Changes the cwd to the project root
-    // (whereever it finds ionic.project, errors if it doesn't find it) for tasks that require it.
-    // The cliTasks are in lib/tasks/cliTasks.js - with an attribute to disable changing pwd
-    // for commands like start, help, docs, and v2
+    //this should be tracked by each task
     if (!taskSetting.disableChangePwd) {
-      try {
-        logging.logger.debug('Looking up ionic root, cwd:', process.env.PWD);
-        var root = Utils.cdIonicRoot();
-        isIonicV2 = Utils.isIonicV2(root);
-        isIonicV2 && logging.logger.debug('Ionic 2 project.')
-        logging.logger.debug('ionic root now set pwd:', process.env.PWD);
-      } catch (error) {
-        //Hard fail here breaks plugin installation for v1 start task
-        logging.logger.debug(error);
+      var root = Utils.cdIonicRoot();
+      var project = IonicProject.load(root);
+      argv.v2 = project && project.get('v2');
+      argv.v2 && logging.logger.debug('Ionic 2 project.');
+
+      if (fs.existsSync('node_modules')) {
+        //run with gulp hooks
+        return runWithGulp(argv, taskInstance);
+      } else if (argv.v2) {
+        console.warn('WARN: No node_modules directory found, do you need to run npm install?');
       }
     }
+    return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
 
-    var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
+  } catch (ex) {
+    logging.logger.debug('Cli.Run - Error', ex);
+    return Utils.fail(ex);
+  }
+};
 
-    argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
+function runWithGulp(argv, taskInstance){
+  var cmdName = argv._[0];
+  var beforeHook = cmdName + ':before';
+  var afterHook = cmdName + ':after';
 
-    var taskModule = Cli.lookupTask(taskSetting.module);
-    var taskInstance = new taskModule();
+  if (loadGulpfile()) {
+    logging.logger.debug('Gulpfile found');
 
-    if (isIonicV2) {
-      // probably a better way to do this, but to avoid changing run() for every
-      // task for now
-      argv.v2 = true;
-    }
-
-    console.log();
-    var oldConfig = fs.existsSync('ionic.config.js');
-    if (oldConfig) {
-      console.warn('WARN: ionic.config.js has been deprecated. Please use ionic.json instead.\n');
+    try {
+      var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
+    } catch(e) {
+      // Empty gulpfile (or one that doesn't require gulp?), and no gulp
+      console.error('\nGulpfile detected, but gulp is not installed');
+      console.error('Do you need to run `npm install`?\n');
+      process.exit(1);
     }
-
-    var cmdName = argv._[0];
-    var gulpFound = loadGulp();
-    if (gulpFound) {
-      logging.logger.debug('Gulpfile found');
-      var beforeHook = cmdName + ':before';
-      var afterHook = cmdName + ':after';
-      try {
-        var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
-      } catch(e) {
-        // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-        console.error('\nGulpfile detected, but gulp is not installed');
-        console.error('Do you need to run `npm install`?\n');
-        process.exit(1);
-      }
-      logEvents(gulp);
-
-      return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
-        function(){
-          // Only some commands return promises
-          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-        },
-        function(e){ //task error, let gulp handle it
-          if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
-            var taskName = (cmdName === 'serve') ? 'watch' : 'build';
-            console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
-            if (oldConfig && gulp.tasks[taskName]) {
-              console.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
-              console.log('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
-              console.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.');
-            } else {
-              console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
-            }
-            console.log();
+    logEvents(gulp);
+
+    return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
+      function(){
+        // Only some commands return promises, so wrap it
+        return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+      },
+      function(e){ //task error, let gulp handle it
+
+        // Warn if it's a v2 project and there isn't a build hook
+        if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
+          var taskName = (cmdName === 'serve') ? 'watch' : 'build';
+          console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
+
+          //The task exists, but there are no hooks for it
+          //They have the old config file, so we're safe to yell at them
+          //With new config, may intentionally not have hooks if running their own build
+          if (gulp.tasks[taskName] && fs.existsSync('ionic.config.js')) {
+            console.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
+            console.log('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
+            console.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n');
+          } else {
+            console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
           }
-          // Only some commands return promises
-          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         }
-      ).then(function(){
-        return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
-      });
-    } else {
-      if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
-        console.warn('WARN: No gulpfile found!');
-        console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+        // Only some commands return promises, so wrap it
+        return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       }
-      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-    }
+    ).then(function(){
+      return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
+    });
+  }
 
-  } catch (ex) {
-    logging.logger.debug('Cli.Run - Error', ex);
-    return Utils.fail(ex);
+  if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
+    console.warn('WARN: No gulpfile found!');
+    console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
   }
-};
+  return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+}
 
-function loadGulp(){
+function loadGulpfile(){
+  //TODO add babel support?
   var names = ['gulpfile.js', 'Gulpfile.js'];
   for (var i = 0, ii = names.length; i < ii; i++) {
     try {

From f469d478924af294ed2979f147191b6c3066f087 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 11:48:47 -0500
Subject: [PATCH 0914/1100] fix(cordova): use cordova command for now

To be safe, since there were issues running ionic project commands
against uninitialized projects.
---
 lib/ionic/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 3b31b63d88..a68758aef7 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -47,7 +47,7 @@ IonicTask.prototype.run = function(ionic, argv) {
         var notInstalledMsg = ['• You\'re trying to build for ', runPlatform, ', but don\'t have the platform installed yet.'].join('').yellow,
           installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join('').blue,
           installedMessage = ['√ Installed platform ', runPlatform].join('').green,
-          installCmd = 'ionic platform add ' + runPlatform;
+          installCmd = 'cordova platform add ' + runPlatform;
         Logging.logger.info(notInstalledMsg);
         Logging.logger.info(installingMsg);
         // Logging.logger.info(installCmd);
@@ -98,7 +98,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
       plugins.forEach(function(plugin) {
         Logging.logger.info(['Installing ', plugin].join('').blue);
-        shelljs.exec('ionic plugin add ' + plugin);
+        shelljs.exec('cordova plugin add --save' + plugin);
       });
     })
     .then(function() {

From d259b32a10cb0f0999ac271e42af16bab3ca1006 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 11:50:14 -0500
Subject: [PATCH 0915/1100] chore(): update tests

---
 spec/cli.spec.js   | 5 +++--
 spec/serve.spec.js | 5 +----
 spec/stats.spec.js | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 673dcf4f3d..ac8ba38c43 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -6,6 +6,7 @@ var IonicAppLib = require('ionic-app-lib'),
     Task = require('../lib/ionic/task').Task,
     Info = IonicAppLib.info,
     Utils = IonicAppLib.utils,
+    Project = IonicAppLib.project,
     rewire = require('rewire');
 
 describe('Cli', function() {
@@ -17,6 +18,8 @@ describe('Cli', function() {
     spyOn(IonicAppLib.events, 'on');
     spyOn(process, 'on');
     spyOn(Info, 'checkRuntime');
+    spyOn(Utils, 'cdIonicRoot');
+    spyOn(Project, 'load');
 
     spyOn(Utils, 'fail').andCallFake(function(err){
       console.log(err);
@@ -129,13 +132,11 @@ describe('Cli', function() {
       });
 
       it('should change pwd for commands', function() {
-        spyOn(Utils, 'cdIonicRoot');
         IonicCli.run(['node', 'bin/ionic', 'serve']);
         expect(Utils.cdIonicRoot).toHaveBeenCalled();
       });
 
       it('should not change pwd for commands', function() {
-        spyOn(Utils, 'cdIonicRoot');
         IonicCli.run(['node', 'bin/ionic', 'start']);
         expect(Utils.cdIonicRoot).not.toHaveBeenCalled();
       });
diff --git a/spec/serve.spec.js b/spec/serve.spec.js
index f087bc4177..0bef54cf0a 100644
--- a/spec/serve.spec.js
+++ b/spec/serve.spec.js
@@ -5,7 +5,7 @@ var IonicAppLib = require('ionic-app-lib'),
     rewire = require('rewire'),
     Utils = IonicAppLib.utils;
 
-var argv = { 
+var argv = {
   _: ['--livereload'],
   nogulp: false
 }
@@ -15,9 +15,6 @@ describe('Serve', function() {
 
   beforeEach(function() {
     serveTask = rewire('../lib/ionic/serve');
-
-    spyOn(Utils, 'isIonicV2').andReturn(false);
-    
   });
 
   it('should have serve defined', function() {
diff --git a/spec/stats.spec.js b/spec/stats.spec.js
index 7fff9daa15..38b0fcc532 100644
--- a/spec/stats.spec.js
+++ b/spec/stats.spec.js
@@ -2,7 +2,6 @@ var Q = require('q'),
     // IonicStats = require('../lib/ionic/stats').IonicStats,
     IonicStatsModule,
     IonicStats,
-    IonicConfig = require('../lib/ionic/config'),
     path = require('path'),
     rewire = require('rewire');
 

From d6a98f0af655407d69afd67ca352b062a1f7a4fd Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 14:15:15 -0500
Subject: [PATCH 0916/1100] chore(): update to beta.20

---
 lib/ionic/assets/gulpfile.js | 39 ++++++++++++++++++++++++++++++++++++
 package.json                 |  4 ++--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 lib/ionic/assets/gulpfile.js

diff --git a/lib/ionic/assets/gulpfile.js b/lib/ionic/assets/gulpfile.js
new file mode 100644
index 0000000000..9a09b05562
--- /dev/null
+++ b/lib/ionic/assets/gulpfile.js
@@ -0,0 +1,39 @@
+var gulp = require('gulp'),
+    gulpWatch = require('gulp-watch'),
+    del = require('del'),
+    argv = process.argv;
+
+/**
+ * Ionic Gulp tasks, for more information on each see
+ * https://github.com/driftyco/ionic-gulp-tasks
+ */
+var buildWebpack = require('ionic-gulp-webpack-build');
+var buildSass = require('ionic-gulp-sass-build');
+var copyHTML = require('ionic-gulp-html-copy');
+var copyFonts = require('ionic-gulp-fonts-copy');
+
+gulp.task('watch', ['sass', 'html', 'fonts'], function(){
+  gulpWatch('app/**/*.scss', function(){ gulp.start('sass'); });
+  gulpWatch('app/**/*.html', function(){ gulp.start('html'); });
+  return buildWebpack({ watch: true });
+});
+gulp.task('build', ['sass', 'html', 'fonts'], buildWebpack);
+gulp.task('sass', buildSass);
+gulp.task('html', copyHTML);
+gulp.task('fonts', copyFonts);
+gulp.task('clean', function(done){
+  del('www/build', done);
+});
+
+/**
+ * Ionic hooks
+ * Add ':before' or ':after' to any Ionic project command name to run the specified
+ * tasks before or after the command.
+ */
+gulp.task('serve:before', ['watch']);
+gulp.task('emulate:before', ['build']);
+gulp.task('deploy:before', ['build']);
+
+// we want to 'watch' when livereloading
+var shouldWatch = argv.indexOf('-l') > -1 || argv.indexOf('--livereload') > -1;
+gulp.task('run:before', [shouldWatch ? 'watch' : 'build']);
diff --git a/package.json b/package.json
index a8b1f37dfc..30c3392746 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.20",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -74,7 +74,7 @@
     "gulp": "3.8.8",
     "gulp-util": "^3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.9",
+    "ionic-app-lib": "2.0.0-beta.10",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 33af80c772bde1f3eab65a72646f7b994b2e6431 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 15:29:39 -0500
Subject: [PATCH 0917/1100] chore(hooks): print hook messages before running
 gulp

---
 lib/cli.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index c1cfcafc0b..c0262d707f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -141,6 +141,9 @@ function runWithGulp(argv, taskInstance){
     }
     logEvents(gulp);
 
+    if (gulp.tasks[beforeHook]) {
+      console.info('\nRunning \'' + beforeHook + '\' Gulp task before ' + cmdName);
+    }
     return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
       function(){
         // Only some commands return promises, so wrap it
@@ -168,7 +171,10 @@ function runWithGulp(argv, taskInstance){
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       }
     ).then(function(){
-      return Q.nfcall(gulp.start.bind(gulp), argv._[0] + ':after');
+      if (gulp.tasks[beforeHook]) {
+        console.info('\nRunning \'' + afterHook + '\' Gulp task after ' + cmdName);
+      }
+      return Q.nfcall(gulp.start.bind(gulp), afterHook);
     });
   }
 

From 0ce56425aa4254dcf39c9c2476be4b8b2ee9ed24 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 15:30:12 -0500
Subject: [PATCH 0918/1100] fix(hooks): only warn about missing tasks if they
 are missing

---
 lib/cli.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index c0262d707f..cf71ee5543 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -150,9 +150,7 @@ function runWithGulp(argv, taskInstance){
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       },
       function(e){ //task error, let gulp handle it
-
-        // Warn if it's a v2 project and there isn't a build hook
-        if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
+        if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
           var taskName = (cmdName === 'serve') ? 'watch' : 'build';
           console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
 

From 375ad4b0c656c8b4578f88a46facaabf77a8c56d Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 17 Mar 2016 16:49:41 -0500
Subject: [PATCH 0919/1100] feat(start): add --skip-npm flag

---
 lib/tasks/cliTasks.js | 4 ++++
 spec/cli.spec.js      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index bf28f2f366..8779ade1dd 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -43,6 +43,10 @@ var TASKS = [
     options: {
       '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
       '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
+      '--skip-npm': {
+        title: 'Skip npm package installation',
+        boolean: true
+      },
       '--no-cordova|-w': {
         title: 'Create a basic structure without Cordova requirements',
         boolean: true
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index ac8ba38c43..9de3fbab31 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -122,7 +122,7 @@ describe('Cli', function() {
         var task = IonicCli.getTaskWithName('start');
         var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
         //We expect 6 total = 3 options, each with short hand notation.
-        expect(booleanOptions.length).toBe(10);
+        expect(booleanOptions.length).toBe(11);
       });
 
       it('should track stats for cli', function() {

From e897dac54dec2778e02c975c29bcdcfaaa4d2c99 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 11:34:47 -0500
Subject: [PATCH 0920/1100] fix(gulp): check proper hook name

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index cf71ee5543..ad04a321c1 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -169,7 +169,7 @@ function runWithGulp(argv, taskInstance){
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       }
     ).then(function(){
-      if (gulp.tasks[beforeHook]) {
+      if (gulp.tasks[afterHook]) {
         console.info('\nRunning \'' + afterHook + '\' Gulp task after ' + cmdName);
       }
       return Q.nfcall(gulp.start.bind(gulp), afterHook);

From c8643b7510ee9165b91dc1782441e3565c24b722 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 13:40:56 -0500
Subject: [PATCH 0921/1100] feat(hooks): print newline after gulp tasks have
 finished

---
 lib/cli.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index ad04a321c1..5c6856205c 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -139,7 +139,7 @@ function runWithGulp(argv, taskInstance){
       console.error('Do you need to run `npm install`?\n');
       process.exit(1);
     }
-    logEvents(gulp);
+    logEvents(gulp, [beforeHook, afterHook]);
 
     if (gulp.tasks[beforeHook]) {
       console.info('\nRunning \'' + beforeHook + '\' Gulp task before ' + cmdName);
@@ -207,7 +207,7 @@ function loadGulpfile(){
   return false;
 }
 
-function logEvents(gulpInst) {
+function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
     // TODO: batch these
     // so when 5 tasks start at once it only logs one time with all 5
@@ -220,6 +220,9 @@ function logEvents(gulpInst) {
       'Finished', '\'' + chalk.cyan(e.task) + '\'',
       'after', chalk.magenta(time)
     );
+    if (finalTaskNames.indexOf(e.task) > -1) {
+      console.log();
+    }
   });
 
   gulpInst.on('task_err', function(e) {

From 912dceb5ac15a3a2600d6411fb00ef97da06b792 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 13:42:03 -0500
Subject: [PATCH 0922/1100] feat(console): make console info messages cyan

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 5c6856205c..7ad22afc53 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -308,7 +308,7 @@ Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
     for (var n in arguments) {
       msg += arguments[n] + ' ';
     }
-    consoleInfo.call(console, msg.blue.bold);
+    consoleInfo.call(console, msg.cyan.bold);
   };
 
   var consoleWarn = console.warn;

From 0bd5b6f08ecda3d805dbe27be5119395ef04dda4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 13:45:08 -0500
Subject: [PATCH 0923/1100] chore(hooks): gulp is lowercase

---
 lib/cli.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 7ad22afc53..e7198d0278 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -142,7 +142,7 @@ function runWithGulp(argv, taskInstance){
     logEvents(gulp, [beforeHook, afterHook]);
 
     if (gulp.tasks[beforeHook]) {
-      console.info('\nRunning \'' + beforeHook + '\' Gulp task before ' + cmdName);
+      console.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
     }
     return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
       function(){
@@ -170,7 +170,7 @@ function runWithGulp(argv, taskInstance){
       }
     ).then(function(){
       if (gulp.tasks[afterHook]) {
-        console.info('\nRunning \'' + afterHook + '\' Gulp task after ' + cmdName);
+        console.info('\nRunning \'' + afterHook + '\' gulp task after ' + cmdName);
       }
       return Q.nfcall(gulp.start.bind(gulp), afterHook);
     });

From 408a660411c231c55d66104114ac0d39556a5314 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 13:45:49 -0500
Subject: [PATCH 0924/1100] feat(hooks): download default gulpfile

If user has ionic.config.js and no gulpfile, prompt to download the
default gulpfile so they can still build.
---
 lib/cli.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/lib/cli.js b/lib/cli.js
index e7198d0278..2b15f3af12 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -176,10 +176,48 @@ function runWithGulp(argv, taskInstance){
     });
   }
 
+  //No gulpfile
   if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
     console.warn('WARN: No gulpfile found!');
     console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+
+    if (fs.existsSync('ionic.config.js')) {
+      var inquirer = require('inquirer');
+      var deferred = Q.defer();
+
+      console.info('Looks like you are using the deprecated ionic.config.js and have no gulpfile!');
+      console.info('As of beta.21 the Ionic CLI relies on gulp hooks to build your web assets\n');
+      inquirer.prompt([{
+        type: 'confirm',
+        name: 'downloadGulp',
+        message: 'Would you like to download the default gulpfile?'.cyan,
+      }],
+      function(answers){
+        answers.downloadGulp ? deferred.resolve() : deferred.reject();
+      });
+      var downloadGulp = false;
+      return deferred.promise.then(
+        function(){
+          downloadGulp = true;
+          return downloadDefaultGulpfile();
+        },
+        function(){
+          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+        }
+      ).then(
+        function(){
+          if (downloadGulp) {
+            console.success('Successfully downloaded gulpfile. Try running \'' + cmdName + '\' again.');
+          }
+        },
+        function(err) {
+          console.error('There was an error downloading the default gulpfile: ' + err);
+          process.exit(1);
+        }
+      );
+    }
   }
+
   return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
 }
 
@@ -207,6 +245,34 @@ function loadGulpfile(){
   return false;
 }
 
+function downloadDefaultGulpfile(){
+  var https = require('https');
+  var fileStream = fs.createWriteStream('gulpfile.js');
+  var deferred = Q.defer();
+  var project = IonicProject.load();
+  var branch = project.get('typescript') ? 'typescript' : 'master';
+  var url = 'https://cdn.rawgit.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
+
+  console.info(('Downloading default gulpfile from: ' + url));
+
+  fileStream.on('open', function () {
+    https.get(url, function (res) {
+      res.on('error', function (err) {
+        deferred.reject(err);
+      });
+
+      res.pipe(fileStream);
+    });
+  }).on('error', function (err) {
+    deferred.reject(err);
+  }).on('finish', function () {
+    deferred.resolve();
+  });
+
+  return deferred.promise;
+}
+
+
 function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
     // TODO: batch these

From 906795de194be9ddddc40acb56613f62bfe399e5 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 14:48:54 -0500
Subject: [PATCH 0925/1100] chore(): add comment for clarity

---
 lib/cli.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cli.js b/lib/cli.js
index 2b15f3af12..fa8c6bf91f 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -150,6 +150,7 @@ function runWithGulp(argv, taskInstance){
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       },
       function(e){ //task error, let gulp handle it
+        //if there is no hook task, but it's a v2 app and a command that usually needs a hook
         if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
           var taskName = (cmdName === 'serve') ? 'watch' : 'build';
           console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');

From 3e1044da257a519f11851e2cff0dc04fcafdc268 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 21 Mar 2016 14:51:58 -0500
Subject: [PATCH 0926/1100] chore(): update to beta.21

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 30c3392746..5d101a2e40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -74,7 +74,7 @@
     "gulp": "3.8.8",
     "gulp-util": "^3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.10",
+    "ionic-app-lib": "2.0.0-beta.11",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 2139cce71020d617d502364ae9bf4f11c3a0b429 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Mar 2016 07:26:28 -0500
Subject: [PATCH 0927/1100] chore(): update to beta.22

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5d101a2e40..5a2fa937c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.22",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -74,7 +74,7 @@
     "gulp": "3.8.8",
     "gulp-util": "^3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.11",
+    "ionic-app-lib": "2.0.0-beta.12",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 86fbce6696f1eeed8877c98648256af024264b92 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 25 Mar 2016 16:48:54 -0500
Subject: [PATCH 0928/1100] fix(cli): use github for default gulpfile

Rawgit permanently caches the file, so it doesn't update, which was the
whole point of using github.  Just use github directly, as probably not
too many people will need to upgrade their v2 projects and this will
eventually be removed anyways.
---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index fa8c6bf91f..529e33b1e7 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -252,7 +252,7 @@ function downloadDefaultGulpfile(){
   var deferred = Q.defer();
   var project = IonicProject.load();
   var branch = project.get('typescript') ? 'typescript' : 'master';
-  var url = 'https://cdn.rawgit.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
+  var url = 'https://raw.githubusercontent.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
 
   console.info(('Downloading default gulpfile from: ' + url));
 

From 89f560b0c85669d7b15db80983b1ef1d5d58bfcc Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 25 Mar 2016 16:51:24 -0500
Subject: [PATCH 0929/1100] feat(cli): install necessary packages for default
 gulpfile

After downloading the default gulpfile, install the necessary packages
for it to work.
---
 lib/cli.js   | 53 ++++++++++++++++++++++++++++++++++++++--------------
 package.json |  1 +
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 529e33b1e7..18d64a1f41 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -198,23 +198,28 @@ function runWithGulp(argv, taskInstance){
       });
       var downloadGulp = false;
       return deferred.promise.then(
-        function(){
+        function() {
           downloadGulp = true;
-          return downloadDefaultGulpfile();
+          return downloadDefaultGulpfile(cmdName).then(
+            installGulpfilePackages,
+            function(err) {
+              console.error('There was an error downloading the default gulpfile: ' + err);
+              process.exit(1);
+            }
+          ).then(
+            function(){
+              console.success('Npm packages installed successfully. Try running \'' + cmdName + '\' again.');
+            },
+            function(){
+              console.warn('There was an error installing the packages required by the gulpfile.');
+              console.warn('You\'ll need to install the following packages manually: ');
+              console.warn('    ' + requires.join(' '));
+            }
+          );
         },
-        function(){
+        function() {
           return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
         }
-      ).then(
-        function(){
-          if (downloadGulp) {
-            console.success('Successfully downloaded gulpfile. Try running \'' + cmdName + '\' again.');
-          }
-        },
-        function(err) {
-          console.error('There was an error downloading the default gulpfile: ' + err);
-          process.exit(1);
-        }
       );
     }
   }
@@ -254,7 +259,7 @@ function downloadDefaultGulpfile(){
   var branch = project.get('typescript') ? 'typescript' : 'master';
   var url = 'https://raw.githubusercontent.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
 
-  console.info(('Downloading default gulpfile from: ' + url));
+  console.info('\nDownloading default gulpfile from: ' + url);
 
   fileStream.on('open', function () {
     https.get(url, function (res) {
@@ -273,6 +278,26 @@ function downloadDefaultGulpfile(){
   return deferred.promise;
 }
 
+function installGulpfilePackages(cmdName){
+  var detective = require('detective');
+  var requires = detective(fs.readFileSync('gulpfile.js'));
+  var deferred = Q.defer();
+
+  console.success('Successfully downloaded gulpfile.\n');
+  console.info('Now installing npm packages used by the gulpfile: ');
+  console.info('    ' + requires.join(' ') + '\n');
+
+  var npmInstall = require('child_process').spawn('npm', ['install', '--save-dev'].concat(requires));
+  npmInstall.stdout.on('data', function(data){ logging.logger.debug(data) });
+  npmInstall.stderr.on('data', function(data){ logging.logger.debug(data) });
+  npmInstall.on('error', function(err) { console.error(err) });
+  npmInstall.on('exit', function(code) {
+    code !== 0 ? deferred.reject() : deferred.resolve();
+  });
+
+  return deferred.promise;
+}
+
 
 function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
diff --git a/package.json b/package.json
index 5a2fa937c7..6f8cf15c3c 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "connect-livereload": "0.5.2",
     "crc": "3.2.1",
     "cross-spawn": "0.2.3",
+    "detective": "4.3.1",
     "event-stream": "3.0.20",
     "expand-tilde": "1.2.0",
     "finalhandler": "0.2.0",

From 984f46f6f8526abf9710e0ff104ffd762facf58e Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 25 Mar 2016 22:34:06 -0500
Subject: [PATCH 0930/1100] fix(state): fix state

---
 lib/ionic/state.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 80dc657572..6335a1728b 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -33,8 +33,8 @@ var fs = require('fs'),
   shelljs = require('shelljs'),
   Task = require('./task').Task,
   _ = require('underscore'),
-  IonicProject = require('./project'),
   IonicAppLib = require('ionic-app-lib'),
+  IonicProject = IonicAppLib.project,
   State = IonicAppLib.state,
   Utils = IonicAppLib.utils,
   IonicInfo = IonicAppLib.info;
@@ -56,13 +56,13 @@ IonicTask.prototype.run = function run(ionic, argv) {
 
   this.ionic = ionic;
 
-  try {
-    projectPath = path.resolve('ionic.project');
-    stats = fs.statSync(projectPath);
-  } catch (ex) {
-    this.ionic.fail('You cannot run any state commands on a project that is not an Ionic project.\nTry adding an ionic.project file or running ionic start to get an application to save or restore');
-    return;
-  }
+  // try {
+  //   projectPath = path.resolve('ionic.project');
+  //   stats = fs.statSync(projectPath);
+  // } catch (ex) {
+  //   this.ionic.fail('You cannot run any state commands on a project that is not an Ionic project.\nTry adding an ionic.project file or running ionic start to get an application to save or restore');
+  //   return;
+  // }
 
   try {
     project = IonicProject.load();

From 9c53ffc33cbf543fd556ebb659b9f5404d3f41a2 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 25 Mar 2016 22:55:41 -0500
Subject: [PATCH 0931/1100] fix(cli): report gulpfile errors

---
 lib/cli.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 18d64a1f41..cae2682f26 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -235,17 +235,20 @@ function loadGulpfile(){
       require(path.resolve(process.cwd() + '/' + names[i]));
       return true;
     } catch(e){
-      if (e instanceof SyntaxError) {
-        console.error('\nThere is a syntax error in your gulpfile:');
-        console.error(e.message)
-        process.exit(1);
-      }
-      if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(names[i]) === -1) {
-        console.log('Uh oh! Looks like you\'re missing a module in your gulpfile:');
-        console.error(e.message);
-        console.log('\nDo you need to run `npm install`?\n');
-        process.exit(1);
+      if (e.code === 'MODULE_NOT_FOUND') {
+        if (e.message.indexOf(names[i]) === -1) {
+          console.log('Uh oh! Looks like you\'re missing a module in your gulpfile:');
+          console.error(e.message);
+          console.log('\nDo you need to run `npm install`?\n');
+          process.exit(1);
+        } else {
+          // ignore missing gulpfile
+          continue
+        }
       }
+      console.error('There is an error in your gulpfile: ')
+      console.error(e.stack);
+      process.exit(1);
     }
   }
   return false;

From 74cc1b4dbf4b30ca0ba7ebac57d167d00633f21c Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 28 Mar 2016 08:30:24 -0500
Subject: [PATCH 0932/1100] chore(): update to beta.23

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6f8cf15c3c..92938a3472 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.22",
+  "version": "2.0.0-beta.23",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -75,7 +75,7 @@
     "gulp": "3.8.8",
     "gulp-util": "^3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.12",
+    "ionic-app-lib": "2.0.0-beta.13",
     "moment": "2.11.1",
     "ncp": "0.4.2",
     "open": "0.0.5",

From 29b5c4ea023c172775c2298fa1f3aa7e9b787142 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 30 Mar 2016 13:14:31 -0500
Subject: [PATCH 0933/1100] chore(): remove unused ports file

The portfinder code was moved to ionic-app-lib and is no longer used.
---
 lib/ionic/ports.js | 209 ---------------------------------------------
 package.json       |   1 -
 2 files changed, 210 deletions(-)
 delete mode 100644 lib/ionic/ports.js

diff --git a/lib/ionic/ports.js b/lib/ionic/ports.js
deleted file mode 100644
index 5fe7a1a7e4..0000000000
--- a/lib/ionic/ports.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * portfinder.js: A simple tool to find an open port on the current machine.
- *
- * (C) 2011, Charlie Robbins
- *
- */
- 
-var fs = require('fs'),
-    net = require('net'),
-    path = require('path'),
-    async = require('async');
-    // mkdirp = require('mkdirp').mkdirp;
-
-//
-// ### @basePort {Number}
-// The lowest port to begin any port search from
-//
-exports.basePort = 8000;
-
-//
-// ### @basePath {string}
-// Default path to begin any socket search from
-//
-exports.basePath = '/tmp/portfinder'
-
-exports.getPort = function (options, callback) {
-  if (!callback) {
-    callback = options;
-    options = {}; 
-  }
-  
-  options.port   = options.port   || exports.basePort;
-  options.host   = options.host   || null;
-  options.server = options.server || net.createServer(function () {
-    //
-    // Create an empty listener for the port testing server.
-    //
-  });
-  
-  function onListen () {
-    options.server.removeListener('error', onError);
-    // console.log('onListen')
-    options.server.close();
-    callback(null, options.port)
-  }
-  
-  function onError (err) {
-    // console.log('Error:', err)
-    options.server.removeListener('listening', onListen);
-
-    if (err.code !== 'EADDRINUSE' && err.code !== 'EACCES') {
-      return callback(err);
-    }
-
-    exports.getPort({
-      port: exports.nextPort(options.port),
-      host: options.host,
-      server: options.server
-    }, callback);
-  }
-
-  options.server.once('error', onError);
-  options.server.once('listening', onListen);
-  options.server.listen(options.port, options.host);
-};
-
-exports.getPorts = function (count, options, callback) {
-  if (!callback) {
-    callback = options;
-    options = {};
-  }
-
-  // console.log('calling getPorts')
-
-  var lastPort = null;
-  async.timesSeries(count, function(index, asyncCallback) {
-    if (lastPort) {
-      options.port = exports.nextPort(lastPort);
-    }
-
-    exports.getPort(options, function (err, port) {
-      if (err) {
-        asyncCallback(err);
-      } else {
-        lastPort = port;
-        asyncCallback(null, port);
-      }
-    });
-  }, callback);
-};
-
-//
-// ### function getSocket (options, callback)
-// #### @options {Object} Settings to use when finding the necessary port
-// #### @callback {function} Continuation to respond to when complete.
-// Responds with a unbound socket using the specified directory and base
-// name on the current machine.
-//
-exports.getSocket = function (options, callback) {
-  if (!callback) {
-    callback = options;
-    options = {};
-  }
-
-  options.mod  = options.mod    || 0755;
-  options.path = options.path   || exports.basePath + '.sock';
-  
-  //
-  // Tests the specified socket
-  //
-  function testSocket () {
-    fs.stat(options.path, function (err) {
-      //
-      // If file we're checking doesn't exist (thus, stating it emits ENOENT),
-      // we should be OK with listening on this socket.
-      //
-      if (err) {
-        if (err.code == 'ENOENT') {
-          callback(null, options.path);
-        }
-        else {
-          callback(err);
-        }
-      }
-      else {
-        //
-        // This file exists, so it isn't possible to listen on it. Lets try
-        // next socket.
-        //
-        options.path = exports.nextSocket(options.path);
-        exports.getSocket(options, callback);
-      }
-    });
-  }
-  
-  //
-  // Create the target `dir` then test connection
-  // against the socket.
-  //
-  function createAndTestSocket (dir) {
-    mkdirp(dir, options.mod, function (err) {
-      if (err) {
-        return callback(err);
-      }
-      
-      options.exists = true;
-      testSocket();
-    });
-  }
-  
-  //
-  // Check if the parent directory of the target
-  // socket path exists. If it does, test connection
-  // against the socket. Otherwise, create the directory
-  // then test connection. 
-  //
-  function checkAndTestSocket () {
-    var dir = path.dirname(options.path);
-    
-    fs.stat(dir, function (err, stats) {
-      if (err || !stats.isDirectory()) {
-        return createAndTestSocket(dir);
-      }
-
-      options.exists = true;
-      testSocket();
-    });
-  }
-  
-  //
-  // If it has been explicitly stated that the 
-  // target `options.path` already exists, then 
-  // simply test the socket.
-  //
-  return options.exists 
-    ? testSocket()
-    : checkAndTestSocket();
-};
-
-//
-// ### function nextPort (port)
-// #### @port {Number} Port to increment from.
-// Gets the next port in sequence from the 
-// specified `port`.
-//
-exports.nextPort = function (port) {
-  return port + 1;
-};
-
-//
-// ### function nextSocket (socketPath)
-// #### @socketPath {string} Path to increment from
-// Gets the next socket path in sequence from the 
-// specified `socketPath`.
-//
-exports.nextSocket = function (socketPath) {
-  var dir = path.dirname(socketPath),
-      name = path.basename(socketPath, '.sock'),
-      match = name.match(/^([a-zA-z]+)(\d*)$/i),
-      index = parseInt(match[2]),
-      base = match[1];
-  
-  if (isNaN(index)) {
-    index = 0;
-  }
-  
-  index += 1;
-  return path.join(dir, base + index + '.sock');
-};
diff --git a/package.json b/package.json
index 92938a3472..585725caa5 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "async": "0.9.2",
     "chalk": "^1.1.1",
     "cheerio": "0.19.0",
     "cli-table": "0.3.1",

From b069cde2e40f11127090b158c76c1c699045db05 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 30 Mar 2016 16:13:31 -0500
Subject: [PATCH 0934/1100] chore(): remove unused dependencies

---
 lib/cli.js            | 15 +++++++--------
 lib/ionic/cordova.js  |  2 --
 lib/ionic/hooks.js    |  1 -
 lib/ionic/security.js |  1 -
 lib/ionic/share.js    |  4 +---
 lib/ionic/start.js    |  1 -
 lib/ionic/stats.js    |  1 -
 package.json          | 38 +++++++-------------------------------
 8 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index cae2682f26..ab9ca924b3 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -18,7 +18,6 @@ var Cli = module.exports,
     Q = require('q'),
     semver = require('semver'),
     gutil = require('gulp-util'),
-    chalk = require('chalk'),
     prettyTime = require('pretty-hrtime');
 
 Cli.Tasks = TASKS = Tasks;
@@ -306,14 +305,14 @@ function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
     // TODO: batch these
     // so when 5 tasks start at once it only logs one time with all 5
-    gutil.log('Starting', '\'' + chalk.cyan(e.task) + '\'...');
+    gutil.log('Starting', '\'' + e.task.cyan + '\'...');
   });
 
   gulpInst.on('task_stop', function(e) {
     var time = prettyTime(e.hrDuration);
     gutil.log(
-      'Finished', '\'' + chalk.cyan(e.task) + '\'',
-      'after', chalk.magenta(time)
+      'Finished', '\'' + e.task.cyan + '\'',
+      'after', time.magenta
     );
     if (finalTaskNames.indexOf(e.task) > -1) {
       console.log();
@@ -324,16 +323,16 @@ function logEvents(gulpInst, finalTaskNames) {
     var msg = formatGulpError(e);
     var time = prettyTime(e.hrDuration);
     gutil.log(
-      '\'' + chalk.cyan(e.task) + '\'',
-      chalk.red('errored after'),
-      chalk.magenta(time)
+      '\'' + e.task.cyan + '\'',
+      'errored after'.red,
+      time.magenta
     );
     gutil.log(msg);
   });
 
   // gulpInst.on('task_not_found', function(err) {
   //   gutil.log(
-  //     chalk.red('Task \'' + err.task + '\' is not in your gulpfile')
+  //     ('Task \'' + err.task + '\' is not in your gulpfile').red
   //   );
   //   gutil.log('Please check the documentation for proper gulpfile formatting');
   //   process.exit(1);
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index a68758aef7..0bd527a4cd 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -5,9 +5,7 @@ var Task = require('./task').Task,
     // argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
     path = require('path'),
     exec = require('child_process').exec,
-    colors = require('colors'),
     shelljs = require('shelljs'),
-    prompt = require('prompt'),
     IonicAppLib = require('ionic-app-lib'),
     IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index f0de6dff13..169a064161 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     Q = require('q'),
     shelljs = require('shelljs'),
     Task = require('./task').Task,
-    _ = require('underscore'),
     IonicInfo = require('./info').IonicTask,
     IonicAppLib = require('ionic-app-lib'),
     Hooks = IonicAppLib.hooks;
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 99cbe483ed..adca7cca71 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -3,7 +3,6 @@ var fs = require('fs'),
     Q = require('q'),
     expandTilde = require('expand-tilde'),
     _ = require('underscore'),
-    moment = require('moment'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 07f0b989f7..1166b9bc2e 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -3,8 +3,6 @@ var path = require('path'),
     shelljs = require('shelljs/global'),
     argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
     Q = require('q'),
-    open = require('open'),
-    xml2js = require('xml2js'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicStore = require('./store').IonicStore,
@@ -36,7 +34,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   if (project.get('app_id') == '') {
     return ionic.fail('You must first upload the app to share it');
   }
-  
+
   var email = argv._[1];
 
   if(email.indexOf('@') < 0) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 13c36f963f..46c5025017 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     prompt = require('prompt'),
     colors = require('colors'),
     Q = require('q'),
-    open = require('open'),
     IonicTemplates = require('./templates').IonicTask,
     IonicStore = require('./store').IonicStore,
     Task = require('./task').Task,
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 81e30b5a85..6866b9cfc9 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -8,7 +8,6 @@ var path = require('path'),
     crypto = require('crypto'),
     Buffer = require('buffer').Buffer,
     util = require('util'),
-    es = require('event-stream'),
     fs = require('fs'),
     os = require('os'),
     IonicConfig = require('ionic-app-lib').config;
diff --git a/package.json b/package.json
index 585725caa5..fdf47046d2 100644
--- a/package.json
+++ b/package.json
@@ -58,79 +58,55 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "chalk": "^1.1.1",
-    "cheerio": "0.19.0",
     "cli-table": "0.3.1",
     "colors": "0.6.2",
-    "connect": "3.1.1",
-    "connect-livereload": "0.5.2",
-    "crc": "3.2.1",
-    "cross-spawn": "0.2.3",
     "detective": "4.3.1",
-    "event-stream": "3.0.20",
     "expand-tilde": "1.2.0",
-    "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "gulp-util": "^3.0.7",
+    "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
     "ionic-app-lib": "2.0.0-beta.13",
     "moment": "2.11.1",
-    "ncp": "0.4.2",
     "open": "0.0.5",
     "optimist": "0.6.0",
-    "pretty-hrtime": "^1.0.2",
+    "pretty-hrtime": "1.0.2",
     "progress": "1.1.7",
     "prompt": "0.2.12",
-    "proxy-middleware": "0.7.0",
     "q": "1.0.1",
     "request": "2.51.0",
     "semver": "4.3.6",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",
-    "tiny-lr-fork": "0.0.5",
     "underscore": "1.7.0",
-    "unzip": "0.1.9",
-    "vinyl-fs": "0.3.7",
-    "xml2js": "0.4.4"
+    "unzip": "0.1.9"
   },
   "devDependencies": {
     "jasmine-node": "1.14.5",
     "rewire": "2.5.1"
   },
   "bundledDependencies": [
-    "async",
-    "cheerio",
     "cli-table",
     "colors",
-    "connect",
-    "connect-livereload",
-    "crc",
-    "cross-spawn",
-    "event-stream",
+    "detective",
     "expand-tilde",
-    "finalhandler",
     "form-data",
     "gulp",
+    "gulp-util",
     "inquirer",
     "ionic-app-lib",
     "moment",
-    "ncp",
-    "npm",
     "open",
     "optimist",
+    "pretty-hrtime",
     "progress",
     "prompt",
-    "proxy-middleware",
     "q",
     "request",
     "semver",
     "serve-static",
     "shelljs",
-    "tiny-lr-fork",
     "underscore",
-    "unzip",
-    "vinyl-fs",
-    "xml2js"
+    "unzip"
   ]
 }

From 94fd20b2579a9d31cf6ed381f2bcfa815b456ae4 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 30 Mar 2016 16:14:21 -0500
Subject: [PATCH 0935/1100] chore(): remove unused multibar file

---
 lib/ionic/multibar.js | 103 ------------------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 lib/ionic/multibar.js

diff --git a/lib/ionic/multibar.js b/lib/ionic/multibar.js
deleted file mode 100644
index 05de1e8f63..0000000000
--- a/lib/ionic/multibar.js
+++ /dev/null
@@ -1,103 +0,0 @@
-var ProgressBar = require('progress');
-
-function Multibar(stream) {
-  this.stream     = stream || process.stderr;
-  this.cursor     = 0;
-  this.bars       = [];
-  this.terminates = 0;
-}
-
-Multibar.prototype = {
-  newBar: function(schema, options) {
-    options.stream = this.stream;
-    var bar = new ProgressBar(schema, options);
-    this.bars.push(bar);
-    var index = this.bars.length - 1;
-
-    // alloc line
-    this.move(index);
-    this.stream.write('\n');
-    this.cursor ++;
-
-    // replace original
-    var self  = this;
-    bar.otick = bar.tick;
-    bar.oterminate = bar.terminate;
-    bar.tick = function(value, options) {
-      self.tick(index, value, options);
-    }
-    bar.terminate = function() {
-      self.terminates++;
-      if (self.terminates == self.bars.length) {
-        self.terminate();
-      }
-    }
-
-    return bar;
-  },
-
-  terminate: function() {
-    this.move(this.bars.length);
-    this.stream.clearLine();
-    this.stream.cursorTo(0);
-  },
-
-  move: function(index) {
-    if (!this.stream.isTTY) return;
-    this.stream.moveCursor(0, index - this.cursor);
-    this.cursor = index;
-  },
-
-  tick: function(index, value, options) {
-    var bar = this.bars[index];
-    if (bar) {
-      this.move(index);
-      bar.otick(value, options);
-    }
-  }
-}
-
-// var mbars = new Multibar();
-// var bars  = [];
-
-// function addBar() {
-//   bars.push(mbars.newBar('  :title [:bar] :percent', {
-//       complete: '='
-//     , incomplete: ' '
-//     , width: 30
-//     , total: 100
-//   }));
-//   return bars[bars.length - 1];
-// }
-
-// function forward() {
-//   for (var i = 0; i < bars.length; i++) {
-//     bars[i].tick(1, { title: 'forward: ' });
-//   }
-//   if (bars[0].curr > 60) {
-//     addBar().tick(bars[0].curr);
-//     backward();
-//   } else {
-//     setTimeout(forward, 20);
-//   }
-// }
-
-// function backward() {
-//   for (var i = 0; i < bars.length; i++) {
-//     bars[i].tick(-1, { title: 'backward: ' });
-//   }
-//   if (bars[0].curr == 0) {
-//     mbars.terminate();
-//     console.log("End all");
-//   } else {
-//     setTimeout(backward, 20);
-//   }
-// }
-
-// for(var i = 0; i < 5; i++) {
-//   addBar();
-// }
-
-// forward();
-
-module.exports = new Multibar();

From ed59740e310949b2f60879b3c05a793714bba7cb Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Thu, 31 Mar 2016 21:58:11 -0400
Subject: [PATCH 0936/1100] Adding support for typescript to generators

---
 lib/ionic/generate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 0b2329a5c2..b0c255810c 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -24,6 +24,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
+	var isTS = argv._[3] != null 
 
     var ionicModule = loadToolingModule();
 
@@ -34,7 +35,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var promise;
     try {
-      promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
+      promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS});
     } catch (err) {
       if (err.message.indexOf('no generator available') != -1) {
         console.log('✗ '.red + err.message.red);

From 5d42d98357cf00d8ce63786662caf29656c6fdab Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Thu, 31 Mar 2016 22:33:34 -0400
Subject: [PATCH 0937/1100] Changed TS argument to be a boolean

Changed TS argument to be a boolean
---
 lib/ionic/generate.js | 2 +-
 lib/tasks/cliTasks.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index b0c255810c..fada1922ae 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -24,7 +24,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
-	var isTS = argv._[3] != null 
+	var isTS = argv.ts;
 
     var ionicModule = loadToolingModule();
 
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 8779ade1dd..038ab6d85f 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -513,6 +513,10 @@ var TASKS = [
       '--list': {
         title: 'List available generators',
         boolean: true
+      },
+	  '--typescript|--ts': {
+        boolean: true,
+        title: '(with --v2 only) Use TypeScript in generation'
       }
     },
    }

From 17ae7b30d607416cfc5827afeb0aeecc582a2a3d Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Thu, 31 Mar 2016 22:41:23 -0400
Subject: [PATCH 0938/1100] Tab -> spaces

---
 lib/ionic/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index fada1922ae..9c3311c4fc 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -24,7 +24,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
-	var isTS = argv.ts;
+    var isTS = argv.ts;
 
     var ionicModule = loadToolingModule();
 

From c2869f3561f7efe2128597a91667764f36563108 Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Thu, 31 Mar 2016 22:43:09 -0400
Subject: [PATCH 0939/1100] Tab -> spaces

---
 lib/tasks/cliTasks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 038ab6d85f..8b6e92275b 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -514,7 +514,7 @@ var TASKS = [
         title: 'List available generators',
         boolean: true
       },
-	  '--typescript|--ts': {
+      '--typescript|--ts': {
         boolean: true,
         title: '(with --v2 only) Use TypeScript in generation'
       }

From 3d54ea3be1e02d6c32a0bd12566181504eae2302 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 1 Apr 2016 15:04:11 -0500
Subject: [PATCH 0940/1100] chore(): remove unused crosswalk notes

---
 lib/ionic/CrosswalkNotes.md | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 lib/ionic/CrosswalkNotes.md

diff --git a/lib/ionic/CrosswalkNotes.md b/lib/ionic/CrosswalkNotes.md
deleted file mode 100644
index 7f6d9e473a..0000000000
--- a/lib/ionic/CrosswalkNotes.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Crosswalk Notes
-
-Cloned down Cordova android 4.0.x
-Ran download shell
-Copied files into plugin libs
-Plugin add that downloaded plugin
-
-
-When running `cordova run android` -
------------------------
-* Where:
-Script '/Users/JoshBavari/Development/testing/crosswalk-engine/platforms/android/cordova.gradle' line: 59
-
-* What went wrong:
-A problem occurred evaluating script.
-> No installed build tools found. Please install the Android build tools version 19.1.0 or higher.
-
-Had to bump the minversionnumber in platform/android/AndroidManifest.xml to 14 from 10.
-
-
-
-
-## Roadmap for Crosswalk integration
-
-Cordova release in Jan 2015 is pushing for pluggable web views
-
-In the meantime, do we go ahead and release now as a beta?
-
-When they do release, how do we integrate with those changes?
-
-
-
-`ionic browser add crosswalk` will add that engine file.
-It will also add a platform for android
-How do we handle the case of when they want to re-add stuffs?
-Removing Android - browser remove feature
-

From 3ecebb50c5108771a37ae5424e4c797d9cb493f3 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 1 Apr 2016 15:08:26 -0500
Subject: [PATCH 0941/1100] feat(): remove postinstall script

There are no longer any dependencies in app-lib or the CLI that require
native bindings that need to potentially be rebuilt.
---
 lib/tasks/postinstall.js | 11 -----------
 package.json             |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 lib/tasks/postinstall.js

diff --git a/lib/tasks/postinstall.js b/lib/tasks/postinstall.js
deleted file mode 100644
index eefb5255ae..0000000000
--- a/lib/tasks/postinstall.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var execSync = require('child_process').execSync
-
-var previousGlobalConfig = process.env.npm_config_global;
-process.env.npm_config_global = 'false';
-
-var cmd = 'npm rebuild node-sass spawn-sync';
-cmd += process.platform === 'darwin' ? ' fsevents' : '';
-
-execSync(cmd, {stdio: [0,1,2]});
-process.env.npm_config_global = previousGlobalConfig;
-
diff --git a/package.json b/package.json
index fdf47046d2..7c00828df0 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,7 @@
     "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",
     "test": "npm run jasmine",
     "e2e": "jasmine-node --captureExceptions ./e2e",
-    "jasmine": "jasmine-node --captureExceptions  ./spec",
-    "postinstall": "node lib/tasks/postinstall"
+    "jasmine": "jasmine-node --captureExceptions  ./spec"
   },
   "keywords": [
     "ionic",

From ff99d143dd6a4c3e694b9faad11bc6b308eb0b54 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 1 Apr 2016 15:09:51 -0500
Subject: [PATCH 0942/1100] feat(app): remove unused app task

BREAKING CHANGE: the 'app' task has been removed
---
 lib/ionic/app.js      | 190 ------------------------------------------
 lib/tasks/cliTasks.js |  12 ---
 2 files changed, 202 deletions(-)
 delete mode 100644 lib/ionic/app.js

diff --git a/lib/ionic/app.js b/lib/ionic/app.js
deleted file mode 100644
index ba9993f510..0000000000
--- a/lib/ionic/app.js
+++ /dev/null
@@ -1,190 +0,0 @@
-var fs = require('fs'),
-    path = require('path'),
-    parseUrl = require('url').parse,
-    request = require('request'),
-    argv = require('optimist').argv,
-    FormData = require('form-data'),
-    IonicProject = require('./project'),
-    IonicTask = require('./task').IonicTask,
-    Task = require('./task').Task,
-    IonicLoginTask = require('./login').IonicTask,
-    IonicUploadTask = require('./upload').IonicTask,
-    IonicUtils = require('./utils');
-
-var IonicTask = function() {};
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-
-  self.ionic = ionic;
-  self.inputValues = {};
-  self.useCmdArgs = false;
-
-  this.getCmdLineOptions();
-
-  ionic.IONIC_DASH = 'http://stage.apps.ionic.io';
-
-  var login = new IonicLoginTask();
-  login.get(ionic, function(jar) {
-    self.jar = jar;
-
-    if (argv['versions'] || argv.v) {
-      self.versions(self);
-    } else if (argv['deploy'] || argv.d) {
-      if (!self.inputValues['uuid']) {
-        // Deploying a new version
-        var upload = new IonicUploadTask();
-
-        upload.setNote(self.inputValues['note'] || '');
-        upload.run(self.ionic, argv, function() {
-          self.deploy(self);
-        });
-      } else {
-        self.deploy(self);
-      }
-    }
-  });
-};
-
-IonicTask.prototype.versions = function(self) {
-  var project = null;
-
-  try {
-    project = IonicProject.load();
-  } catch (ex) {
-    self.ionic.fail(ex.message);
-    return
-  }
-
-  if (!project.get('app_id')) {
-    console.log("No versions uploaded!".bold.red);
-    return false;
-  }
-
-  var form = new FormData();
-  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
-
-  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/versions';
-  var params = parseUrl(url);
-
-  form.submit({
-    protocol: params.protocol,
-    hostname: params.hostname,
-    port: params.port,
-    path: params.path,
-    headers: form.getHeaders({
-      cookie: IonicUtils.transformCookies(self.jar)
-    })
-  },
-  function (err, response) {
-    if (err) {
-      return self.ionic.fail('Error logging in: ' + err);
-    }
-
-    response.setEncoding('utf8');
-    response.on("data", function(data) {
-      try {
-        var d = JSON.parse(data);
-        if (d.errors && d.errors.length) {
-          for (var j = 0; j < d.errors.length; j++) {
-            console.log((d.errors[j]).bold.error);
-          }
-          return self.ionic.fail('Unable to fetch versions list');
-        }
-
-          var heading = ['    UUID   ', ' Created ', '            Note '];
-          var heading_underline = ['------------', '----------', '----------------------------']
-
-          console.log(heading.join('\t'));
-          console.log(heading_underline.join('\t'));
-
-          for (var j = 0; j < d.length; j++) {
-            var active = (d[j].active) ? ' *' : '  ';
-            var uuid = (d[j].active) ? d[j].uuid.substring(0,8).green : d[j].uuid.substring(0,8);
-            var note = d[j].note.substring(0,25) || '\t';
-
-            console.log([active + ' ' + uuid, ' ' + d[j].created, ' ' + note].join('\t'));
-          }
-        } catch(parseEx) {
-          return self.ionic.fail('Error response: ' + parseEx);
-        }
-      });
-    });
-}
-
-IonicTask.prototype.deploy = function(self) {
-  var project = null;
-
-  try {
-    project = IonicProject.load();
-  } catch (ex) {
-    self.ionic.fail(ex.message);
-    return
-  }
-
-  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/deploy';
-
-  request({
-      method: 'POST',
-      url: url,
-      jar: self.jar,
-      form: {
-        uuid: self.inputValues['uuid'],
-        csrfmiddlewaretoken: self.getCsrfToken(self.jar)
-      },
-      headers: form.getHeaders({
-        cookie: jar.map(function(c) {
-          return c.key + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    },
-    function (err, response, body) {
-      if (err) {
-        return self.ionic.fail('Error deploying version: ' + err);
-      }
-
-      try {
-        var d = JSON.parse(body);
-        if (d.errors && d.errors.length) {
-          for (var j = 0; j < d.errors.length; j++) {
-            console.log((d.errors[j]).bold.error);
-          }
-          return self.ionic.fail('Unable to deploy version');
-        }
-
-        console.log("Successfully deployed " + d.uuid);
-
-      } catch (parseEx) {
-        return self.ionic.fail('Error response: ' + parseEx);
-      }
-    }
-  );
-};
-
-IonicTask.prototype.getCmdLineOptions = function() {
-  var self = this;
-
-  function getCmdArgValue(propertyName, shortName) {
-    var value = argv[propertyName] || argv[shortName];
-    if(value) {
-      self.inputValues[propertyName] = value;
-      self.useCmdArgs = true;
-    }
-  }
-
-  getCmdArgValue('note', 'n');
-  getCmdArgValue('uuid', 'u');
-};
-
-IonicTask.prototype.getCsrfToken = function(jar) {
-  for (var i = 0; i < jar.length; i++) {
-    if (jar[i].key == 'csrftoken') {
-      return jar[i].value;
-    }
-  }
-  return '';
-}
-
-exports.IonicTask = IonicTask;
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 8779ade1dd..bc590ddfcc 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -283,18 +283,6 @@ var TASKS = [
     name: 'address',
     module: './ionic/serve'
   },
-  {
-    title: 'app',
-    name: 'app',
-    // summary: 'Deploy a new Ionic app version or list versions',
-    // options: {
-    //   '--versions|-v': 'List recently uploaded versions of this app',
-    //   '--deploy|-d': 'Upload the current working copy and mark it as deployed',
-    //   '--note|-n': 'Add a note to a deploy',
-    //   '--uuid|-u': 'Mark an already uploaded version as deployed'
-    // },
-    module: './ionic/app'
-  },
   {
     title: 'io',
     name: 'io',

From 319f1cc41f9c20fbddbca306d4dafc2fab5cafc2 Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Fri, 1 Apr 2016 21:10:22 -0400
Subject: [PATCH 0943/1100] Default generators to Typescript according to
 config

---
 lib/ionic/generate.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 9c3311c4fc..b79460d00c 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     Utils = ionicAppLib.utils,
     logging = ionicAppLib.logging,
     Info = ionicAppLib.info;
+    Project =  ionicAppLib.project;
 
 var IonicTask = function() {};
 
@@ -21,10 +22,17 @@ IonicTask.prototype.run = function(ionic, argv) {
     if (!argv.v2) {
       return Utils.fail('Generators are only available for Ionic 2 projects');
     }
+	
+	var project;
+	try {
+		var project = Project.load(process.cwd());
+	} catch (err){
+		return Utils.fail(err);
+	}
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
-    var isTS = argv.ts;
+    var isTS = project.typescript || argv.ts;
 
     var ionicModule = loadToolingModule();
 

From ccf423e228e25f5368de978787c2d166b772332f Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Fri, 1 Apr 2016 21:12:32 -0400
Subject: [PATCH 0944/1100] Tabs to spaces.. again... thanks Notepad++

---
 lib/ionic/generate.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index b79460d00c..0a72752912 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -22,13 +22,13 @@ IonicTask.prototype.run = function(ionic, argv) {
     if (!argv.v2) {
       return Utils.fail('Generators are only available for Ionic 2 projects');
     }
-	
-	var project;
-	try {
-		var project = Project.load(process.cwd());
-	} catch (err){
-		return Utils.fail(err);
-	}
+  
+    var project;
+    try {
+      var project = Project.load(process.cwd());
+    } catch (err){
+      return Utils.fail(err);
+    }
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names

From a675e3b47376ac1b13379687009b8435ae4d36a2 Mon Sep 17 00:00:00 2001
From: andrewmcgivery <andrew@mcgivery.com>
Date: Fri, 1 Apr 2016 21:16:26 -0400
Subject: [PATCH 0945/1100] Removed double "var"

---
 lib/ionic/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 0a72752912..0f6c3b821c 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -25,7 +25,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   
     var project;
     try {
-      var project = Project.load(process.cwd());
+      project = Project.load(process.cwd());
     } catch (err){
       return Utils.fail(err);
     }

From 6e8c937aeb374aa0a749abee99119056704fc0b0 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 1 Apr 2016 21:00:01 -0500
Subject: [PATCH 0946/1100] chore(): replace console statements with logger

---
 lib/cli.js             | 156 +++++++++++++----------------------------
 lib/ionic/add.js       |  23 +++---
 lib/ionic/bower.js     |   2 +-
 lib/ionic/cordova.js   |  56 +++++++--------
 lib/ionic/docs.js      |  29 ++++----
 lib/ionic/generate.js  |   4 +-
 lib/ionic/hooks.js     |   6 +-
 lib/ionic/io-init.js   |   4 +-
 lib/ionic/ions.js      |  13 ++--
 lib/ionic/lib.js       |  57 +++++++--------
 lib/ionic/link.js      |  12 ++--
 lib/ionic/login.js     |  13 ++--
 lib/ionic/package.js   |  39 ++++++-----
 lib/ionic/push.js      |  39 ++++++-----
 lib/ionic/security.js  |  17 ++---
 lib/ionic/serve.js     |  12 ++--
 lib/ionic/service.js   |  41 +++++------
 lib/ionic/share.js     |   7 +-
 lib/ionic/start.js     |  12 ++--
 lib/ionic/state.js     |   3 +-
 lib/ionic/templates.js |  21 +++---
 lib/ionic/upload.js    |   5 +-
 spec/cli.spec.js       |   6 --
 23 files changed, 264 insertions(+), 313 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index ab9ca924b3..f9be2806bd 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -14,7 +14,8 @@ var Cli = module.exports,
     settings = require('../package.json'),
     Tasks = require('./tasks/cliTasks'),
     Utils = IonicAppLib.utils,
-    logging = IonicAppLib.logging,
+    Logging = IonicAppLib.logging,
+    log = Logging.logger,
     Q = require('q'),
     semver = require('semver'),
     gutil = require('gulp-util'),
@@ -28,7 +29,7 @@ Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
 // This is where the logger for the app-lib can be configured (or replaced).
-logging.logger.level = 'info';
+log.level = 'info';
 
 
 // Cli.dev = function dev() {
@@ -52,7 +53,6 @@ Cli.run = function run(processArgv) {
     //execute, grab those options, and reparse the arguments.
     var argv = optimist(processArgv.slice(2)).argv;
 
-    Cli.setUpConsoleLoggingHelpers();
     Cli.attachErrorHandling();
     Cli.checkLatestVersion();
 
@@ -74,7 +74,7 @@ Cli.run = function run(processArgv) {
     }
 
     if (argv.verbose) {
-      logging.logger.level = 'debug';
+      log.level = 'debug';
     }
 
     if(argv.help || argv.h) {
@@ -84,7 +84,7 @@ Cli.run = function run(processArgv) {
     if(argv['stats-opt-out']) {
       IonicConfig.set('statsOptOut', true);
       IonicConfig.save();
-      logging.logger.info('Successful stats opt-out');
+      log.info('Successful stats opt-out');
       return;
     } else {
       IonicStats.t();
@@ -94,7 +94,7 @@ Cli.run = function run(processArgv) {
     if(!taskSetting) {
       return Cli.printAvailableTasks();
     }
-    logging.logger.debug('Task setting:', taskSetting);
+    log.debug('Task setting:', taskSetting);
     var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
     argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
     var taskModule = Cli.lookupTask(taskSetting.module);
@@ -105,19 +105,18 @@ Cli.run = function run(processArgv) {
       var root = Utils.cdIonicRoot();
       var project = IonicProject.load(root);
       argv.v2 = project && project.get('v2');
-      argv.v2 && logging.logger.debug('Ionic 2 project.');
+      argv.v2 && log.debug('Ionic 2 project.');
 
       if (fs.existsSync('node_modules')) {
         //run with gulp hooks
         return runWithGulp(argv, taskInstance);
       } else if (argv.v2) {
-        console.warn('WARN: No node_modules directory found, do you need to run npm install?');
+        log.warn('WARN: No node_modules directory found, do you need to run npm install?');
       }
     }
     return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
 
   } catch (ex) {
-    logging.logger.debug('Cli.Run - Error', ex);
     return Utils.fail(ex);
   }
 };
@@ -128,20 +127,20 @@ function runWithGulp(argv, taskInstance){
   var afterHook = cmdName + ':after';
 
   if (loadGulpfile()) {
-    logging.logger.debug('Gulpfile found');
+    log.verbose('Gulpfile found');
 
     try {
       var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
     } catch(e) {
       // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-      console.error('\nGulpfile detected, but gulp is not installed');
-      console.error('Do you need to run `npm install`?\n');
+      log.error('\nGulpfile detected, but gulp is not installed');
+      log.error('Do you need to run `npm install`?\n');
       process.exit(1);
     }
     logEvents(gulp, [beforeHook, afterHook]);
 
     if (gulp.tasks[beforeHook]) {
-      console.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
+      log.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
     }
     return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
       function(){
@@ -152,17 +151,17 @@ function runWithGulp(argv, taskInstance){
         //if there is no hook task, but it's a v2 app and a command that usually needs a hook
         if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
           var taskName = (cmdName === 'serve') ? 'watch' : 'build';
-          console.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
+          log.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
 
           //The task exists, but there are no hooks for it
           //They have the old config file, so we're safe to yell at them
           //With new config, may intentionally not have hooks if running their own build
           if (gulp.tasks[taskName] && fs.existsSync('ionic.config.js')) {
-            console.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
-            console.log('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
-            console.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n');
+            log.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
+            log.info('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
+            log.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n');
           } else {
-            console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+            log.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
           }
         }
         // Only some commands return promises, so wrap it
@@ -170,7 +169,7 @@ function runWithGulp(argv, taskInstance){
       }
     ).then(function(){
       if (gulp.tasks[afterHook]) {
-        console.info('\nRunning \'' + afterHook + '\' gulp task after ' + cmdName);
+        log.info('\nRunning \'' + afterHook + '\' gulp task after ' + cmdName);
       }
       return Q.nfcall(gulp.start.bind(gulp), afterHook);
     });
@@ -178,15 +177,15 @@ function runWithGulp(argv, taskInstance){
 
   //No gulpfile
   if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
-    console.warn('WARN: No gulpfile found!');
-    console.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+    log.warn('WARN: No gulpfile found!');
+    log.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
 
     if (fs.existsSync('ionic.config.js')) {
       var inquirer = require('inquirer');
       var deferred = Q.defer();
 
-      console.info('Looks like you are using the deprecated ionic.config.js and have no gulpfile!');
-      console.info('As of beta.21 the Ionic CLI relies on gulp hooks to build your web assets\n');
+      log.info('Looks like you are using the deprecated ionic.config.js and have no gulpfile!');
+      log.info('As of beta.21 the Ionic CLI relies on gulp hooks to build your web assets\n');
       inquirer.prompt([{
         type: 'confirm',
         name: 'downloadGulp',
@@ -202,17 +201,17 @@ function runWithGulp(argv, taskInstance){
           return downloadDefaultGulpfile(cmdName).then(
             installGulpfilePackages,
             function(err) {
-              console.error('There was an error downloading the default gulpfile: ' + err);
+              log.error('There was an error downloading the default gulpfile: ' + err);
               process.exit(1);
             }
           ).then(
             function(){
-              console.success('Npm packages installed successfully. Try running \'' + cmdName + '\' again.');
+              log.info('Npm packages installed successfully. Try running \'' + cmdName + '\' again.');
             },
             function(){
-              console.warn('There was an error installing the packages required by the gulpfile.');
-              console.warn('You\'ll need to install the following packages manually: ');
-              console.warn('    ' + requires.join(' '));
+              log.warn('There was an error installing the packages required by the gulpfile.');
+              log.warn('You\'ll need to install the following packages manually: ');
+              log.warn('    ' + requires.join(' '));
             }
           );
         },
@@ -236,17 +235,17 @@ function loadGulpfile(){
     } catch(e){
       if (e.code === 'MODULE_NOT_FOUND') {
         if (e.message.indexOf(names[i]) === -1) {
-          console.log('Uh oh! Looks like you\'re missing a module in your gulpfile:');
-          console.error(e.message);
-          console.log('\nDo you need to run `npm install`?\n');
+          log.info('Uh oh! Looks like you\'re missing a module in your gulpfile:');
+          log.error(e.message);
+          log.info('\nDo you need to run `npm install`?\n');
           process.exit(1);
         } else {
           // ignore missing gulpfile
           continue
         }
       }
-      console.error('There is an error in your gulpfile: ')
-      console.error(e.stack);
+      log.error('There is an error in your gulpfile: ')
+      log.error(e.stack);
       process.exit(1);
     }
   }
@@ -261,7 +260,7 @@ function downloadDefaultGulpfile(){
   var branch = project.get('typescript') ? 'typescript' : 'master';
   var url = 'https://raw.githubusercontent.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
 
-  console.info('\nDownloading default gulpfile from: ' + url);
+  log.info('\nDownloading default gulpfile from: ' + url);
 
   fileStream.on('open', function () {
     https.get(url, function (res) {
@@ -285,14 +284,16 @@ function installGulpfilePackages(cmdName){
   var requires = detective(fs.readFileSync('gulpfile.js'));
   var deferred = Q.defer();
 
-  console.success('Successfully downloaded gulpfile.\n');
-  console.info('Now installing npm packages used by the gulpfile: ');
-  console.info('    ' + requires.join(' ') + '\n');
+  log.info('Successfully downloaded gulpfile.\n'.green);
+  log.info('Now installing npm packages used by the gulpfile: ');
+  log.info('    ' + requires.join(' ') + '\n');
 
   var npmInstall = require('child_process').spawn('npm', ['install', '--save-dev'].concat(requires));
-  npmInstall.stdout.on('data', function(data){ logging.logger.debug(data) });
-  npmInstall.stderr.on('data', function(data){ logging.logger.debug(data) });
-  npmInstall.on('error', function(err) { console.error(err) });
+  npmInstall.stdout.on('data', function(data){ log.debug(data) });
+  npmInstall.stderr.on('data', function(data){ log.debug(data) });
+  npmInstall.on('error', function(err) {
+    log.error('Error in gulp npm install: ' + err.stack);
+  });
   npmInstall.on('exit', function(code) {
     code !== 0 ? deferred.reject() : deferred.resolve();
   });
@@ -315,7 +316,7 @@ function logEvents(gulpInst, finalTaskNames) {
       'after', time.magenta
     );
     if (finalTaskNames.indexOf(e.task) > -1) {
-      console.log();
+      log.info();
     }
   });
 
@@ -380,64 +381,6 @@ Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
   return booleanOptions;
 };
 
-Cli.setUpConsoleLoggingHelpers = function setUpConsoleLoggingHelpers() {
-  colors.setTheme({
-    silly: 'rainbow',
-    input: 'grey',
-    small: 'grey',
-    verbose: 'cyan',
-    prompt: ['yellow', 'bold'],
-    info: 'white',
-    data: 'grey',
-    help: 'cyan',
-    warn: 'yellow',
-    debug: 'blue',
-    error: 'red'
-  });
-
-  var consoleInfo = console.info;
-  console.info = function() {
-    if (arguments.length === 1 && !arguments[0]) return;
-    var msg = '';
-    for (var n in arguments) {
-      msg += arguments[n] + ' ';
-    }
-    consoleInfo.call(console, msg.cyan.bold);
-  };
-
-  var consoleWarn = console.warn;
-  console.warn = function() {
-    if (arguments.length === 1 && !arguments[0]) return;
-    var msg = '';
-    for (var n in arguments) {
-      msg += arguments[n] + ' ';
-    }
-    consoleWarn.call(console, msg.yellow.bold);
-  };
-
-  var consoleError = console.error;
-  console.error = function() {
-    if (arguments.length === 1 && !arguments[0]) return;
-    var msg = ' ✗';
-    for (var n in arguments) {
-      msg += ' ' + arguments[n];
-    }
-    consoleError.call(console, msg.red.bold);
-  };
-
-  console.success = function() {
-    if (arguments.length === 1 && !arguments[0]) return;
-    var msg = ' ✓';
-    for (var n in arguments) {
-      msg += ' ' + arguments[n];
-    }
-    console.log(msg.green.bold);
-  };
-
-  //Default level is set to 'info'
-  IonicAppLib.logging.createDefaultLogger();
-};
-
 Cli.lookupTask = function lookupTask(module) {
   try {
     var taskModule = require(module).IonicTask;
@@ -694,7 +637,7 @@ Cli.processExit = function processExit(code) {
 };
 
 Cli.version = function version() {
-  console.log(settings.version + '\n');
+  log.info(settings.version + '\n');
 };
 
 Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
@@ -736,11 +679,8 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
         }
         process.stdout.write('+---------------------------------------------------------+\n'.green);
       } catch(ex) {
-        console.log('ex', ex.stack);
         q.reject('Error occurred in downloading the CLI messages:', ex)
         Utils.fail(ex);
-        q.reject(ex);
-        return
       }
       q.resolve(messagesJson);
     } else {
@@ -780,17 +720,17 @@ Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
 Cli.attachErrorHandling = function attachErrorHandling() {
   Utils.errorHandler = function errorHandler(msg, taskHelp) {
     try {
-      logging.logger.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
+      log.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       if (msg) {
         var info = Cli.gatherInfo();
         var ionicCliVersion = info.ionic_cli;
         if (stack && stack.length > 0) {
-          process.stderr.write('\n' + stack.error.bold + '\n\n');
+          process.stderr.write('\n' + stack.bold + '\n\n');
         }
-        process.stderr.write('\n' + errorMessage.error.bold);
-        process.stderr.write( (' (CLI v' + ionicCliVersion + ')').error.bold + '\n');
+        process.stderr.write('\n' + errorMessage.bold);
+        process.stderr.write( (' (CLI v' + ionicCliVersion + ')').bold + '\n');
 
         Info.printInfo(info);
       }
@@ -828,7 +768,7 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
   try {
     versionHasBeenChecked = semver.satisfies(version, lastVersionChecked);
   } catch (ex) {
-    console.log(ex);
+    log.info(ex);
   }
 
   if (!lastVersionChecked || !versionHasBeenChecked) {
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index a4274765b7..27c0f41b22 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -4,7 +4,9 @@ var Task = require('./task').Task,
     IonicCordova = require('./cordova').IonicTask,
     // argv = require('optimist').argv,
     fs = require('fs'),
-    ioLib = require('ionic-app-lib').ioConfig,
+    IonicAppLib = require('ionic-app-lib'),
+    ioLib = IonicAppLib.ioConfig,
+    log = IonicAppLib.logging.logger,
     path = require('path'),
     bower = require('./bower');
 
@@ -19,12 +21,11 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(compo
 
   if (result.code != 0) {
     //Error happened, report it.
-    var errorMessage = 'Bower error, check that "'.error.bold + componentName.verbose + '"'.error.bold + ' exists,'.error.bold + 
-                       '\nor try running "'.error.bold + bowerInstallCommand.verbose + '" for more info.'.error.bold;
+    var errorMessage = 'Bower error, check that "'.red.bold + componentName.verbose + '"'.red.bold + ' exists,'.red.bold +
+                       '\nor try running "'.red.bold + bowerInstallCommand.verbose + '" for more info.'.red.bold;
     this.ionic.fail(errorMessage, 'add');
   } else {
-    var message = 'Bower component installed - ' + componentName;
-    console.log(message.green)
+    log.info('Bower component installed - ' + componentName)
   }
 }
 
@@ -34,23 +35,23 @@ IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(c
   var result = exec(bowerUninstallCommand);
 
   if (result.code != 0) {
-    var errorMessage = 'Failed to find the bower component "'.error.bold + componentName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose + '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
     this.ionic.fail(errorMessage, 'add')
   } else {
     var message = 'Bower component removed - ' + componentName;
-    console.log(message.red);
+    log.info(message.red);
   }
 }
 
 IonicTask.prototype.listComponents = function listComponents() {
   try {
     var bowerJson = require(path.join(process.cwd(), 'bower.json'));
-    console.log('Ions, bower components, or addons installed: '.info)
+    log.info('Ions, bower components, or addons installed: ')
     for (var bowerCompIndex in bowerJson.devDependencies) {
-      console.log(bowerCompIndex.green);
+      log.info(bowerCompIndex.green);
     }
-  }catch(ex) {
-    console.log('This command can only be used when in an Ionic project directory'.red.bold);
+  } catch(ex) {
+    log.error('This command can only be used when in an Ionic project directory'.red.bold);
   }
 }
 
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index 3c6657c23d..f22b2aee1a 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -39,7 +39,7 @@ exports.IonicBower = {
       var bowerFilePath = path.resolve('bower.json');
       fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
     } catch (e) {
-      console.log(('Error saving ' + bowerFilePath + ': ' + e).error.bold);
+      console.log(('Error saving ' + bowerFilePath + ': ' + e).red.bold);
     }
   },
 
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 0bd527a4cd..c106bfbdb7 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -13,7 +13,7 @@ var Task = require('./task').Task,
     Hooks = IonicAppLib.hooks,
     State = IonicAppLib.state,
     Utils = IonicAppLib.utils,
-    Logging = IonicAppLib.logging,
+    log = IonicAppLib.logging.logger,
     Serve = IonicAppLib.serve,
     IonicProject = IonicAppLib.project;
 
@@ -34,7 +34,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     if (argv._.indexOf('run') != -1 || argv._.indexOf('build') != -1 || argv._.indexOf('emulate') != -1) {
 
       if (runPlatform == 'ios' && os.platform() !== 'darwin') {
-        return Logging.logger.info('✗ You cannot run iOS unless you are on Mac OSX.'.red);
+        return log.error('✗ You cannot run iOS unless you are on Mac OSX.');
       }
 
       var runPlatform = argv._[1] || 'ios',
@@ -43,14 +43,14 @@ IonicTask.prototype.run = function(ionic, argv) {
 
       if (!platformInstalled) {
         var notInstalledMsg = ['• You\'re trying to build for ', runPlatform, ', but don\'t have the platform installed yet.'].join('').yellow,
-          installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join('').blue,
-          installedMessage = ['√ Installed platform ', runPlatform].join('').green,
+          installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join(''),
+          installedMessage = ['√ Installed platform ', runPlatform].join(''),
           installCmd = 'cordova platform add ' + runPlatform;
-        Logging.logger.info(notInstalledMsg);
-        Logging.logger.info(installingMsg);
-        // Logging.logger.info(installCmd);
+        log.info(notInstalledMsg);
+        log.info(installingMsg);
+        // log.info(installCmd);
         shelljs.exec(installCmd);
-        Logging.logger.info(installedMessage);
+        log.info(installedMessage);
       }
 
       if (!pluginsInstalled) {
@@ -73,7 +73,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
 
     // if (isAddCmd || isRmCmd) {
-    //   console.log('this this this', isAddCmd, isRmCmd)
+    //   ('this this this', isAddCmd, isRmCmd)
     //   Hooks.setHooksPermission(process.cwd());
     // }
 
@@ -95,7 +95,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       ];
 
       plugins.forEach(function(plugin) {
-        Logging.logger.info(['Installing ', plugin].join('').blue);
+        log.info(['Installing ', plugin].join(''));
         shelljs.exec('cordova plugin add --save' + plugin);
       });
     })
@@ -134,13 +134,13 @@ IonicTask.prototype.run = function(ionic, argv) {
       var argumentName = argv._[2];
       if (isPlatformCmd && isAddCmd) {
         addDefaultResources = true;
-        console.log('Saving platform to package.json file'.blue)
+        log.info('Saving platform to package.json file')
         return State.savePlatform(process.cwd(), argumentName);
       } else if (isPlatformCmd && isRmCmd) {
-        console.log('Removing platform from package.json file'.blue)
+        log.info('Removing platform from package.json file')
         return State.removePlatform(process.cwd(), argumentName);
       } else if (isPluginCmd && isAddCmd) {
-        console.log('Saving plugin to package.json file'.blue)
+        log.info('Saving plugin to package.json file')
         var variables;
         if (argv.variable && (typeof argv.variable == 'string')) {
           variables = [argv.variable];
@@ -149,13 +149,13 @@ IonicTask.prototype.run = function(ionic, argv) {
         }
         return State.savePlugin(process.cwd(), argumentName, variables);
       } else if (isPluginCmd && isRmCmd) {
-        console.log('Removing plugin from package.json file'.blue)
+        log.info('Removing plugin from package.json file')
         return State.removePlugin(process.cwd(), argumentName);
       }
     })
     .catch(function(ex) {
-      console.log('Error happened', ex)
-      console.log(ex.stack);
+      log.error('Error happened', ex)
+      log.error(ex.stack);
       throw ex;
     });
   } catch (ex) {
@@ -228,9 +228,9 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   }
   var cordovaIsInstalled = Utils.cordovaInstalled();
 
-  Logging.logger.debug('Cordova is installed:', cordovaIsInstalled);
+  log.debug('Cordova is installed:', cordovaIsInstalled);
   if (!cordovaIsInstalled) {
-    Logging.logger.debug('Executing cordova without CLI: ' + cleanArgs);
+    log.debug('Executing cordova without CLI: ' + cleanArgs);
     //If no cordova CLI is installed, fall back to local cordova-lib.
     //TODO: Add ability to be smart = only use this if cordova CLI is not installed.
     //TODO: Enable passing variables with the plugins
@@ -259,20 +259,20 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
       }
 
       return promise.then(function(result) {
-        Logging.logger.info('cleanArgs[0]', cleanArgs[0], 'completed');
-        Logging.logger.debug('Result from cordova-lib:', result);
+        log.info('cleanArgs[0]', cleanArgs[0], 'completed');
+        log.debug('Result from cordova-lib:', result);
         deferred.resolve(result);
       })
       .catch(function(ex) {
         deferred.reject(ex);
       });
     } catch (ex) {
-      Logging.logger.error('An Error occurred trying to fall back to Cordova-lib execution:', ex);
+      log.error('An Error occurred trying to fall back to Cordova-lib execution:', ex);
       throw ex;
     }
   }
 
-  Logging.logger.debug('Executing cordova cli: ' + cleanArgs.join(' '));
+  log.debug('Executing cordova cli: ' + cleanArgs.join(' '));
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
 
   cordovaProcess.stdout.on('data', function (data) {
@@ -281,7 +281,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 
   cordovaProcess.stderr.on('data', function (data) {
     if(data) {
-      process.stderr.write(data.toString().error.bold);
+      process.stderr.write(data.toString().bold);
     }
   });
 
@@ -335,7 +335,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 IonicTask.prototype.setupLiveReload = function(argv) {
   var d = Q.defer();
 
-  console.log('Setup Live Reload'.green.bold);
+  log.info('Setup Live Reload'.green.bold);
 
   var project = null;
 
@@ -343,7 +343,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     var cwd = process.cwd();
     project = IonicProject.load(cwd);
   } catch (ex) {
-    console.log('Error occured', ex);
+    log.info('Error occured', ex);
     return Utils.fail(ex.message);
   }
 
@@ -364,7 +364,7 @@ IonicTask.prototype.setupLiveReload = function(argv) {
 
   if (argv.all) {
     promise = Q();
-    console.log('Defaulting address to 0.0.0.0');
+    log.info('Defaulting address to 0.0.0.0');
     options.address = '0.0.0.0';
   } else if (argv.address) {
     options.address = argv.address;
@@ -396,8 +396,8 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     return options;
   })
   .catch(function(error) {
-    console.log('There was an error serving your Ionic application for run', error);
-    console.log(error.stack);
+    log.info('There was an error serving your Ionic application for run', error);
+    log.info(error.stack);
     throw error;
   });
 };
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 858f28ea15..4856cf9441 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -7,6 +7,7 @@ var fs = require('fs'),
     _ = require('underscore'),
     IonicInfo = require('./info').IonicTask,
     IonicDocs = require('./resources/docs.json'),
+    log = require('ionic-app-lib').logging.logger,
     COLUMN_LIMIT = 3;
 
 
@@ -25,7 +26,7 @@ Docs.list = function list() {
     var Table = require('cli-table');
     var docsList = IonicDocs.api;
     // var i = 0;
-    console.log('Help Topics'.yellow);
+    log.info('Help Topics'.yellow);
     _.each(docsList, function(doc) {
       var table = new Table({ head: [doc.id] });
       var count = 0;
@@ -41,13 +42,13 @@ Docs.list = function list() {
         count++;
       });
       table.push(row);
-      console.log(table.toString());
+      log.info(table.toString());
     });
 
   } catch (ex) {
-    console.log('Error listing docs:', ex);
+    log.error('Error listing docs:', ex);
   }
-  console.log('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold);
+  log.info('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold);
 };
 
 Docs.openDefault = function openDefault() {
@@ -59,17 +60,17 @@ Docs.openDefault = function openDefault() {
   var url = 'http://ionicframework.com/docs/';
   if (ionicVersion) {
     url += ionicVersion + '/api';
-    console.log('Ionic version:', ionicVersion);
+    log.info('Ionic version:', ionicVersion);
   }
   return require('open')(sanitizeUrl(url));
 };
 
 Docs.lookUpCommand = function lookUpCommand(helpDoc) {
-  // console.log('Going thru doc commands', helpDoc)
+  // log.info('Going thru doc commands', helpDoc)
   //Go through all the different help topics
   var docsList = IonicDocs.api;
-  helpDoc = helpDoc.replace(/-[a-zA-Z]/g, function(match) { 
-    return match[1].toUpperCase(); 
+  helpDoc = helpDoc.replace(/-[a-zA-Z]/g, function(match) {
+    return match[1].toUpperCase();
   });
 
   var docs = _.map(docsList, function(doc) {
@@ -85,7 +86,7 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
   var match = _.find(docs, { doc: helpDoc }) || _.find(docs, { doc: '$' + helpDoc});
   if (match) {
     return openDoc(match.topic, match.doc);
-  
+
   } else if (helpDoc.length >= 3) {
 
     var lowerHelp = helpDoc.toLowerCase();
@@ -100,7 +101,7 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
       })
       .slice(0,3);
 
-    if (matches.length === 0) return console.log('No matching docs found for "' + helpDoc.cyan + '".');
+    if (matches.length === 0) return log.info('No matching docs found for "' + helpDoc.cyan + '".');
 
     prompt.message = 'Did you mean ';
     if (matches.length > 1) {
@@ -143,7 +144,7 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
 
   function openDoc(topic, doc) {
     var url = sanitizeUrl('http://ionicframework.com/docs/api/' + topic + '/' + doc);
-    console.log('Opening Ionic document:'.green.bold, url.green.bold);
+    log.info('Opening Ionic document:'.green.bold, url.green.bold);
     return require('open')(url);
   }
 };
@@ -153,15 +154,15 @@ IonicTask.prototype.run = function run(ionic) {
   this.ionic = ionic;
 
   var docCmd = argv._[1];
-  // console.log('docCmd', docCmd);
+  // log.info('docCmd', docCmd);
 
   if(docCmd == 'ls') {
     Docs.list();
   } else if (!docCmd) {
-    // console.log('openDefault')
+    // log.info('openDefault')
     Docs.openDefault();
   } else {
-    // console.log('look up command', docCmd)
+    // log.info('look up command', docCmd)
     //Look up what it was
     Docs.lookUpCommand(docCmd);
   }
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 0b2329a5c2..c3cb2faaa9 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -4,7 +4,7 @@ var fs = require('fs'),
     ionicAppLib = require('ionic-app-lib'),
     Q = require('q'),
     Utils = ionicAppLib.utils,
-    logging = ionicAppLib.logging,
+    log = ionicAppLib.logging.logger,
     Info = ionicAppLib.info;
 
 var IonicTask = function() {};
@@ -37,7 +37,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
     } catch (err) {
       if (err.message.indexOf('no generator available') != -1) {
-        console.log('✗ '.red + err.message.red);
+        log.error(err.message);
         ionicModule.Generate.printAvailableGenerators();
         return
       }
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 169a064161..9b60e03cba 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -6,6 +6,7 @@ var fs = require('fs'),
     Task = require('./task').Task,
     IonicInfo = require('./info').IonicTask,
     IonicAppLib = require('ionic-app-lib'),
+    log = IonicAppLib.logging.logger,
     Hooks = IonicAppLib.hooks;
 
 shelljs.config.silent = true;
@@ -15,7 +16,6 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic) {
-  var self = this;
   this.ionic = ionic;
 
   var cmd = argv._[1];
@@ -33,10 +33,10 @@ IonicTask.prototype.run = function run(ionic) {
         Hooks.setHooksPermission(process.cwd());
         break;
       default:
-        console.log('Please supply a command - either add or remove'.red.bold);
+        log.error('Please supply a command - either add or remove');
     }
   } catch (ex) {
-    console.log('error:', ex, ex.stack);
+    log.error('There was an error running the hooks command: ', ex.stack);
   }
 
 };
diff --git a/lib/ionic/io-init.js b/lib/ionic/io-init.js
index 023a024dee..866465652b 100644
--- a/lib/ionic/io-init.js
+++ b/lib/ionic/io-init.js
@@ -3,6 +3,7 @@ var IonicAppLib = require('ionic-app-lib'),
     argv = require('optimist').argv,
     prompt = require('prompt'),
     IonicProject = IonicAppLib.project,
+    log = IonicAppLib.logging.logger,
     IonicTask = require('./task').IonicTask,
     Task = require('./task').Task,
     Login = IonicAppLib.login,
@@ -29,7 +30,7 @@ IonicTask.prototype.run = function(ionic) {
   Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
-      console.log('No previous login existed. Attempting to log in now.');
+      log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
     }
     return jar;
@@ -42,7 +43,6 @@ IonicTask.prototype.run = function(ionic) {
     }
   })
   .catch(function(ex) {
-    console.log('Error', ex, ex.stack);
     Utils.fail(ex);
   });
 };
diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
index 7ed8fdb90f..6464ed3ff0 100644
--- a/lib/ionic/ions.js
+++ b/lib/ionic/ions.js
@@ -1,5 +1,6 @@
 var argv = require('optimist').argv,
     IonicProject = require('./project'),
+    log = require('ionic-app-lib').logging.logger,
     Task = require('./task').Task,
     _ = require('underscore');
 
@@ -36,9 +37,9 @@ var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
-  console.log('Ionic Ions - ions power your app to be awesome.');
-  console.log('A curated collection of useful addons, components, and ux interactions for extending ionic.')
-  console.log('\n')
+  log.info('Ionic Ions - ions power your app to be awesome.');
+  log.info('A curated collection of useful addons, components, and ux interactions for extending ionic.')
+  log.info('\n')
 
   _.each(ions, function(ion) {
 
@@ -54,10 +55,10 @@ IonicTask.prototype.run = function(ionic) {
       dots += '.';
     }
 
-    // Header Shrink ... A shrinking header effect like Facebook\'s .. 
+    // Header Shrink ... A shrinking header effect like Facebook\'s ..
     var installStr = ['\'ionic add ', ion.ion, '\''].join('')
-    console.log(ion.name, dots, installStr)
-    console.log(ion.description, '\n')
+    log.info(ion.name, dots, installStr)
+    log.info(ion.description, '\n')
   })
 }
 
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 2c7c53fe45..15223b933a 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     colors = require('colors'),
     exec = require('child_process').exec,
     Q = require('q'),
+    log = require('ionic-app-lib').logging.logger,
     Task = require('./task').Task;
 
 var IonicTask = function() {};
@@ -47,7 +48,7 @@ IonicTask.prototype.loadVersionData = function() {
   try {
     this.local = require(this.versionFilePath);
   } catch(e) {
-    console.log('Unable to load ionic lib version information'.bold.error);
+    log.error('Unable to load ionic lib version information');
   }
 };
 
@@ -55,15 +56,15 @@ IonicTask.prototype.loadVersionData = function() {
 IonicTask.prototype.printLibVersions = function() {
   var self = this;
 
-  console.log('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
+  log.info('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
 
   this.getVersionData('latest').then(function(){
-    console.log('Latest Ionic version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+    log.info('Latest Ionic version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
 
     if(self.local.version != self.versionData.version_number) {
-      console.log(' * Local version is out of date'.yellow );
+      log.info(' * Local version is out of date'.yellow );
     } else {
-      console.log(' * Local version up to date'.green );
+      log.info(' * Local version up to date'.green );
     }
   });
 };
@@ -84,17 +85,17 @@ IonicTask.prototype.getVersionData = function(version) {
   request({ url: url, proxy: proxy }, function(err, res, body) {
     try {
       if(err || !res || !body) {
-        console.log('Unable to receive version data');
+        log.error('Unable to receive version data');
         q.reject();
         return;
       }
       if(res.statusCode == 404) {
-        console.log( ('Invalid version: ' + version).bold.red );
+        log.error('Invalid version: ' + version);
         q.reject();
         return;
       }
       if(res.statusCode >= 400) {
-        console.log('Unable to load version data');
+        log.error('Unable to load version data');
         q.reject();
         return;
       }
@@ -105,7 +106,7 @@ IonicTask.prototype.getVersionData = function(version) {
 
       q.resolve();
     } catch(e) {
-      console.log('Error loading '.bold.error + version.bold + ' version information'.bold.error );
+      log.error('Error loading ' + version.bold + ' version information');
       q.reject();
     }
   });
@@ -126,7 +127,7 @@ IonicTask.prototype.updateLibVersion = function() {
 
     bowerCmd.stderr.on('data', function (data) {
       if(data) {
-        process.stderr.write(data.toString().error.bold);
+        process.stderr.write(data.toString().red.bold);
       }
     });
 
@@ -139,7 +140,7 @@ IonicTask.prototype.updateLibVersion = function() {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  console.log('Are you sure you want to replace '.green.bold + libPath.bold + ' with an updated version of Ionic?'.green.bold);
+  log.info('Are you sure you want to replace '.green.bold + libPath.bold + ' with an updated version of Ionic?'.green.bold);
 
   var promptProperties = {
     areYouSure: {
@@ -151,7 +152,7 @@ IonicTask.prototype.updateLibVersion = function() {
 
   prompt.get({properties: promptProperties}, function (err, promptResult) {
     if(err) {
-      return console.log(err);
+      return log.error(err);
     }
 
     var areYouSure = promptResult.areYouSure.toLowerCase().trim();
@@ -182,9 +183,9 @@ IonicTask.prototype.getLatest = function() {
 
   this.getVersionData(version).then(function(){
     if(version == 'latest') {
-      console.log('Latest version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+      log.info('Latest version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
     } else {
-      console.log('Version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+      log.info('Version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
     }
     self.downloadZip(self.versionData.version_number);
   });
@@ -204,27 +205,27 @@ IonicTask.prototype.downloadZip = function(version) {
     fs.mkdirSync(self.tmpExtractPath);
   }
 
-  console.log('Downloading: '.green.bold + archivePath);
+  log.info('Downloading: '.green.bold + archivePath);
 
   var proxy = process.env.PROXY || null;
   request({ url: archivePath, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
     if(err) {
-      console.log(err);
+      log.error(err);
       return;
     }
     if(res.statusCode == 404 || res.statusCode == 406) {
-      console.log( ('Invalid version: ' + version).bold.red );
+      log.error('Invalid version: ' + version);
       return;
     }
     if(res.statusCode >= 400) {
-      console.log('Unable to download zip (' + res.statusCode + ')');
+      log.error('Unable to download zip (' + res.statusCode + ')');
       return;
     }
     try {
       fs.writeFileSync(self.tmpZipPath, body);
       self.updateFiles();
     } catch(e) {
-      console.error(e);
+      log.error(e);
     }
   }).on('response', function(res){
 
@@ -246,9 +247,9 @@ IonicTask.prototype.downloadZip = function(version) {
     try {
       fs.unlink(self.tmpZipPath);
     } catch(e) {
-      console.error(e);
+      log.error(e);
     }
-    console.error(err);
+    log.error(err);
   });
 
 };
@@ -261,7 +262,7 @@ IonicTask.prototype.updateFiles = function(version) {
   try {
     var readStream = fs.createReadStream(self.tmpZipPath);
     readStream.on('error', function(err) {
-      console.log( ('updateFiles readStream: ' + err).error );
+      log.debug('updateFiles readStream error: ' + err);
     });
 
     var writeStream = unzip.Extract({ path: self.tmpExtractPath });
@@ -279,7 +280,7 @@ IonicTask.prototype.updateFiles = function(version) {
           }
         }
         if(!copyFrom) {
-          console.log('updateFiles, invalid zip');
+          log.error('updateFiles, invalid zip');
           return;
         }
 
@@ -297,7 +298,7 @@ IonicTask.prototype.updateFiles = function(version) {
           rm('-rf', path.join(ionicLibDir, 'bower.json'));
         } catch(e){}
 
-        console.log('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
+        log.info('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
 
         self.writeVersionData();
 
@@ -305,16 +306,16 @@ IonicTask.prototype.updateFiles = function(version) {
         ionicBower.setIonicVersion(self.versionData.version_number);
 
       } catch(e){
-        console.log('updateFiles Error: ' + e);
+        log.error('updateFiles Error: ' + e);
       }
     });
     writeStream.on('error', function(err) {
-      console.log( ('updateFiles writeStream: ' + err).error );
+      log.error('updateFiles writeStream: ' + err);
     });
     readStream.pipe(writeStream);
 
   } catch(e) {
-    console.log('updateFiles Error: ' + e);
+    log.error('updateFiles Error: ' + e);
   }
 
 };
@@ -331,7 +332,7 @@ IonicTask.prototype.writeVersionData = function() {
                       JSON.stringify(versionData, null, 2) );
 
   } catch(e) {
-    console.log( ('Error writing version data: ' + e).error.bold );
+    log.error('Error writing version data: ' + e);
   }
 };
 
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 7330d65b98..68659e26b6 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,7 +1,9 @@
 var fs = require('fs'),
     path = require('path'),
     argv = require('optimist').argv,
-    IonicProject = require('ionic-app-lib').project,
+    IonicAppLib = require('ionic-app-lib'),
+    log = IonicAppLib.logging.logger,
+    IonicProject = IonicAppLib.project,
     Task = require('./task').Task;
 
 var IonicTask = function() {};
@@ -15,22 +17,22 @@ IonicTask.prototype.run = function run(ionic) {
   var ionicProjectFile = path.resolve('.', 'ionic.project');
 
   if(!fs.existsSync(ionicProjectFile)) {
-    console.log('You cannot run this command unless you are in an Ionic Project folder'.red.bold)
+    log.error('You cannot run this command unless you are in an Ionic Project folder');
     return
   }
 
   if(!argv._[1] && !argv.reset) {
-    console.log('Please supply an Ionic App ID with this command or pass the --reset option'.red.bold);
+    log.error('Please supply an Ionic App ID with this command or pass the --reset option');
     return
   }
 
   if(argv.reset || argv.r) {
     this.setAppId('')
   } else {
-    this.setAppId(argv._[1]);  
+    this.setAppId(argv._[1]);
   }
 
-  console.log('Your Ionic App ID was set'.green)
+  log.info('Your Ionic App ID was set'.green);
 
 }
 
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index e6fee59f41..3fb66bcfbe 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,6 +1,7 @@
 var IonicAppLib = require('ionic-app-lib'),
     IonicStore = require('./store').IonicStore,
     Login = IonicAppLib.login,
+    log = IonicAppLib.logging.logger,
     prompt = require('prompt'),
     Q = require('q'),
     settings = IonicAppLib.settings,
@@ -31,14 +32,14 @@ LoginTask.login = function login(argv) {
     return Login.requestLogIn(loginInfo.email, loginInfo.password, true);
   })
   .then(function(cookieJar) {
-    console.log('Logged in! :)'.green);
+    log.info.log('Logged in! :)'.green);
     return cookieJar;
   })
   .catch(function(ex) {
-    console.log('Error logging in');
+    log.error('Error logging in');
     throw ex;
-    // console.log(ex);
-    // console.log(ex.stack);
+    // log.info(ex);
+    // log.info(ex.stack);
   });
 };
 
@@ -63,8 +64,8 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
   }];
 
   // prompt for log
-  console.log('\nTo continue, please login to your Ionic account.'.bold.green);
-  console.log('Don\'t have one? Create one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
+  log.info('\nTo continue, please login to your Ionic account.'.bold.green);
+  log.info('Don\'t have one? Create one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
 
   prompt.override = argv;
   prompt.message = '';
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 8eb74f9296..ea4e38b1dd 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -8,6 +8,7 @@ var fs = require('fs'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
+    log = IonicAppLib.logging.logger,
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
     Table = require('./table'),
@@ -77,7 +78,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -144,7 +145,7 @@ function packageList(ionic, argv, dir, project, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -154,8 +155,8 @@ function packageList(ionic, argv, dir, project, appId) {
     })
     .then(function(body) {
       if (body.data.length === 0) {
-        console.log('You don\'t have any builds yet!');
-        console.log('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
+        log.info('You don\'t have any builds yet!');
+        log.info('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
       } else {
         var count = 0,
             headers = ['id', 'status', 'platform', 'mode'],
@@ -193,10 +194,10 @@ function packageList(ionic, argv, dir, project, appId) {
           table.push(row);
         });
 
-        console.log('');
-        console.log(table.toString());
-        console.log('\nShowing', String(count).yellow, 'of your latest builds.');
-        console.log('');
+        log.info('');
+        log.info(table.toString());
+        log.info('\nShowing', String(count).yellow, 'of your latest builds.');
+        log.info('');
       }
     })
     .catch(function(ex) {
@@ -212,7 +213,7 @@ function packageInfo(ionic, argv, dir, project, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -245,15 +246,15 @@ function packageInfo(ionic, argv, dir, project, appId) {
         table.push(['completed'.yellow, formatDate(build.completed)]);
       }
 
-      console.log('');
-      console.log(table.toString());
-      console.log('');
+      log.info('');
+      log.info(table.toString());
+      log.info('');
 
       if (build.output) {
-        console.log('output'.yellow + ':');
-        console.log('');
-        console.log(build.output);
-        console.log('');
+        log.info('output'.yellow + ':');
+        log.info('');
+        log.info(build.output);
+        log.info('');
       }
 
     })
@@ -282,7 +283,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -304,8 +305,8 @@ function packageDownload(ionic, argv, dir, project, appId) {
         bar.tick(bar.total);
       }
 
-      console.log('Wrote:', filename);
-      console.success('Done!'.green);
+      log.info('Wrote:', filename);
+      log.info('Done!'.green);
     }, null, function(state) {
       if (typeof bar === 'undefined') {
         bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index caf322d5ed..d38e0b87e0 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -10,6 +10,7 @@ var fs = require('fs'),
     IonicAppLib = require('ionic-app-lib'),
     IonicProject = IonicAppLib.project,
     Login = IonicAppLib.login,
+    log = IonicAppLib.logging.logger,
     LoginTask = require('./login');
     // IonicLoginTask = require('./login').IonicTask;
 
@@ -29,7 +30,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
-      console.log('No previous login existed. Attempting to log in now.');
+      log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
     }
     return jar;
@@ -41,7 +42,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       if (argv._[2]) {
         self.set_webhook_url(self, argv._[2].trim());
       } else {
-        console.log('You need to specify a webhook url!'.bold.red);
+        log.error('You need to specify a webhook url!'.bold.red);
       }
     } else if (argv['google-api-key']) {
       self.set_google_api_key(self, argv['google-api-key'].trim());
@@ -59,7 +60,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     }
   })
   .catch(function(ex) {
-    console.log('An error occurred', ex);
+    log.error('An error occurred', ex);
   })
 
 };
@@ -68,7 +69,7 @@ IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    console.log("You need to upload your app first!".bold.red);
+    log.error("You need to upload your app first!".bold.red);
     return false;
   }
 
@@ -97,7 +98,7 @@ IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
         }
 
         if (response.statusCode == '200') {
-          console.log("Webhook URL set to", webhook_url);
+          log.info("Webhook URL set to", webhook_url);
         } else {
           return self.ionic.fail('App not found');
         }
@@ -113,7 +114,7 @@ IonicTask.prototype.set_google_api_key = function(self, google_api_key) {
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    console.log("You need to upload your app first!".bold.red);
+    log.error("You need to upload your app first!".bold.red);
     return false;
   }
 
@@ -142,7 +143,7 @@ IonicTask.prototype.set_google_api_key = function(self, google_api_key) {
         }
 
         if (response.statusCode == '200') {
-          console.log("Google API Key Saved".green);
+          log.info("Google API Key Saved".green);
         } else {
           return self.ionic.fail('App not found');
         }
@@ -158,7 +159,7 @@ IonicTask.prototype.send_push = function(self) {
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    console.log("You need to upload your app first!".bold.red);
+    log.error("You need to upload your app first!".bold.red);
     return false;
   }
 
@@ -234,9 +235,9 @@ IonicTask.prototype.send_push = function(self) {
 
     request(options, function(err, response, body) {
       if (!err && response.statusCode == 202) {
-        console.log("Successfully queued push notification");
+        log.info("Successfully queued push notification");
       } else {
-        console.log("Error queueing push notification", err);
+        log.error("Error queueing push notification", err);
       }
     });
   });
@@ -247,19 +248,19 @@ IonicTask.prototype.set_production_mode = function(self) {
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    console.log("You need to upload your app first!".bold.red);
+    log.error("You need to upload your app first!".bold.red);
     return false;
   }
 
   if (self.inputValues['production-mode'] === true) {
-    console.log("You need to specify a value [y/n] to set the production mode!".bold.red);
+    log.error("You need to specify a value [y/n] to set the production mode!".bold.red);
     return false;
   }
 
   self.inputValues['production-mode'] = self.inputValues['production-mode'].toLowerCase();
 
   if (self.inputValues['production-mode'] != 'y' && self.inputValues['production-mode'] != 'n') {
-    console.log("You need to specify a value [y/n] to set the production mode!".bold.red);
+    log.error("You need to specify a value [y/n] to set the production mode!".bold.red);
     return false;
   }
 
@@ -296,15 +297,15 @@ IonicTask.prototype.set_production_mode = function(self) {
           var d = JSON.parse(data);
           if (d.errors && d.errors.length) {
             for (var j = 0; j < d.errors.length; j++) {
-              console.log((d.errors[j]).bold.error);
+              log.error((d.errors[j]).bold.red);
             }
             return self.ionic.fail('Unable to set mode');
           }
 
           if (self.inputValues['production-mode'] == 'y') {
-            console.log("Successfully set production mode");
+            log.info("Successfully set production mode");
           } else {
-            console.log("Successfully set development mode");
+            log.info("Successfully set development mode");
           }
 
         } catch (parseEx) {
@@ -319,7 +320,7 @@ IonicTask.prototype.upload_cert = function(self) {
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    console.log("You need to upload your app first!".bold.red);
+    log.error("You need to upload your app first!".bold.red);
     return false;
   }
 
@@ -398,12 +399,12 @@ IonicTask.prototype.upload_cert = function(self) {
             var d = JSON.parse(data);
             if (d.errors && d.errors.length) {
               for (var j = 0; j < d.errors.length; j++) {
-                console.log((d.errors[j]).bold.error);
+                log.error((d.errors[j]).bold.red);
               }
               return self.ionic.fail('Unable to upload certificate');
             }
 
-            console.log("Successfully uploaded certificate");
+            log.info("Successfully uploaded certificate");
 
           } catch (parseEx) {
             return self.ionic.fail('Error response: ' + parseEx);
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index adca7cca71..3aca3e8a2a 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -7,6 +7,7 @@ var fs = require('fs'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
     Security = IonicAppLib.security,
+    log = IonicAppLib.logging.logger,
     LoginTask = require('./login'),
     Prompt = require('./prompt'),
     Table = require('./table'),
@@ -80,7 +81,7 @@ function addSecurityProfile(ionic, argv, dir, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -114,7 +115,7 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
@@ -126,8 +127,8 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
     })
     .then(function(body) {
       if (body.data.length === 0) {
-        console.log('You don\'t have any Security Profiles yet!');
-        console.log('Type ' + 'ionic help security'.yellow + ' to learn how to use Security Profiles.');
+        log.info('You don\'t have any Security Profiles yet!');
+        log.info('Type ' + 'ionic help security'.yellow + ' to learn how to use Security Profiles.');
       } else {
         var table = new Table({ head: ['name', 'tag', 'android', 'ios'] });
 
@@ -140,9 +141,9 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
           ]);
         });
 
-        console.log('');
-        console.log(table.toString());
-        console.log('');
+        log.info('');
+        log.info(table.toString());
+        log.info('');
       }
     })
     .catch(function(ex) {
@@ -171,7 +172,7 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
   return Login.retrieveLogin()
     .then(function(jar) {
       if (!jar) {
-        console.log('No previous login existed. Attempting to log in now.');
+        log.info('No previous login existed. Attempting to log in now.');
         return LoginTask.login(argv);
       }
       return jar;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 3c1a4d48a0..c9ce1a1129 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -4,6 +4,7 @@ var IonicAppLib = require('ionic-app-lib'),
     Q = require('q'),
     Task = require('./task').Task,
     Serve = IonicAppLib.serve,
+    log = IonicAppLib.logging.logger,
     IonicProject = IonicAppLib.project;
 
 var DEFAULT_HTTP_PORT = 8100;
@@ -34,7 +35,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   try {
     project = IonicProject.load(cwd);
   } catch (ex) {
-    console.log('Error occured', ex);
+    log.error('Error occured', ex);
     return Utils.fail(ex.message);
   }
 
@@ -64,7 +65,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     return promise
     .then(function() {
-      // console.log('options.address', options.address);
+      // log.info('options.address', options.address);
       return Serve.checkPorts(true, options.port, options.address, options);
     })
     .then(function() {
@@ -80,16 +81,15 @@ IonicTask.prototype.run = function(ionic, argv) {
     })
     .then(function() {
       // return Serve.listenToServeLogs(options);
-      events.on('serverlog', console.log);
-      events.on('consolelog', console.log);
+      events.on('serverlog', log.info);
+      events.on('consolelog', log.info);
     })
     .catch(function(error) {
-      console.log('There was an error serving your Ionic application:', error);
+      log.info('There was an error serving your Ionic application:', error);
       throw error;
     });
   } catch (ex) {
     Utils.fail('Error with serve- ' + ex);
-    console.log(ex.stack);
   }
 };
 
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 37d9d2bc93..0f8c32a3e2 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -6,7 +6,8 @@ var Task = require('./task').Task,
     fs = require('fs'),
     path = require('path'),
     _ = require('underscore'),
-    bower = require('./bower');
+    bower = require('./bower'),
+    log = require('ionic-app-lib').logging.logger;
 
 var IonicTask = function() {};
 
@@ -47,7 +48,7 @@ IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(servi
 }
 
 IonicTask.prototype.installBowerComponent = function installBowerComponent(serviceName) {
-  // console.log('We are here now.');
+  // log.info('We are here now.');
   var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
   // var bowerInstallCommand = 'bower install ionic-service-' + serviceName;
 
@@ -55,7 +56,7 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(servi
 
   if (result.code != 0) {
     //Error happened, report it.
-    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose + '"'.bold + '.\nAre you sure it exists?'.bold;
     this.ionic.fail(errorMessage, 'service');
   } else {
     this.addServiceToIonicJson(serviceName);
@@ -68,22 +69,22 @@ IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(s
   var result = exec(bowerUninstallCommand);
 
   if (result.code != 0) {
-    var errorMessage = 'Failed to find the service "'.error.bold + serviceName.verbose + '"'.error.bold + '.\nAre you sure it exists?'.error.bold;
+    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose + '"'.bold + '.\nAre you sure it exists?'.bold;
     this.ionic.fail(errorMessage, 'service')
   } else {
-    // console.log('Uninstalled Ionic service', serviceName);
+    // log.info('Uninstalled Ionic service', serviceName);
   }
 }
 
 IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLocation() {
   var bowerRcFileLocation = path.join(process.cwd(), '.bowerrc');
-  // console.log('location bowerrc: ' , bowerRcFileLocation)
+  // log.info('location bowerrc: ' , bowerRcFileLocation)
   var bowerRc = null;
 
   try {
     var content = fs.readFileSync(bowerRcFileLocation, 'utf8');
     bowerRc = JSON.parse(content);
-    // console.log('bowerRc contents: ', bowerRc)
+    // log.info('bowerRc contents: ', bowerRc)
   } catch (ex) { }
 
   var directory = 'www/lib'; //Default directory
@@ -106,33 +107,33 @@ IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory
   // var packageBowerJson = require(bowerJsonLocation);
   var packageBowerJson = this.getBowerJson(directory, serviceName);
 
-  // console.log('bowerjson = ', packageBowerJson.plugins);
-  // console.log('ionic - ', IonicCordova);
+  // log.info('bowerjson = ', packageBowerJson.plugins);
+  // log.info('ionic - ', IonicCordova);
   _.each(packageBowerJson.plugins, function(plugin) {
     // var ic = new IonicCordova();
     // ic.run('ionic plugin add ' + plugin);
-    console.log('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
+    log.info('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
     var installPluginCmd = 'ionic plugin add ' + plugin.uri;
-    console.log(installPluginCmd);
+    log.info(installPluginCmd);
     var pluginInstallResult = exec(installPluginCmd);
 
     if (pluginInstallResult.code != 0) {
-      var errorMessage = 'Failed to find the plugin "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
       this.ionic.fail(errorMessage, 'service');
     }
-    // console.log(pluginInstallResult);
+    // log.info(pluginInstallResult);
   })
 }
 
 IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bowerJson) {
   _.each(bowerJson.plugins, function(plugin) {
-    console.log('Uninstalling cordova plugin -  ' + plugin.name);
+    log.info('Uninstalling cordova plugin -  ' + plugin.name);
     var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
-    console.log(uninstallPluginCmd);
+    log.info(uninstallPluginCmd);
     var pluginRemoveResult = exec(uninstallPluginCmd)
 
     if (pluginRemoveResult.code != 0) {
-      var errorMessage = 'Failed to find the plugin to remove "'.error.bold + plugin.name.verbose + '"'.error.bold + '.'.error.bold;
+      var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
       this.ionic.fail(errorMessage, 'service');
     }
   })
@@ -142,12 +143,12 @@ IonicTask.prototype.addService = function addService(serviceName) {
   this.installBowerComponent(serviceName);
 
   var directory = this.getBowerComponentsLocation();
-  // console.log('Directory we are searching for bower.json - ', directory);
+  // log.info('Directory we are searching for bower.json - ', directory);
 
-  console.log('Checking for any plugins required by service package');
+  log.info('Checking for any plugins required by service package');
 
   this.installBowerPlugins(directory, serviceName);
-  console.log('ionic service add completed');
+  log.info('ionic service add completed');
 }
 
 IonicTask.prototype.removeService = function removeService(serviceName) {
@@ -163,7 +164,7 @@ IonicTask.prototype.removeService = function removeService(serviceName) {
 IonicTask.prototype.listServices = function listServices() {
   // var directory = this.getBowerComponentsLocation();
   var bowerJson = require(process.cwd() + '/bower.json');
-  // console.log(bowerJson);
+  // log.info(bowerJson);
 
 }
 
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 1166b9bc2e..b768ecbffd 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -10,6 +10,7 @@ var path = require('path'),
     LoginTask = require('./login'),
     IonicAppLib = require('ionic-app-lib'),
     Share = IonicAppLib.share,
+    log = IonicAppLib.logging.logger,
     Login = IonicAppLib.login,
     Utils = IonicAppLib.utils;
 
@@ -41,12 +42,12 @@ IonicTask.prototype.run = function(ionic, argv) {
     return ionic.fail('Invalid email address', 'share');
   }
 
-  console.log(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
+  log.info(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
 
   return Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
-      console.log('No previous login existed. Attempting to log in now.');
+      log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
     }
     return jar;
@@ -55,7 +56,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     return Share.shareApp(process.cwd(), jar, email);
   })
   .catch(function(ex) {
-    // console.log('Error', ex, ex.stack);
+    // log.info('Error', ex, ex.stack);
     return Utils.fail(ex);
   });
 };
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 46c5025017..962d6c2eb9 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -9,8 +9,10 @@ var fs = require('fs'),
     Task = require('./task').Task,
     IonicAppLib = require('ionic-app-lib'),
     Start = IonicAppLib.start,
+    log = IonicAppLib.logging.logger,
     Utils = IonicAppLib.utils;
 
+
 var Start;
 var IonicTask = function() {};
 IonicTask.prototype = new Task();
@@ -27,7 +29,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   }
 
   if (argv._[1] == '.') {
-    console.log('Please name your Ionic project something meaningful other than \'.\''.red);
+    log.error('Please name your Ionic project something meaningful other than \'.\''.red);
     return
   }
 
@@ -37,7 +39,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   // Grab the app's relative directory name
 
 
-  console.log('\nOne awesome Ionic app coming right up...\n'.yellow.bold);
+  log.info('\nOne awesome Ionic app coming right up...\n');
 
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
@@ -49,7 +51,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   .then(function(promptToContinue) {
     if (!promptToContinue) {
       startingApp = false;
-      console.log('\nIonic start cancelled by user.\n'.red.bold);
+      log.info('\nIonic start cancelled by user.\n');
       return;
     }
     return Start.startApp(options);
@@ -71,12 +73,12 @@ IonicTask.prototype.run = function run(ionic, argv) {
   })
   .then(function() {
     if (options.v2) {
-      console.log('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
+      log.info('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
     }
   })
   .catch(function(error) {
     // return Utils.fail(error);
-    console.error(error);
+    log.error(error);
     throw error;
   });
 };
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 6335a1728b..133cd53a41 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -37,6 +37,7 @@ var fs = require('fs'),
   IonicProject = IonicAppLib.project,
   State = IonicAppLib.state,
   Utils = IonicAppLib.utils,
+  log = IonicAppLib.logging.logger,
   IonicInfo = IonicAppLib.info;
 
 // var State = module.exports;
@@ -90,7 +91,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
       State.clearState(process.cwd(), options);
       break;
     default:
-      console.log('Please specify a command [ save | restore | reset | clear ] for the state command.'.red.bold);
+      log.error('Please specify a command [ save | restore | reset | clear ] for the state command.');
   }
 
 };
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 1fbd05bb5a..e768bd4095 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -3,7 +3,8 @@ var colors = require('colors'),
     _ = require('underscore'),
     Q = require('q'),
     Task = require('./task').Task,
-    request = require('request');
+    request = require('request'),
+    log = require('ionic-app-lib').logging.logger;
     // starterTemplates = require('./starter-templates')
 
 var IonicTask = function() {};
@@ -13,12 +14,12 @@ IonicTask.prototype = new Task();
 IonicTask.prototype.fetchStarterTemplates = function() {
   var self = this;
 
-  // console.log('About to fetch template');
+  // log.info('About to fetch template');
   var downloadUrl = 'http://code.ionicframework.com/content/starter-templates.json';
   var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
-  // console.log('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
-  console.log('\nDownloading Starter Templates'.bold, '-', downloadUrl);
+  // log.info('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
+  log.info('\nDownloading Starter Templates'.bold, '-', downloadUrl);
 
   var q = Q.defer();
 
@@ -28,15 +29,15 @@ IonicTask.prototype.fetchStarterTemplates = function() {
       var templatesJson = {};
       try {
         templatesJson = JSON.parse(html);
-      }catch(ex) {
-        console.log('ex', ex)
+      } catch(ex) {
+        log.error('ex', ex);
         q.reject('Error occured in download templates:', ex)
         self.ionic.fail(ex);
         return;
       }
       q.resolve(templatesJson);
     } else {
-      console.log('Unable to fetch the starter templates. Please check your internet connection'.red);
+      log.error('Unable to fetch the starter templates. Please check your internet connection');
       q.reject(res);
     }
   });
@@ -45,7 +46,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
 IonicTask.prototype.list = function list(templates) {
   //Should have array of [{ name: 'name', description: 'desc' }]
-  console.log('\n')
+  log.info('\n')
   _.each(templates, function(template) {
     var rightColumn = 20, dots = '';
     var shortName = template.name.replace('ionic-starter-', '');
@@ -53,7 +54,7 @@ IonicTask.prototype.list = function list(templates) {
       dots += '.';
     }
     var outStr = []
-    console.log(shortName.green, dots, template.description);
+    log.info(shortName.green, dots, template.description);
   })
 };
 
@@ -63,7 +64,7 @@ IonicTask.prototype.run = function(ionic) {
   self.fetchStarterTemplates()
   .then(function(starterTemplates) {
     var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
-    console.log('Ionic Starter templates'.green);
+    log.info('Ionic Starter templates'.green);
     self.list(templates);
   });
 
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 757ea11063..081b59b044 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -4,6 +4,7 @@ var IonicAppLib = require('ionic-app-lib'),
     LoginTask = require('./login'),
     Task = require('./task').Task,
     Upload = IonicAppLib.upload,
+    log = IonicAppLib.logging.logger,
     Utils = IonicAppLib.utils;
 
 var IonicTask = function() {};
@@ -17,7 +18,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   return Login.retrieveLogin()
   .then(function(jar){
     if (!jar) {
-      console.log('No previous login existed. Attempting to log in now.');
+      log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
     }
     return jar;
@@ -26,7 +27,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return Upload.doUpload(process.cwd(), jar, note, deploy);
   })
   .catch(function(ex) {
-    // console.log('Error', ex, ex.stack);
+    // log.info('Error', ex, ex.stack);
     Utils.fail(ex);
   });
 };
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 9de3fbab31..22bbf6263d 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -111,12 +111,6 @@ describe('Cli', function() {
         expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
       });
 
-      it('should set up console logging helpers', function() {
-        spyOn(IonicCli, 'setUpConsoleLoggingHelpers');
-        IonicCli.run(['node', 'bin/ionic']);
-        expect(IonicCli.setUpConsoleLoggingHelpers).toHaveBeenCalled();
-      });
-
       it('should get boolean options from start task', function() {
         var tasks = require('../lib/tasks/cliTasks');
         var task = IonicCli.getTaskWithName('start');

From dc8738f4f8d6ebc87c0119f85d85cfd45639620e Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 1 Apr 2016 21:05:04 -0500
Subject: [PATCH 0947/1100] chore(): remove unused functions

---
 lib/cli.js           | 16 ----------------
 lib/ionic/cordova.js |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index f9be2806bd..862a6fd9c4 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -691,18 +691,6 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   return q.promise;
 };
 
-//A little why on this reportExtras here -
-//We need to access the CLI's package.json file
-//for that, we need the path to be relative to this,
-//not the node_module/ionic-app-lib directory
-Cli.reportExtras = function reportExtras(err) {
-  var commandLineInfo = process.argv;
-
-  var info = Cli.gatherInfo();
-  info.command = commandLineInfo;
-  return info;
-};
-
 Cli.gatherInfo = function gatherInfo() {
   var info = Info.gatherInfo();
   Info.getIonicVersion(info, process.cwd());
@@ -757,10 +745,6 @@ Cli.getContentSrc = function getContentSrc() {
   return Utils.getContentSrc(process.cwd());
 };
 
-Cli.setConfigXml = function setConfigXml(settings) {
-  return ConfigXml.setConfigXml(process.cwd(), settings);
-};
-
 Cli.doRuntimeCheck = function doRuntimeCheck(version) {
   var lastVersionChecked = IonicConfig.get('lastVersionChecked');
   var versionHasBeenChecked;
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index c106bfbdb7..7a98876376 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -104,7 +104,7 @@ IonicTask.prototype.run = function(ionic, argv) {
         return self.setupLiveReload(argv);
       } else {
         // ensure the content node was set back to its original
-        return self.ionic.setConfigXml({
+        return ConfigXml.setConfigXml(process.cwd(), {
           resetContent: true,
           errorWhenNotFound: false
         });
@@ -305,7 +305,7 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
 
     process.on('exit', function(){
       // verify it was set back
-      self.ionic.setConfigXml( process.cwd(), {
+      ConfigXml.setConfigXml(process.cwd(), {
         resetContent: true,
         errorWhenNotFound: false
       });

From 61ff94fa875fa2d68348bce894e6d14535ceec27 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 4 Apr 2016 09:54:40 -0500
Subject: [PATCH 0948/1100] fix(generate): use project.get

---
 lib/ionic/generate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 00febd25ed..294cd1019e 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -32,7 +32,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var generator = argv._[1];
     var name = argv._[2] //TODO support multiple names
-    var isTS = project.typescript || argv.ts;
+    var isTS = project.get('typescript') || argv.ts;
 
     var ionicModule = loadToolingModule();
 

From 7bf4e5cb5b9315a16a53f99095165a8c55cd2ced Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 4 Apr 2016 11:16:25 -0500
Subject: [PATCH 0949/1100] chore(): add some log colors

---
 lib/cli.js         | 16 ++++++++--------
 lib/ionic/start.js |  5 +----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 862a6fd9c4..871a15211b 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -111,7 +111,7 @@ Cli.run = function run(processArgv) {
         //run with gulp hooks
         return runWithGulp(argv, taskInstance);
       } else if (argv.v2) {
-        log.warn('WARN: No node_modules directory found, do you need to run npm install?');
+        log.warn('WARN: No node_modules directory found, do you need to run npm install?'.yellow);
       }
     }
     return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
@@ -133,8 +133,8 @@ function runWithGulp(argv, taskInstance){
       var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
     } catch(e) {
       // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-      log.error('\nGulpfile detected, but gulp is not installed');
-      log.error('Do you need to run `npm install`?\n');
+      log.error('\nGulpfile detected, but gulp is not installed'.red);
+      log.error('Do you need to run `npm install`?\n'.red);
       process.exit(1);
     }
     logEvents(gulp, [beforeHook, afterHook]);
@@ -151,17 +151,17 @@ function runWithGulp(argv, taskInstance){
         //if there is no hook task, but it's a v2 app and a command that usually needs a hook
         if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
           var taskName = (cmdName === 'serve') ? 'watch' : 'build';
-          log.warn('WARN: No \'' + beforeHook + '\' gulp task found!');
+          log.warn(('WARN: No \'' + beforeHook + '\' gulp task found!').yellow);
 
           //The task exists, but there are no hooks for it
           //They have the old config file, so we're safe to yell at them
           //With new config, may intentionally not have hooks if running their own build
           if (gulp.tasks[taskName] && fs.existsSync('ionic.config.js')) {
-            log.info('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n')
-            log.info('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n');
-            log.info('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n');
+            log.info(('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n').cyan)
+            log.info(('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n').cyan);
+            log.info(('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n').cyan);
           } else {
-            log.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
+            log.warn(('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n').yellow);
           }
         }
         // Only some commands return promises, so wrap it
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 962d6c2eb9..0a29f8b5a9 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -38,9 +38,6 @@ IonicTask.prototype.run = function run(ionic, argv) {
       startingApp = true;
   // Grab the app's relative directory name
 
-
-  log.info('\nOne awesome Ionic app coming right up...\n');
-
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
@@ -51,7 +48,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   .then(function(promptToContinue) {
     if (!promptToContinue) {
       startingApp = false;
-      log.info('\nIonic start cancelled by user.\n');
+      log.info('\nIonic start cancelled by user.');
       return;
     }
     return Start.startApp(options);

From 021702adb6bd49f793a1302146a61a2261472015 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 4 Apr 2016 11:16:43 -0500
Subject: [PATCH 0950/1100] fix(start): don't run start commands if cancelled

---
 lib/ionic/start.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 0a29f8b5a9..77445d1ee7 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -66,10 +66,12 @@ IonicTask.prototype.run = function run(ionic, argv) {
   })
   */
   .then(function() {
-    return Start.promptLogin(options);
+    if (startingApp) {
+      return Start.promptLogin(options);
+    }
   })
   .then(function() {
-    if (options.v2) {
+    if (options.v2 && startingApp) {
       log.info('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
     }
   })

From 730b32f5e59db0cdc476222d391b4431bc083435 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 4 Apr 2016 11:20:50 -0500
Subject: [PATCH 0951/1100] chore(): update to beta.24

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7c00828df0..0fe543f7d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.23",
+  "version": "2.0.0-beta.24",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -65,7 +65,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.13",
+    "ionic-app-lib": "2.0.0-beta.14",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 679b22e509988a852eb47a8daa6c1c1e89072a69 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 7 Apr 2016 15:36:30 -0500
Subject: [PATCH 0952/1100] Added editorconfig to the project and added Visual
 Studio code config to the gitignore.

---
 .editorconfig | 15 +++++++++++++++
 .gitignore    |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..f1cc3ad329
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
index d0acd17ee4..b9930655d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.cookies
 node_modules/
 .idea/
+.vscode/

From 345993aa1e65d51d619a7acb1d5fa8dc934ccb8b Mon Sep 17 00:00:00 2001
From: "qinghong.sheng" <464165202@qq.com>
Date: Wed, 20 Apr 2016 19:44:15 +0800
Subject: [PATCH 0953/1100] fix a mistake

---
 lib/ionic/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 3fb66bcfbe..2763203108 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -32,7 +32,7 @@ LoginTask.login = function login(argv) {
     return Login.requestLogIn(loginInfo.email, loginInfo.password, true);
   })
   .then(function(cookieJar) {
-    log.info.log('Logged in! :)'.green);
+    log.info('Logged in! :)'.green);
     return cookieJar;
   })
   .catch(function(ex) {

From f0c885c272719fb811541a1163168f426cff6481 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 20 Apr 2016 09:29:15 -0500
Subject: [PATCH 0954/1100] chore(): update to beta.25

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0fe543f7d4..27f9a18f07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.25",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -65,7 +65,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.14",
+    "ionic-app-lib": "2.0.0-beta.15",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 5153adf906c07c863c30176499b68401b0b49976 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 20 Apr 2016 09:43:24 -0500
Subject: [PATCH 0955/1100] chore(build): remove stats check that prevents beta
 from logging to mixpanel.

---
 lib/ionic/stats.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 6866b9cfc9..5d63fb3d6f 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -526,7 +526,6 @@ exports.IonicStats = {
     try {
 
       var packageJson = exports.getVersion();
-      if (packageJson.version.indexOf('beta') > -1) return;
 
       if(process.argv.length < 3) return;
 

From a100e8ba94a34ef7efffddb67bea06e427ad3619 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 20 Apr 2016 10:24:08 -0500
Subject: [PATCH 0956/1100] fix(serve): remove unused lab preview template

---
 lib/ionic/assets/preview.html | 190 ----------------------------------
 1 file changed, 190 deletions(-)
 delete mode 100644 lib/ionic/assets/preview.html

diff --git a/lib/ionic/assets/preview.html b/lib/ionic/assets/preview.html
deleted file mode 100644
index aad119a41f..0000000000
--- a/lib/ionic/assets/preview.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!doctype html>
-<html ng-app="app">
-  <head>
-    <title ng-bind="title"></title>
-    <style>
-      body {
-        background-color: #EFF1F5;
-        font-family: 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
-        padding: 0;
-        margin: 0;
-        -webkit-font-smoothing: antialiased;
-      }
-      preview {
-        display: block;
-        max-width: 855px;
-        margin: 0 auto 0 auto;
-        overflow: auto;
-      }
-      h2 {
-        color: #fff;
-        font-weight: 200;
-        letter-spacing: 1px;
-      }
-      #header-left {
-        position: absolute;
-        top: 20px;
-        left: 20px;
-        line-height: 40px;
-      }
-      #header-left span {
-        margin-left: 10px;
-        vertical-align: middle;
-        display: inline-block;
-        font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-        font-weight: 300;
-        color: #6F7582;
-        font-size: 16px;
-      }
-      #header {
-      }
-      #header #left {
-        position: absolute; 
-        left: 20px;
-        top: 20px;
-      }
-      #header {
-        position: fixed;
-        top: 30px;
-        right: 20px;
-      }
-      #header a {
-        color: #fff;
-        display: inline-block;
-        margin: 0px 9px;
-        opacity: 0.4;
-        font-size: 90%;
-        letter-spacing: 1px;
-        text-decoration: none;
-      }
-      #header a:hover {
-        opacity: 1;
-      }
-      h2 a {
-        font-size: 18px;
-        color: #6F7582;
-        text-decoration: none;
-      }
-      .phone {
-        float: left;
-        margin: 40px 20px 0 20px;
-      }
-      .frame {
-        border: none;
-        border-radius: 3px;
-        box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.3);
-      }
-      #iphone-frame {
-        top: 109px;
-        left: 25px;
-        width: 375px;
-        height: 667px;
-      }
-      #android-frame {
-        top: 88px;
-        left: 24px;
-        width: 375px;
-        height: 667px;
-      }
-      #iphone {
-      }
-      #android {
-      }
-      #logo {
-        display: inline-block;
-        width: 48px;
-        height: 48px;
-        vertical-align: middle;
-        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACQRJREFUeNrsXQmMFEUUrR0OEVAINyoIKIjGa4NBAhhZFA0uQU1cgxwJciyECGgIEQKoxEU0iCIQ5BA0AWQjRhJYUA4BIxIhQQMaWUHCIrccETnWLAi+R7/Gdtid7Znp7mGG/slL7dFT/f/rOn79+tWTNXPWXJMq2b33yO0o2gH3A22AFkBToCFQy3FpGVAKnAD2AyXCD8DW1i2bHEmVDVUDJqwOiqeA7kBX4NaoS44BB3gpcA44A1QDagD8bF3gQeDRqHpJ6tfAcmAdCD2dMQTCON6jBzAAeBKorn8VA/OALcB2YCcMP+uyThJ5J/AQ0B7oCPQXyvD/IpTzgdWo8x8/7cvyqwvLyKHAcOAW4BKwEVgKrIRhv3t8vzv0oJ51tFC25hnALNzvTFoQCENuQjEKeFndjuPTHLYIGLE/oKGCZL4IDAIaa+ycDkx128oDJxBKZ6kLTZbSe4FJwEIoXZaiSepG6TQWaAYcBEYDhdDpkhf3iHikaGsUG4AFGvTZbdtCyfmpIo+Ce5cCH+LHVsArQG3gU2A9dG4R7REAnYC2QCSwFoib5aN4T24HCRwNpU+aa1CgK92jtzWhndaD5sz/DnCv49Ij+tt02HLRFwKhTE0U/HAf4BC7Cm621qSBQPdczdKNK7mUE16vWCRGElSAs+omkfcVHeF0IU9de6VaYWWSB4zwdAwEeXeh+B7IVnfoAYVOmPSTgS6vezXWmFg1TvLu4wAM1AMGg7iPTPpKF5fXNdEyszgpAtXy1su347iw1KS31I3j2vpJdWGNeWvV8vpkAHn2KiXpayMuyONsWyRHdEiGkEdZ4fK6n2HzvmRa4Fx7wkjzMS9aOAH+6WYSSXgWlpNsuyrjM4g8ujIHFHiojMRGCTnSWp79CJySn+erq4L7VUHRE8gxVlC1WpxV0Nn9w1jhsaVuoy+4720oxiiS00yEbpSjzZVVTdlf4ppABQY2KCz0hN9Osh7W58aKTHshXIr1ht4bPFixFInQruUFICpyY/qLvAUBkMf1KaPJjE6/C8wGShIJhKIuttzngQJgFX7vjHq2JbNiQR0LtGrpBSypdAxUPI8hqZMK/fgtE9R1hkFhBiL2JBpFxucOAx8YK/LNIWC6B/qN0TA2BdzUcjOJjNIi+/WAoiq9gV8023s1QWxGUWisUH+ydTFa84Z6yKiYBCoMz0jyXi8NitHl6snL3+xVgNMhmzysa6axdgNHQOfasVrgUC3VJgURCGULB7KAwT5U/7eHel7QsMaHPaxcArV7Nlwz2EITSrR8AhwlR3K5rpqF6QdxzTvR69anG/LhjDTW5nkyws30Aui4LGDHuxR2cCU2TpPUqmgCOVVfkvPoJXm8xzI9oKNyUA/qXvEI62klZ/sL1EsSJwTcCj8WgQP/R6AyBsjqRq/3a7UEJHmfGSvsX5rkA2mqQMB4/My0jhUBtsI9uOc3tIfuHjMg7DGQ6RbMGPAj0sLdsN+AfsmSZ/t6KJ7WJDE2BWPhMnH1uHMS6a5ypQ83vBlY5OW4iro4BKwBOqSAwCKVPZ0EcgFf7EP3tWWfT3VmpSCKswfFLuCxywQqxYwRiW/TzK24mMJ7f8flJ7hrwhbYTn/cErp6rmWryvYRRwhpe8iLa7EjPNkksI1+2Rny4t6bUtkyopXBMa/TvjJZwBWj1gxxtSCBdEwPhLTELSWcSEggI8LHQz7iFrbC+iSQUdZzIR9xC7twDduRPhPyEbdwKXlDJOQhYbngXMrVDvmIW2rZBNJ9qRnyEbeQszMkkLtODUI+4hZydpwEHlYwIZT4hJwdjsghbFjepnEoFazjLK7oP5eQwF36+90hNa7F5moXCdyhXx4IeXEtNlc7SKAdmnk45MW12Fxtiyh9lcGER0JeXAu5OkDubEeaeXQ8I9Y8g4y83acJhBy1FWdXViJfqszNkFmS2459gb98qD7XyZlNIHfZue2YlwHk8Ygrc3t4ov19H26RJ65WXSEQfZmhmdVAl3TtxtB7onJXmJrHLFXu3xb40H27GOtVAqecLZDCnBjusw5I08b3mrFyVpj9wGyIZ5SW5qUMEEdX8oecyUV8Yjy2OhRMv5XKg9KJCPMMAxhXh4ojOzvhvxaop8UXNDC9t1/oqVwl/cTNDGfLjg6oMkOefXucGPdKavhgUGBrd3ExTtzMdv4vEtUNuFEyDWgJ5HuoQyePDWJ3ZQJ5UOeU88XJNHFkKmqBlKnGSoScqCTwZIUZ8y+gro4eG3SPsV4g4XfrIwcTxcnU6P9HyhmM+TIG5t3xg1M80IFH5s9z6ocyI5UgmYghVfg+GIA6zTJW1vybAbS+KeJibHmvlArkqBfqy1FraeKRUYwgPQe9dvvc+roZKw+RWak55R3FCOywoc5X5CmS0cjE/74GtuLDerDL/X4nFvStrwfF9Ofsih5WzNeeoBKe35irVUqu30pfQ6sanipgti7zxvNh97yKro1U4pzyg4tVUYG5fqRANi+KRZ5x2Y3y1ZXH4MkMug5aH20cI5uHVHZ9pQTiCTBvpodmvTm4QV4Gk0fb5sjWHrLdJNsCSSLXf5yReHpzcSaSKJsWy8Zustl4QqBI/NVYr+3krFyYSd1ZthTKtq6y1XhKoEj8CUVnYx3VmocbT3YevEvH2ZY2GOtVpLSps2w0vhDoaIkd7ImF0718pnQjr75cFXvC6BBPy0uYQMeY2Nnh4uyQ154u5HWTk3zZVVHLO5RIXQnnB3KGAvrKzaG3vgaKzfcoAOFbYIA6anlWR05yPzezrecERjnb2VovMuS9G0q+5HE8MVniqlMnYx1PGCBdsytzkgMhUCRSsRwpxzUrI9vFUHpgKokUcdwnKZZO56VjjleBiCBfg7zAx8OM0To0F1Hcw2gs94SB4qlev+U8k17ETdJyFfHpYqzds0NqebOjI8nXPIEOw2K9Cp4nRBN5FTz3Q5hixiwphseYq9JW/y5T9Ihbj0U+bG0GS2CU4c4vI+CYGZ0Za38ZAQ/+2F9GQGEskTnJDfSZhlGf42cYJ2S6xSp70zsICfTbHGTYEiHW12Hw5+hdt7MimK8PWGesxFD6cttivSDRb/lXgAEA54tdUatEpQUAAAAASUVORK5CYII=);
-        background-repeat: no-repeat;
-        width: 40px;
-        height: 40px;
-        background-size: 100%;
-      }
-      #logo:hover {
-        opacity: 1;
-      }
-      #logo img {
-        max-width: 100%;
-      }
-    </style>
-
-    <!-- quick and dirty templating, don't touch this -->
-    <script>
-      //INSERT_JSON_HERE;
-    </script>
-
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.min.js"></script>
-    <script>
-      angular.module('app', [])
-      .directive('preview', function() {
-        return {
-          restrict: 'E',
-          scope: true,
-          link: function($scope, $element, $attr) {
-            $scope.screenSizes = [
-              { label: 'iPhone 5 (320x568)', size: '320x568' }
-            ];
-            $scope.screenSize = $scope.screenSizes[0];
-          }
-        }
-      })
-      .run(['$rootScope', function($rootScope) {
-        $rootScope.appName = BOOTSTRAP && BOOTSTRAP.appName || null;
-        $rootScope.title = $rootScope.appName && $rootScope.appName + ' - Ionic App' || 'Ionic App';
-      }]);
-    </script>
-
-  </head>
-  <body>
-    <div id="header-left">
-      <a target="_blank" href="http://ionicframework.com/" id="logo">
-      </a>
-      <span ng-bind="appName"></span>
-    </div>
-    <!--
-    <header id="header">
-      <a target="_blank" href="http://ionicframework.com/docs/components/">CSS</a>
-      <a target="_blank" href="http://ionicframework.com/docs/api/">API</a>
-      <a target="_blank" href="http://forum.ionicframework.com/">Forum</a>
-      <a target="_blank" href="http://ngcordova.com/">ngCordova</a>
-      <a target="_blank" href="https://github.com/driftyco/ionic">GitHub</a>
-    </header>
-    -->
-    <preview>
-      <!--
-      <div id="choice">
-        <select ng-model="screenSize" ng-options="s.label for s in screenSizes"></select>
-      </div>
-      -->
-      <div class="phone">
-        <div id="iphone">
-          <h2><a href="/?ionicplatform=ios" target="_blank">iOS</a></h2>
-          <iframe id="iphone-frame" src="/?ionicplatform=ios" class="frame"></iframe>
-        </div>
-      </div>
-      <div class="phone">
-        <div id="android">
-          <h2><a href="/?ionicplatform=android" target="_blank">Android</a></h2>
-          <iframe id="android-frame" src="/?ionicplatform=android" class="frame"></iframe>
-        </div>
-      </div>
-    </preview>
-    <!--
-    <a href="http://ionicframework.com/" id="logo">
-      <img src="http://docs.ionic.io/img/ionic-logo.png">
-    </a>
-    -->
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-44023830-9', {
-        'cookieDomain': 'none'
-      })
-      ga('send', 'pageview');
-    </script>
-  </body>
-</html>

From 704fc2d468d7f05c44fcd749389b4d138c278842 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 20 Apr 2016 13:58:40 -0500
Subject: [PATCH 0957/1100] feat(stats): update stats to track --v2 and --ts
 flags; add os, gulp, and nodejs to tracked metadata

---
 lib/ionic/stats.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 5d63fb3d6f..a276fe5daf 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -4,13 +4,15 @@ var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments)
 
 var path = require('path'),
     http = require('http'),
+    _ = require('underscore');
     querystring = require('querystring'),
     crypto = require('crypto'),
     Buffer = require('buffer').Buffer,
     util = require('util'),
     fs = require('fs'),
     os = require('os'),
-    IonicConfig = require('ionic-app-lib').config;
+    IonicConfig = require('ionic-app-lib').config,
+    IonicInfo = require('ionic-app-lib').info;
 
 exports.getVersion = function getVersion() {
   var packageJson = require('../../package.json');
@@ -564,7 +566,7 @@ exports.IonicStats = {
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass --splash --icon'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass --splash --icon --v2 --ts'.split(' ');
 
       // collect only certain args, skip over everything else
       for(x=0; x<cmdArgs.length; x++) {
@@ -610,9 +612,16 @@ exports.IonicStats = {
         statsData.account_id = ionicConfig.get('id');
       } catch (e2) {}
 
-      //console.log('STATS', cmdName, statsData);
+      var info = {}
+      IonicInfo.getNodeVersion(info);
+      IonicInfo.getOsEnvironment(info);
+      IonicInfo.gatherGulpInfo(info);
 
-      this.mp(cmdName, statsData);
+      this.mp(cmdName, _.extend(statsData, {
+        os: info.os,
+        gulp: info.gulp,
+        node: info.node
+      }));
 
     } catch(e) {
       console.log( ('Error stats: ' + e) );

From 704a810f7edc88566192a8aebce9bd160351ee3d Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 20 Apr 2016 15:12:39 -0500
Subject: [PATCH 0958/1100] chore(git): update git to ignore visual studio code
 dir and code coverage dir.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index d0acd17ee4..8a6b50dbe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.cookies
 node_modules/
 .idea/
+coverage/
+.vscode/

From d321eba6779ae153ad54320afc88f2d11f717546 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 20 Apr 2016 15:30:21 -0500
Subject: [PATCH 0959/1100] chore(test): add test coverage and ensure circleci
 runs coveralls.

chore(test): add test coverage and ensure circleci runs coveralls.
---
 .gitignore   |  1 +
 appveyor.yml | 31 +++++++++++++++++++++++++++++++
 circle.yml   |  6 ++++++
 package.json |  9 ++++++---
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 appveyor.yml
 create mode 100644 circle.yml

diff --git a/.gitignore b/.gitignore
index b9930655d1..9799c4a1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 node_modules/
 .idea/
 .vscode/
+coverage/
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..eac8ee9a94
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,31 @@
+# http://www.appveyor.com/docs/appveyor-yml
+
+# Test against these versions of Node.js.
+environment:
+  matrix:
+    - nodejs_version: "0.12"
+    - nodejs_version: "4.2"
+
+# Install scripts. (runs after repo cloning)
+install:
+  - git rev-parse HEAD
+  # Get the latest stable version of Node 0.STABLE.latest
+  - ps: Install-Product node $env:nodejs_version
+  # Typical npm stuff.
+  - npm version
+  - npm install
+
+cache:
+  - '%APPDATA%\npm-cache'
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - npm version
+  - cmd: npm run test
+
+# Don't actually build.
+build: off
+
+# Set build version format here instead of in the admin panel.
+version: "{build}"
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000..a0d097163d
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,6 @@
+test:
+  override:
+    - nvm use 0.12 && npm test
+    - nvm use 4.0 && npm test
+  post:
+    - npm run coveralls
diff --git a/package.json b/package.json
index e18f01d307..0bc9fc67e0 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,9 @@
     "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
     "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",
     "test": "npm run jasmine",
-    "e2e": "jasmine-node --captureExceptions ./e2e",
-    "jasmine": "jasmine-node --captureExceptions  ./spec"
+    "coveralls": "istanbul cover node_modules/jasmine-node/bin/jasmine-node --captureExceptions spec/ && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js && rm -rf coverage",
+    "e2e": "jasmine-node --captureExceptions e2e/",
+    "jasmine": "jasmine-node --captureExceptions  spec/"
   },
   "keywords": [
     "ionic",
@@ -88,8 +89,10 @@
     "xml2js": "0.4.4"
   },
   "devDependencies": {
+    "istanbul": "^0.4.3",
     "jasmine-node": "^1.14.5",
-    "rewire": "^2.3.4"
+    "rewire": "^2.3.4",
+    "coveralls": "^2.2.0"
   },
   "bundledDependencies": [
     "async",

From bfe0f1f677eb889897e5659bd46aca9734a8b624 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 20 Apr 2016 15:52:43 -0500
Subject: [PATCH 0960/1100] chore(docs): update badges on readme to include
 appveyor and npm

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e5242f3b1..d2b3dc465f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-[![Circle CI](https://circleci.com/gh/driftyco/ionic-cli.svg?style=svg)](https://circleci.com/gh/driftyco/ionic-cli)
+[![Build Status][circle-badge]][circle-badge-url]
+[![Build status][appveyor-badge]][appveyor-badge-url]
+[![npm][npm-badge]][npm-badge-url]
 
 Ionic-Cli
 =========
@@ -585,3 +587,9 @@ The ionic.project is a configuration for an ionic project that stores the follow
 * `sass` - the setting to watch sass during `ionic serve`.  
 * `watchPatterns` - the patterns to watch and live reload during `ionic.serve`.  
 
+[circle-badge]: https://circleci.com/gh/driftyco/ionic-cli.svg?style=shield
+[circle-badge-url]: https://circleci.com/gh/driftyco/ionic-cli
+[appveyor-badge]: https://ci.appveyor.com/api/projects/status/oqaqa7fdc7y9mma3?svg=true
+[appveyor-badge-url]: https://ci.appveyor.com/project/jthoms1/ionic-cli
+[npm-badge]: https://img.shields.io/npm/v/ionic.svg
+[npm-badge-url]: https://www.npmjs.com/package/ionic

From ee26541ab227bf140732687f36278384144b5707 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 21 Apr 2016 19:51:11 -0500
Subject: [PATCH 0961/1100] chore(build): add eslint and remove jscs

---
 .editorconfig     | 15 +++++++++++
 .eslintrc.js      | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 .jscs.json        | 41 ----------------------------
 package.json      |  1 +
 spec/.eslintrc.js |  5 ++++
 5 files changed, 90 insertions(+), 41 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .eslintrc.js
 delete mode 100644 .jscs.json
 create mode 100644 spec/.eslintrc.js

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..f1cc3ad329
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000..64b5fde258
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,69 @@
+module.exports = {
+  "env": {
+    "browser": true,
+    "commonjs": true
+  },
+  "extends": "eslint:recommended",
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "brace-style": [
+      "error",
+      "1tbs",
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "camelcase": [
+      "error",
+      {
+        "properties": "always"
+      }
+    ],
+    "comma-style": [
+      "error",
+      "last"
+    ],
+    "consistent-this": [
+      "error",
+      "self"
+    ],
+    "new-cap": [
+      "error"
+    ],
+    "no-extra-semi": "error",
+    "no-lonely-if": "error",
+    "no-underscore-dangle": "error",
+    "no-spaced-func": "error",
+    "space-before-function-paren": [
+      2,
+      "never"
+    ],
+    "keyword-spacing": [
+      "error",
+      {
+        "before": true,
+        "after": true
+      }
+    ],
+    "space-before-blocks": [
+      2,
+      "always"
+    ]
+  }
+};
+
diff --git a/.jscs.json b/.jscs.json
deleted file mode 100644
index 4e02926354..0000000000
--- a/.jscs.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "excludeFiles": ["src/ngLocale/**"],
-  "disallowKeywords": ["with"],
-  "disallowMixedSpacesAndTabs": true,
-  "disallowMultipleLineStrings": true,
-  "disallowNewlineBeforeBlockStatements": true,
-  "disallowSpaceAfterObjectKeys": true,
-  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
-  "disallowSpaceBeforeBinaryOperators": [","],
-  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-  "disallowSpacesInAnonymousFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInFunctionDeclaration": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInNamedFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInsideArrayBrackets": true,
-  "disallowSpacesInsideParentheses": true,
-  "disallowTrailingComma": true,
-  "disallowTrailingWhitespace": true,
-  "requireCommaBeforeLineBreak": true,
-  "requireLineFeedAtFileEnd": true,
-  "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-  "requireSpaceBeforeBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
-  "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
-  "requireSpaceBeforeBlockStatements": true,
-  "requireSpacesInConditionalExpression": {
-    "afterTest": true,
-    "beforeConsequent": true,
-    "afterConsequent": true,
-    "beforeAlternate": true
-  },
-  "requireSpacesInFunction": {
-    "beforeOpeningCurlyBrace": true
-  },
-  "validateLineBreaks": "LF",
-  "validateParameterSeparator": ", "
-}
diff --git a/package.json b/package.json
index 27f9a18f07..2329b09943 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "unzip": "0.1.9"
   },
   "devDependencies": {
+    "eslint": "^2.8.0",
     "jasmine-node": "1.14.5",
     "rewire": "2.5.1"
   },
diff --git a/spec/.eslintrc.js b/spec/.eslintrc.js
new file mode 100644
index 0000000000..d1f5e00643
--- /dev/null
+++ b/spec/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    jasmine: true
+  }
+};

From 93249cccc8cd65d54f7b79bfbbb7306f2ed166b1 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 21 Apr 2016 22:10:03 -0500
Subject: [PATCH 0962/1100] chore(build): change options in eslint rules

---
 .eslintrc.js | 175 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 130 insertions(+), 45 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 64b5fde258..25cffd5e16 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,69 +1,154 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true
+  env: {
+    node: true,
+    commonjs: true
   },
-  "extends": "eslint:recommended",
-  "rules": {
-    "indent": [
-      "error",
+  extends: 'eslint:recommended',
+  rules: {
+    indent: [
+      'error',
       2
     ],
-    "linebreak-style": [
-      "error",
-      "unix"
+    'linebreak-style': [
+      'error',
+      'unix'
     ],
-    "quotes": [
-      "error",
-      "single"
+    'lines-around-comment': [
+      'error',
+      {
+        beforeLineComment: true
+      }
     ],
-    "semi": [
-      "error",
-      "always"
+    'spaced-comment': [
+      'error',
+      'always'
     ],
-    "brace-style": [
-      "error",
-      "1tbs",
+    'new-parens': 'error',
+    'newline-per-chained-call': [
+      'error',
       {
-        "allowSingleLine": true
+        ignoreChainWithDepth: 3
       }
     ],
-    "camelcase": [
-      "error",
+    quotes: [
+      'error',
+      'single'
+    ],
+    semi: [
+      'error',
+      'always'
+    ],
+    'semi-spacing': [
+      'error',
       {
-        "properties": "always"
+        before: false,
+        after: true
       }
     ],
-    "comma-style": [
-      "error",
-      "last"
+    'brace-style': [
+      'error',
+      '1tbs',
+      {
+        allowSingleLine: true
+      }
     ],
-    "consistent-this": [
-      "error",
-      "self"
+    camelcase: [
+      'error',
+      {
+        properties: 'always'
+      }
     ],
-    "new-cap": [
-      "error"
+    'comma-style': [
+      'error',
+      'last'
     ],
-    "no-extra-semi": "error",
-    "no-lonely-if": "error",
-    "no-underscore-dangle": "error",
-    "no-spaced-func": "error",
-    "space-before-function-paren": [
-      2,
-      "never"
+    'comma-spacing': [
+      'error',
+      {
+        before: false,
+        after: true
+      }
+    ],
+    'computed-property-spacing': [
+      'error',
+      'never'
     ],
-    "keyword-spacing": [
-      "error",
+    'func-style': [
+      'error',
+      'declaration',
       {
-        "before": true,
-        "after": true
+        allowArrowFunctions: true
       }
     ],
-    "space-before-blocks": [
+    'consistent-this': [
+      'error',
+      'self'
+    ],
+    'new-cap': [
+      'error'
+    ],
+    'no-console': 0,
+    'array-bracket-spacing': [
+      'error',
+      'never'
+    ],
+    'object-curly-spacing': [
+      'error',
+      'always'
+    ],
+    'max-len': [
+      'error',
+      120,
+      4
+    ],
+    'no-new-object': 'error',
+    'quote-props': [
+      'error',
+      'as-needed'
+    ],
+    'block-spacing': 'error',
+    'handle-callback-err': 'error',
+    'no-new-require': 'error',
+    'no-path-concat': 'error',
+    'callback-return': 'error',
+    'no-array-constructor': 'error',
+    'no-useless-escape': 'error',
+    'no-extra-semi': 'error',
+    'no-lonely-if': 'error',
+    'no-underscore-dangle': 'error',
+    'no-spaced-func': 'error',
+    'no-plusplus': 'error',
+    'one-var-declaration-per-line': [
+      'error',
+      'always'
+    ],
+    'no-multiple-empty-lines': [
+      'error',
+      {
+        max: 2
+      }
+    ],
+    'guard-for-in': 'error',
+    'keyword-spacing': [
+      'error',
+      {
+        before: true,
+        after: true
+      }
+    ],
+    'space-before-function-paren': [
       2,
-      "always"
-    ]
+      'never'
+    ],
+    'space-before-blocks': [
+      2,
+      'always'
+    ],
+    'space-in-parens': [
+      'error',
+      'never'
+    ],
+    'space-infix-ops': 'error'
   }
 };
 

From b6a80dd2aa196eacbf935f9851321023350ae05e Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Sat, 23 Apr 2016 09:08:47 -0500
Subject: [PATCH 0963/1100] Eslint massive cleanup (#952)

* fix(eslint): correct eslint errors in the e2e folder

* fix(eslint): correct errors from lib/cli

* fix(eslint): correct errors within spec files.

* fix(eslint): correct eslint errors within hooks

* fix(eslint): correct errors within lib/tasks

* fix(eslint): resolve errors within ionic tasks

* fix(eslint): correct issues introduced by eslint changes.
---
 .eslintrc.js                                  |  28 +-
 e2e/.eslintrc.js                              |   6 +
 e2e/e2e.spec.js                               | 111 --
 e2e/helpers.js                                |  40 +-
 e2e/shell.spec.js                             | 186 +---
 lib/cli.js                                    | 323 +++---
 .../after_platform_add/010_install_plugins.js |  26 +-
 .../after_plugin_add/010_register_plugin.js   |  40 +-
 .../after_plugin_rm/010_deregister_plugin.js  |   9 +-
 .../after_prepare/010_add_platform_class.js   |  39 +-
 .../020_remove_sass_from_platforms.js         |  10 +-
 .../before_platform_add/init_directories.js   |  12 +-
 lib/ionic/add.js                              |  87 +-
 lib/ionic/assets/gulpfile.js                  |  16 +-
 lib/ionic/bower.js                            |  26 +-
 lib/ionic/browser.js                          |   8 +-
 lib/ionic/cordova.js                          | 233 +++--
 lib/ionic/docs.js                             |  51 +-
 lib/ionic/generate.js                         |  50 +-
 lib/ionic/help.js                             |  20 +-
 lib/ionic/hooks.js                            |  44 +-
 lib/ionic/info.js                             |  16 +-
 lib/ionic/io-config.js                        |  36 +-
 lib/ionic/io-init.js                          |  30 +-
 lib/ionic/ionitron.js                         | 107 +-
 lib/ionic/ions.js                             |  33 +-
 lib/ionic/lib.js                              | 177 ++--
 lib/ionic/link.js                             |  36 +-
 lib/ionic/login.js                            |  84 +-
 lib/ionic/package.js                          | 104 +-
 lib/ionic/prompt.js                           |   8 +-
 lib/ionic/push.js                             | 368 ++++---
 lib/ionic/resources.js                        |  23 +-
 lib/ionic/security.js                         | 135 +--
 lib/ionic/serve.js                            |  36 +-
 lib/ionic/service.js                          | 126 +--
 lib/ionic/setup.js                            |   5 +-
 lib/ionic/share.js                            |  38 +-
 lib/ionic/start.js                            |  48 +-
 lib/ionic/state.js                            |  96 +-
 lib/ionic/stats.js                            | 959 +++++++++---------
 lib/ionic/store.js                            |  23 +-
 lib/ionic/table.js                            |  12 +-
 lib/ionic/task.js                             |   5 +-
 lib/ionic/templates.js                        |  42 +-
 lib/ionic/upload.js                           |  20 +-
 lib/ionic/utils.js                            |  32 +-
 lib/tasks/bumpversion.js                      |  46 +-
 lib/tasks/cliTasks.js                         | 132 +--
 lib/tasks/createDocsJson.js                   |  40 +-
 spec/.eslintrc.js                             |   3 +
 spec/cli.spec.js                              | 150 +--
 spec/serve.spec.js                            |  21 +-
 spec/start.spec.js                            |  11 +-
 spec/stats.spec.js                            |  33 +-
 55 files changed, 2075 insertions(+), 2325 deletions(-)
 create mode 100644 e2e/.eslintrc.js
 delete mode 100644 e2e/e2e.spec.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 25cffd5e16..0905e44435 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,6 +5,10 @@ module.exports = {
   },
   extends: 'eslint:recommended',
   rules: {
+    eqeqeq: [
+      "error",
+      "smart"
+    ],
     indent: [
       'error',
       2
@@ -32,7 +36,10 @@ module.exports = {
     ],
     quotes: [
       'error',
-      'single'
+      'single',
+      {
+        avoidEscape: true
+      }
     ],
     semi: [
       'error',
@@ -58,6 +65,15 @@ module.exports = {
         properties: 'always'
       }
     ],
+    "no-console": 0,
+    "no-extra-semi": "error",
+    "no-lonely-if": "error",
+    "no-underscore-dangle": "error",
+    "no-spaced-func": "error",
+    "space-before-function-paren": [
+      2,
+      "never"
+    ],
     'comma-style': [
       'error',
       'last'
@@ -85,7 +101,10 @@ module.exports = {
       'self'
     ],
     'new-cap': [
-      'error'
+      'error',
+      {
+        capIsNewExceptions: ['Q']
+      }
     ],
     'no-console': 0,
     'array-bracket-spacing': [
@@ -99,7 +118,10 @@ module.exports = {
     'max-len': [
       'error',
       120,
-      4
+      4,
+      {
+        ignoreUrls: true
+      }
     ],
     'no-new-object': 'error',
     'quote-props': [
diff --git a/e2e/.eslintrc.js b/e2e/.eslintrc.js
new file mode 100644
index 0000000000..4f83ced97a
--- /dev/null
+++ b/e2e/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+  env: {
+    node: true,
+    jasmine: true
+  }
+};
diff --git a/e2e/e2e.spec.js b/e2e/e2e.spec.js
deleted file mode 100644
index cf12370c20..0000000000
--- a/e2e/e2e.spec.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// var fs = require('fs'),
-//     helpers = require('./helpers'),
-//     path = require('path'),
-//     Q = require('q'),
-//     shell = require('shelljs');
-
-// var IonicCli = require('../lib/cli');
-// var IonicAppLib = require('ionic-app-lib');
-
-// var tmpDir = helpers.tmpDir('create_test');
-// var appName = 'TestIonic';
-// var appId = 'org.ionic.testing';
-// var project = path.join(tmpDir, appName);
-// var optimist = require('optimist');
-// var start = IonicAppLib.start;
-// var utils = IonicAppLib.utils;
-// var optimistSpy;
-
-
-// xdescribe('end-to-end', function() {
-//   beforeEach(function() {
-//       jasmine.getEnv().defaultTimeoutInterval = 150000;
-//       // if (optimistSpy) {
-//       //   optimistSpy.reset();
-//       // }
-//       optimistSpy = spyOn(optimist, 'boolean');
-//       optimist.boolean.reset();
-
-//       //Mock out call to get the app directory, return our project
-//       spyOn(utils, 'getProjectDirectory').andReturn(project);
-
-//       //Disable console.log statements
-//       // spyOn(IonicAppLib.events, 'on');
-//       // spyOn(process.stdout, 'write');
-//       spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
-
-
-//       shell.rm('-rf', project);
-//       shell.mkdir('-p', tmpDir);
-//   });
-//   afterEach(function() {
-//       process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
-//       // shell.rm('-rf', tmpDir);
-//   });
-
-//   describe('#start e2e', function() {
-//     it('should call start with default template and folder name', function(done) {
-//       console.log('default template');
-//       var args = { _: ['start', 'test'], verbose: true};
-//       //Mock out args from the commands.
-//       // optimistSpy.andReturn({argv: args});
-//       optimistSpy.andCallFake(function(){
-//         return {argv: args};
-//       });
-
-//       Q()
-//       .then(function() {
-//         return IonicCli.run(args);
-//       }).then(function(){
-//         expect(path.join(project, 'www', 'index.html')).toExist();
-//         expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
-//       })
-//       .catch(function(error) {
-//         expect('this').toBe('not this');
-//       })
-//       .fin(done);
-//     });
-
-//     it('should call start with sidemenu template and folder name', function(done) {
-//       console.log('sidemenu template');
-//       var args = { _: ['start', 'test', 'sidemenu'], verbose: true};
-//       //Mock out args from the commands.
-//       // optimistSpy.andReturn({argv: args});
-//       optimistSpy.andCallFake(function(){
-//         return {argv: args};
-//       });
-
-//       Q()
-//       .then(function() {
-//         return IonicCli.run(args);
-//       }).then(function(){
-//         expect(path.join(project, 'www', 'index.html')).toExist();
-//         expect(path.join(project, 'www', 'templates', 'menu.html')).toExist();
-//       })
-//       .catch(function(error) {
-//         expect('this').toBe('not this');
-//       })
-//       .fin(done);
-//     });
-
-//     it('should call start with blank template and folder name', function(done) {
-//       var args = { _: ['start', 'test', 'blank'], verbose: true};
-//       //Mock out args from the commands.
-//       optimistSpy.andCallFake(function(){
-//         return {argv: args};
-//       });
-
-//       Q()
-//       .then(function() {
-//         return IonicCli.run(args);
-//       }).then(function(){
-//         expect(path.join(project, 'www', 'index.html')).toExist();
-//         expect(path.join(project, 'www', 'js', 'app.js')).toExist();
-//       })
-//       .catch(function(error) {
-//         expect('this').toBe('not this');
-//       })
-//       .fin(done);
-//     });
-//   });
-// });
diff --git a/e2e/helpers.js b/e2e/helpers.js
index 3db75d5c96..0a9032424d 100644
--- a/e2e/helpers.js
+++ b/e2e/helpers.js
@@ -17,18 +17,18 @@
     under the License.
 */
 
-var path = require('path'),
-    fs = require('fs'),
-    shell = require('shelljs'),
-    os = require('os');
+var path = require('path');
+var fs = require('fs');
+var shell = require('shelljs');
+var os = require('os');
 
 module.exports.tmpDir = function(subdir) {
-    var dir = path.join(os.tmpdir(), 'e2e-test');
-    if (subdir) {
-        dir = path.join(dir, subdir);
-    }
-    shell.mkdir('-p', dir);
-    return dir;
+  var dir = path.join(os.tmpdir(), 'e2e-test');
+  if (subdir) {
+    dir = path.join(dir, subdir);
+  }
+  shell.mkdir('-p', dir);
+  return dir;
 };
 
 // Returns the platform that should be used for testing on this host platform.
@@ -48,17 +48,17 @@ module.exports.testPlatform = 'android';
 
 // Add the toExist matcher.
 beforeEach(function() {
-    this.addMatchers({
-        'toExist': function() {
-            var notText = this.isNot ? ' not' : '';
-            var self = this;
+  this.addMatchers({
+    toExist: function() {
+      var notText = this.isNot ? ' not' : '';
+      var self = this;
 
-            this.message = function() {
-                return 'Expected file ' + self.actual + notText + ' to exist.';
-            };
+      this.message = function() {
+        return 'Expected file ' + self.actual + notText + ' to exist.';
+      };
 
-            return fs.existsSync(this.actual);
-        }
-    });
+      return fs.existsSync(this.actual);
+    }
+  });
 });
 
diff --git a/e2e/shell.spec.js b/e2e/shell.spec.js
index 052e7782cb..e0939f8173 100644
--- a/e2e/shell.spec.js
+++ b/e2e/shell.spec.js
@@ -1,22 +1,14 @@
-var fs = require('fs'),
-    helpers = require('./helpers'),
-    path = require('path'),
-    Q = require('q'),
-    request = require('request'),
-    shell = require('shelljs');
+var helpers = require('./helpers');
+var path = require('path');
+var shell = require('shelljs');
 
-var IonicCli = require('../lib/cli');
 var IonicAppLib = require('ionic-app-lib');
-var Serve = IonicAppLib.serve;
 
 var tmpDir = helpers.tmpDir('create_test');
 var appName = 'TestIonic';
-var appId = 'org.ionic.testing';
 var project = path.join(tmpDir, appName);
 var optimist = require('optimist');
-var start = IonicAppLib.start;
 var utils = IonicAppLib.utils;
-var optimistSpy;
 
 // What to test
 
@@ -24,181 +16,47 @@ var optimistSpy;
 // * [ ] Start
 // * [ ] Serve
 // * [ ] Run
-// * [ ] 
+// * [ ]
 
 
-ddescribe('end-to-end', function() {
+describe('end-to-end', function() {
   beforeEach(function() {
-      jasmine.getEnv().defaultTimeoutInterval = 150000;
-      // if (optimistSpy) {
-      //   optimistSpy.reset();
-      // }
-      optimistSpy = spyOn(optimist, 'boolean');
-      optimist.boolean.reset();
+    jasmine.getEnv().defaultTimeoutInterval = 150000;
+    optimist.boolean.reset();
 
-      //Mock out call to get the app directory, return our project
-      spyOn(utils, 'getProjectDirectory').andReturn(project);
+    // Mock out call to get the app directory, return our project
+    spyOn(utils, 'getProjectDirectory').andReturn(project);
+    spyOn(IonicAppLib.multibar, 'newBar').andReturn({ tick: function() {} });
 
-      //Disable console.log statements
-      // spyOn(IonicAppLib.events, 'on');
-      // spyOn(process.stdout, 'write');
-      spyOn(IonicAppLib.multibar, 'newBar').andReturn({tick: function(){}});
-
-
-      console.log('Removing project', project);
-      shell.rm('-rf', project);
-      shell.mkdir('-p', tmpDir);
-
-      //Copy over created project here.
+    console.log('Removing project', project);
+    shell.rm('-rf', project);
+    shell.mkdir('-p', tmpDir);
 
+    // Copy over created project here.
   });
 
   afterEach(function() {
-      process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
-      // shell.rm('-rf', tmpDir);
+    process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
+    // shell.rm('-rf', tmpDir);
   });
 
-  //This is working, Tim!
-  describe('#start', function(){
+  // This is working, Tim!
+  describe('#start', function() {
     it('should start a v2 app without cordova cli', function() {
       console.log('Starting v2 app');
       shell.cd(tmpDir);
+
       // shell.rm('-rf', path.join(project, 'i2'));
-      shell.exec('ionic start ' + appName +' --v2');
+      shell.exec('ionic start ' + appName + ' --v2');
       console.log('Ionic v2 app start completed. Now checking files existing.');
       expect(path.join(project, 'node_modules', 'ionic-framework')).toExist();
       expect(path.join(project, 'www', 'index.html')).toExist();
+
       // expect(path.join(project, 'hooks', 'before_prepare', '01_gulp_build.js')).toExist();
       console.log('v2 start completed');
+
       // done();
       return;
     });
   });
-
-  // xdescribe('#start', function(){
-  //   xit('should start a new app', function(done) {
-  //     shell.cd(tmpDir);
-  //     shell.exec('echo "yes" | ionic start s1');
-  //     // expect(path.join(project, 's1', 'www', 'index.html')).toExist();
-  //     // expect(path.join(project, 's1', 'www', 'templates', 'tabs.html')).toExist();
-  //     shell.cd(path.join(tmpDir, 's1'));
-
-  //     // var deferred = Q.defer();
-
-  //     // spyOn(Serve, 'showFinishedServeMessage').andReturn(deferred.promise);
-
-  //     Q()
-  //     .then(function() {
-  //       // var deferred = Q.defer();
-  //       // shell.exec('ionic serve -b & ', {async: true});
-  //         // deferred.resolve();
-  //       // });
-  //       // return deferred.promise;
-  //     })
-  //     .then(function(){
-  //       console.log('ionic serve is done');
-  //       var deferred = Q.defer();
-
-  //       request({ url: 'http://0.0.0.0:8100' }, function(err, res, body) {
-  //         try {
-  //           console.log('body returned', body);
-  //           deferred.resolve(body);
-  //         } catch(e) {
-  //           deferred.reject(body);
-  //         }
-  //       });
-  //       return deferred.promise;
-  //     })
-  //     .then(function(result) {
-  //       console.log('result:', result);
-  //       expect(result).toBe(true);
-  //     })
-  //     .catch(function(err){
-  //       expect('this').toBe('not this');
-  //     })
-  //     .fin(done);
-
-  //   });
-
-  //   iit('should start a new app and run it', function() {
-  //     shell.cd(tmpDir);
-  //     shell.exec('echo "yes" | ionic start ' + appName);
-  //     shell.cd(project);
-      
-  //     expect(path.join(project, 'www', 'index.html')).toExist();
-  //     expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
-      
-  //     shell.exec('ionic plugin add org.apache.cordova.splashscreen');
-      
-  //     expect(path.join(project, 'plugins', 'org.apache.cordova.splashscreen', 'plugin.xml')).toExist();
-      
-  //     shell.exec('ionic platform add android');
-
-  //     expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
-  //     expect(path.join(project, 'resources', 'icon.png')).toExist();
-
-  //     shell.exec('ionic hooks add');
-  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
-
-  //     shell.exec('ionic hooks remove');
-  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
-
-  //     shell.exec('ionic build ios');
-  //     expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
-
-  //     shell.exec('ionic build android');
-  //     //NOTE this expects you're using ant to build. In cordova android 4.0.0 - gradle is used, ant-build wont be there.
-  //     expect(path.join(project, 'platforms', 'android', 'ant-build', 'MainActivity-debug.apk')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build.xml')).toExist();
-
-  //     shell.exec('ionic browser add crosswalk');
-  //     expect(path.join(project, 'engine', 'xwalk-webviews')).toExist();
-
-  //     shell.exec('ionic build android');
-  //     expect(path.join(project, 'platforms', 'android', 'gradle.properties')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-armv7-debug.apk')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-x86-debug.apk')).toExist();
-
-  //   });
-
-  //   iit('should start new v2 app', function() {
-  //     shell.cd(tmpDir);
-  //     shell.exec('echo "yes" | ionic start ' + appName);
-  //     shell.cd(project);
-      
-  //     expect(path.join(project, 'www', 'index.html')).toExist();
-  //     expect(path.join(project, 'www', 'templates', 'tabs.html')).toExist();
-      
-  //     shell.exec('ionic plugin add org.apache.cordova.splashscreen');
-      
-  //     expect(path.join(project, 'plugins', 'org.apache.cordova.splashscreen', 'plugin.xml')).toExist();
-      
-  //     shell.exec('ionic platform add android');
-
-  //     expect(path.join(project, 'platforms', 'android', 'AndroidManifest.xml')).toExist();
-  //     expect(path.join(project, 'resources', 'icon.png')).toExist();
-
-  //     shell.exec('ionic hooks add');
-  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).toExist();
-
-  //     shell.exec('ionic hooks remove');
-  //     expect(path.join(project, 'hooks', 'after_plugin_add', '010_register_plugin.js')).not.toExist();
-
-  //     shell.exec('ionic build ios');
-  //     expect(path.join(project, 'platforms', 'ios', 'build', 'emulator', [appName, '.app'].join(''), 'config.xml')).toExist();
-
-  //     shell.exec('ionic build android');
-  //     //NOTE this expects you're using ant to build. In cordova android 4.0.0 - gradle is used, ant-build wont be there.
-  //     expect(path.join(project, 'platforms', 'android', 'ant-build', 'MainActivity-debug.apk')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build.xml')).toExist();
-
-  //     shell.exec('ionic browser add crosswalk');
-  //     expect(path.join(project, 'engine', 'xwalk-webviews')).toExist();
-
-  //     shell.exec('ionic build android');
-  //     expect(path.join(project, 'platforms', 'android', 'gradle.properties')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-armv7-debug.apk')).toExist();
-  //     expect(path.join(project, 'platforms', 'android', 'build', 'outputs', 'apk', 'android-x86-debug.apk')).toExist();
-  //   })
-  // });
 });
diff --git a/lib/cli.js b/lib/cli.js
index 871a15211b..90cda0fd16 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -1,30 +1,27 @@
-var Cli = module.exports,
-    colors = require('colors'),
-    IonicAppLib = require('ionic-app-lib'),
-    ConfigXml = IonicAppLib.configXml,
-    IonicStats = require('./ionic/stats').IonicStats,
-    IonicStore = require('./ionic/store').IonicStore,
-    IonicConfig = new IonicStore('ionic.config'),
-    Info = IonicAppLib.info,
-    IonicProject = IonicAppLib.project,
-    Ionitron = require('./ionic/ionitron'),
-    optimist = require('optimist'),
-    path = require('path'),
-    fs = require('fs'),
-    settings = require('../package.json'),
-    Tasks = require('./tasks/cliTasks'),
-    Utils = IonicAppLib.utils,
-    Logging = IonicAppLib.logging,
-    log = Logging.logger,
-    Q = require('q'),
-    semver = require('semver'),
-    gutil = require('gulp-util'),
-    prettyTime = require('pretty-hrtime');
-
-Cli.Tasks = TASKS = Tasks;
+var Cli = module.exports;
+var IonicAppLib = require('ionic-app-lib');
+var IonicStats = require('./ionic/stats').IonicStats;
+var IonicStore = require('./ionic/store').IonicStore;
+var IonicConfig = new IonicStore('ionic.config');
+var Info = IonicAppLib.info;
+var IonicProject = IonicAppLib.project;
+var Ionitron = require('./ionic/ionitron');
+var optimist = require('optimist');
+var path = require('path');
+var fs = require('fs');
+var settings = require('../package.json');
+var Tasks = require('./tasks/cliTasks');
+var Utils = IonicAppLib.utils;
+var Logging = IonicAppLib.logging;
+var log = Logging.logger;
+var Q = require('q');
+var semver = require('semver');
+var gutil = require('gulp-util');
+var prettyTime = require('pretty-hrtime');
+
+var TASKS = Cli.Tasks = Tasks;
 
 Cli.IONIC_DASH = 'https://apps.ionic.io';
-//Cli.IONIC_DASH = 'http://localhost:8000';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
 
@@ -48,27 +45,28 @@ log.level = 'info';
 // This way, we can still test with passing in arguments.
 Cli.run = function run(processArgv) {
   try {
-    //First we parse out the args to use them.
-    //Later, we will fetch the command they are trying to
-    //execute, grab those options, and reparse the arguments.
+
+    // First we parse out the args to use them.
+    // Later, we will fetch the command they are trying to
+    // execute, grab those options, and reparse the arguments.
     var argv = optimist(processArgv.slice(2)).argv;
 
     Cli.attachErrorHandling();
     Cli.checkLatestVersion();
 
-    process.on('exit', function(){
+    process.on('exit', function() {
       Cli.printVersionWarning();
     });
 
-    //Before taking any more steps, lets check their
-    //environment and display any upgrade warnings
+    // Before taking any more steps, lets check their
+    // environment and display any upgrade warnings
     Cli.doRuntimeCheck(settings.version);
 
     if ((argv.version || argv.v) && !argv._.length) {
       return Cli.version();
     }
 
-    if(argv.ionitron) {
+    if (argv.ionitron) {
       var lang = argv.es ? 'es' : 'en';
       return Ionitron.print(lang);
     }
@@ -77,11 +75,11 @@ Cli.run = function run(processArgv) {
       log.level = 'debug';
     }
 
-    if(argv.help || argv.h) {
+    if (argv.help || argv.h) {
       return Cli.printHelpLines();
     }
 
-    if(argv['stats-opt-out']) {
+    if (argv['stats-opt-out']) {
       IonicConfig.set('statsOptOut', true);
       IonicConfig.save();
       log.info('Successful stats opt-out');
@@ -91,16 +89,16 @@ Cli.run = function run(processArgv) {
     }
 
     var taskSetting = Cli.tryBuildingTask(argv);
-    if(!taskSetting) {
+    if (!taskSetting) {
       return Cli.printAvailableTasks();
     }
     log.debug('Task setting:', taskSetting);
     var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
     argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
-    var taskModule = Cli.lookupTask(taskSetting.module);
-    var taskInstance = new taskModule();
+    var TaskModule = Cli.lookupTask(taskSetting.module);
+    var taskInstance = new TaskModule();
 
-    //this should be tracked by each task
+    // this should be tracked by each task
     if (!taskSetting.disableChangePwd) {
       var root = Utils.cdIonicRoot();
       var project = IonicProject.load(root);
@@ -108,7 +106,8 @@ Cli.run = function run(processArgv) {
       argv.v2 && log.debug('Ionic 2 project.');
 
       if (fs.existsSync('node_modules')) {
-        //run with gulp hooks
+
+        // run with gulp hooks
         return runWithGulp(argv, taskInstance);
       } else if (argv.v2) {
         log.warn('WARN: No node_modules directory found, do you need to run npm install?'.yellow);
@@ -121,7 +120,7 @@ Cli.run = function run(processArgv) {
   }
 };
 
-function runWithGulp(argv, taskInstance){
+function runWithGulp(argv, taskInstance) {
   var cmdName = argv._[0];
   var beforeHook = cmdName + ':before';
   var afterHook = cmdName + ':after';
@@ -131,7 +130,8 @@ function runWithGulp(argv, taskInstance){
 
     try {
       var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
-    } catch(e) {
+    } catch (e) {
+
       // Empty gulpfile (or one that doesn't require gulp?), and no gulp
       log.error('\nGulpfile detected, but gulp is not installed'.red);
       log.error('Do you need to run `npm install`?\n'.red);
@@ -143,31 +143,35 @@ function runWithGulp(argv, taskInstance){
       log.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
     }
     return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
-      function(){
+      function() {
+
         // Only some commands return promises, so wrap it
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       },
-      function(e){ //task error, let gulp handle it
-        //if there is no hook task, but it's a v2 app and a command that usually needs a hook
+      function(e) { // task error, let gulp handle it
+
+        // if there is no hook task, but it's a v2 app and a command that usually needs a hook
         if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
           var taskName = (cmdName === 'serve') ? 'watch' : 'build';
           log.warn(('WARN: No \'' + beforeHook + '\' gulp task found!').yellow);
 
-          //The task exists, but there are no hooks for it
-          //They have the old config file, so we're safe to yell at them
-          //With new config, may intentionally not have hooks if running their own build
+          // The task exists, but there are no hooks for it
+          // They have the old config file, so we're safe to yell at them
+          // With new config, may intentionally not have hooks if running their own build
           if (gulp.tasks[taskName] && fs.existsSync('ionic.config.js')) {
-            log.info(('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n').cyan)
+            log.info(('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n').cyan);
             log.info(('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n').cyan);
             log.info(('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n').cyan);
           } else {
-            log.warn(('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n').yellow);
+            log.warn(('If your app requires a build step, you may want to ensure it runs before ' +
+                      cmdName + '.\n').yellow);
           }
         }
+
         // Only some commands return promises, so wrap it
         return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
       }
-    ).then(function(){
+    ).then(function() {
       if (gulp.tasks[afterHook]) {
         log.info('\nRunning \'' + afterHook + '\' gulp task after ' + cmdName);
       }
@@ -175,7 +179,7 @@ function runWithGulp(argv, taskInstance){
     });
   }
 
-  //No gulpfile
+  // No gulpfile
   if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
     log.warn('WARN: No gulpfile found!');
     log.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
@@ -189,15 +193,13 @@ function runWithGulp(argv, taskInstance){
       inquirer.prompt([{
         type: 'confirm',
         name: 'downloadGulp',
-        message: 'Would you like to download the default gulpfile?'.cyan,
+        message: 'Would you like to download the default gulpfile?'.cyan
       }],
-      function(answers){
+      function(answers) {
         answers.downloadGulp ? deferred.resolve() : deferred.reject();
       });
-      var downloadGulp = false;
       return deferred.promise.then(
         function() {
-          downloadGulp = true;
           return downloadDefaultGulpfile(cmdName).then(
             installGulpfilePackages,
             function(err) {
@@ -205,13 +207,12 @@ function runWithGulp(argv, taskInstance){
               process.exit(1);
             }
           ).then(
-            function(){
+            function() {
               log.info('Npm packages installed successfully. Try running \'' + cmdName + '\' again.');
             },
-            function(){
+            function() {
               log.warn('There was an error installing the packages required by the gulpfile.');
               log.warn('You\'ll need to install the following packages manually: ');
-              log.warn('    ' + requires.join(' '));
             }
           );
         },
@@ -225,14 +226,15 @@ function runWithGulp(argv, taskInstance){
   return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
 }
 
-function loadGulpfile(){
-  //TODO add babel support?
+function loadGulpfile() {
+
+  // TODO add babel support?
   var names = ['gulpfile.js', 'Gulpfile.js'];
-  for (var i = 0, ii = names.length; i < ii; i++) {
+  for (var i = 0, ii = names.length; i < ii; i += 1) {
     try {
       require(path.resolve(process.cwd() + '/' + names[i]));
       return true;
-    } catch(e){
+    } catch (e) {
       if (e.code === 'MODULE_NOT_FOUND') {
         if (e.message.indexOf(names[i]) === -1) {
           log.info('Uh oh! Looks like you\'re missing a module in your gulpfile:');
@@ -240,11 +242,12 @@ function loadGulpfile(){
           log.info('\nDo you need to run `npm install`?\n');
           process.exit(1);
         } else {
+
           // ignore missing gulpfile
-          continue
+          continue;
         }
       }
-      log.error('There is an error in your gulpfile: ')
+      log.error('There is an error in your gulpfile: ');
       log.error(e.stack);
       process.exit(1);
     }
@@ -252,7 +255,7 @@ function loadGulpfile(){
   return false;
 }
 
-function downloadDefaultGulpfile(){
+function downloadDefaultGulpfile() {
   var https = require('https');
   var fileStream = fs.createWriteStream('gulpfile.js');
   var deferred = Q.defer();
@@ -262,24 +265,24 @@ function downloadDefaultGulpfile(){
 
   log.info('\nDownloading default gulpfile from: ' + url);
 
-  fileStream.on('open', function () {
-    https.get(url, function (res) {
-      res.on('error', function (err) {
+  fileStream.on('open', function() {
+    https.get(url, function(res) {
+      res.on('error', function(err) {
         deferred.reject(err);
       });
 
       res.pipe(fileStream);
     });
-  }).on('error', function (err) {
+  }).on('error', function(err) {
     deferred.reject(err);
-  }).on('finish', function () {
+  }).on('finish', function() {
     deferred.resolve();
   });
 
   return deferred.promise;
 }
 
-function installGulpfilePackages(cmdName){
+function installGulpfilePackages() {
   var detective = require('detective');
   var requires = detective(fs.readFileSync('gulpfile.js'));
   var deferred = Q.defer();
@@ -289,8 +292,8 @@ function installGulpfilePackages(cmdName){
   log.info('    ' + requires.join(' ') + '\n');
 
   var npmInstall = require('child_process').spawn('npm', ['install', '--save-dev'].concat(requires));
-  npmInstall.stdout.on('data', function(data){ log.debug(data) });
-  npmInstall.stderr.on('data', function(data){ log.debug(data) });
+  npmInstall.stdout.on('data', function(data) { log.debug(data); });
+  npmInstall.stderr.on('data', function(data) { log.debug(data); });
   npmInstall.on('error', function(err) {
     log.error('Error in gulp npm install: ' + err.stack);
   });
@@ -304,6 +307,7 @@ function installGulpfilePackages(cmdName){
 
 function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
+
     // TODO: batch these
     // so when 5 tasks start at once it only logs one time with all 5
     gutil.log('Starting', '\'' + e.task.cyan + '\'...');
@@ -372,7 +376,7 @@ Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
       var optionWithPipe = key;
       var optionsSplit = optionWithPipe.split('|');
       booleanOptions.push(optionsSplit[0].substring(2));
-      if (optionsSplit.length == 2) {
+      if (optionsSplit.length === 2) {
         booleanOptions.push(optionsSplit[1].substring(1));
       }
     }
@@ -395,13 +399,13 @@ Cli.printVersionWarning = function printVersionWarning() {
     return;
   }
 
-  if (Cli.npmVersion && Cli.npmVersion != settings.version.trim()) {
+  if (Cli.npmVersion && Cli.npmVersion !== settings.version.trim()) {
     process.stdout.write('\n------------------------------------\n'.red);
     process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
-    process.stdout.write( (' * Locally installed version: ' + settings.version + '\n').yellow );
-    process.stdout.write( (' * Latest version: ' + Cli.npmVersion + '\n').yellow );
-    process.stdout.write( (' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow );
-    process.stdout.write( ' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow );
+    process.stdout.write((' * Locally installed version: ' + settings.version + '\n').yellow);
+    process.stdout.write((' * Latest version: ' + Cli.npmVersion + '\n').yellow);
+    process.stdout.write((' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow);
+    process.stdout.write(' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow);
     process.stdout.write('------------------------------------\n\n'.red);
     Cli.npmVersion = null;
   }
@@ -412,13 +416,15 @@ Cli.checkLatestVersion = function checkLatestVersion() {
 
   try {
     if (settings.version.indexOf('beta') > -1 || settings.version.indexOf('alpha') > -1) {
+
       // don't bother checking if its a beta
       Cli.latestVersion.resolve();
       return;
     }
 
     var versionCheck = IonicConfig.get('versionCheck');
-    if (versionCheck && ((versionCheck + 86400000) > Date.now() )) {
+    if (versionCheck && ((versionCheck + 86400000) > Date.now())) {
+
       // we've recently checked for the latest version, so don't bother again
       Cli.latestVersion.resolve();
       return;
@@ -427,11 +433,16 @@ Cli.checkLatestVersion = function checkLatestVersion() {
     var proxy = process.env.PROXY || process.env.http_proxy || null;
     var request = require('request');
     request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
+      if (err) {
+        return console.log(err);
+      }
       try {
         Cli.npmVersion = JSON.parse(body).version;
         IonicConfig.set('versionCheck', Date.now());
         IonicConfig.save();
-      } catch(e) {}
+      } catch (e) {
+        console.log(e);
+      }
       Cli.latestVersion.resolve();
     });
   } catch (e) {
@@ -451,13 +462,13 @@ Cli.tryBuildingTask = function tryBuildingTask(argv) {
 };
 
 Cli.getTaskWithName = function getTaskWithName(name) {
-  for (var i = 0; i < TASKS.length; i++) {
+  for (var i = 0; i < TASKS.length; i += 1) {
     var t = TASKS[i];
-    if(t.name === name) {
+    if (t.name === name) {
       return t;
     }
     if (t.alt) {
-      for(var j = 0; j < t.alt.length; j++) {
+      for (var j = 0; j < t.alt.length; j += 1) {
         var alt = t.alt[j];
         if (alt === name) {
           return t;
@@ -468,30 +479,30 @@ Cli.getTaskWithName = function getTaskWithName(name) {
 };
 
 Cli.printIonic = function printIonic() {
-  var w = function(s) {
+  function w(s) {
     process.stdout.write(s);
-  };
+  }
 
   w('  _             _     \n');
   w(' (_)           (_)     \n');
   w('  _  ___  _ __  _  ___ \n');
   w(' | |/ _ \\| \'_ \\| |/ __|\n');
   w(' | | (_) | | | | | (__ \n');
-  w(' |_|\\___/|_| |_|_|\\___|  CLI v'+ settings.version + '\n');
+  w(' |_|\\___/|_| |_|_|\\___|  CLI v' + settings.version + '\n');
 };
 
-Cli.printAvailableTasks = function printAvailableTasks(argv) {
+Cli.printAvailableTasks = function printAvailableTasks() {
   Cli.printIonic();
   process.stderr.write('\nUsage: ionic task args\n\n=======================\n\n');
 
   if (process.argv.length > 2) {
-    process.stderr.write( (process.argv[2] + ' is not a valid task\n\n').bold.red );
+    process.stderr.write((process.argv[2] + ' is not a valid task\n\n').bold.red);
   }
 
   process.stderr.write('Available tasks: '.bold);
   process.stderr.write('(use --help or -h for more info)\n\n');
 
-  for (var i = 0; i < TASKS.length; i++) {
+  for (var i = 0; i < TASKS.length; i += 1) {
     var task = TASKS[i];
     if (task.summary) {
       var name = '   ' + task.name + '  ';
@@ -511,7 +522,7 @@ Cli.printHelpLines = function printHelpLines() {
   Cli.printIonic();
   process.stderr.write('\n=======================\n');
 
-  for (var i = 0; i < TASKS.length; i++) {
+  for (var i = 0; i < TASKS.length; i += 1) {
     var task = TASKS[i];
     if (task.summary) {
       Cli.printUsage(task);
@@ -523,104 +534,109 @@ Cli.printHelpLines = function printHelpLines() {
 };
 
 Cli.printUsage = function printUsage(d) {
-  var w = function(s) {
+  function w(s) {
     process.stdout.write(s);
-  };
+  }
 
   w('\n');
 
   var rightColumn = 45;
   var dots = '';
   var indent = '';
-  var x, arg;
+  var x;
+  var arg;
 
   var taskArgs = d.title;
 
-  for(arg in d.args) {
-    taskArgs += ' ' + arg;
+  for (arg in d.args) {
+    if ({}.hasOwnProperty.call(d.args, arg)) {
+      taskArgs += ' ' + arg;
+    }
   }
 
   w(taskArgs.green.bold);
 
-  while( (taskArgs + dots).length < rightColumn + 1) {
+  while ((taskArgs + dots).length < rightColumn + 1) {
     dots += '.';
   }
 
   w(' ' + dots.grey + '  ');
 
-  if(d.summary) {
+  if (d.summary) {
     w(d.summary.bold);
   }
 
-  for(arg in d.args) {
-    if( !d.args[arg] ) continue;
+  for (arg in d.args) {
+    if (!d.args[arg]) continue;
 
     indent = '';
     w('\n');
-    while(indent.length < rightColumn) {
+    while (indent.length < rightColumn) {
       indent += ' ';
     }
-    w( (indent + '    ' + arg + ' ').bold );
+    w((indent + '    ' + arg + ' ').bold);
 
     var argDescs = d.args[arg].split('\n');
     var argIndent = indent + '    ';
 
-    for(x=0; x<arg.length + 1; x++) {
+    for (x = 0; x < arg.length + 1; x += 1) {
       argIndent += ' ';
     }
 
-    for(x=0; x<argDescs.length; x++) {
-      if(x===0) {
-        w( argDescs[x].bold );
+    for (x = 0; x < argDescs.length; x += 1) {
+      if (x === 0) {
+        w(argDescs[x].bold);
       } else {
-        w( '\n' + argIndent + argDescs[x].bold );
+        w('\n' + argIndent + argDescs[x].bold);
       }
     }
   }
 
   indent = '';
-  while(indent.length < d.name.length + 1) {
+  while (indent.length < d.name.length + 1) {
     indent += ' ';
   }
 
   var optIndent = indent;
-  while(optIndent.length < rightColumn + 4) {
+  while (optIndent.length < rightColumn + 4) {
     optIndent += ' ';
   }
 
-  for(var opt in d.options) {
-    w('\n');
-    dots = '';
+  for (var opt in d.options) {
+    if ({}.hasOwnProperty.call(d.options, opt)) {
+      w('\n');
+      dots = '';
 
-    var optLine = indent + '[' + opt + ']  ';
+      var optLine = indent + '[' + opt + ']  ';
 
-    w(optLine.yellow.bold);
+      w(optLine.yellow.bold);
 
-    if(d.options[opt]) {
-      while( (dots.length + optLine.length - 2) < rightColumn) {
-        dots += '.';
-      }
-      w(dots.grey + '  ');
+      if (d.options[opt]) {
+        while ((dots.length + optLine.length - 2) < rightColumn) {
+          dots += '.';
+        }
+        w(dots.grey + '  ');
 
-      var taskOpt = d.options[opt],
-          optDescs;
+        var taskOpt = d.options[opt];
+        var optDescs;
 
-      if (typeof taskOpt == 'string') {
-        optDescs = taskOpt.split('\n');
-      } else {
-        optDescs = taskOpt.title.split('\n');
-      }
-      for(x=0; x<optDescs.length; x++) {
-        if(x===0) {
-          w( optDescs[x].bold );
+        if (typeof taskOpt == 'string') {
+          optDescs = taskOpt.split('\n');
         } else {
-          w( '\n' + optIndent + optDescs[x].bold );
+          optDescs = taskOpt.title.split('\n');
+        }
+        for (x = 0; x < optDescs.length; x += 1) {
+          if (x === 0) {
+            w(optDescs[x].bold);
+          } else {
+            w('\n' + optIndent + optDescs[x].bold);
+          }
         }
       }
     }
-  }
 
-  w('\n');
+    w('\n');
+  }
 };
 
 Cli.processExit = function processExit(code) {
@@ -628,11 +644,11 @@ Cli.processExit = function processExit(code) {
     Q.all([Cli.latestVersion.promise, Cli.cliNews.promise])
     .then(function() {
       process.exit(code);
-    })
+    });
   } else {
     Cli.latestVersion.promise.then(function() {
       process.exit(code);
-    })
+    });
   }
 };
 
@@ -641,7 +657,7 @@ Cli.version = function version() {
 };
 
 Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
-  if(typeof skipNewsCheck == 'undefined') {
+  if (typeof skipNewsCheck == 'undefined') {
     skipNewsCheck = true;
   }
 
@@ -649,17 +665,17 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   var proxy = process.env.PROXY || null;
 
   var request = require('request');
-  var monthNames = [ "January", "February", "March", "April", "May", "June",
-  "July", "August", "September", "October", "November", "December" ];
+  var monthNames = ['January', 'February', 'March', 'April', 'May', 'June',
+      'July', 'August', 'September', 'October', 'November', 'December'];
   var d = new Date();
 
   var downloadUrl = 'http://code.ionicframework.com/content/cli-message.json';
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-    if(!err && res && res.statusCode === 200) {
+    if (!err && res && res.statusCode === 200) {
       try {
         var newsId = IonicConfig.get('newsId');
-        messagesJson = JSON.parse(html);
-        if(skipNewsCheck || typeof newsId == 'undefined' || newsId != messagesJson.id) {
+        var messagesJson = JSON.parse(html);
+        if (skipNewsCheck || typeof newsId == 'undefined' || newsId !== messagesJson.id) {
           IonicConfig.set('newsId', messagesJson.id);
           IonicConfig.save();
         } else {
@@ -669,17 +685,21 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 
         process.stdout.write('+---------------------------------------------------------+\n');
 
-        var monthMessage = ['+ Extra! Extra! Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('');
+        var monthMessage = ['+ Extra! Extra! Ionic Updates for ',
+          monthNames[d.getMonth()],
+          ' ',
+          d.getFullYear(),
+          '\n+\n'].join('');
         process.stdout.write(monthMessage);
 
-        for(var i = 0, j = messagesJson.list.length; i < j; i++) {
+        for (var i = 0, j = messagesJson.list.length; i < j; i += 1) {
           var entry = messagesJson.list[i];
           var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.blue.bold, '\n+\n'].join('');
           process.stdout.write(entryMessage);
         }
         process.stdout.write('+---------------------------------------------------------+\n'.green);
-      } catch(ex) {
-        q.reject('Error occurred in downloading the CLI messages:', ex)
+      } catch (ex) {
+        q.reject('Error occurred in downloading the CLI messages:', ex);
         Utils.fail(ex);
       }
       q.resolve(messagesJson);
@@ -698,7 +718,7 @@ Cli.gatherInfo = function gatherInfo() {
   return info;
 };
 
-Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
+Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
   console.log('An uncaught exception occurred and has been reported to Ionic'.error.bold);
   var errorMessage = typeof err === 'string' ? err : err.message;
   Utils.errorHandler(errorMessage);
@@ -706,7 +726,7 @@ Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err, url) {
 };
 
 Cli.attachErrorHandling = function attachErrorHandling() {
-  Utils.errorHandler = function errorHandler(msg, taskHelp) {
+  Utils.errorHandler = function errorHandler(msg) {
     try {
       log.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
@@ -718,7 +738,7 @@ Cli.attachErrorHandling = function attachErrorHandling() {
           process.stderr.write('\n' + stack.bold + '\n\n');
         }
         process.stderr.write('\n' + errorMessage.bold);
-        process.stderr.write( (' (CLI v' + ionicCliVersion + ')').bold + '\n');
+        process.stderr.write((' (CLI v' + ionicCliVersion + ')').bold + '\n');
 
         Info.printInfo(info);
       }
@@ -726,17 +746,18 @@ Cli.attachErrorHandling = function attachErrorHandling() {
       process.exit(1);
       return '';
     } catch (ex) {
-      console.log('errorHandler had an error', ex)
+      console.log('errorHandler had an error', ex);
       console.log(ex.stack);
     }
   };
 
-  //TODO Attach error reporter here
+  // TODO Attach error reporter here
 };
 
-//Backwards compatability for those commands that havent been
-//converted yet.
+// Backwards compatability for those commands that havent been
+// converted yet.
 Cli.fail = function fail(err, taskHelp) {
+
   // var error = typeof err == 'string' ? new Error(err) : err;
   Utils.fail(err, taskHelp);
 };
diff --git a/lib/hooks/after_platform_add/010_install_plugins.js b/lib/hooks/after_platform_add/010_install_plugins.js
index 8260f82b45..1c5a28e5e9 100644
--- a/lib/hooks/after_platform_add/010_install_plugins.js
+++ b/lib/hooks/after_platform_add/010_install_plugins.js
@@ -5,37 +5,37 @@
  * https://raw.githubusercontent.com/diegonetto/generator-ionic/master/templates/hooks/after_platform_add/install_plugins.js
  */
 var exec = require('child_process').exec;
-var path = require('path');
 var util = require('util');
 
 var packageJSON = null;
 
 try {
   packageJSON = require('../../package.json');
-} catch(ex) {
-  console.log('\nThere was an error fetching your package.json file.')
-  console.log('\nPlease ensure a valid package.json is in the root of this project\n')
+} catch (ex) {
+  console.log('\nThere was an error fetching your package.json file.');
+  console.log('\nPlease ensure a valid package.json is in the root of this project\n');
   return;
 }
 
-var cmd = process.platform === 'win32' ? 'cordova.cmd' : 'cordova';
-// var script = path.resolve(__dirname, '../../node_modules/cordova/bin', cmd);
-
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
 
 function installNextPlugin() {
   var curPlugin = packageJSON.cordovaPlugins.shift();
   if (curPlugin) {
     exec('cordova plugin add ' + curPlugin, function(err, stdout, stderr) {
-        util.puts(stdout);
-        util.puts(stderr);
+      if (err) {
+        console.log(err);
+        process.exit(1);
+      }
+      util.puts(stdout);
+      util.puts(stderr);
     })
-    .on("exit", function(code) {
+    .on('exit', function(code) {
       if (code) {
-          console.log("'cordova plugin add " + curPlugin + "' failed with code '" + code + "'");
-          process.exit(code);
+        console.log("'cordova plugin add " + curPlugin + "' failed with code '" + code + "'");
+        process.exit(code);
       } else {
-          installNextPlugin();
+        installNextPlugin();
       }
     });
   }
diff --git a/lib/hooks/after_plugin_add/010_register_plugin.js b/lib/hooks/after_plugin_add/010_register_plugin.js
index b0e9d35481..661dbdf6c2 100644
--- a/lib/hooks/after_plugin_add/010_register_plugin.js
+++ b/lib/hooks/after_plugin_add/010_register_plugin.js
@@ -3,52 +3,52 @@
 /**
  * Push plugins to cordovaPlugins array after_plugin_add
  */
-var fs = require('fs'),
-    packageJSON = require('../../package.json'),
-    path = require('path');
+var fs = require('fs');
+var packageJSON = require('../../package.json');
+var path = require('path');
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
-process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
-  var configString,
-      idRegEx,
-      id,
-      pluginXmlPath,
-      pluginToAdd;
+process.env.CORDOVA_PLUGINS.split(',').forEach(function(plugin) {
+  var configString;
+  var idRegEx;
+  var id;
+  var pluginXmlPath;
+  var pluginToAdd;
 
-  if(plugin.indexOf('https') != -1 || plugin.indexOf('git') != -1) {
+  if (plugin.indexOf('https') !== -1 || plugin.indexOf('git') !== -1) {
     console.log('Installing plugin from url');
   }
 
-  if(plugin.indexOf('/') != -1) {
+  if (plugin.indexOf('/') !== -1) {
     try {
       pluginXmlPath = path.resolve(plugin, 'plugin.xml');
       console.log('got pluginXmlPath:', pluginXmlPath);
       if (!fs.existsSync(pluginXmlPath)) {
-        var errorMessage = ['There was no plugin.xml file found for path: ', pluginXmlPath].join('');
+        console.log(['There was no plugin.xml file found for path: ', pluginXmlPath].join(''));
         return;
       }
 
-      configString = fs.readFileSync(pluginXmlPath,{encoding: 'utf8'});
+      configString = fs.readFileSync(pluginXmlPath, { encoding: 'utf8' });
       idRegEx = new RegExp('<plugin[^>]*id="(.*)"', 'i');
-      id = idRegEx.exec(configString)[1]
-      pluginToAdd = {id: id, locator: plugin};
-    } catch(ex) {
+      id = idRegEx.exec(configString)[1];
+      pluginToAdd = { id: id, locator: plugin };
+    } catch (ex) {
       console.log('There was an error retrieving the plugin.xml filr from the 010_register_plugin.js hook', ex);
     }
   } else {
     pluginToAdd = plugin;
   }
 
-  if(typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) == -1) {
+  if (typeof pluginToAdd == 'string' && packageJSON.cordovaPlugins.indexOf(pluginToAdd) === -1) {
     packageJSON.cordovaPlugins.push(pluginToAdd);
   } else if (typeof pluginToAdd == 'object') {
     var pluginExists = false;
     packageJSON.cordovaPlugins.forEach(function(checkPlugin) {
-      if(typeof checkPlugin == 'object' && checkPlugin.id == pluginToAdd.id) {
+      if (typeof checkPlugin == 'object' && checkPlugin.id === pluginToAdd.id) {
         pluginExists = true;
       }
-    })
-    if(!pluginExists) {
+    });
+    if (!pluginExists) {
       packageJSON.cordovaPlugins.push(pluginToAdd);
     }
   }
diff --git a/lib/hooks/after_plugin_rm/010_deregister_plugin.js b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
index 4f4c6b892e..cc83632398 100644
--- a/lib/hooks/after_plugin_rm/010_deregister_plugin.js
+++ b/lib/hooks/after_plugin_rm/010_deregister_plugin.js
@@ -8,15 +8,16 @@ var packageJSON = require('../../package.json');
 
 packageJSON.cordovaPlugins = packageJSON.cordovaPlugins || [];
 
-process.env.CORDOVA_PLUGINS.split(',').forEach(function (plugin) {
+process.env.CORDOVA_PLUGINS.split(',').forEach(function(plugin) {
   var index = packageJSON.cordovaPlugins.indexOf(plugin);
   if (index > -1) {
     packageJSON.cordovaPlugins.splice(index, 1);
   } else {
-    //If it didnt find a match, it may be listed as {id,locator}
-    for(var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i++) {
+
+    // If it didnt find a match, it may be listed as {id,locator}
+    for (var i = 0, j = packageJSON.cordovaPlugins.length; i < j; i += 1) {
       var packagePlugin = packageJSON.cordovaPlugins[i];
-      if(typeof packagePlugin == 'object' && packagePlugin.id == plugin) {
+      if (typeof packagePlugin == 'object' && packagePlugin.id === plugin) {
         packageJSON.cordovaPlugins.splice(index, 1);
         break;
       }
diff --git a/lib/hooks/after_prepare/010_add_platform_class.js b/lib/hooks/after_prepare/010_add_platform_class.js
index 06049c2898..cdb7d03881 100755
--- a/lib/hooks/after_prepare/010_add_platform_class.js
+++ b/lib/hooks/after_prepare/010_add_platform_class.js
@@ -14,6 +14,7 @@ var path = require('path');
 var rootdir = process.argv[2];
 
 function addPlatformBodyTag(indexPath, platform) {
+
   // add the platform class to the body tag
   try {
     var platformClass = 'platform-' + platform;
@@ -24,21 +25,23 @@ function addPlatformBodyTag(indexPath, platform) {
     });
 
     var bodyTag = findBodyTag(html);
-    if(!bodyTag) return; // no opening body tag, something's wrong
+    if (!bodyTag) return; // no opening body tag, something's wrong
 
-    if(bodyTag.indexOf(platformClass) > -1) return; // already added
+    if (bodyTag.indexOf(platformClass) > -1) return; // already added
 
     var newBodyTag = bodyTag;
 
     var classAttr = findClassAttr(bodyTag);
-    if(classAttr) {
+    if (classAttr) {
+
       // body tag has existing class attribute, add the classname
-      var endingQuote = classAttr.substring(classAttr.length-1);
-      var newClassAttr = classAttr.substring(0, classAttr.length-1);
+      var endingQuote = classAttr.substring(classAttr.length - 1);
+      var newClassAttr = classAttr.substring(0, classAttr.length - 1);
       newClassAttr += ' ' + platformClass + ' ' + cordovaClass + endingQuote;
       newBodyTag = bodyTag.replace(classAttr, newClassAttr);
 
     } else {
+
       // add class attribute to the body tag
       newBodyTag = bodyTag.replace('>', ' class="' + platformClass + ' ' + cordovaClass + '">');
     }
@@ -50,23 +53,29 @@ function addPlatformBodyTag(indexPath, platform) {
     });
 
     process.stdout.write('add to body class: ' + platformClass + '\n');
-  } catch(e) {
+  } catch (e) {
     process.stdout.write(e);
   }
 }
 
 function findBodyTag(html) {
+
   // get the body tag
-  try{
+  try {
     return html.match(/<body(?=[\s>])(.*?)>/gi)[0];
-  }catch(e){}
+  } catch (e) {
+    console.log('failure in findBodyTag');
+  }
 }
 
 function findClassAttr(bodyTag) {
+
   // get the body tag's class attribute
-  try{
+  try {
     return bodyTag.match(/ class=["|'](.*?)["|']/gi)[0];
-  }catch(e){}
+  } catch (e) {
+    console.log('failure in findClassAttr');
+  }
 }
 
 if (rootdir) {
@@ -74,25 +83,25 @@ if (rootdir) {
   // go through each of the platform directories that have been prepared
   var platforms = (process.env.CORDOVA_PLATFORMS ? process.env.CORDOVA_PLATFORMS.split(',') : []);
 
-  for(var x=0; x<platforms.length; x++) {
+  for (var x = 0; x < platforms.length; x += 1) {
+
     // open up the index.html file at the www root
     try {
       var platform = platforms[x].trim().toLowerCase();
       var indexPath;
 
-      if(platform == 'android') {
+      if (platform === 'android') {
         indexPath = path.join('platforms', platform, 'assets', 'www', 'index.html');
       } else {
         indexPath = path.join('platforms', platform, 'www', 'index.html');
       }
 
-      if(fs.existsSync(indexPath)) {
+      if (fs.existsSync(indexPath)) {
         addPlatformBodyTag(indexPath, platform);
       }
 
-    } catch(e) {
+    } catch (e) {
       process.stdout.write(e);
     }
   }
-
 }
diff --git a/lib/hooks/after_prepare/020_remove_sass_from_platforms.js b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
index da3193a35a..e768647044 100644
--- a/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
+++ b/lib/hooks/after_prepare/020_remove_sass_from_platforms.js
@@ -7,11 +7,11 @@
 var fs = require('fs');
 var path = require('path');
 
-var deleteFolderRecursive = function(removePath) {
-  if( fs.existsSync(removePath) ) {
-    fs.readdirSync(removePath).forEach(function(file,index){
+function deleteFolderRecursive(removePath) {
+  if (fs.existsSync(removePath)) {
+    fs.readdirSync(removePath).forEach(function(file) {
       var curPath = path.join(removePath, file);
-      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+      if (fs.lstatSync(curPath).isDirectory()) { // recurse
         deleteFolderRecursive(curPath);
       } else { // delete file
         fs.unlinkSync(curPath);
@@ -19,7 +19,7 @@ var deleteFolderRecursive = function(removePath) {
     });
     fs.rmdirSync(removePath);
   }
-};
+}
 
 var iosPlatformsDir = path.resolve(__dirname, '../../platforms/ios/www/lib/ionic/scss');
 var androidPlatformsDir = path.resolve(__dirname, '../../platforms/android/assets/www/lib/ionic/scss');
diff --git a/lib/hooks/before_platform_add/init_directories.js b/lib/hooks/before_platform_add/init_directories.js
index babde347a4..b887eba42c 100644
--- a/lib/hooks/before_platform_add/init_directories.js
+++ b/lib/hooks/before_platform_add/init_directories.js
@@ -11,13 +11,17 @@ var platformsDir = path.resolve(__dirname, '../../platforms');
 var pluginsDir = path.resolve(__dirname, '../../plugins');
 
 try {
-  fs.mkdirSync(platformsDir, function (err) {
+  fs.mkdirSync(platformsDir, function(err) {
     if (err) { console.error(err); }
   });
-} catch(ex) {}
+} catch (ex) {
+  console.error(ex);
+}
 
 try {
-  fs.mkdirSync(pluginsDir, function (err) {
+  fs.mkdirSync(pluginsDir, function(err) {
     if (err) { console.error(err); }
   });
-} catch(ex) {}
+} catch (ex) {
+  console.error(ex);
+}
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 27c0f41b22..6770fd9464 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -1,16 +1,15 @@
-require('shelljs/global')
+require('shelljs/global');
 
-var Task = require('./task').Task,
-    IonicCordova = require('./cordova').IonicTask,
-    // argv = require('optimist').argv,
-    fs = require('fs'),
-    IonicAppLib = require('ionic-app-lib'),
-    ioLib = IonicAppLib.ioConfig,
-    log = IonicAppLib.logging.logger,
-    path = require('path'),
-    bower = require('./bower');
+var path = require('path');
+var exec = require('child_process').exec;
 
-var IonicTask = function() {};
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var ioLib = IonicAppLib.ioConfig;
+var log = IonicAppLib.logging.logger;
+var bower = require('./bower');
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -19,41 +18,47 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(compo
 
   var result = exec(bowerInstallCommand);
 
-  if (result.code != 0) {
-    //Error happened, report it.
-    var errorMessage = 'Bower error, check that "'.red.bold + componentName.verbose + '"'.red.bold + ' exists,'.red.bold +
-                       '\nor try running "'.red.bold + bowerInstallCommand.verbose + '" for more info.'.red.bold;
+  if (result.code !== 0) {
+
+    // Error happened, report it.
+    var errorMessage = 'Bower error, check that "'.red.bold + componentName.verbose + '"'.red.bold +
+      ' exists,'.red.bold + '\nor try running "'.red.bold + bowerInstallCommand.verbose + '" for more info.'.red.bold;
+
     this.ionic.fail(errorMessage, 'add');
   } else {
-    log.info('Bower component installed - ' + componentName)
+    log.info('Bower component installed - ' + componentName);
   }
-}
+};
 
 IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(componentName) {
   var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
 
   var result = exec(bowerUninstallCommand);
 
-  if (result.code != 0) {
-    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose + '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
-    this.ionic.fail(errorMessage, 'add')
+  if (result.code !== 0) {
+    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose +
+      '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
+
+    this.ionic.fail(errorMessage, 'add');
   } else {
     var message = 'Bower component removed - ' + componentName;
     log.info(message.red);
   }
-}
+};
 
 IonicTask.prototype.listComponents = function listComponents() {
   try {
     var bowerJson = require(path.join(process.cwd(), 'bower.json'));
-    log.info('Ions, bower components, or addons installed: ')
+    log.info('Ions, bower components, or addons installed: ');
     for (var bowerCompIndex in bowerJson.devDependencies) {
-      log.info(bowerCompIndex.green);
+      if ({}.hasOwnProperty.call(bowerJson.devDependencies, bowerCompIndex)) {
+        log.info(bowerCompIndex.green);
+      }
     }
-  } catch(ex) {
+  } catch (ex) {
     log.error('This command can only be used when in an Ionic project directory'.red.bold);
   }
-}
+};
 
 // Need to look at bower.json of package just installed and look for any cordova plugins required
 // Check the directory in the projects `.bowerrc` file
@@ -67,34 +72,34 @@ IonicTask.prototype.run = function(ionic, argv) {
     return;
   }
 
-  var action = argv._[0]
+  var action = argv._[0];
   var componentName = argv._[1];
   var ioSet = false;
 
   try {
     switch (action) {
-      case 'add':
-        ioSet = true;
-        this.installBowerComponent(componentName);
-        break;
-      case 'remove':
-      case 'rm':
-        this.uninstallBowerComponent(componentName);
-        break;
-      case 'list':
-      case 'ls':
-      case '':
-        this.listComponents();
-        break;
+    case 'add':
+      ioSet = true;
+      this.installBowerComponent(componentName);
+      break;
+    case 'remove':
+    case 'rm':
+      this.uninstallBowerComponent(componentName);
+      break;
+    case 'list':
+    case 'ls':
+    case '':
+      this.listComponents();
+      break;
     }
   } catch (error) {
     var errorMessage = error.message ? error.message : error;
-    this.ionic.fail(errorMessage, 'service')
+    this.ionic.fail(errorMessage, 'service');
   }
 
   // Inject the component into our index.html, if necessary, and save the app_id
   ioLib.injectIoComponent(ioSet, componentName);
   ioLib.warnMissingData();
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/assets/gulpfile.js b/lib/ionic/assets/gulpfile.js
index 9a09b05562..200388a738 100644
--- a/lib/ionic/assets/gulpfile.js
+++ b/lib/ionic/assets/gulpfile.js
@@ -1,7 +1,7 @@
-var gulp = require('gulp'),
-    gulpWatch = require('gulp-watch'),
-    del = require('del'),
-    argv = process.argv;
+var gulp = require('gulp');
+var gulpWatch = require('gulp-watch');
+var del = require('del');
+var argv = process.argv;
 
 /**
  * Ionic Gulp tasks, for more information on each see
@@ -12,16 +12,16 @@ var buildSass = require('ionic-gulp-sass-build');
 var copyHTML = require('ionic-gulp-html-copy');
 var copyFonts = require('ionic-gulp-fonts-copy');
 
-gulp.task('watch', ['sass', 'html', 'fonts'], function(){
-  gulpWatch('app/**/*.scss', function(){ gulp.start('sass'); });
-  gulpWatch('app/**/*.html', function(){ gulp.start('html'); });
+gulp.task('watch', ['sass', 'html', 'fonts'], function() {
+  gulpWatch('app/**/*.scss', function() { gulp.start('sass'); });
+  gulpWatch('app/**/*.html', function() { gulp.start('html'); });
   return buildWebpack({ watch: true });
 });
 gulp.task('build', ['sass', 'html', 'fonts'], buildWebpack);
 gulp.task('sass', buildSass);
 gulp.task('html', copyHTML);
 gulp.task('fonts', copyFonts);
-gulp.task('clean', function(done){
+gulp.task('clean', function(done) {
   del('www/build', done);
 });
 
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
index f22b2aee1a..d031f983cb 100644
--- a/lib/ionic/bower.js
+++ b/lib/ionic/bower.js
@@ -1,8 +1,9 @@
-require('shelljs/global')
+require('shelljs/global');
+require('colors');
 
-var fs = require('fs'),
-    path = require('path'),
-    colors = require('colors');
+var fs = require('fs');
+var path = require('path');
+var exec = require('child_process').exec;
 
 exports.IonicBower = {
 
@@ -26,11 +27,13 @@ exports.IonicBower = {
       if (fs.existsSync(bowerFilePath)) {
         return require(bowerFilePath);
       }
-    } catch (e) {}
+    } catch (e) {
+      throw e;
+    }
 
     return {
-      "name": "HelloIonic",
-      "private": "true"
+      name: 'HelloIonic',
+      private: 'true'
     };
   },
 
@@ -46,14 +49,15 @@ exports.IonicBower = {
   checkForBower: function checkForBower() {
     var installed = false;
     try {
-      var result = exec('bower -v', {silent: true});
-      if (result.output.indexOf('command not found') == -1 && result.output.indexOf('not recognized') == -1) {
+      var result = exec('bower -v', { silent: true });
+      if (result.output.indexOf('command not found') === -1 && result.output.indexOf('not recognized') === -1) {
         installed = true;
       }
-    } catch (ex) { }
+    } catch (ex) {
+      throw ex;
+    }
     return installed;
   },
 
   installMessage: 'You must have bower installed to continue. \nType `npm install -g bower`'
-
 };
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index 691cdb992f..f5a91df996 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -1,10 +1,10 @@
-//Deprecated
-var argv = Task = require('./task').Task;
+// Deprecated
+var Task = require('./task').Task;
 
-var IonicTask = function() {};
+function IonicTask() {}
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function run(ionic) {
+IonicTask.prototype.run = function run() {
   console.log(
     'The browser task has been deprecated.\n' +
     'Please use the Cordova Crosswalk plugin instead:\n\n' +
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
index 7a98876376..effdd38b36 100644
--- a/lib/ionic/cordova.js
+++ b/lib/ionic/cordova.js
@@ -1,54 +1,56 @@
-var Task = require('./task').Task,
-    fs = require('fs'),
-    os = require('os'),
-    Q = require('q'),
-    // argv = require('optimist').boolean(['nohooks', 'n', 'r', 'noresources', 'nosave', 'e']).argv,
-    path = require('path'),
-    exec = require('child_process').exec,
-    shelljs = require('shelljs'),
-    IonicAppLib = require('ionic-app-lib'),
-    IonicResources = IonicAppLib.resources,
-    ConfigXml = IonicAppLib.configXml,
-    Cordova = IonicAppLib.cordova,
-    Hooks = IonicAppLib.hooks,
-    State = IonicAppLib.state,
-    Utils = IonicAppLib.utils,
-    log = IonicAppLib.logging.logger,
-    Serve = IonicAppLib.serve,
-    IonicProject = IonicAppLib.project;
-
-var IonicTask = function() {};
+var Task = require('./task').Task;
+var fs = require('fs');
+var os = require('os');
+var Q = require('q');
+var path = require('path');
+var exec = require('child_process').exec;
+var shelljs = require('shelljs');
+var IonicAppLib = require('ionic-app-lib');
+var IonicResources = IonicAppLib.resources;
+var ConfigXml = IonicAppLib.configXml;
+var Cordova = IonicAppLib.cordova;
+var State = IonicAppLib.state;
+var Utils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
+var Serve = IonicAppLib.serve;
+var IonicProject = IonicAppLib.project;
+
+function IonicTask() {}
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
   this.ionic = ionic;
 
-  var self = this,
-      cmdName = process.argv[2].toLowerCase(),
-      appDirectory = process.cwd(),
-      q;
+  var self = this;
+  var cmdName = process.argv[2].toLowerCase();
+  var appDirectory = process.cwd();
+  var q;
 
   try {
+
     // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
     // if not, try to install it.
-    if (argv._.indexOf('run') != -1 || argv._.indexOf('build') != -1 || argv._.indexOf('emulate') != -1) {
+    if (argv._.indexOf('run') !== -1 || argv._.indexOf('build') !== -1 || argv._.indexOf('emulate') !== -1) {
 
-      if (runPlatform == 'ios' && os.platform() !== 'darwin') {
+      if (runPlatform === 'ios' && os.platform() !== 'darwin') {
         return log.error('✗ You cannot run iOS unless you are on Mac OSX.');
       }
 
-      var runPlatform = argv._[1] || 'ios',
-          platformInstalled = self.checkIfPlatformInstalled(runPlatform),
-          pluginsInstalled = self.checkForPlugins();
+      var runPlatform = argv._[1] || 'ios';
+      var platformInstalled = self.checkIfPlatformInstalled(runPlatform);
+      var pluginsInstalled = self.checkForPlugins();
 
       if (!platformInstalled) {
-        var notInstalledMsg = ['• You\'re trying to build for ', runPlatform, ', but don\'t have the platform installed yet.'].join('').yellow,
-          installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join(''),
-          installedMessage = ['√ Installed platform ', runPlatform].join(''),
-          installCmd = 'cordova platform add ' + runPlatform;
+        var notInstalledMsg = [
+          '• You\'re trying to build for ',
+          runPlatform,
+          ', but don\'t have the platform installed yet.'].join('').yellow;
+        var installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join('');
+        var installedMessage = ['√ Installed platform ', runPlatform].join('');
+        var installCmd = 'cordova platform add ' + runPlatform;
+
         log.info(notInstalledMsg);
         log.info(installingMsg);
-        // log.info(installCmd);
         shelljs.exec(installCmd);
         log.info(installedMessage);
       }
@@ -62,22 +64,23 @@ IonicTask.prototype.run = function(ionic, argv) {
       q = Q(false);
     }
 
-    this.isLiveReload = ((cmdName == 'run' || cmdName == 'emulate') && (argv.livereload || argv['live-reload'] || argv.l));
+    this.isLiveReload = ((cmdName === 'run' || cmdName === 'emulate') &&
+                         (argv.livereload || argv['live-reload'] || argv.l));
 
     this.addIcons = !(argv.noresources || argv.r);
 
     var addDefaultResources = false;
-    var isPlatformCmd = argv._.indexOf('platform') != -1 || argv._.indexOf('platforms') != -1;
-    var isAddCmd = argv._.indexOf('add') != -1;
-    var isPluginCmd = argv._.indexOf('plugin') != -1 || argv._.indexOf('plugins') != -1;
-    var isRmCmd = argv._.indexOf('rm') != -1 || argv._.indexOf('remove') != -1;
+    var isPlatformCmd = argv._.indexOf('platform') !== -1 || argv._.indexOf('platforms') !== -1;
+    var isAddCmd = argv._.indexOf('add') !== -1;
+    var isPluginCmd = argv._.indexOf('plugin') !== -1 || argv._.indexOf('plugins') !== -1;
+    var isRmCmd = argv._.indexOf('rm') !== -1 || argv._.indexOf('remove') !== -1;
 
     // if (isAddCmd || isRmCmd) {
     //   ('this this this', isAddCmd, isRmCmd)
     //   Hooks.setHooksPermission(process.cwd());
     // }
 
-    if(isPlatformCmd && isAddCmd) {
+    if (isPlatformCmd && isAddCmd) {
       addDefaultResources = true;
     }
 
@@ -86,12 +89,12 @@ IonicTask.prototype.run = function(ionic, argv) {
         return;
       }
       var plugins = [
-        "cordova-plugin-device",
-        "cordova-plugin-console",
-        "cordova-plugin-whitelist",
-        "cordova-plugin-splashscreen",
-        "cordova-plugin-statusbar",
-        "ionic-plugin-keyboard"
+        'cordova-plugin-device',
+        'cordova-plugin-console',
+        'cordova-plugin-whitelist',
+        'cordova-plugin-splashscreen',
+        'cordova-plugin-statusbar',
+        'ionic-plugin-keyboard'
       ];
 
       plugins.forEach(function(plugin) {
@@ -100,9 +103,10 @@ IonicTask.prototype.run = function(ionic, argv) {
       });
     })
     .then(function() {
-      if(self.isLiveReload) {
+      if (self.isLiveReload) {
         return self.setupLiveReload(argv);
       } else {
+
         // ensure the content node was set back to its original
         return ConfigXml.setConfigXml(process.cwd(), {
           resetContent: true,
@@ -110,15 +114,15 @@ IonicTask.prototype.run = function(ionic, argv) {
         });
       }
     })
-    .then(function(serveOptions){
+    .then(function(serveOptions) {
       if (self.isLiveReload) {
         self.options = serveOptions;
       }
-      if(addDefaultResources && self.addIcons) {
+      if (addDefaultResources && self.addIcons) {
         return IonicResources.copyIconFilesIntoResources(appDirectory)
         .then(function() {
           return IonicResources.addIonicIcons(appDirectory, argv._[2]);
-        })
+        });
       } else {
         return false;
       }
@@ -127,65 +131,72 @@ IonicTask.prototype.run = function(ionic, argv) {
       return self.runCordova(cmdName, argv);
     })
     .then(function(runCode) {
-      //We dont want to do anything if the cordova command failed
-      if(runCode !== 0 || argv.nosave) {
-        return
+
+      // We dont want to do anything if the cordova command failed
+      if (runCode !== 0 || argv.nosave) {
+        return;
       }
       var argumentName = argv._[2];
       if (isPlatformCmd && isAddCmd) {
         addDefaultResources = true;
-        log.info('Saving platform to package.json file')
+        log.info('Saving platform to package.json file');
+
         return State.savePlatform(process.cwd(), argumentName);
       } else if (isPlatformCmd && isRmCmd) {
-        log.info('Removing platform from package.json file')
+        log.info('Removing platform from package.json file');
+
         return State.removePlatform(process.cwd(), argumentName);
       } else if (isPluginCmd && isAddCmd) {
-        log.info('Saving plugin to package.json file')
         var variables;
-        if (argv.variable && (typeof argv.variable == 'string')) {
+
+        log.info('Saving plugin to package.json file');
+        if (argv.variable && (typeof argv.variable === 'string')) {
           variables = [argv.variable];
         } else {
           variables = argv.variable;
         }
         return State.savePlugin(process.cwd(), argumentName, variables);
       } else if (isPluginCmd && isRmCmd) {
-        log.info('Removing plugin from package.json file')
+        log.info('Removing plugin from package.json file');
         return State.removePlugin(process.cwd(), argumentName);
       }
     })
     .catch(function(ex) {
-      log.error('Error happened', ex)
+      log.error('Error happened', ex);
       log.error(ex.stack);
       throw ex;
     });
   } catch (ex) {
     Utils.fail('An error occurred running a Cordova command:' + ex);
   }
-}
+};
 
 IonicTask.prototype.runCordova = function(cmdName, argv) {
   var deferred = Q.defer();
   var self = this;
   var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
-  var cmdArg, x, y;
+  var cmdArg;
+  var x;
+  var y;
 
   // backwards compatibility prior to fully wrapping cordova cmds
-  if(cmdName == 'platform' && cmdArgs.length > 0 ) {
+  if (cmdName === 'platform' && cmdArgs.length > 0) {
+
     // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
     // if a cordova platform cmd isn't the cmd then automatically insert `add`
     var hasCordovaCmd = false;
     var validCommands = 'add remove rm list ls update up check'.split(' ');
-    for(x=0; x<cmdArgs.length; x++) {
+    for (x = 0; x < cmdArgs.length; x += 1) {
       cmdArg = cmdArgs[x].toLowerCase();
-      for(y=0; y<validCommands.length; y++) {
-        if(cmdArg == validCommands[y]) {
+      for (y = 0; y < validCommands.length; y += 1) {
+        if (cmdArg === validCommands[y]) {
           hasCordovaCmd = true;
           break;
         }
       }
     }
 
-    if(!hasCordovaCmd) {
+    if (!hasCordovaCmd) {
       cmdArgs.unshift('add');
     }
   }
@@ -196,28 +207,32 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   var cleanArgs = [];
   var port = argv.port || argv.p || '';
   var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.r || '';
-  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port -i -r --address'.split(' ');
-  var isValdCmd,
-      foundAddressCmd = false;
-  for(x=0; x<cmdArgs.length; x++) {
+  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port' +
+    ' -i -r --address'.split(' ');
+  var isValdCmd;
+  var foundAddressCmd = false;
+
+  for (x = 0; x < cmdArgs.length; x += 1) {
     cmdArg = cmdArgs[x];
-    if(port && cmdArg == port) continue;
-    if(liveReloadPort && cmdArg == liveReloadPort) continue;
+    if (port && cmdArg === port) continue;
+    if (liveReloadPort && cmdArg === liveReloadPort) continue;
     isValdCmd = true;
-    for(y=0; y<ignoreCmds.length; y++) {
-      if(cmdArg == ignoreCmds[y]) {
+    for (y = 0; y < ignoreCmds.length; y += 1) {
+      if (cmdArg === ignoreCmds[y]) {
         isValdCmd = false;
-        //if address is passed, the arg after it will need to be taken out as well.
-        //also note, if they use --address="localhost", this will not happen
+
+        // if address is passed, the arg after it will need to be taken out as well.
+        // also note, if they use --address="localhost", this will not happen
         if (cmdArg === '--address') {
           foundAddressCmd = true;
         }
         break;
       }
     }
-    if(isValdCmd && !foundAddressCmd) {
+    if (isValdCmd && !foundAddressCmd) {
+
       // make sure --target= has double quotes around it (process.argv removes them)
-      if(cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
+      if (cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
         cmdArg = cmdArg.replace('--target=', '--target="') + '"';
       }
 
@@ -231,11 +246,12 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   log.debug('Cordova is installed:', cordovaIsInstalled);
   if (!cordovaIsInstalled) {
     log.debug('Executing cordova without CLI: ' + cleanArgs);
-    //If no cordova CLI is installed, fall back to local cordova-lib.
-    //TODO: Add ability to be smart = only use this if cordova CLI is not installed.
-    //TODO: Enable passing variables with the plugins
-    //TODO: Enable checking for multiple platforms/plugins/ls
-    //ex: (multiple plugin ids) ionic plugin add cordova-plugin-camera cordova-plugin-geolocation
+
+    // If no cordova CLI is installed, fall back to local cordova-lib.
+    // TODO: Add ability to be smart = only use this if cordova CLI is not installed.
+    // TODO: Enable passing variables with the plugins
+    // TODO: Enable checking for multiple platforms/plugins/ls
+    // ex: (multiple plugin ids) ionic plugin add cordova-plugin-camera cordova-plugin-geolocation
     //    (multiple platforms) ionic platform add ios android
     //    (listing) ionic plugin ls
     //    (version) ionic platform add ios@8.1.1
@@ -275,12 +291,12 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
   log.debug('Executing cordova cli: ' + cleanArgs.join(' '));
   var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
 
-  cordovaProcess.stdout.on('data', function (data) {
+  cordovaProcess.stdout.on('data', function(data) {
     process.stdout.write(data);
   });
 
-  cordovaProcess.stderr.on('data', function (data) {
-    if(data) {
+  cordovaProcess.stderr.on('data', function(data) {
+    if (data) {
       process.stderr.write(data.toString().bold);
     }
   });
@@ -289,21 +305,25 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
     deferred.resolve(code);
   });
 
-  if(self.isLiveReload) {
-    cordovaProcess.on('exit', function(){
+  if (self.isLiveReload) {
+    cordovaProcess.on('exit', function() {
+
       // Serve.showFinishedServeMessage(self.options);
       Serve.printCommandTips(self.options);
-      setTimeout(function(){
+      setTimeout(function() {
+
         // set it back to the original src after a few seconds
         ConfigXml.setConfigXml(process.cwd(), {
           resetContent: true,
           errorWhenNotFound: true
         });
+
         // deferred.resolve();
       }, 5000);
     });
 
-    process.on('exit', function(){
+    process.on('exit', function() {
+
       // verify it was set back
       ConfigXml.setConfigXml(process.cwd(), {
         resetContent: true,
@@ -311,19 +331,19 @@ IonicTask.prototype.runCordova = function(cmdName, argv) {
       });
     });
 
-    var readLine = require("readline");
-    if(process.platform === "win32") {
-      var rl = readLine.createInterface ({
-          input: process.stdin,
-          output: process.stdout
+    var readLine = require('readline');
+    if (process.platform === 'win32') {
+      var rl = readLine.createInterface({
+        input: process.stdin,
+        output: process.stdout
       });
 
-      rl.on("SIGINT", function (){
-        process.emit("SIGINT");
+      rl.on('SIGINT', function() {
+        process.emit('SIGINT');
       });
     }
 
-    process.on("SIGINT", function(){
+    process.on('SIGINT', function() {
       process.exit();
     });
   }
@@ -348,8 +368,9 @@ IonicTask.prototype.setupLiveReload = function(argv) {
   }
 
   var options = Serve.loadSettings(argv, project);
+
   // options.address = '0.0.0.0';
-  options.appDirectory = process.cwd();//called from cli - ionic serve - cwd is this
+  options.appDirectory = process.cwd(); // called from cli - ionic serve - cwd is this
   options.runLivereload = true;
   options.launchBrowser = false;
   options.launchLab = false;
@@ -379,14 +400,14 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     return Serve.checkPorts(true, options.port, options.address, options);
   })
   .then(function() {
-    if(options.runLivereload) {
+    if (options.runLivereload) {
       return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
     }
   })
   .then(function() {
-    ConfigXml.setConfigXml( process.cwd(), {
+    ConfigXml.setConfigXml(process.cwd(), {
       devServer: Serve.host(options.address, options.port)
-    }).then(function(){
+    }).then(function() {
       d.resolve();
     });
     return Serve.start(options);
@@ -406,9 +427,9 @@ IonicTask.prototype.checkIfPlatformInstalled = function checkIfPlatformInstalled
   platform = platform || 'ios';
 
   var platformPath = path.join(process.cwd(), 'platforms', platform);
-  var platformStats;
+
   try {
-    platformStats = fs.statSync(platformPath);
+    fs.statSync(platformPath);
     return true;
   } catch (ex) {
     return false;
@@ -417,9 +438,9 @@ IonicTask.prototype.checkIfPlatformInstalled = function checkIfPlatformInstalled
 
 IonicTask.prototype.checkForPlugins = function checkForPlugins() {
   var pluginPath = path.join(process.cwd(), 'plugins');
-  var platformStats;
+
   try {
-    platformStats = fs.statSync(pluginPath);
+    fs.statSync(pluginPath);
     return true;
   } catch (ex) {
     return false;
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 4856cf9441..566a7f6694 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -1,19 +1,15 @@
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    Q = require('q'),
-    prompt = require('prompt'),
-    Task = require('./task').Task,
-    _ = require('underscore'),
-    IonicInfo = require('./info').IonicTask,
-    IonicDocs = require('./resources/docs.json'),
-    log = require('ionic-app-lib').logging.logger,
-    COLUMN_LIMIT = 3;
+var argv = require('optimist').argv;
+var prompt = require('prompt');
+var Task = require('./task').Task;
+var _ = require('underscore');
+var IonicDocs = require('./resources/docs.json');
+var log = require('ionic-app-lib').logging.logger;
+var COLUMN_LIMIT = 3;
 
 
 var Docs = module.exports;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -25,6 +21,7 @@ Docs.list = function list() {
   try {
     var Table = require('cli-table');
     var docsList = IonicDocs.api;
+
     // var i = 0;
     log.info('Help Topics'.yellow);
     _.each(docsList, function(doc) {
@@ -33,13 +30,13 @@ Docs.list = function list() {
       var row = [];
       _.each(doc.docs, function(docItem) {
         var addDoc = docItem.replace('$', '');
-        if(count >= COLUMN_LIMIT) {
+        if (count >= COLUMN_LIMIT) {
           table.push(row);
           row = [];
           count = 0;
         }
         row.push(addDoc);
-        count++;
+        count += 1;
       });
       table.push(row);
       log.info(table.toString());
@@ -66,8 +63,9 @@ Docs.openDefault = function openDefault() {
 };
 
 Docs.lookUpCommand = function lookUpCommand(helpDoc) {
+
   // log.info('Going thru doc commands', helpDoc)
-  //Go through all the different help topics
+  // Go through all the different help topics
   var docsList = IonicDocs.api;
   helpDoc = helpDoc.replace(/-[a-zA-Z]/g, function(match) {
     return match[1].toUpperCase();
@@ -83,7 +81,7 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
   });
   docs = _.flatten(docs);
 
-  var match = _.find(docs, { doc: helpDoc }) || _.find(docs, { doc: '$' + helpDoc});
+  var match = _.find(docs, { doc: helpDoc }) || _.find(docs, { doc: '$' + helpDoc });
   if (match) {
     return openDoc(match.topic, match.doc);
 
@@ -96,10 +94,10 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
         return lowerDoc.indexOf(lowerHelp) > -1 ||
           lowerHelp.indexOf(lowerDoc) > -1;
       })
-      .sort(function(a,b) {
+      .sort(function(a, b) {
         return a.doc.length < b.doc.length ? -1 : 1;
       })
-      .slice(0,3);
+      .slice(0, 3);
 
     if (matches.length === 0) return log.info('No matching docs found for "' + helpDoc.cyan + '".');
 
@@ -124,10 +122,13 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
     prompt.start();
     prompt.get({
       name: 'choice',
-      default: matches.length === 1 ? 'yes' : '1',
+      default: matches.length === 1 ? 'yes' : '1'
     }, function(err, result) {
+      if (err) {
+        throw err;
+      }
       var num;
-      if (matches.length == 1) {
+      if (matches.length === 1) {
         if (result.choice.match(/^y/i, result.choice.trim())) {
           num = 1;
         }
@@ -135,7 +136,7 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
         num = parseInt(result.choice.trim());
       }
       if (!isNaN(num) && num > 0 && num <= matches.length) {
-        num--; // chioce (1-based) to index (0-based)
+        num -= 1; // chioce (1-based) to index (0-based)
         return openDoc(matches[num].topic, matches[num].doc);
       }
     });
@@ -150,20 +151,22 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
 };
 
 IonicTask.prototype.run = function run(ionic) {
-  var self = this;
   this.ionic = ionic;
 
   var docCmd = argv._[1];
+
   // log.info('docCmd', docCmd);
 
-  if(docCmd == 'ls') {
+  if (docCmd === 'ls') {
     Docs.list();
   } else if (!docCmd) {
+
     // log.info('openDefault')
     Docs.openDefault();
   } else {
+
     // log.info('look up command', docCmd)
-    //Look up what it was
+    // Look up what it was
     Docs.lookUpCommand(docCmd);
   }
 
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 294cd1019e..d54a7b8e45 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -1,37 +1,35 @@
-var fs = require('fs'),
-    path = require('path'),
-    Task = require('./task').Task,
-    ionicAppLib = require('ionic-app-lib'),
-    Q = require('q'),
-    Utils = ionicAppLib.utils,
-    log = ionicAppLib.logging.logger,
-    Info = ionicAppLib.info;
-    Project =  ionicAppLib.project;
-
-var IonicTask = function() {};
+var path = require('path');
+var Task = require('./task').Task;
+var ionicAppLib = require('ionic-app-lib');
+var Utils = ionicAppLib.utils;
+var log = ionicAppLib.logging.logger;
+var Project =  ionicAppLib.project;
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
   try {
     if (!argv.list && argv._.length < 3) {
-      //TODO should have a mechanism for printing usage on invalid tasks
+
+      // TODO should have a mechanism for printing usage on invalid tasks
       Utils.fail('Invalid arguments. Usage: ionic generate <generator> <name>');
     }
 
     if (!argv.v2) {
       return Utils.fail('Generators are only available for Ionic 2 projects');
     }
-  
+
     var project;
     try {
       project = Project.load(process.cwd());
-    } catch (err){
+    } catch (err) {
       return Utils.fail(err);
     }
 
     var generator = argv._[1];
-    var name = argv._[2] //TODO support multiple names
+    var name = argv._[2]; // TODO support multiple names
     var isTS = project.get('typescript') || argv.ts;
 
     var ionicModule = loadToolingModule();
@@ -43,12 +41,12 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     var promise;
     try {
-      promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS});
+      promise = ionicModule.generate({ appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS });
     } catch (err) {
-      if (err.message.indexOf('no generator available') != -1) {
+      if (err.message.indexOf('no generator available') !== -1) {
         log.error(err.message);
         ionicModule.Generate.printAvailableGenerators();
-        return
+        return;
       }
       return Utils.fail(err);
     }
@@ -57,22 +55,26 @@ IonicTask.prototype.run = function(ionic, argv) {
   } catch (err) {
     Utils.fail('There was an error generating your item:', err);
   }
-}
+};
+
+function loadToolingModule() {
+
+  // First try node_modules/ionic-angular/tooling
+  var toolingPath;
+  var ionicModule;
 
-function loadToolingModule(){
-  //First try node_modules/ionic-angular/tooling
-  var toolingPath, ionicModule;
   try {
     toolingPath = path.join(process.cwd(), 'node_modules', 'ionic-angular', 'tooling');
     ionicModule = require(toolingPath);
   } catch (err) {
+
     // if this isn't found, that's fine, check for ionic-framework
     if (err.code !== 'MODULE_NOT_FOUND') {
       Utils.fail('Error when requiring ' + toolingPath + ':\n  ' + err);
     }
   }
 
-  //Then try node_modules/ionic-framework/tooling
+  // Then try node_modules/ionic-framework/tooling
   if (!ionicModule) {
     try {
       ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework', 'tooling'));
@@ -83,7 +85,7 @@ function loadToolingModule(){
     }
   }
 
-  //Last, try node_modules/ionic-framework (beta.1 and below)
+  // Last, try node_modules/ionic-framework (beta.1 and below)
   if (!ionicModule) {
     try {
       ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 4f725633b2..ddc18b699d 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,12 +1,12 @@
-var IonicTask = require('./task').IonicTask,
-    argv = require('optimist').argv,
-    Task = require('./task').Task;
+var argv = require('optimist').argv;
+var Task = require('./task').Task;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic) {
+
   // var self = this;
 
   // self.ionic = ionic;
@@ -15,22 +15,20 @@ IonicTask.prototype.run = function(ionic) {
 
   var task = ionic.getTaskWithName(command);
 
-  if(command == '') {
+  if (command === '') {
     ionic.printHelpLines();
     return;
-  }
-  else if (!task) {
-    console.log('Command not found.'.red.bold)
-    return
+  } else if (!task) {
+    console.log('Command not found.'.red.bold);
+    return;
   }
 
   ionic.printIonic();
   process.stderr.write('\n=======================\n');
 
-
   ionic.printUsage(task);
 
   process.stderr.write('\n\n');
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 9b60e03cba..01bea3c577 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -1,17 +1,13 @@
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    Q = require('q'),
-    shelljs = require('shelljs'),
-    Task = require('./task').Task,
-    IonicInfo = require('./info').IonicTask,
-    IonicAppLib = require('ionic-app-lib'),
-    log = IonicAppLib.logging.logger,
-    Hooks = IonicAppLib.hooks;
+var argv = require('optimist').argv;
+var shelljs = require('shelljs');
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+var Hooks = IonicAppLib.hooks;
 
 shelljs.config.silent = true;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -21,19 +17,19 @@ IonicTask.prototype.run = function run(ionic) {
   var cmd = argv._[1];
   try {
 
-    switch(cmd) {
-      case 'add':
-        Hooks.add(process.cwd());
-        break;
-      case 'remove':
-        Hooks.remove(process.cwd());
-        break;
-      case 'perm':
-      case 'permissions':
-        Hooks.setHooksPermission(process.cwd());
-        break;
-      default:
-        log.error('Please supply a command - either add or remove');
+    switch (cmd) {
+    case 'add':
+      Hooks.add(process.cwd());
+      break;
+    case 'remove':
+      Hooks.remove(process.cwd());
+      break;
+    case 'perm':
+    case 'permissions':
+      Hooks.setHooksPermission(process.cwd());
+      break;
+    default:
+      log.error('Please supply a command - either add or remove');
     }
   } catch (ex) {
     log.error('There was an error running the hooks command: ', ex.stack);
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index bc91bef8e0..6ebcde1a98 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -1,11 +1,9 @@
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    Task = require('./task').Task,
-    ionicAppLib = require('ionic-app-lib'),
-    Info = ionicAppLib.info;
+var path = require('path');
+var Task = require('./task').Task;
+var ionicAppLib = require('ionic-app-lib');
+var Info = ionicAppLib.info;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -15,7 +13,7 @@ IonicTask.prototype.run = function(ionic) {
   try {
 
     var info = Info.gatherInfo();
-    
+
     Info.getIonicVersion(info, process.cwd());
     Info.getIonicCliVersion(info, path.join(__dirname, '../../'));
 
@@ -25,6 +23,6 @@ IonicTask.prototype.run = function(ionic) {
   } catch (ex) {
     this.ionic.fail('There was an error retrieving your environment information:', ex);
   }
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
index a8a5492e42..4de448bfc1 100644
--- a/lib/ionic/io-config.js
+++ b/lib/ionic/io-config.js
@@ -1,14 +1,10 @@
-var IonicAppLib = require('ionic-app-lib'),
-    ioLib = IonicAppLib.ioConfig,
-    argv = require('optimist').argv,
-    fs = require('fs'),
-    prompt = require('prompt'),
-    IonicProject = IonicAppLib.project,
-    IonicTask = require('./task').IonicTask,
-    Task = require('./task').Task,
-    IonicLoginTask = require('./login').IonicTask;
-
-var IonicTask = function() {};
+var IonicAppLib = require('ionic-app-lib');
+var ioLib = IonicAppLib.ioConfig;
+var argv = require('optimist').argv;
+var IonicProject = IonicAppLib.project;
+var Task = require('./task').Task;
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -22,23 +18,23 @@ IonicTask.prototype.run = function(ionic) {
     self.project = IonicProject.load();
   } catch (ex) {
     self.ionic.fail(ex.message);
-    return
+    return;
   }
 
-  var set = false,
-      write = false,
-      key = '',
-      val = '';
+  var set = false;
+  var write = false;
+  var key = '';
+  var val = '';
 
-  if (argv['_'][1] == 'set' || argv['_'][1] == 'unset' || argv['_'][1] == 'build' || argv['_'][1] == 'info') {
-    if (argv['_'][1] == 'build') {
+  if (argv['_'][1] === 'set' || argv['_'][1] === 'unset' || argv['_'][1] === 'build' || argv['_'][1] === 'info') {
+    if (argv['_'][1] === 'build') {
       write = true;
       ioLib.writeIoConfig(false, false, true);
-    } else if (argv['_'][1] == 'info') {
+    } else if (argv['_'][1] === 'info') {
       write = true;
       ioLib.listConfig();
     } else {
-      if (argv['_'][1] == 'set') {
+      if (argv['_'][1] === 'set') {
         set = true;
       }
       if (argv['_'][2]) {
diff --git a/lib/ionic/io-init.js b/lib/ionic/io-init.js
index 866465652b..7fe31ee03b 100644
--- a/lib/ionic/io-init.js
+++ b/lib/ionic/io-init.js
@@ -1,16 +1,14 @@
-var IonicAppLib = require('ionic-app-lib'),
-    ioLib = IonicAppLib.ioConfig,
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    IonicProject = IonicAppLib.project,
-    log = IonicAppLib.logging.logger,
-    IonicTask = require('./task').IonicTask,
-    Task = require('./task').Task,
-    Login = IonicAppLib.login,
-    LoginTask = require('./login'),
-    Utils = require('./utils');
+var IonicAppLib = require('ionic-app-lib');
+var ioLib = IonicAppLib.ioConfig;
+var argv = require('optimist').argv;
+var IonicProject = IonicAppLib.project;
+var log = IonicAppLib.logging.logger;
+var Task = require('./task').Task;
+var Login = IonicAppLib.login;
+var LoginTask = require('./login');
+var Utils = require('./utils');
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -24,11 +22,11 @@ IonicTask.prototype.run = function(ionic) {
     self.project = IonicProject.load();
   } catch (ex) {
     self.ionic.fail(ex.message);
-    return
+    return;
   }
 
   Login.retrieveLogin()
-  .then(function(jar){
+  .then(function(jar) {
     if (!jar) {
       log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
@@ -36,10 +34,10 @@ IonicTask.prototype.run = function(ionic) {
     return jar;
   })
   .then(function(jar) {
-    if (argv['_'][1] == 'init') {
+    if (argv['_'][1] === 'init') {
       ioLib.initIoPlatform(process.cwd(), jar);
     } else {
-      self.ionic.fail("Invalid command");
+      self.ionic.fail('Invalid command');
     }
   })
   .catch(function(ex) {
diff --git a/lib/ionic/ionitron.js b/lib/ionic/ionitron.js
index 4ed7726c8c..3befddc537 100644
--- a/lib/ionic/ionitron.js
+++ b/lib/ionic/ionitron.js
@@ -1,59 +1,72 @@
-var colors = require('colors'),
-    path = require('path'),
-    fs = require('fs');
+require('colors');
+
+var path = require('path');
+var fs = require('fs');
 
 var ionitronStatements = [
-    'Hello human, what shall we build today?',
-    '*BEEP BEEP* ALL YOUR BASE ARE BELONG TO US *BEEP BEEP*',
-    'Prepare to dominate your hybrid app. Engaging now.',
-    'My sensors indicate you have an undying love for ionic,         |\n       |  or is it just me?\t\t\t\t\t\t',
-    'That\'s a nice looking app you have there. \t\t\t  |\n       |  Definitely one of the better human made apps I\'ve seen.\t',
-    'Oh, hi there. I was just not indexing your hard drive,          |\n       |  definitely not doing that.                                    ',
-    'That would need bee\'s approval',
-    'Fork you! Oh, I\'m sorry, wrong branch.'
+  'Hello human, what shall we build today?',
+  '*BEEP BEEP* ALL YOUR BASE ARE BELONG TO US *BEEP BEEP*',
+  'Prepare to dominate your hybrid app. Engaging now.',
+  'My sensors indicate you have an undying love for ionic,         |\n       ' +
+    '|  or is it just me?\t\t\t\t\t\t',
+  'That\'s a nice looking app you have there. \t\t\t  |\n       |  Definitely ' +
+    'one of the better human made apps I\'ve seen.\t',
+  'Oh, hi there. I was just not indexing your hard drive,          |\n       ' +
+    '|  definitely not doing that.                                    ',
+  'That would need bee\'s approval',
+  'Fork you! Oh, I\'m sorry, wrong branch.'
 ];
 
-var ionitronStatements_es = [
-    '\u0021Hola humano! \u00BFQu\u00E9 vamos a construir hoy?',
-    '*BEEP BEEP* TU BASE NOS PERTENECE *BEEP BEEP*',
-    'Prep\u00E1rate para dominar las aplicaciones h\u00EDbridas.               |\n       |  Participa ahora.\t\t\t\t\t\t',
-    'Mis sensores indican que sientes amor eterno hacia Ionic,       |\n       |  \u00BFo es solo hacia m\u00ED?\t\t\t\t\t\t',
-    'Es una bonita aplicaci\u00F3n esa que tienes.  \t\t\t  |\n       |  Eres el mejor desarrollador humano que he visto.\t\t',
-    'Oh, hola. No estaba indexando tu disco duro, no hago eso.',
-    'Es necesitaria la aprobaci\u00F3n de las abejas.',
-    'Bif\u00Farcate! Oh, Lo siento, rama equivocada. '
+var ionitronStatementsEs = [
+  '\u0021Hola humano! \u00BFQu\u00E9 vamos a construir hoy?',
+  '*BEEP BEEP* TU BASE NOS PERTENECE *BEEP BEEP*',
+  'Prep\u00E1rate para dominar las aplicaciones h\u00EDbridas.               ' +
+    '|\n       |  Participa ahora.\t\t\t\t\t\t',
+  'Mis sensores indican que sientes amor eterno hacia Ionic,       |\n       ' +
+    '|  \u00BFo es solo hacia m\u00ED?\t\t\t\t\t\t',
+  'Es una bonita aplicaci\u00F3n esa que tienes.  \t\t\t  |\n       |  Eres el ' +
+    'mejor desarrollador humano que he visto.\t\t',
+  'Oh, hola. No estaba indexando tu disco duro, no hago eso.',
+  'Es necesitaria la aprobaci\u00F3n de las abejas.',
+  'Bif\u00Farcate! Oh, Lo siento, rama equivocada. '
 ];
 
 var ionictronAsciiFile = 'ionitron.txt';
 
 module.exports.print = function print(lang) {
 
-    var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
-    var contents = fs.readFileSync(ionitronPath, 'utf8');
-    var messageContent;
-
-    switch (lang) {
-        case 'es':
-            //Replace the 'h' (antenna) by Ñ hahaha'
-            contents = contents.replace('h', '\u00D1');
-            messageContent = [ionitronStatements_es[Math.floor(Math.random() * (ionitronStatements_es.length - 0) + 0)]].join('');
-            break;
-        default:
-            messageContent = [ionitronStatements[Math.floor(Math.random() * (ionitronStatements.length - 0) + 0)]].join('');
-    }
+  var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
+  var contents = fs.readFileSync(ionitronPath, 'utf8');
+  var messageContent;
+
+  switch (lang) {
+  case 'es':
+
+    // Replace the 'h' (antenna) by Ñ hahaha'
+    contents = contents.replace('h', '\u00D1');
+    messageContent = [ionitronStatementsEs[Math.floor(Math.random() *
+                                                       (ionitronStatementsEs.length - 0) + 0)]].join('');
+    break;
+  default:
+    messageContent = [ionitronStatements[Math.floor(Math.random() *
+                                                       (ionitronStatements.length - 0) + 0)]].join('');
+  }
 
-    var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
-    // console.log(messageContent.length, replaceString.length)
-    if (messageContent.length < replaceString.length) {
-        var diff = (replaceString.length) - messageContent.length;
-        var i = 0;
-        // console.log(diff, i)
-        while (i < diff) {
-            messageContent = messageContent + ' ';
-            i++;
-        }
+  var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
+
+  // console.log(messageContent.length, replaceString.length)
+  if (messageContent.length < replaceString.length) {
+    var diff = (replaceString.length) - messageContent.length;
+    var i = 0;
+
+    // console.log(diff, i)
+    while (i < diff) {
+      messageContent = messageContent + ' ';
+      i += 1;
     }
-    contents = contents.replace(replaceString, messageContent)
-    console.log(contents.cyan);
-    return;
-}
+  }
+  contents = contents.replace(replaceString, messageContent);
+  console.log(contents.cyan);
+
+  return;
+};
diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
index 6464ed3ff0..d04c4eb4d1 100644
--- a/lib/ionic/ions.js
+++ b/lib/ionic/ions.js
@@ -1,8 +1,6 @@
-var argv = require('optimist').argv,
-    IonicProject = require('./project'),
-    log = require('ionic-app-lib').logging.logger,
-    Task = require('./task').Task,
-    _ = require('underscore');
+var log = require('ionic-app-lib').logging.logger;
+var Task = require('./task').Task;
+var _ = require('underscore');
 
 var ions = [
   {
@@ -30,36 +28,33 @@ var ions = [
     name: 'Tinder Cards',
     description: 'Tinder style card swiping interaction'
   }
-]
+];
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function() {
   log.info('Ionic Ions - ions power your app to be awesome.');
-  log.info('A curated collection of useful addons, components, and ux interactions for extending ionic.')
-  log.info('\n')
+  log.info('A curated collection of useful addons, components, and ux interactions for extending ionic.');
+  log.info('\n');
 
   _.each(ions, function(ion) {
 
     var rightColumn = 20;
     var dots = '';
-    var indent = '';
-    var x, arg;
-
     var startStr = ion.name;
 
 
-    while( (startStr + dots).length < rightColumn + 1) {
+    while ((startStr + dots).length < rightColumn + 1) {
       dots += '.';
     }
 
     // Header Shrink ... A shrinking header effect like Facebook\'s ..
-    var installStr = ['\'ionic add ', ion.ion, '\''].join('')
-    log.info(ion.name, dots, installStr)
-    log.info(ion.description, '\n')
-  })
-}
+    var installStr = ['\'ionic add ', ion.ion, '\''].join('');
+    log.info(ion.name, dots, installStr);
+    log.info(ion.description, '\n');
+  });
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 15223b933a..1b3b018d8f 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -1,18 +1,18 @@
-var fs = require('fs'),
-    os = require('os'),
-    shelljs = require('shelljs/global'),
-    request = require('request'),
-    path = require('path'),
-    unzip = require('unzip'),
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    colors = require('colors'),
-    exec = require('child_process').exec,
-    Q = require('q'),
-    log = require('ionic-app-lib').logging.logger,
-    Task = require('./task').Task;
-
-var IonicTask = function() {};
+require('colors');
+
+var fs = require('fs');
+var path = require('path');
+var shell = require('shelljs');
+var request = require('request');
+var unzip = require('unzip');
+var argv = require('optimist').argv;
+var prompt = require('prompt');
+var exec = require('child_process').exec;
+var Q = require('q');
+var log = require('ionic-app-lib').logging.logger;
+var Task = require('./task').Task;
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -22,15 +22,17 @@ IonicTask.prototype.run = function(ionic) {
   self.versionData = {};
   self.usesBower = false;
 
-  if (!fs.existsSync( path.resolve('www') )) {
-    return ionic.fail('"www" directory cannot be found. Make sure the working directory is at the top level of an Ionic project.', 'lib');
+  if (!fs.existsSync(path.resolve('www'))) {
+    return ionic.fail('"www" directory cannot be found. Make sure the working directory ' +
+                      'is at the top level of an Ionic project.', 'lib');
   }
 
   this.loadVersionData();
 
-  if(argv._.length > 1 && (argv._[1].toLowerCase() == 'update' || argv._[1].toLowerCase() == 'up')) {
+  if (argv._.length > 1 && (argv._[1].toLowerCase() === 'update' || argv._[1].toLowerCase() === 'up')) {
     this.updateLibVersion();
   } else {
+
     // just version info
     this.printLibVersions();
   }
@@ -40,14 +42,15 @@ IonicTask.prototype.run = function(ionic) {
 
 IonicTask.prototype.loadVersionData = function() {
   this.versionFilePath = path.resolve('www/lib/ionic/version.json');
-  if( !fs.existsSync(this.versionFilePath) ) {
+
+  if (!fs.existsSync(this.versionFilePath)) {
     this.versionFilePath = path.resolve('www/lib/ionic/bower.json');
     this.usesBower = fs.existsSync(this.versionFilePath);
   }
 
   try {
     this.local = require(this.versionFilePath);
-  } catch(e) {
+  } catch (e) {
     log.error('Unable to load ionic lib version information');
   }
 };
@@ -58,13 +61,14 @@ IonicTask.prototype.printLibVersions = function() {
 
   log.info('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
 
-  this.getVersionData('latest').then(function(){
-    log.info('Latest Ionic version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+  this.getVersionData('latest').then(function() {
+    log.info('Latest Ionic version: '.bold.green + self.versionData.version_number +
+             '  (released ' + self.versionData.release_date + ')');
 
-    if(self.local.version != self.versionData.version_number) {
-      log.info(' * Local version is out of date'.yellow );
+    if (self.local.version !== self.versionData.version_number) {
+      log.info(' * Local version is out of date'.yellow);
     } else {
-      log.info(' * Local version up to date'.green );
+      log.info(' * Local version up to date'.green);
     }
   });
 };
@@ -75,7 +79,7 @@ IonicTask.prototype.getVersionData = function(version) {
   var self = this;
 
   var url = 'http://code.ionicframework.com';
-  if(version == 'latest') {
+  if (version === 'latest') {
     url += '/latest.json';
   } else {
     url += '/' + version + '/version.json';
@@ -84,28 +88,28 @@ IonicTask.prototype.getVersionData = function(version) {
   var proxy = process.env.PROXY || process.env.http_proxy || null;
   request({ url: url, proxy: proxy }, function(err, res, body) {
     try {
-      if(err || !res || !body) {
+      if (err || !res || !body) {
         log.error('Unable to receive version data');
         q.reject();
         return;
       }
-      if(res.statusCode == 404) {
+      if (res.statusCode === 404) {
         log.error('Invalid version: ' + version);
         q.reject();
         return;
       }
-      if(res.statusCode >= 400) {
+      if (res.statusCode >= 400) {
         log.error('Unable to load version data');
         q.reject();
         return;
       }
       self.versionData = JSON.parse(body);
-      self.versionData.version_number = self.versionData.version_number || self.versionData.version;
-      self.versionData.version_codename = self.versionData.version_codename || self.versionData.codename;
-      self.versionData.release_date = self.versionData.release_date || self.versionData.date;
+      self.versionData['version_number'] = self.versionData.version_number || self.versionData.version;
+      self.versionData['version_codename'] = self.versionData.version_codename || self.versionData.codename;
+      self.versionData['release_date'] = self.versionData.release_date || self.versionData.date;
 
       q.resolve();
-    } catch(e) {
+    } catch (e) {
       log.error('Error loading ' + version.bold + ' version information');
       q.reject();
     }
@@ -118,15 +122,15 @@ IonicTask.prototype.getVersionData = function(version) {
 IonicTask.prototype.updateLibVersion = function() {
   var self = this;
 
-  if(self.usesBower) {
+  if (self.usesBower) {
     var bowerCmd = exec('bower update ionic');
 
-    bowerCmd.stdout.on('data', function (data) {
+    bowerCmd.stdout.on('data', function(data) {
       process.stdout.write(data);
     });
 
-    bowerCmd.stderr.on('data', function (data) {
-      if(data) {
+    bowerCmd.stderr.on('data', function(data) {
+      if (data) {
         process.stderr.write(data.toString().red.bold);
       }
     });
@@ -140,7 +144,8 @@ IonicTask.prototype.updateLibVersion = function() {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  log.info('Are you sure you want to replace '.green.bold + libPath.bold + ' with an updated version of Ionic?'.green.bold);
+  log.info('Are you sure you want to replace '.green.bold + libPath.bold +
+           ' with an updated version of Ionic?'.green.bold);
 
   var promptProperties = {
     areYouSure: {
@@ -150,13 +155,13 @@ IonicTask.prototype.updateLibVersion = function() {
     }
   };
 
-  prompt.get({properties: promptProperties}, function (err, promptResult) {
-    if(err) {
+  prompt.get({ properties: promptProperties }, function(err, promptResult) {
+    if (err) {
       return log.error(err);
     }
 
     var areYouSure = promptResult.areYouSure.toLowerCase().trim();
-    if(areYouSure == 'yes' || areYouSure == 'y') {
+    if (areYouSure === 'yes' || areYouSure === 'y') {
       self.getLatest();
     }
   });
@@ -167,25 +172,27 @@ IonicTask.prototype.getLatest = function() {
   var self = this;
 
   var dirPath = path.resolve('www/lib/');
-  if(!fs.existsSync(dirPath)) {
+  if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath);
   }
 
   dirPath = path.resolve('www/lib/ionic/');
-  if(!fs.existsSync(dirPath)) {
+  if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath);
   }
 
   var version = argv.version || argv.v;
-  if(version === true || !version) {
+  if (version === true || !version) {
     version = 'latest';
   }
 
-  this.getVersionData(version).then(function(){
-    if(version == 'latest') {
-      log.info('Latest version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+  this.getVersionData(version).then(function() {
+    if (version === 'latest') {
+      log.info('Latest version: '.bold.green + self.versionData.version_number +
+               '  (released ' + self.versionData.release_date + ')');
     } else {
-      log.info('Version: '.bold.green + self.versionData.version_number + '  (released ' + self.versionData.release_date + ')');
+      log.info('Version: '.bold.green + self.versionData.version_number +
+               '  (released ' + self.versionData.release_date + ')');
     }
     self.downloadZip(self.versionData.version_number);
   });
@@ -201,7 +208,7 @@ IonicTask.prototype.downloadZip = function(version) {
   self.tmpExtractPath = path.resolve('www/lib/.ionic');
   self.tmpZipPath = path.join(self.tmpExtractPath, 'ionic.zip');
 
-  if( !fs.existsSync(self.tmpExtractPath) ) {
+  if (!fs.existsSync(self.tmpExtractPath)) {
     fs.mkdirSync(self.tmpExtractPath);
   }
 
@@ -209,25 +216,25 @@ IonicTask.prototype.downloadZip = function(version) {
 
   var proxy = process.env.PROXY || null;
   request({ url: archivePath, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
-    if(err) {
+    if (err) {
       log.error(err);
       return;
     }
-    if(res.statusCode == 404 || res.statusCode == 406) {
+    if (res.statusCode === 404 || res.statusCode === 406) {
       log.error('Invalid version: ' + version);
       return;
     }
-    if(res.statusCode >= 400) {
+    if (res.statusCode >= 400) {
       log.error('Unable to download zip (' + res.statusCode + ')');
       return;
     }
     try {
       fs.writeFileSync(self.tmpZipPath, body);
       self.updateFiles();
-    } catch(e) {
+    } catch (e) {
       log.error(e);
     }
-  }).on('response', function(res){
+  }).on('response', function(res) {
 
     var ProgressBar = require('progress');
     var bar = new ProgressBar('[:bar]  :percent  :etas', {
@@ -237,16 +244,18 @@ IonicTask.prototype.downloadZip = function(version) {
       total: parseInt(res.headers['content-length'], 10)
     });
 
-    res.on('data', function (chunk) {
+    res.on('data', function(chunk) {
       try {
         bar.tick(chunk.length);
-      } catch(e){}
+      } catch (e) {
+        log.error(e);
+      }
     });
 
   }).on('error', function(err) {
     try {
       fs.unlink(self.tmpZipPath);
-    } catch(e) {
+    } catch (e) {
       log.error(e);
     }
     log.error(err);
@@ -255,7 +264,7 @@ IonicTask.prototype.downloadZip = function(version) {
 };
 
 
-IonicTask.prototype.updateFiles = function(version) {
+IonicTask.prototype.updateFiles = function() {
   var self = this;
   var ionicLibDir = path.resolve('www/lib/ionic');
 
@@ -265,47 +274,55 @@ IonicTask.prototype.updateFiles = function(version) {
       log.debug('updateFiles readStream error: ' + err);
     });
 
-    var writeStream = unzip.Extract({ path: self.tmpExtractPath });
+    var writeStream = unzip.Extract({ path: self.tmpExtractPath }); // eslint-disable-line new-cap
     writeStream.on('close', function() {
       try {
-        rm('-rf', self.tmpZipPath)
-      } catch(e){}
+        shell.rm('-rf', self.tmpZipPath);
+      } catch (e) {
+        log.error(e);
+      }
 
       try {
         var dir = fs.readdirSync(self.tmpExtractPath);
         var copyFrom;
-        for(var x=0; x<dir.length; x++) {
-          if( dir[x].indexOf('ionic') === 0 ) {
+        for (var x = 0; x < dir.length; x += 1) {
+          if (dir[x].indexOf('ionic') === 0) {
             copyFrom = path.join(self.tmpExtractPath, dir[x], '*');
           }
         }
-        if(!copyFrom) {
+        if (!copyFrom) {
           log.error('updateFiles, invalid zip');
           return;
         }
 
-        cp('-Rf', copyFrom, ionicLibDir);
+        shell.cp('-Rf', copyFrom, ionicLibDir);
 
         try {
-          rm('-rf', self.tmpExtractPath)
-        } catch(e){}
+          shell.rm('-rf', self.tmpExtractPath);
+        } catch (e) {
+          log.error(e);
+        }
 
         try {
-          rm('-rf', path.join(ionicLibDir, 'README.md'));
-        } catch(e){}
+          shell.rm('-rf', path.join(ionicLibDir, 'README.md'));
+        } catch (e) {
+          log.error(e);
+        }
 
         try {
-          rm('-rf', path.join(ionicLibDir, 'bower.json'));
-        } catch(e){}
+          shell.rm('-rf', path.join(ionicLibDir, 'bower.json'));
+        } catch (e) {
+          log.error(e);
+        }
 
-        log.info('Ionic version updated to: '.bold.green + self.versionData.version_number.bold );
+        log.info('Ionic version updated to: '.bold.green + self.versionData.version_number.bold);
 
         self.writeVersionData();
 
         var ionicBower = require('./bower').IonicBower;
         ionicBower.setIonicVersion(self.versionData.version_number);
 
-      } catch(e){
+      } catch (e) {
         log.error('updateFiles Error: ' + e);
       }
     });
@@ -314,7 +331,7 @@ IonicTask.prototype.updateFiles = function(version) {
     });
     readStream.pipe(writeStream);
 
-  } catch(e) {
+  } catch (e) {
     log.error('updateFiles Error: ' + e);
   }
 
@@ -323,15 +340,15 @@ IonicTask.prototype.updateFiles = function(version) {
 IonicTask.prototype.writeVersionData = function() {
   try {
     var versionData = {
-      "version": this.versionData.version_number || this.versionData.version,
-      "codename": this.versionData.version_codename || this.versionData.codename,
-      "date": this.versionData.release_date || this.versionData.date
+      version: this.versionData.version_number || this.versionData.version,
+      codename: this.versionData.version_codename || this.versionData.codename,
+      date: this.versionData.release_date || this.versionData.date
     };
 
-    fs.writeFileSync( path.resolve('www/lib/ionic/version.json'),
-                      JSON.stringify(versionData, null, 2) );
+    fs.writeFileSync(path.resolve('www/lib/ionic/version.json'),
+                      JSON.stringify(versionData, null, 2));
 
-  } catch(e) {
+  } catch (e) {
     log.error('Error writing version data: ' + e);
   }
 };
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 68659e26b6..57796d86b1 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,40 +1,38 @@
-var fs = require('fs'),
-    path = require('path'),
-    argv = require('optimist').argv,
-    IonicAppLib = require('ionic-app-lib'),
-    log = IonicAppLib.logging.logger,
-    IonicProject = IonicAppLib.project,
-    Task = require('./task').Task;
+var fs = require('fs');
+var path = require('path');
+var argv = require('optimist').argv;
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+var IonicProject = IonicAppLib.project;
+var Task = require('./task').Task;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic) {
   this.ionic = ionic;
-  var self = this;
 
   var ionicProjectFile = path.resolve('.', 'ionic.project');
 
-  if(!fs.existsSync(ionicProjectFile)) {
+  if (!fs.existsSync(ionicProjectFile)) {
     log.error('You cannot run this command unless you are in an Ionic Project folder');
-    return
+    return;
   }
 
-  if(!argv._[1] && !argv.reset) {
+  if (!argv._[1] && !argv.reset) {
     log.error('Please supply an Ionic App ID with this command or pass the --reset option');
-    return
+    return;
   }
 
-  if(argv.reset || argv.r) {
-    this.setAppId('')
+  if (argv.reset || argv.r) {
+    this.setAppId('');
   } else {
     this.setAppId(argv._[1]);
   }
 
   log.info('Your Ionic App ID was set'.green);
-
-}
+};
 
 IonicTask.prototype.setAppId = function setAppId(appId) {
   var project = null;
@@ -45,8 +43,8 @@ IonicTask.prototype.setAppId = function setAppId(appId) {
     project.save();
   } catch (ex) {
     this.ionic.fail(ex.message);
-    return
+    return;
   }
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 2763203108..8678cbbe77 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,19 +1,18 @@
-var IonicAppLib = require('ionic-app-lib'),
-    IonicStore = require('./store').IonicStore,
-    Login = IonicAppLib.login,
-    log = IonicAppLib.logging.logger,
-    prompt = require('prompt'),
-    Q = require('q'),
-    settings = IonicAppLib.settings,
-    Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var Login = IonicAppLib.login;
+var log = IonicAppLib.logging.logger;
+var prompt = require('prompt');
+var Q = require('q');
+var settings = IonicAppLib.settings;
+var Task = require('./task').Task;
 
 var LoginTask = module.exports;
 
-//Login is set up a little differently than other tasks
-//First of all - we need a way to prompt the user for email/pw
-//Thats done with a prompt, so we handle that here instead of the lib
-//Any other calls to login in the lib take email/pw to login
-//The login task itself just runs LoginTask.login()
+// Login is set up a little differently than other tasks
+// First of all - we need a way to prompt the user for email/pw
+// Thats done with a prompt, so we handle that here instead of the lib
+// Any other calls to login in the lib take email/pw to login
+// The login task itself just runs LoginTask.login()
 
 LoginTask.login = function login(argv) {
   var email = argv.email || argv.e || process.env.IONIC_EMAIL;
@@ -22,7 +21,7 @@ LoginTask.login = function login(argv) {
   var promise;
 
   if (email && password) {
-    promise = Q({email: email, password: password});
+    promise = Q({ email: email, password: password });
   } else {
     promise = LoginTask.promptForLogin(argv);
   }
@@ -38,22 +37,23 @@ LoginTask.login = function login(argv) {
   .catch(function(ex) {
     log.error('Error logging in');
     throw ex;
+
     // log.info(ex);
     // log.info(ex.stack);
   });
 };
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 LoginTask.promptForLogin = function promptForLogin(argv) {
   var q = Q.defer();
-  var self = this;
 
   var schema = [{
     name: 'email',
-    pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/,
+    pattern: new RegExp(["^[A-z0-9!#$%&'*+/=?^_{|}~-]+(?:.[A-z0-9!#$%&'*+/=?^_{|}~-]+)",
+                        '*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$'].join('')),
     description: 'Email:'.yellow.bold,
     required: true
   }, {
@@ -72,61 +72,19 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
   prompt.delimiter = '';
   prompt.start();
 
-  prompt.get(schema, function (err, result) {
-    if(err) {
+  prompt.get(schema, function(err, result) {
+    if (err) {
       return q.reject('Error logging in: ' + err);
     }
 
-    q.resolve({email: result.email, password: result.password});
+    q.resolve({ email: result.email, password: result.password });
   });
 
   return q.promise;
 };
 
-IonicTask.prototype.run = function(ionic, argv, callback) {
-
-  var self = this;
-
+IonicTask.prototype.run = function(ionic, argv) {
   return LoginTask.login(argv);
-
-};
-
-IonicTask.prototype.get = function(ionic, callback) {
-  this.cookieData = new IonicStore('cookies');
-
-  if(ionic.jar) {
-    // already in memory
-    callback(ionic.jar);
-    return;
-  }
-
-  this.email = argv.email || argv.e || process.env.IONIC_EMAIL;
-  this.password = argv.password || argv.p || process.env.IONIC_PASSWORD;
-
-  if(!this.email && this.password) {
-    return ionic.fail('--email or -e command line flag, or IONIC_EMAIL environment variable required');
-  }
-  if(this.email && !this.password) {
-    return ionic.fail('--password or -p command line flag, or IONIC_PASSWORD environment variable required');
-  }
-
-  if(!this.email && !this.password) {
-    // did not include cmd line flags, check for existing cookies
-    var jar = this.cookieData.get(ionic.IONIC_DASH);
-
-    if(jar && jar.length) {
-      for(var i in jar) {
-        var cookie = jar[i];
-        if(cookie.key == "sessionid" && new Date(cookie.expires) > new Date()) {
-          ionic.jar = jar;
-          callback(jar);
-          return;
-        }
-      }
-    }
-  }
-
-  this.run(ionic, argv, callback);
 };
 
 LoginTask.IonicTask = IonicTask;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index ea4e38b1dd..956b89eba0 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,22 +1,21 @@
-var fs = require('fs'),
-    path = require('path'),
-    _ = require('underscore'),
-    Q = require('q'),
-    moment = require('moment'),
-    expandTilde = require('expand-tilde'),
-    ProgressBar = require('progress'),
-    IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
-    Login = IonicAppLib.login,
-    log = IonicAppLib.logging.logger,
-    Package = IonicAppLib.package,
-    LoginTask = require('./login'),
-    Table = require('./table'),
-    Task = require('./task').Task;
+var path = require('path');
+var _ = require('underscore');
+var Q = require('q');
+var moment = require('moment');
+var expandTilde = require('expand-tilde');
+var ProgressBar = require('progress');
+var IonicAppLib = require('ionic-app-lib');
+var Utils = IonicAppLib.utils;
+var Login = IonicAppLib.login;
+var log = IonicAppLib.logging.logger;
+var Package = IonicAppLib.package;
+var LoginTask = require('./login');
+var Table = require('./table');
+var Task = require('./task').Task;
 
 var Project = IonicAppLib.project;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -30,9 +29,9 @@ IonicTask.prototype.run = function(ionic, argv) {
     cmd = argv._[1];
   }
 
-  var dir = null,
-      project = null,
-      appId = null;
+  var dir = null;
+  var project = null;
+  var appId = null;
 
   try {
     dir = process.cwd();
@@ -47,29 +46,28 @@ IonicTask.prototype.run = function(ionic, argv) {
   }
 
   switch (cmd) {
-    case 'build':
-      return packageBuild(ionic, argv, dir, project, appId);
-    case 'list':
-      return packageList(ionic, argv, dir, project, appId);
-    case 'info':
-      return packageInfo(ionic, argv, dir, project, appId);
-    case 'download':
-      return packageDownload(ionic, argv, dir, project, appId);
+  case 'build':
+    return packageBuild(ionic, argv, dir, project, appId);
+  case 'list':
+    return packageList(ionic, argv, dir, project, appId);
+  case 'info':
+    return packageInfo(ionic, argv, dir, project, appId);
+  case 'download':
+    return packageDownload(ionic, argv, dir, project, appId);
   }
 
-  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'package')
-
+  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'package');
 };
 
 function packageBuild(ionic, argv, dir, project, appId) {
 
   if (argv._.length < 3) {
-    return Utils.fail("Specify a valid platform (android or ios).", 'package');
+    return Utils.fail('Specify a valid platform (android or ios).', 'package');
   }
 
-  var jar,
-      platform = argv._[2],
-      buildMode = argv.release ? 'release' : 'debug';
+  var jar;
+  var platform = argv._[2];
+  var buildMode = argv.release ? 'release' : 'debug';
 
   if (!_.contains(['android', 'ios'], platform)) {
     return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'package');
@@ -100,14 +98,14 @@ function packageBuild(ionic, argv, dir, project, appId) {
           return Package.buildAndroidDebug(dir, jar, appId, options);
         } else if (buildMode === 'release') {
           if (typeof argv.profile === 'undefined') {
-            return Utils.fail("Must specify security profile for android release builds (--profile <tag>).", 'package');
+            return Utils.fail('Must specify security profile for android release builds (--profile <tag>).', 'package');
           }
 
           return Package.buildAndroidRelease(dir, jar, appId, argv.profile, options);
         }
       } else if (platform === 'ios') {
         if (typeof argv.profile === 'undefined') {
-          return Utils.fail("Must specify security profile for ios builds (--profile <tag>).", 'package');
+          return Utils.fail('Must specify security profile for ios builds (--profile <tag>).', 'package');
         }
 
         return Package.buildIOS(dir, jar, appId, argv.profile, buildMode, options);
@@ -118,15 +116,14 @@ function packageBuild(ionic, argv, dir, project, appId) {
     .catch(function(ex) {
       Utils.fail(ex, 'package');
     });
-
-};
+}
 
 function formatStatus(status) {
   switch (status) {
-    case 'SUCCESS':
-      return status.green;
-    case 'FAILED':
-      return status.red;
+  case 'SUCCESS':
+    return status.green;
+  case 'FAILED':
+    return status.red;
   }
 
   return status;
@@ -158,10 +155,10 @@ function packageList(ionic, argv, dir, project, appId) {
         log.info('You don\'t have any builds yet!');
         log.info('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
       } else {
-        var count = 0,
-            headers = ['id', 'status', 'platform', 'mode'],
-            table,
-            screenWidth = process.stdout.getWindowSize()[0];
+        var count = 0;
+        var headers = ['id', 'status', 'platform', 'mode'];
+        var table;
+        var screenWidth = process.stdout.getWindowSize()[0];
 
         if (screenWidth > 100) {
           headers.push('started');
@@ -174,7 +171,7 @@ function packageList(ionic, argv, dir, project, appId) {
         table = new Table({ head: headers });
 
         _.each(body.data.slice(0, limit), function(build) {
-          count++;
+          count += 1;
 
           var row = [
             build.id,
@@ -225,14 +222,14 @@ function packageInfo(ionic, argv, dir, project, appId) {
         return Package.listBuilds(appId, jar);
       }
 
-      return { data: [ { id: argv._[2] } ] };
+      return { data: [{ id: argv._[2] }] };
     })
     .then(function(body) {
       return Package.getBuild(appId, jar, body.data[0].id, { fields: ['output'] });
     })
     .then(function(body) {
-      var table = new Table(),
-          build = body.data;
+      var table = new Table();
+      var build = body.data;
 
       table.push(
         ['id'.yellow, build.id],
@@ -261,14 +258,13 @@ function packageInfo(ionic, argv, dir, project, appId) {
     .catch(function(ex) {
       Utils.fail(ex, 'package');
     });
-
 }
 
 function packageDownload(ionic, argv, dir, project, appId) {
 
-  var jar,
-      bar,
-      downloadDirectory;
+  var jar;
+  var bar;
+  var downloadDirectory;
 
   if (typeof argv.d !== 'undefined') {
     argv['destination'] = argv.d;
@@ -295,7 +291,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
         return Package.listBuilds(appId, jar);
       }
 
-      return { data: [ { id: argv._[2] } ] };
+      return { data: [{ id: argv._[2] }] };
     })
     .then(function(body) {
       return Package.downloadBuild(appId, jar, body.data[0].id, downloadDirectory);
diff --git a/lib/ionic/prompt.js b/lib/ionic/prompt.js
index 101e140935..a97add59f8 100644
--- a/lib/ionic/prompt.js
+++ b/lib/ionic/prompt.js
@@ -1,7 +1,5 @@
-var prompt = require('prompt'),
-    IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
-    Q = require('q');
+var prompt = require('prompt');
+var Q = require('q');
 
 var Prompt = module.exports;
 
@@ -11,7 +9,7 @@ Prompt.prompt = function(schema, argv) {
   prompt.message = '';
   prompt.delimiter = '';
   prompt.start();
-  prompt.get(schema, function (err, result) {
+  prompt.get(schema, function(err, result) {
     if (err) {
       if (err.message === 'canceled') {
         return q.reject(false);
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index d38e0b87e0..04073dba41 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -1,20 +1,18 @@
-var fs = require('fs'),
-    path = require('path'),
-    parseUrl = require('url').parse,
-    request = require('request'),
-    argv = require('optimist').argv,
-    prompt = require('prompt'),
-    FormData = require('form-data'),
-    IonicTask = require('./task').IonicTask,
-    Task = require('./task').Task,
-    IonicAppLib = require('ionic-app-lib'),
-    IonicProject = IonicAppLib.project,
-    Login = IonicAppLib.login,
-    log = IonicAppLib.logging.logger,
-    LoginTask = require('./login');
-    // IonicLoginTask = require('./login').IonicTask;
-
-var IonicTask = function() {};
+var fs = require('fs');
+var path = require('path');
+var parseUrl = require('url').parse;
+var request = require('request');
+var argv = require('optimist').argv;
+var prompt = require('prompt');
+var FormData = require('form-data');
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var IonicProject = IonicAppLib.project;
+var Login = IonicAppLib.login;
+var log = IonicAppLib.logging.logger;
+var LoginTask = require('./login');
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -28,7 +26,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   this.getCmdLineOptions();
 
   Login.retrieveLogin()
-  .then(function(jar){
+  .then(function(jar) {
     if (!jar) {
       log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
@@ -38,7 +36,7 @@ IonicTask.prototype.run = function(ionic, argv) {
   .then(function(jar) {
     self.jar = jar;
 
-    if (argv._[1] && argv._[1].trim() == 'webhook_url') {
+    if (argv._[1] && argv._[1].trim() === 'webhook_url') {
       if (argv._[2]) {
         self.set_webhook_url(self, argv._[2].trim());
       } else {
@@ -47,12 +45,15 @@ IonicTask.prototype.run = function(ionic, argv) {
     } else if (argv['google-api-key']) {
       self.set_google_api_key(self, argv['google-api-key'].trim());
     } else if (argv['send'] || argv.s) {
+
       // Dev wants to send a push notification
       self.send_push(self);
     } else if (argv['ios-dev-cert'] || argv['ios-prod-cert'] || argv.d || argv.p) {
+
       // Dev wants to upload an ios push cert
       self.upload_cert(self);
     } else if (argv['production-mode'] || argv.l) {
+
       // Dev wants to switch between test/live mode
       // this will look like --live-mode=[y/n]
       // where y will put into live and n will put into dev
@@ -61,105 +62,102 @@ IonicTask.prototype.run = function(ionic, argv) {
   })
   .catch(function(ex) {
     log.error('An error occurred', ex);
-  })
-
+  });
 };
 
-IonicTask.prototype.set_webhook_url = function(self, webhook_url) {
+IonicTask.prototype.set_webhook_url = function(task, webhook_url) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error("You need to upload your app first!".bold.red);
+    log.error('You need to upload your app first!'.bold.red);
     return false;
   }
 
-  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/webhook-url';
+  var url = task.ionic.IONIC_DASH + task.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/webhook-url';
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
   form.append('webhook_url', webhook_url);
 
   form.submit({
-      protocol: params.protocol,
-      hostname: params.hostname,
-      port: params.port,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: self.jar.map(function(c) {
-          return c.key + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    },
-    function (err, response) {
-      response.on("data", function(data) {
-        if (err) {
-          return self.ionic.fail('Error setting Webhook URL: ' + err);
-        }
+    protocol: params.protocol,
+    hostname: params.hostname,
+    port: params.port,
+    path: params.path,
+    headers: form.getHeaders({
+      cookie: task.jar.map(function(c) {
+        return c.key + '=' + encodeURIComponent(c.value);
+      }).join('; ')
+    })
+  },
+  function(err, response) {
+    response.on('data', function() {
+      if (err) {
+        return task.ionic.fail('Error setting Webhook URL: ' + err);
+      }
 
-        if (response.statusCode == '200') {
-          log.info("Webhook URL set to", webhook_url);
-        } else {
-          return self.ionic.fail('App not found');
-        }
-      })
-    }
-  );
+      if (response.statusCode === '200') {
+        log.info('Webhook URL set to', webhook_url);
+      } else {
+        return task.ionic.fail('App not found');
+      }
+    });
+  });
 
   return true;
 };
 
 
-IonicTask.prototype.set_google_api_key = function(self, google_api_key) {
+IonicTask.prototype.set_google_api_key = function(task, google_api_key) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error("You need to upload your app first!".bold.red);
+    log.error('You need to upload your app first!'.bold.red);
     return false;
   }
 
-  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/google-api-key';
+  var url = task.ionic.IONIC_DASH + task.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/google-api-key';
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
   form.append('android_api_key', google_api_key);
 
   form.submit({
-      protocol: params.protocol,
-      hostname: params.hostname,
-      port: params.port,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: self.jar.map(function(c) {
-          return c.key + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    },
-    function (err, response) {
-      response.on("data", function(data) {
-        if (err) {
-          return self.ionic.fail('Error setting Google API Key: ' + err);
-        }
+    protocol: params.protocol,
+    hostname: params.hostname,
+    port: params.port,
+    path: params.path,
+    headers: form.getHeaders({
+      cookie: task.jar.map(function(c) {
+        return c.key + '=' + encodeURIComponent(c.value);
+      }).join('; ')
+    })
+  },
+  function(err, response) {
+    response.on('data', function() {
+      if (err) {
+        return task.ionic.fail('Error setting Google API Key: ' + err);
+      }
 
-        if (response.statusCode == '200') {
-          log.info("Google API Key Saved".green);
-        } else {
-          return self.ionic.fail('App not found');
-        }
-      })
-    }
-  );
+      if (response.statusCode === '200') {
+        log.info('Google API Key Saved'.green);
+      } else {
+        return task.ionic.fail('App not found');
+      }
+    });
+  });
 
   return true;
 };
 
 
-IonicTask.prototype.send_push = function(self) {
+IonicTask.prototype.send_push = function(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error("You need to upload your app first!".bold.red);
+    log.error('You need to upload your app first!'.bold.red);
     return false;
   }
 
@@ -178,7 +176,7 @@ IonicTask.prototype.send_push = function(self) {
     description: 'Device token'.yellow.bold,
     required: true,
     isFile: false
-  }
+  };
 
   promptProperties['alert'] = {
     name: 'alert',
@@ -192,23 +190,23 @@ IonicTask.prototype.send_push = function(self) {
     description: 'Badge count'.yellow.bold,
     required: false,
     isFile: false
-  }
+  };
 
   promptProperties['sound'] = {
     name: 'sound',
     description: 'Sound file name'.yellow.bold,
     required: false,
     isFile: false
-  }
+  };
 
   prompt.start();
 
-  prompt.get({properties: promptProperties}, function(err, promptResult) {
+  prompt.get({ properties: promptProperties }, function(err, promptResult) {
     if (err) {
-      return self.ionic.fail('Error: ' + err);
+      return task.ionic.fail('Error: ' + err);
     }
 
-    var api_key = promptResult['push-api-key'];
+    var apiKey = promptResult['push-api-key'];
 
     var notification = {
       platform: 'ios',
@@ -220,7 +218,7 @@ IonicTask.prototype.send_push = function(self) {
           sound: promptResult['sound']
         }
       }
-    }
+    };
 
     var options = {
       url: 'https://push.ionic.io/api/v1/push',
@@ -228,99 +226,97 @@ IonicTask.prototype.send_push = function(self) {
       json: true,
       headers: {
         'X-Ionic-Application-Id': project.get('app_id'),
-        'authorization': 'Basic ' + new Buffer(api_key + ':').toString('base64')
+        authorization: 'Basic ' + new Buffer(apiKey + ':').toString('base64')
       },
       body: notification
     };
 
-    request(options, function(err, response, body) {
-      if (!err && response.statusCode == 202) {
-        log.info("Successfully queued push notification");
+    request(options, function(err, response) {
+      if (!err && response.statusCode === 202) {
+        log.info('Successfully queued push notification');
       } else {
-        log.error("Error queueing push notification", err);
+        log.error('Error queueing push notification', err);
       }
     });
   });
-
 };
 
-IonicTask.prototype.set_production_mode = function(self) {
+IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error("You need to upload your app first!".bold.red);
+    log.error('You need to upload your app first!'.bold.red);
     return false;
   }
 
-  if (self.inputValues['production-mode'] === true) {
-    log.error("You need to specify a value [y/n] to set the production mode!".bold.red);
+  if (task.inputValues['production-mode'] === true) {
+    log.error('You need to specify a value [y/n] to set the production mode!'.bold.red);
     return false;
   }
 
-  self.inputValues['production-mode'] = self.inputValues['production-mode'].toLowerCase();
+  task.inputValues['production-mode'] = task.inputValues['production-mode'].toLowerCase();
 
-  if (self.inputValues['production-mode'] != 'y' && self.inputValues['production-mode'] != 'n') {
-    log.error("You need to specify a value [y/n] to set the production mode!".bold.red);
+  if (task.inputValues['production-mode'] !== 'y' && task.inputValues['production-mode'] !== 'n') {
+    log.error('You need to specify a value [y/n] to set the production mode!'.bold.red);
     return false;
   }
 
-  var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/set-production-mode';
+  var url = task.ionic.IONIC_DASH + task.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/set-production-mode';
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
-  form.append('production_mode', self.inputValues['production-mode']);
+  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
+  form.append('production_mode', task.inputValues['production-mode']);
 
   form.submit({
-      protocol: params.protocol,
-      hostname: params.hostname,
-      port: params.port,
-      path: params.path,
-      headers: form.getHeaders({
-        cookie: self.jar.map(function(c) {
-          return c.key + "=" + encodeURIComponent(c.value);
-        }).join("; ")
-      })
-    },
-    function (err, response) {
+    protocol: params.protocol,
+    hostname: params.hostname,
+    port: params.port,
+    path: params.path,
+    headers: form.getHeaders({
+      cookie: task.jar.map(function(c) {
+        return c.key + '=' + encodeURIComponent(c.value);
+      }).join('; ')
+    })
+  },
+  function(err, response) {
+    if (err) {
+      return task.ionic.fail('Error uploading certificate: ' + err);
+    }
+
+    response.setEncoding('utf8');
+    response.on('data', function(data) {
       if (err) {
-        return self.ionic.fail('Error uploading certificate: ' + err);
+        return task.ionic.fail('Error setting mode: ' + err);
       }
 
-      response.setEncoding('utf8');
-      response.on("data", function(data) {
-        if (err) {
-          return self.ionic.fail('Error setting mode: ' + err);
-        }
-
-        try {
-          var d = JSON.parse(data);
-          if (d.errors && d.errors.length) {
-            for (var j = 0; j < d.errors.length; j++) {
-              log.error((d.errors[j]).bold.red);
-            }
-            return self.ionic.fail('Unable to set mode');
-          }
-
-          if (self.inputValues['production-mode'] == 'y') {
-            log.info("Successfully set production mode");
-          } else {
-            log.info("Successfully set development mode");
+      try {
+        var d = JSON.parse(data);
+        if (d.errors && d.errors.length) {
+          for (var j = 0; j < d.errors.length; j += 1) {
+            log.error((d.errors[j]).bold.red);
           }
+          return task.ionic.fail('Unable to set mode');
+        }
 
-        } catch (parseEx) {
-          return self.ionic.fail('Error response: ' + parseEx);
+        if (task.inputValues['production-mode'] === 'y') {
+          log.info('Successfully set production mode');
+        } else {
+          log.info('Successfully set development mode');
         }
-      });
-    }
-  );
+
+      } catch (parseEx) {
+        return task.ionic.fail('Error response: ' + parseEx);
+      }
+    });
+  });
 };
 
-IonicTask.prototype.upload_cert = function(self) {
+IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error("You need to upload your app first!".bold.red);
+    log.error('You need to upload your app first!'.bold.red);
     return false;
   }
 
@@ -350,77 +346,76 @@ IonicTask.prototype.upload_cert = function(self) {
 
   prompt.start();
 
-  prompt.get({properties: promptProperties}, function(err, promptResult) {
+  prompt.get({ properties: promptProperties }, function(err, promptResult) {
     if (err) {
-      return self.ionic.fail('Error: ' + err);
+      return task.ionic.fail('Error: ' + err);
     }
 
-    var url = self.ionic.IONIC_DASH + self.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/upload-push-cert';
+    var url = task.ionic.IONIC_DASH + task.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/upload-push-cert';
     var params = parseUrl(url);
 
     var form = new FormData();
-    form.append('csrfmiddlewaretoken', self.getCsrfToken(self.jar));
+    form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
 
     var inputFile;
 
     try {
       inputFile = promptResult['ios-push-cert'].replace(/\\ /g, ' ').trim();
-      form.append('ios_push_cert', fs.createReadStream( resolvePath(inputFile) ) );
-    } catch(e) {
-      return self.ionic.fail("Error loading " + resolvePath(inputFile));
+      form.append('ios_push_cert', fs.createReadStream(resolvePath(inputFile)));
+    } catch (e) {
+      return task.ionic.fail('Error loading ' + resolvePath(inputFile));
     }
 
     // Set the flag for if this is a production or dev cert
     form.append('prod_cert', prodCert);
 
     form.submit({
-        protocol: params.protocol,
-        hostname: params.hostname,
-        port: params.port,
-        path: params.path,
-        headers: form.getHeaders({
-          cookie: self.jar.map(function(c) {
-            return c.key + "=" + encodeURIComponent(c.value);
-          }).join("; ")
-        })
-      },
-      function (err, response) {
+      protocol: params.protocol,
+      hostname: params.hostname,
+      port: params.port,
+      path: params.path,
+      headers: form.getHeaders({
+        cookie: task.jar.map(function(c) {
+          return c.key + '=' + encodeURIComponent(c.value);
+        }).join('; ')
+      })
+    },
+    function(err, response) {
+      if (err) {
+        return task.ionic.fail('Error uploading certificate: ' + err);
+      }
+
+      response.setEncoding('utf8');
+      response.on('data', function(data) {
         if (err) {
-          return self.ionic.fail('Error uploading certificate: ' + err);
+          return task.ionic.fail('Error uploading certificate: ' + err);
         }
 
-        response.setEncoding('utf8');
-        response.on("data", function(data) {
-          if (err) {
-            return self.ionic.fail('Error uploading certificate: ' + err);
-          }
-
-          try {
-            var d = JSON.parse(data);
-            if (d.errors && d.errors.length) {
-              for (var j = 0; j < d.errors.length; j++) {
-                log.error((d.errors[j]).bold.red);
-              }
-              return self.ionic.fail('Unable to upload certificate');
+        try {
+          var d = JSON.parse(data);
+          if (d.errors && d.errors.length) {
+            for (var j = 0; j < d.errors.length; j += 1) {
+              log.error((d.errors[j]).bold.red);
             }
+            return task.ionic.fail('Unable to upload certificate');
+          }
 
-            log.info("Successfully uploaded certificate");
+          log.info('Successfully uploaded certificate');
 
-          } catch (parseEx) {
-            return self.ionic.fail('Error response: ' + parseEx);
-          }
-        });
-      }
-    );
+        } catch (parseEx) {
+          return task.ionic.fail('Error response: ' + parseEx);
+        }
+      });
+    });
   });
-}
+};
 
 IonicTask.prototype.getCmdLineOptions = function() {
   var self = this;
 
   function getCmdArgValue(propertyName, shortName) {
     var value = argv[propertyName] || argv[shortName];
-    if(value) {
+    if (value) {
       self.inputValues[propertyName] = value;
       self.useCmdArgs = true;
     }
@@ -428,9 +423,9 @@ IonicTask.prototype.getCmdLineOptions = function() {
 
   function getCmdArgFile(propertyName, shortName) {
     var value = argv[propertyName] || argv[shortName];
-    if(value) {
-      if(!fileExists(value)) {
-        return self.ionic.fail("Unable to find file: " + argv[propertyName]);
+    if (value) {
+      if (!fileExists(value)) {
+        return self.ionic.fail('Unable to find file: ' + argv[propertyName]);
       }
       self.inputFiles[propertyName] = value;
       self.useCmdArgs = true;
@@ -444,21 +439,22 @@ IonicTask.prototype.getCmdLineOptions = function() {
 };
 
 IonicTask.prototype.getCsrfToken = function(jar) {
-  for (var i = 0; i < jar.length; i++) {
-    if (jar[i].key == 'csrftoken') {
+  for (var i = 0; i < jar.length; i += 1) {
+    if (jar[i].key === 'csrftoken') {
       return jar[i].value;
     }
   }
   return '';
-}
+};
 
 function fileExists(filePath) {
+
   // check if a file exists with a relative path or absolute path
   filePath = filePath.replace(/\\ /g, ' ').trim();
   return fs.existsSync(resolvePath(filePath));
 }
 
-function resolvePath (p) {
+function resolvePath(p) {
   if (p.substr(0, 1) === '~') {
     p = process.env.HOME + p.substr(1);
   }
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 7d80d8a254..9d81bd4c69 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,22 +1,21 @@
-var argv = require('optimist').argv,
-    Task = require('./task').Task,
-    IonicAppLib = require('ionic-app-lib'),
-    IonicResources = IonicAppLib.resources,
-    IonicStats = require('./stats').IonicStats,
-    Utils = IonicAppLib.utils;
-
+var argv = require('optimist').argv;
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var IonicResources = IonicAppLib.resources;
+var IonicStats = require('./stats').IonicStats;
+var Utils = IonicAppLib.utils;
 var Project = IonicAppLib.project;
-var IonicTask = function() {};
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function() {
-  var dir = null,
-      project = null;
+  var dir = null;
 
   try {
     dir = process.cwd();
-    project = Project.load(dir);
+    Project.load(dir);
   } catch (ex) {
     return Utils.fail(ex, 'resources');
   }
@@ -36,4 +35,4 @@ IonicTask.prototype.run = function() {
 
 module.exports = {
   IonicTask: IonicTask
-}
+};
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 3aca3e8a2a..4b5945c5a0 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -1,27 +1,28 @@
-var fs = require('fs'),
-    path = require('path'),
-    Q = require('q'),
-    expandTilde = require('expand-tilde'),
-    _ = require('underscore'),
-    IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
-    Login = IonicAppLib.login,
-    Security = IonicAppLib.security,
-    log = IonicAppLib.logging.logger,
-    LoginTask = require('./login'),
-    Prompt = require('./prompt'),
-    Table = require('./table'),
-    Task = require('./task').Task;
+var fs = require('fs');
+var path = require('path');
+var Q = require('q');
+var expandTilde = require('expand-tilde');
+var _ = require('underscore');
+var IonicAppLib = require('ionic-app-lib');
+var Utils = IonicAppLib.utils;
+var Login = IonicAppLib.login;
+var Security = IonicAppLib.security;
+var log = IonicAppLib.logging.logger;
+var LoginTask = require('./login');
+var Prompt = require('./prompt');
+var Table = require('./table');
+var Task = require('./task').Task;
 
 var Project = IonicAppLib.project;
-var IonicTask = function() {};
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
 
-  var cmd,
-      subcmd;
+  var cmd;
+  var subcmd;
 
   if (argv._.length < 2) {
     cmd = 'profiles';
@@ -29,9 +30,9 @@ IonicTask.prototype.run = function(ionic, argv) {
     cmd = argv._[1];
   }
 
-  var dir = null,
-      project = null,
-      appId = null;
+  var dir = null;
+  var project = null;
+  var appId = null;
 
   try {
     dir = process.cwd();
@@ -46,37 +47,37 @@ IonicTask.prototype.run = function(ionic, argv) {
   }
 
   switch (cmd) {
-    case 'profiles':
-      if (argv._.length < 3) {
-        subcmd = 'list';
-      } else {
-        subcmd = argv._[2];
-      }
+  case 'profiles':
+    if (argv._.length < 3) {
+      subcmd = 'list';
+    } else {
+      subcmd = argv._[2];
+    }
 
-      switch (subcmd) {
-        case 'add':
-          return addSecurityProfile(ionic, argv, dir, appId);
-        case 'list':
-          return listSecurityProfiles(ionic, argv, dir, appId);
-        default:
-          return Utils.fail("Unknown subcommand 'profiles " + subcmd + "'.", 'security')
-      }
-    case 'credentials':
-      return addSecurityCredentials(ionic, argv, dir, appId);
+    switch (subcmd) {
+    case 'add':
+      return addSecurityProfile(ionic, argv, dir, appId);
+    case 'list':
+      return listSecurityProfiles(ionic, argv, dir, appId);
+    default:
+      return Utils.fail("Unknown subcommand 'profiles " + subcmd + "'.", 'security');
+    }
+  case 'credentials':
+    return addSecurityCredentials(ionic, argv, dir, appId);
   }
 
-  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'security')
-
+  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'security');
 };
 
 function addSecurityProfile(ionic, argv, dir, appId) {
 
   if (argv._.length < 4) {
-    return Utils.fail("Specify a name for this Security Profile. Example: 'ionic security profile add \"My New Profile\"'.", 'security');
+    return Utils.fail('Specify a name for this Security Profile. Example: ' +
+                      "'ionic security profile add \"My New Profile\"'.", 'security');
   }
 
-  var jar,
-      name = argv._[3];
+  var jar;
+  var name = argv._[3];
 
   return Login.retrieveLogin()
     .then(function(jar) {
@@ -91,11 +92,11 @@ function addSecurityProfile(ionic, argv, dir, appId) {
 
       return Security.addProfile(appId, jar, name);
     })
-    .then(function(body) {
+    .then(function() {
       console.success('Added "' + name + '".');
     }, function(err) {
       if (typeof err === 'object') {
-        if (err.type == 'ProfileExists') {
+        if (err.type === 'ProfileExists') {
           console.error(err.message);
         } else {
           return Q.reject(new Error(err.message));
@@ -154,16 +155,17 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
 function addSecurityCredentials(ionic, argv, dir, appId) {
 
   if (argv._.length < 3) {
-    return Utils.fail("Specify a valid platform (android or ios).", 'security');
+    return Utils.fail('Specify a valid platform (android or ios).', 'security');
   }
 
   if (typeof argv.profile === 'undefined') {
-    return Utils.fail("Specify the Security Profile on which these credentials are saved (--profile <tag>).", 'security');
+    return Utils.fail('Specify the Security Profile on which these credentials are saved ' +
+                      '(--profile <tag>).', 'security');
   }
 
-  var jar,
-      platform = argv._[2],
-      profile = argv.profile;
+  var jar;
+  var platform = argv._[2];
+  var profile = argv.profile;
 
   if (!_.contains(['android', 'ios'], platform)) {
     return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'security');
@@ -243,30 +245,32 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
     })
     .then(function(result) {
       if (platform === 'android') {
-        var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
-            keystorePassword = result['keystore-password'],
-            keyAlias = result['key-alias'],
-            keyPassword = result['key-password'],
-            keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-        return Security.addAndroidCredentials(appId, jar, profile, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
+        var keystoreFilePath = path.resolve(expandTilde(result['keystore']));
+        var keystorePassword = result['keystore-password'];
+        var keyAlias = result['key-alias'];
+        var keyPassword = result['key-password'];
+        var keystoreFileStream = fs.createReadStream(keystoreFilePath);
+
+        return Security.addAndroidCredentials(appId, jar, profile, keystoreFileStream,
+                                              keystorePassword, keyAlias, keyPassword);
       } else if (platform === 'ios') {
-        var certificateFilePath = path.resolve(expandTilde(result['cert'])),
-            certificatePassword = result['cert-password'],
-            provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
-            certificateFileStream = fs.createReadStream(certificateFilePath),
-            provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
-
-        return Security.addIOSCredentials(appId, jar, profile, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+        var certificateFilePath = path.resolve(expandTilde(result['cert']));
+        var certificatePassword = result['cert-password'];
+        var provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile']));
+        var certificateFileStream = fs.createReadStream(certificateFilePath);
+        var provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
+
+        return Security.addIOSCredentials(appId, jar, profile, certificateFileStream,
+                                          certificatePassword, provisioningProfileFileStream);
       }
 
       return Q.reject('Unrecognized platform.');
     })
-    .then(function(body) {
+    .then(function() {
       console.success('Added ' + platform + ' credentials to your Security Profile.');
     }, function(err) {
       if (typeof err === 'object') {
-        if (err.type == 'CredentialsExist') {
+        if (err.type === 'CredentialsExist') {
           console.error(err.message);
         } else {
           return Q.reject(new Error(err.message));
@@ -276,7 +280,6 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
     .catch(function(ex) {
       Utils.fail(ex, 'package');
     });
-
-};
+}
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index c9ce1a1129..c66d67f78a 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,32 +1,28 @@
-var IonicAppLib = require('ionic-app-lib'),
-    Utils = IonicAppLib.utils,
-    events = IonicAppLib.events,
-    Q = require('q'),
-    Task = require('./task').Task,
-    Serve = IonicAppLib.serve,
-    log = IonicAppLib.logging.logger,
-    IonicProject = IonicAppLib.project;
+var IonicAppLib = require('ionic-app-lib');
+var Utils = IonicAppLib.utils;
+var events = IonicAppLib.events;
+var Q = require('q');
+var Task = require('./task').Task;
+var Serve = IonicAppLib.serve;
+var log = IonicAppLib.logging.logger;
+var IonicProject = IonicAppLib.project;
 
-var DEFAULT_HTTP_PORT = 8100;
-var DEFAULT_LIVE_RELOAD_PORT = 35729;
-var IONIC_LAB_URL = '/ionic-lab';
-
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
-  var self = this;
   this.ionic = ionic;
   this.port = argv._[1];
   this.liveReloadPort = argv._[2];
 
-  if (argv._[0] == 'address') {
+  if (argv._[0] === 'address') {
+
     // reset any address configs
     var ionicConfig = IonicAppLib.config.load();
     ionicConfig.set('ionicServeAddress', null);
     ionicConfig.set('platformServeAddress', null);
-    return Serve.getAddress({isAddressCmd: true});
+    return Serve.getAddress({ isAddressCmd: true });
   }
 
   var project = null;
@@ -41,11 +37,11 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   var options = Serve.loadSettings(argv, project);
 
-  options.appDirectory = cwd;//called from cli - ionic serve - cwd is this
+  options.appDirectory = cwd; // called from cli - ionic serve - cwd is this
 
   options.nogulp = argv.nogulp;
 
-  //check if CONNECT_LIVE_RELOAD_PORT is defined and use that instead
+  // check if CONNECT_LIVE_RELOAD_PORT is defined and use that instead
   if (process.env.CONNECT_LIVE_RELOAD_PORT) {
     options.liveReloadPort = process.env.CONNECT_LIVE_RELOAD_PORT;
   }
@@ -65,11 +61,10 @@ IonicTask.prototype.run = function(ionic, argv) {
 
     return promise
     .then(function() {
-      // log.info('options.address', options.address);
       return Serve.checkPorts(true, options.port, options.address, options);
     })
     .then(function() {
-      if(options.runLivereload) {
+      if (options.runLivereload) {
         return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
       }
     })
@@ -80,7 +75,6 @@ IonicTask.prototype.run = function(ionic, argv) {
       return Serve.showFinishedServeMessage(options);
     })
     .then(function() {
-      // return Serve.listenToServeLogs(options);
       events.on('serverlog', log.info);
       events.on('consolelog', log.info);
     })
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 0f8c32a3e2..2d5ffe2dbc 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -1,15 +1,14 @@
-require('shelljs/global')
+require('shelljs/global');
 
-var Task = require('./task').Task,
-    IonicCordova = require('./cordova').IonicTask,
-    argv = require('optimist').argv,
-    fs = require('fs'),
-    path = require('path'),
-    _ = require('underscore'),
-    bower = require('./bower'),
-    log = require('ionic-app-lib').logging.logger;
+var Task = require('./task').Task;
+var fs = require('fs');
+var path = require('path');
+var exec = require('child_process').exec;
+var _ = require('underscore');
+var bower = require('./bower');
+var log = require('ionic-app-lib').logging.logger;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -19,10 +18,12 @@ IonicTask.prototype.readIonicProjectJson = function readIonicProjectJson() {
   try {
     var content = fs.readFileSync(ionicProjectFile, 'utf8');
     ionicProjectJson = JSON.parse(content);
-  } catch (ex) { }
+  } catch (ex) {
+    throw ex;
+  }
 
   return ionicProjectJson;
-}
+};
 
 IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(serviceName) {
   var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
@@ -34,122 +35,112 @@ IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(servi
       ionicProjectJson.services = [];
     }
 
-    var existingProject = _.findWhere(ionicProjectJson.services, {name: serviceName});
+    var existingProject = _.findWhere(ionicProjectJson.services, { name: serviceName });
     if (typeof existingProject != 'undefined') {
       return;
     }
 
-    ionicProjectJson.services.push({name: serviceName});
+    ionicProjectJson.services.push({ name: serviceName });
     fs.writeFileSync(ionicProjectFile, JSON.stringify(ionicProjectJson, null, 2), 'utf8');
 
   } catch (ex) {
     this.ionic.fail('Failed to update the ionic.project settings for the service', 'service');
   }
-}
+};
 
 IonicTask.prototype.installBowerComponent = function installBowerComponent(serviceName) {
-  // log.info('We are here now.');
   var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
-  // var bowerInstallCommand = 'bower install ionic-service-' + serviceName;
-
   var result = exec(bowerInstallCommand);
 
-  if (result.code != 0) {
-    //Error happened, report it.
-    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose + '"'.bold + '.\nAre you sure it exists?'.bold;
+  if (result.code !== 0) {
+
+    // Error happened, report it.
+    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
+      '"'.bold + '.\nAre you sure it exists?'.bold;
     this.ionic.fail(errorMessage, 'service');
   } else {
     this.addServiceToIonicJson(serviceName);
   }
-}
+};
 
 IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(serviceName) {
   var bowerUninstallCommand = 'bower unlink ionic-service-' + serviceName;
 
   var result = exec(bowerUninstallCommand);
 
-  if (result.code != 0) {
-    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose + '"'.bold + '.\nAre you sure it exists?'.bold;
-    this.ionic.fail(errorMessage, 'service')
-  } else {
-    // log.info('Uninstalled Ionic service', serviceName);
+  if (result.code !== 0) {
+    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
+      '"'.bold + '.\nAre you sure it exists?'.bold;
+    this.ionic.fail(errorMessage, 'service');
   }
-}
+};
 
 IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLocation() {
   var bowerRcFileLocation = path.join(process.cwd(), '.bowerrc');
-  // log.info('location bowerrc: ' , bowerRcFileLocation)
   var bowerRc = null;
 
   try {
     var content = fs.readFileSync(bowerRcFileLocation, 'utf8');
     bowerRc = JSON.parse(content);
-    // log.info('bowerRc contents: ', bowerRc)
-  } catch (ex) { }
+  } catch (ex) {
+    throw ex;
+  }
 
-  var directory = 'www/lib'; //Default directory
+  var directory = 'www/lib'; // Default directory
 
   if (bowerRc && bowerRc.directory) {
     directory = bowerRc.directory;
   }
 
   return directory;
-}
+};
 
 IonicTask.prototype.getBowerJson = function getBowerJson(directory, serviceName) {
   var bowerJsonLocation = path.join(process.cwd(), directory, 'ionic-service-' + serviceName, 'ionic-plugins.json');
   var packageBowerJson = require(bowerJsonLocation);
   return packageBowerJson;
-}
+};
 
 IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory, serviceName) {
-  // var bowerJsonLocation = process.cwd() + '/' + directory + '/ionic-service-' + serviceName + '/bower.json';
-  // var packageBowerJson = require(bowerJsonLocation);
   var packageBowerJson = this.getBowerJson(directory, serviceName);
 
-  // log.info('bowerjson = ', packageBowerJson.plugins);
-  // log.info('ionic - ', IonicCordova);
   _.each(packageBowerJson.plugins, function(plugin) {
-    // var ic = new IonicCordova();
-    // ic.run('ionic plugin add ' + plugin);
     log.info('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
     var installPluginCmd = 'ionic plugin add ' + plugin.uri;
     log.info(installPluginCmd);
     var pluginInstallResult = exec(installPluginCmd);
 
-    if (pluginInstallResult.code != 0) {
+    if (pluginInstallResult.code !== 0) {
       var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
       this.ionic.fail(errorMessage, 'service');
     }
-    // log.info(pluginInstallResult);
-  })
-}
+  });
+};
 
 IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bowerJson) {
   _.each(bowerJson.plugins, function(plugin) {
     log.info('Uninstalling cordova plugin -  ' + plugin.name);
     var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
     log.info(uninstallPluginCmd);
-    var pluginRemoveResult = exec(uninstallPluginCmd)
+    var pluginRemoveResult = exec(uninstallPluginCmd);
 
-    if (pluginRemoveResult.code != 0) {
+    if (pluginRemoveResult.code !== 0) {
       var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
       this.ionic.fail(errorMessage, 'service');
     }
-  })
-}
+  });
+};
 
 IonicTask.prototype.addService = function addService(serviceName) {
   this.installBowerComponent(serviceName);
 
   var directory = this.getBowerComponentsLocation();
-  // log.info('Directory we are searching for bower.json - ', directory);
 
   log.info('Checking for any plugins required by service package');
 
   this.installBowerPlugins(directory, serviceName);
   log.info('ionic service add completed');
-}
+};
 
 IonicTask.prototype.removeService = function removeService(serviceName) {
   var directory = this.getBowerComponentsLocation();
@@ -158,21 +149,16 @@ IonicTask.prototype.removeService = function removeService(serviceName) {
   this.uninstallBowerComponent(serviceName);
 
   this.uninstallBowerPlugins(packageBowerJson);
-
-}
+};
 
 IonicTask.prototype.listServices = function listServices() {
-  // var directory = this.getBowerComponentsLocation();
-  var bowerJson = require(process.cwd() + '/bower.json');
-  // log.info(bowerJson);
-
-}
+};
 
 // Need to look at bower.json of package just installed and look for any cordova plugins required
 // Check the directory in the projects `.bowerrc` file
 // Then go to /path/to/bower/components/<ionic-service-serviceName>/ionic-plugins.json - 'plugins'
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
-IonicTask.prototype.run = function run(ionic, argv, callback) {
+IonicTask.prototype.run = function run(ionic, argv) {
   this.ionic = ionic;
 
   if (!bower.IonicBower.checkForBower()) {
@@ -180,25 +166,25 @@ IonicTask.prototype.run = function run(ionic, argv, callback) {
     return;
   }
 
-  var action = argv._[1]
+  var action = argv._[1];
   var serviceName = argv._[2];
 
   try {
     switch (action) {
-      case 'add':
-        this.addService(serviceName);
-        break;
-      case 'remove':
-        this.removeService(serviceName);
-        break;
-      case 'list':
-        this.listServices();
-        break;
+    case 'add':
+      this.addService(serviceName);
+      break;
+    case 'remove':
+      this.removeService(serviceName);
+      break;
+    case 'list':
+      this.listServices();
+      break;
     }
   } catch (error) {
     var errorMessage = error.message ? error.message : error;
-    this.ionic.fail(errorMessage, 'service')
+    this.ionic.fail(errorMessage, 'service');
   }
-}
+};
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index c246cdf889..5bba986374 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,11 +1,12 @@
 var Task = require('./task').Task;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function() {
-  //TODO link to gulp hook docs
+
+  // TODO link to gulp hook docs
   console.log('The setup task has been deprecated.\n');
 };
 
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index b768ecbffd..699caccae3 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,27 +1,22 @@
-var path = require('path'),
-    parseUrl = require('url').parse,
-    shelljs = require('shelljs/global'),
-    argv = require('optimist').boolean(['no-cordova', 'sass', 'list']).argv,
-    Q = require('q'),
-    FormData = require('form-data'),
-    IonicProject = require('./project'),
-    IonicStore = require('./store').IonicStore,
-    Task = require('./task').Task,
-    LoginTask = require('./login'),
-    IonicAppLib = require('ionic-app-lib'),
-    Share = IonicAppLib.share,
-    log = IonicAppLib.logging.logger,
-    Login = IonicAppLib.login,
-    Utils = IonicAppLib.utils;
+require('shelljs/global');
 
-var IonicTask = function() {};
+var IonicProject = require('./project');
+var Task = require('./task').Task;
+var LoginTask = require('./login');
+var IonicAppLib = require('ionic-app-lib');
+var Share = IonicAppLib.share;
+var log = IonicAppLib.logging.logger;
+var Login = IonicAppLib.login;
+var Utils = IonicAppLib.utils;
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function(ionic, argv) {
   var project;
 
-  if(argv._.length < 2) {
+  if (argv._.length < 2) {
     return ionic.fail('Invalid command', 'share');
   }
 
@@ -29,23 +24,23 @@ IonicTask.prototype.run = function(ionic, argv) {
     project = IonicProject.load();
   } catch (ex) {
     ionic.fail(ex.message);
-    return
+    return;
   }
 
-  if (project.get('app_id') == '') {
+  if (project.get('app_id') === '') {
     return ionic.fail('You must first upload the app to share it');
   }
 
   var email = argv._[1];
 
-  if(email.indexOf('@') < 0) {
+  if (email.indexOf('@') < 0) {
     return ionic.fail('Invalid email address', 'share');
   }
 
   log.info(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
 
   return Login.retrieveLogin()
-  .then(function(jar){
+  .then(function(jar) {
     if (!jar) {
       log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
@@ -56,7 +51,6 @@ IonicTask.prototype.run = function(ionic, argv) {
     return Share.shareApp(process.cwd(), jar, email);
   })
   .catch(function(ex) {
-    // log.info('Error', ex, ex.stack);
     return Utils.fail(ex);
   });
 };
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 77445d1ee7..07debdbb54 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,20 +1,18 @@
-var fs = require('fs'),
-    shelljs = require('shelljs/global'),
-    // argv = require('optimist').boolean(['no-cordova', 'sass', 'list', 'w']).argv,
-    prompt = require('prompt'),
-    colors = require('colors'),
-    Q = require('q'),
-    IonicTemplates = require('./templates').IonicTask,
-    IonicStore = require('./store').IonicStore,
-    Task = require('./task').Task,
-    IonicAppLib = require('ionic-app-lib'),
-    Start = IonicAppLib.start,
-    log = IonicAppLib.logging.logger,
-    Utils = IonicAppLib.utils;
+require('shelljs/global');
+require('colors');
 
+var fs = require('fs');
+var Q = require('q');
+var IonicTemplates = require('./templates').IonicTask;
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var Start = IonicAppLib.start;
+var log = IonicAppLib.logging.logger;
+var Utils = IonicAppLib.utils;
+
+
+function IonicTask() {}
 
-var Start;
-var IonicTask = function() {};
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic, argv) {
@@ -28,16 +26,16 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return ionic.fail('Invalid command', 'start');
   }
 
-  if (argv._[1] == '.') {
+  if (argv._[1] === '.') {
     log.error('Please name your Ionic project something meaningful other than \'.\''.red);
-    return
+    return;
   }
 
-  var promptPromise,
-      options = Utils.preprocessCliOptions(argv),
-      startingApp = true;
-  // Grab the app's relative directory name
+  var promptPromise;
+  var options = Utils.preprocessCliOptions(argv);
+  var startingApp = true;
 
+  // Grab the app's relative directory name
   if (fs.existsSync(options.targetPath)) {
     promptPromise = Start.promptForOverwrite(options.targetPath);
   } else {
@@ -58,13 +56,6 @@ IonicTask.prototype.run = function run(ionic, argv) {
       return Start.printQuickHelp(options);
     }
   })
-  /*
-  .then(function() {
-    if (startingApp) {
-      return ionic.printNewsUpdates(true);
-    }
-  })
-  */
   .then(function() {
     if (startingApp) {
       return Start.promptLogin(options);
@@ -76,7 +67,6 @@ IonicTask.prototype.run = function run(ionic, argv) {
     }
   })
   .catch(function(error) {
-    // return Utils.fail(error);
     log.error(error);
     throw error;
   });
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 133cd53a41..809bb467ba 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -1,99 +1,51 @@
-// "cordovaPlatforms": [
-//   "ios",
-//   {
-//     "android": {
-//       "id": "android",
-//       "locator": "https://github.com/apache/cordova-android.git"
-//     }
-//   }
-// ],
-// "cordovaPlugins": [
-//   "org.apache.cordova.device",
-//   "org.apache.cordova.console",
-//   "com.ionic.keyboard",
-//   "org.apache.cordova.splashscreen",
-//   {
-//     "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
-//     "id": "org.cordova.croswalk"
-//   },
-//   {
-//     "locator": "/path/to/cloned/phonegap-facebook-plugin",
-//     "id": "",
-//     "variables": {
-//         "APP_ID": "some_id",
-//         "APP_NAME": "some_name"
-//     }
-//   }
-// ]
-
-var fs = require('fs'),
-  path = require('path'),
-  // argv = require('optimist').boolean(['plugins', 'platforms']).argv,
-  Q = require('q'),
-  shelljs = require('shelljs'),
-  Task = require('./task').Task,
-  _ = require('underscore'),
-  IonicAppLib = require('ionic-app-lib'),
-  IonicProject = IonicAppLib.project,
-  State = IonicAppLib.state,
-  Utils = IonicAppLib.utils,
-  log = IonicAppLib.logging.logger,
-  IonicInfo = IonicAppLib.info;
+var shelljs = require('shelljs');
+var Task = require('./task').Task;
+var IonicAppLib = require('ionic-app-lib');
+var IonicProject = IonicAppLib.project;
+var State = IonicAppLib.state;
+var log = IonicAppLib.logging.logger;
 
 // var State = module.exports;
 
 shelljs.config.silent = true;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
 IonicTask.prototype.run = function run(ionic, argv) {
-  var self = this,
-      project,
-      stats,
-      projectPath,
-      options = { platforms: true, plugins: true };
+  var options = { platforms: true, plugins: true };
 
   this.ionic = ionic;
 
-  // try {
-  //   projectPath = path.resolve('ionic.project');
-  //   stats = fs.statSync(projectPath);
-  // } catch (ex) {
-  //   this.ionic.fail('You cannot run any state commands on a project that is not an Ionic project.\nTry adding an ionic.project file or running ionic start to get an application to save or restore');
-  //   return;
-  // }
-
   try {
-    project = IonicProject.load();
+    IonicProject.load();
   } catch (ex) {
     this.ionic.fail(ex.message);
     return;
   }
 
-  //If either plugin or platforms is specified, set it to that value.
+  // If either plugin or platforms is specified, set it to that value.
   if (argv.platforms || argv.plugins) {
     options = { platforms: argv.platforms, plugins: argv.plugins };
   }
 
   switch (argv._[1]) {
-    case 'save':
-      State.saveState(process.cwd(), options);
-      break;
-    case 'restore':
-      State.restoreState(process.cwd(), options);
-      break;
-    case 'reset':
-      State.resetState(process.cwd(), options);
-      break;
-    case 'clear':
-      State.clearState(process.cwd(), options);
-      break;
-    default:
-      log.error('Please specify a command [ save | restore | reset | clear ] for the state command.');
+  case 'save':
+    State.saveState(process.cwd(), options);
+    break;
+  case 'restore':
+    State.restoreState(process.cwd(), options);
+    break;
+  case 'reset':
+    State.resetState(process.cwd(), options);
+    break;
+  case 'clear':
+    State.clearState(process.cwd(), options);
+    break;
+  default:
+    log.error('Please specify a command [ save | restore | reset | clear ] for the state command.');
   }
-
 };
 
 exports.IonicTask = IonicTask;
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index a276fe5daf..f5cf1b2884 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -1,511 +1,510 @@
-var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, os, IonicConfig;
-var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-        __slice = Array.prototype.slice;
-
-var path = require('path'),
-    http = require('http'),
-    _ = require('underscore');
-    querystring = require('querystring'),
-    crypto = require('crypto'),
-    Buffer = require('buffer').Buffer,
-    util = require('util'),
-    fs = require('fs'),
-    os = require('os'),
-    IonicConfig = require('ionic-app-lib').config,
-    IonicInfo = require('ionic-app-lib').info;
+/* eslint-disable camelcase, no-underscore-dangle */
+
+var path = require('path');
+var http = require('http');
+var _ = require('underscore');
+var querystring = require('querystring');
+var Buffer = require('buffer').Buffer;
+var util = require('util');
+var IonicConfig = require('ionic-app-lib').config;
+var IonicInfo = require('ionic-app-lib').info;
 
 exports.getVersion = function getVersion() {
   var packageJson = require('../../package.json');
   return packageJson;
 };
 
-/*
-    Heavily inspired by the original js library copyright Mixpanel, Inc.
-    (http://mixpanel.com/)
+/**
+ *  Heavily inspired by the original js library copyright Mixpanel, Inc.
+ *  (http://mixpanel.com/)
+ *
+ *  Copyright (c) 2012 Carl Sverre
+ *
+ *  Released under the MIT license.
+ */
 
-    Copyright (c) 2012 Carl Sverre
+function create_client(token, config) {
+  var metrics = {};
 
-    Released under the MIT license.
-*/
+  if (!token) {
+    throw new Error('The Mixpanel Client needs a Mixpanel token: `init(token)`');
+  }
 
-var create_client = function(token, config) {
-    var metrics = {};
+  metrics.config = {
+    test: false,
+    debug: false,
+    verbose: false
+  };
+
+  metrics.token = token;
+
+  /**
+   * send_request(data)
+   *     ---
+   * this function sends an async GET request to mixpanel
+   *
+   *   data:object                     the data to send in the request
+   *   callback:function(err:Error)    callback is called when the request is
+   *                                   finished or an error occurs
+   */
+  metrics.send_request = function(endpoint, data, callback) {
+    callback = callback || function() {};
+    var event_data = new Buffer(JSON.stringify(data));
+    var request_data = {
+      data: event_data.toString('base64'),
+      ip: 0,
+      verbose: metrics.config.verbose ? 1 : 0
+    };
 
-    if(!token) {
-        throw new Error("The Mixpanel Client needs a Mixpanel token: `init(token)`");
+    if (endpoint === '/import') {
+      var key = metrics.config.key;
+      if (!key) {
+        throw new Error('The Mixpanel Client needs a Mixpanel api key when importing old events: ' +
+                        ' `init(token, { key: ... })`');
+      }
+      request_data.api_key = key;
     }
 
-    metrics.config = {
-        test: false,
-        debug: false,
-        verbose: false
+    var request_options = {
+      host: 'api.mixpanel.com',
+      port: 80,
+      headers: {}
     };
 
-    metrics.token = token;
+    if (metrics.config.test) { request_data.test = 1; }
 
-    /**
-        send_request(data)
-        ---
-        this function sends an async GET request to mixpanel
-
-        data:object                     the data to send in the request
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.send_request = function(endpoint, data, callback) {
-        callback = callback || function() {};
-        var event_data = new Buffer(JSON.stringify(data));
-        var request_data = {
-            'data': event_data.toString('base64'),
-            'ip': 0,
-            'verbose': metrics.config.verbose ? 1 : 0
-        };
-
-        if (endpoint === '/import') {
-            var key = metrics.config.key;
-            if (!key) {
-                throw new Error("The Mixpanel Client needs a Mixpanel api key when importing old events: `init(token, { key: ... })`");
-            }
-            request_data.api_key = key;
-        }
+    var query = querystring.stringify(request_data);
 
-        var request_options = {
-            host: 'api.mixpanel.com',
-            port: 80,
-            headers: {}
-        };
-
-        if (metrics.config.test) { request_data.test = 1; }
-
-        var query = querystring.stringify(request_data);
-
-        request_options.path = [endpoint,"?",query].join("");
-
-        http.get(request_options, function(res) {
-            var data = "";
-            res.on('data', function(chunk) {
-               data += chunk;
-            });
-
-            res.on('end', function() {
-                var e;
-                if(metrics.config.verbose) {
-                    try {
-                        var result = JSON.parse(data);
-                        if(result.status != 1) {
-                            e = new Error("Mixpanel Server Error: " + result.error);
-                        }
-                    }
-                    catch(ex) {
-                        e = new Error("Could not parse response from Mixpanel");
-                    }
-                }
-                else {
-                    e = (data !== '1') ? new Error("Mixpanel Server Error: " + data) : undefined;
-                }
-
-                callback(e);
-            });
-        }).on('error', function(e) {
-            if(metrics.config.debug) {
-                console.log("Got Error: " + e.message);
-            }
-            callback(e);
-        });
-    };
-
-    /**
-        track(event, properties, callback)
-        ---
-        this function sends an event to mixpanel.
-
-        event:string                    the event name
-        properties:object               additional event properties to send
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.track = function(event, properties, callback) {
-        if (typeof(properties) === 'function' || !properties) {
-            callback = properties;
-            properties = {};
-        }
+    request_options.path = [endpoint, '?', query].join('');
 
-        // if properties.time exists, use import endpoint
-        var endpoint = (typeof(properties.time) === 'number') ? '/import' : '/track';
+    http.get(request_options, function(res) {
+      var data = '';
+      res.on('data', function(chunk) {
+        data += chunk;
+      });
 
-        properties.token = metrics.token;
-        properties.mp_lib = "node";
+      res.on('end', function() {
+        var e;
 
-        var data = {
-            'event' : event,
-            'properties' : properties
-        };
-
-        if (metrics.config.debug) {
-            console.log("Sending the following event to Mixpanel:");
-            console.log(data);
-        }
-
-        metrics.send_request(endpoint, data, callback);
-    };
-
-    /**
-        import(event, properties, callback)
-        ---
-        This function sends an event to mixpanel using the import
-        endpoint.  The time argument should be either a Date or Number,
-        and should signify the time the event occurred.
-
-        It is highly recommended that you specify the distinct_id
-        property for each event you import, otherwise the events will be
-        tied to the IP address of the sending machine.
-
-        For more information look at:
-        https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
-
-        event:string                    the event name
-        time:date|number                the time of the event
-        properties:object               additional event properties to send
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.import = function(event, time, properties, callback) {
-        if (typeof(properties) === 'function' || !properties) {
-            callback = properties;
-            properties = {};
+        if (metrics.config.verbose) {
+          try {
+            var result = JSON.parse(data);
+            if (result.status !== 1) {
+              e = new Error('Mixpanel Server Error: ' + result.error);
+            }
+          } catch (ex) {
+            e = new Error('Could not parse response from Mixpanel');
+          }
+        } else {
+          e = (data !== '1') ? new Error('Mixpanel Server Error: ' + data) : undefined;
         }
 
-        if (time === void 0) {
-            throw new Error("The import method requires you to specify the time of the event");
-        } else if (Object.prototype.toString.call(time) === '[object Date]') {
-            time = Math.floor(time.getTime() / 1000);
-        }
+        callback(e);
+      });
+    }).on('error', function(e) {
+      if (metrics.config.debug) {
+        console.log('Got Error: ' + e.message);
+      }
+      callback(e);
+    });
+  };
+
+  /**
+   *  track(event, properties, callback)
+   *  ---
+   *  this function sends an event to mixpanel.
+   *
+   *  event:string                    the event name
+   *  properties:object               additional event properties to send
+   *  callback:function(err:Error)    callback is called when the request is
+   *                                  finished or an error occurs
+   */
+  metrics.track = function(event, properties, callback) {
+    if (typeof(properties) === 'function' || !properties) {
+      callback = properties;
+      properties = {};
+    }
 
-        properties.time = time;
+    // if properties.time exists, use import endpoint
+    var endpoint = (typeof(properties.time) === 'number') ? '/import' : '/track';
 
-        metrics.track(event, properties, callback);
-    };
+    properties.token = metrics.token;
+    properties.mp_lib = 'node';
 
-    /**
-        alias(distinct_id, alias)
-        ---
-        This function creates an alias for distinct_id
-
-        For more information look at:
-        https://mixpanel.com/docs/integration-libraries/using-mixpanel-alias
-
-        distinct_id:string              the current identifier
-        alias:string                    the future alias
-    */
-    metrics.alias = function(distinct_id, alias, callback) {
-        var properties = {
-            distinct_id: distinct_id,
-            alias: alias
-        };
-
-        metrics.track('$create_alias', properties, callback);
+    var data = {
+      event: event,
+      properties: properties
     };
 
-    metrics.people = {
-        /** people.set_once(distinct_id, prop, to, callback)
-            ---
-            The same as people.set but in the words of mixpanel:
-            mixpanel.people.set_once
-
-            " This method allows you to set a user attribute, only if
-             it is not currently set. It can be called multiple times
-             safely, so is perfect for storing things like the first date
-             you saw a user, or the referrer that brought them to your
-             website for the first time. "
-
-        */
-        set_once: function(distinct_id, prop, to, callback) {
-            var $set = {}, data = {};
-
-            if (typeof(prop) === 'object') {
-                callback = to;
-                $set = prop;
-            } else {
-                $set[prop] = to;
-            }
-
-            this._set(distinct_id, $set, callback, { set_once: true });
-        },
-
-        /**
-            people.set(distinct_id, prop, to, callback)
-            ---
-            set properties on an user record in engage
+    if (metrics.config.debug) {
+      console.log('Sending the following event to Mixpanel:');
+      console.log(data);
+    }
 
-            usage:
+    metrics.send_request(endpoint, data, callback);
+  };
+
+  /**
+   *  import(event, properties, callback)
+   *  ---
+   *  This function sends an event to mixpanel using the import
+   *  endpoint.  The time argument should be either a Date or Number,
+   *  and should signify the time the event occurred.
+   *
+   *  It is highly recommended that you specify the distinct_id
+   *  property for each event you import, otherwise the events will be
+   *  tied to the IP address of the sending machine.
+   *
+   *  For more information look at:
+   *  https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
+   *
+   *  event:string                    the event name
+   *  time:date|number                the time of the event
+   *  properties:object               additional event properties to send
+   *  callback:function(err:Error)    callback is called when the request is
+   *                                  finished or an error occurs
+   */
+  metrics.import = function(event, time, properties, callback) {
+    if (typeof(properties) === 'function' || !properties) {
+      callback = properties;
+      properties = {};
+    }
 
-                mixpanel.people.set('bob', 'gender', 'm');
+    if (time === void 0) {
+      throw new Error('The import method requires you to specify the time of the event');
+    } else if (Object.prototype.toString.call(time) === '[object Date]') {
+      time = Math.floor(time.getTime() / 1000);
+    }
 
-                mixpanel.people.set('joe', {
-                    'company': 'acme',
-                    'plan': 'premium'
-                });
-        */
-        set: function(distinct_id, prop, to, callback) {
-            var $set = {}, data = {};
+    properties.time = time;
+
+    metrics.track(event, properties, callback);
+  };
+
+  /**
+   *  alias(distinct_id, alias)
+   *  ---
+   *  This function creates an alias for distinct_id
+   *
+   *  For more information look at:
+   *  https://mixpanel.com/docs/integration-libraries/using-mixpanel-alias
+   *
+   *  distinct_id:string              the current identifier
+   *  alias:string                    the future alias
+   */
+  metrics.alias = function(distinct_id, alias, callback) {
+    var properties = {
+      distinct_id: distinct_id,
+      alias: alias
+    };
 
-            if (typeof(prop) === 'object') {
-                callback = to;
-                $set = prop;
-            } else {
-                $set[prop] = to;
-            }
+    metrics.track('$create_alias', properties, callback);
+  };
+
+  metrics.people = {
+
+    /** people.set_once(distinct_id, prop, to, callback)
+     *  ---
+     *  The same as people.set but in the words of mixpanel:
+     *  mixpanel.people.set_once
+     *
+     *  " This method allows you to set a user attribute, only if
+     *   it is not currently set. It can be called multiple times
+     *   safely, so is perfect for storing things like the first date
+     *   you saw a user, or the referrer that brought them to your
+     *   website for the first time. "
+     *
+     */
+    set_once: function(distinct_id, prop, to, callback) {
+      var $set = {};
+
+      if (typeof(prop) === 'object') {
+        callback = to;
+        $set = prop;
+      } else {
+        $set[prop] = to;
+      }
 
-            this._set(distinct_id, $set, callback);
-        },
+      this._set(distinct_id, $set, callback, { set_once: true });
+    },
 
-        // used internally by set and set_once
-        _set: function(distinct_id, $set, callback, options) {
-            var set_key = (options && options.set_once) ? "$set_once" : "$set";
+    /**
+     *  people.set(distinct_id, prop, to, callback)
+     *  ---
+     *  set properties on an user record in engage
+     *
+     *  usage:
+     *
+     *      mixpanel.people.set('bob', 'gender', 'm');
+     *
+     *      mixpanel.people.set('joe', {
+     *          'company': 'acme',
+     *          'plan': 'premium'
+     *      });
+     */
+    set: function(distinct_id, prop, to, callback) {
+      var $set = {};
+
+      if (typeof(prop) === 'object') {
+        callback = to;
+        $set = prop;
+      } else {
+        $set[prop] = to;
+      }
 
-            var data = {
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-            data[set_key] = $set;
+      this._set(distinct_id, $set, callback);
+    },
 
-            if ('ip' in $set) {
-                data.$ip = $set.ip;
-                delete $set.ip;
-            }
+    // used internally by set and set_once
+    _set: function(distinct_id, $set, callback, options) {
+      var set_key = (options && options.set_once) ? '$set_once' : '$set';
 
-            if ($set.$ignore_time) {
-                data.$ignore_time = $set.$ignore_time;
-                delete $set.$ignore_time;
-            }
+      var data = {
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
+      data[set_key] = $set;
 
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
+      if ('ip' in $set) {
+        data.$ip = $set.ip;
+        delete $set.ip;
+      }
 
-            metrics.send_request('/engage', data, callback);
-        },
+      if ($set.$ignore_time) {
+        data.$ignore_time = $set.$ignore_time;
+        delete $set.$ignore_time;
+      }
 
-        /**
-            people.increment(distinct_id, prop, to, callback)
-            ---
-            increment/decrement properties on an user record in engage
-
-            usage:
-
-                mixpanel.people.increment('bob', 'page_views', 1);
-
-                // or, for convenience, if you're just incrementing a counter by 1, you can
-                // simply do
-                mixpanel.people.increment('bob', 'page_views');
-
-                // to decrement a counter, pass a negative number
-                mixpanel.people.increment('bob', 'credits_left', -1);
-
-                // like mixpanel.people.set(), you can increment multiple properties at once:
-                mixpanel.people.increment('bob', {
-                    counter1: 1,
-                    counter2: 3,
-                    counter3: -2
-                });
-        */
-        increment: function(distinct_id, prop, by, callback) {
-            var $add = {};
-
-            if (typeof(prop) === 'object') {
-                callback = by;
-                Object.keys(prop).forEach(function(key) {
-                    var val = prop[key];
-
-                    if (isNaN(parseFloat(val))) {
-                        if (metrics.config.debug) {
-                            console.error("Invalid increment value passed to mixpanel.people.increment - must be a number");
-                            console.error("Passed " + key + ":" + val);
-                        }
-                        return;
-                    } else {
-                        $add[key] = val;
-                    }
-                });
-            } else {
-                if (!by) { by = 1; }
-                $add[prop] = by;
-            }
+      if (metrics.config.debug) {
+        console.log('Sending the following data to Mixpanel (Engage):');
+        console.log(data);
+      }
 
-            var data = {
-                '$add': $add,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
+      metrics.send_request('/engage', data, callback);
+    },
 
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
+    /**
+     * people.increment(distinct_id, prop, to, callback)
+     * ---
+     * increment/decrement properties on an user record in engage
+     *
+     * usage:
+     *
+     * mixpanel.people.increment('bob', 'page_views', 1);
+     *
+     * // or, for convenience, if you're just incrementing a counter by 1, you can
+     * // simply do
+     * mixpanel.people.increment('bob', 'page_views');
+     *
+     * // to decrement a counter, pass a negative number
+     * mixpanel.people.increment('bob', 'credits_left', -1);
+     *
+     * // like mixpanel.people.set(), you can increment multiple properties at once:
+     * mixpanel.people.increment('bob', {
+     *   counter1: 1,
+     *   counter2: 3,
+     *   counter3: -2
+     * });
+     */
+    increment: function(distinct_id, prop, by, callback) {
+      var $add = {};
+
+      if (typeof(prop) === 'object') {
+        callback = by;
+        Object.keys(prop).forEach(function(key) {
+          var val = prop[key];
+
+          if (isNaN(parseFloat(val))) {
+            if (metrics.config.debug) {
+              console.error('Invalid increment value passed to mixpanel.people.increment - must be a number');
+              console.error('Passed ' + key + ':' + val);
             }
+            return;
+          } else {
+            $add[key] = val;
+          }
+        });
+      } else {
+        if (!by) { by = 1; }
+        $add[prop] = by;
+      }
 
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-            people.track_charge(distinct_id, amount, properties, callback)
-            ---
-            Record that you have charged the current user a certain
-            amount of money.
-
-            usage:
-
-                // charge a user $29.99
-                mixpanel.people.track_charge('bob', 29.99);
-
-                // charge a user $19 on the 1st of february
-                mixpanel.people.track_charge('bob', 19, { '$time': new Date('feb 1 2012') });
-        */
-        track_charge: function(distinct_id, amount, properties, callback) {
-            var $append = {};
-
-            if (!properties) { properties = {}; }
+      var data = {
+        $add: $add,
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
 
-            if (typeof(amount) !== 'number') {
-                amount = parseFloat(amount);
-                if (isNaN(amount)) {
-                    console.error("Invalid value passed to mixpanel.people.track_charge - must be a number");
-                    return;
-                }
-            }
+      if (metrics.config.debug) {
+        console.log('Sending the following data to Mixpanel (Engage):');
+        console.log(data);
+      }
 
-            properties.$amount = amount;
+      metrics.send_request('/engage', data, callback);
+    },
 
-            if (properties.hasOwnProperty('$time')) {
-                var time = properties.$time;
-                if (Object.prototype.toString.call(time) === '[object Date]') {
-                    properties.$time = time.toISOString();
-                }
-            }
+    /**
+     *  people.track_charge(distinct_id, amount, properties, callback)
+     *  ---
+     *  Record that you have charged the current user a certain
+     *  amount of money.
+     *
+     *  usage:
+     *
+     *      // charge a user $29.99
+     *      mixpanel.people.track_charge('bob', 29.99);
+     *
+     *      // charge a user $19 on the 1st of february
+     *      mixpanel.people.track_charge('bob', 19, { '$time': new Date('feb 1 2012') });
+     */
+    track_charge: function(distinct_id, amount, properties, callback) {
+
+      if (!properties) { properties = {}; }
+
+      if (typeof(amount) !== 'number') {
+        amount = parseFloat(amount);
+        if (isNaN(amount)) {
+          console.error('Invalid value passed to mixpanel.people.track_charge - must be a number');
+          return;
+        }
+      }
 
-            var data = {
-                '$append': { '$transactions': properties },
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
+      properties.$amount = amount;
 
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
+      if (properties.hasOwnProperty('$time')) {
+        var time = properties.$time;
+        if (Object.prototype.toString.call(time) === '[object Date]') {
+          properties.$time = time.toISOString();
+        }
+      }
 
-            metrics.send_request('/engage', data, callback);
+      var data = {
+        $append: {
+          $transactions: properties
         },
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
 
-        /**
-            people.clear_charges(distinct_id, callback)
-            ---
-            Clear all the current user's transactions.
-
-            usage:
-
-                mixpanel.people.clear_charges('bob');
-        */
-        clear_charges: function(distinct_id, callback) {
-            var data = {
-                '$set': { '$transactions': [] },
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
+      if (metrics.config.debug) {
+        console.log('Sending the following data to Mixpanel (Engage):');
+        console.log(data);
+      }
 
-            if(metrics.config.debug) {
-                console.log("Clearing this user's charges:", distinct_id);
-            }
+      metrics.send_request('/engage', data, callback);
+    },
 
-            metrics.send_request('/engage', data, callback);
+    /**
+     *  people.clear_charges(distinct_id, callback)
+     *  ---
+     *  Clear all the current user's transactions.
+     *
+     *  usage:
+     *
+     *      mixpanel.people.clear_charges('bob');
+     */
+    clear_charges: function(distinct_id, callback) {
+      var data = {
+        $set: {
+          $transactions: []
         },
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
 
-        /**
-            people.delete_user(distinct_id, callback)
-            ---
-            delete an user record in engage
-
-            usage:
-
-                mixpanel.people.delete_user('bob');
-        */
-        delete_user: function(distinct_id, callback) {
-            var data = {
-                '$delete': distinct_id,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Deleting the user from engage:", distinct_id);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
+      if (metrics.config.debug) {
+        console.log("Clearing this user's charges:", distinct_id);
+      }
 
-        /**
-         people.unset(distinct_id, prop, callback)
-         ---
-         delete a property on an user record in engage
-
-         usage:
-
-            mixpanel.people.unset('bob', 'page_views');
-
-            mixpanel.people.unset('bob', ['page_views', 'last_login']);
-         */
-        unset: function(distinct_id, prop, callback) {
-            var $unset = [];
-
-            if (util.isArray(prop)) {
-                $unset = prop;
-            } else if (typeof(prop) === 'string') {
-                $unset = [prop];
-            } else {
-                if (metrics.config.debug) {
-                    console.error("Invalid argument passed to mixpanel.people.unset - must be a string or array");
-                    console.error("Passed: " + prop);
-                }
-                return;
-            }
+      metrics.send_request('/engage', data, callback);
+    },
 
-            var data = {
-                '$unset': $unset,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
+    /**
+     *  people.delete_user(distinct_id, callback)
+     *  ---
+     *  delete an user record in engage
+     *
+     *  usage:
+     *
+     *      mixpanel.people.delete_user('bob');
+     */
+    delete_user: function(distinct_id, callback) {
+      var data = {
+        $delete: distinct_id,
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
 
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
+      if (metrics.config.debug) {
+        console.log('Deleting the user from engage:', distinct_id);
+      }
 
-            metrics.send_request('/engage', data, callback);
-        }
-    };
+      metrics.send_request('/engage', data, callback);
+    },
 
     /**
-        set_config(config)
-        ---
-        Modifies the mixpanel config
-
-        config:object       an object with properties to override in the
-                            mixpanel client config
-    */
-    metrics.set_config = function(config) {
-        for (var c in config) {
-            if (config.hasOwnProperty(c)) {
-                metrics.config[c] = config[c];
-            }
+     *  people.unset(distinct_id, prop, callback)
+     *  ---
+     *  delete a property on an user record in engage
+     *
+     *  usage:
+     *
+     *    mixpanel.people.unset('bob', 'page_views');
+     *
+     *    mixpanel.people.unset('bob', ['page_views', 'last_login']);
+     */
+    unset: function(distinct_id, prop, callback) {
+      var $unset = [];
+
+      if (util.isArray(prop)) {
+        $unset = prop;
+      } else if (typeof(prop) === 'string') {
+        $unset = [prop];
+      } else {
+        if (metrics.config.debug) {
+          console.error('Invalid argument passed to mixpanel.people.unset - must be a string or array');
+          console.error('Passed: ' + prop);
         }
-    };
+        return;
+      }
+
+      var data = {
+        $unset: $unset,
+        $token: metrics.token,
+        $distinct_id: distinct_id
+      };
+
+      if (metrics.config.debug) {
+        console.log('Sending the following data to Mixpanel (Engage):');
+        console.log(data);
+      }
 
-    if (config) {
-        metrics.set_config(config);
+      metrics.send_request('/engage', data, callback);
     }
+  };
+
+  /**
+   *  set_config(config)
+   *  ---
+   *  Modifies the mixpanel config
+   *
+   *  config:object       an object with properties to override in the
+   *                      mixpanel client config
+   */
+  metrics.set_config = function(config) {
+    for (var c in config) {
+      if (config.hasOwnProperty(c)) {
+        metrics.config[c] = config[c];
+      }
+    }
+  };
 
-    return metrics;
-};
+  if (config) {
+    metrics.set_config(config);
+  }
+
+  return metrics;
+}
 
 // module exporting
 /*
@@ -529,9 +528,9 @@ exports.IonicStats = {
 
       var packageJson = exports.getVersion();
 
-      if(process.argv.length < 3) return;
+      if (process.argv.length < 3) return;
 
-      if( ionicConfig.get('statsOptOut') === true ) {
+      if (ionicConfig.get('statsOptOut') === true) {
         return;
       }
 
@@ -540,13 +539,16 @@ exports.IonicStats = {
 
       var statsData = additionalData || {};
       var platforms = [];
-      var x, y, cmd;
+      var x;
+      var y;
+      var cmd;
 
       // update any aliases with the full cmd so there's a common property
+      // TODO: This probably does not work correctly
       var aliasMap = {
-        'rm': 'remove',
-        'ls': 'list',
-        'up': 'update',
+        rm: 'remove',
+        ls: 'list',
+        up: 'update',
         '-w': '--no-cordova',
         '-b': '--nobrowser',
         '-r': '--nolivereload',
@@ -554,35 +556,37 @@ exports.IonicStats = {
         '-l': '--livereload',
         '-c': '--consolelogs',
         '-s': '--serverlogs',
-        '-n': '--no-email',
-        '-s': '--sass'
+        '-n': '--no-email'
       };
-      for(x=0; x<cmdArgs.length; x++) {
-        for(y in aliasMap) {
-          if(cmdArgs[x].toLowerCase() == y) {
+      for (x = 0; x < cmdArgs.length; x += 1) {
+        for (y in aliasMap) {
+          if (cmdArgs[x].toLowerCase() === y) {
             cmdArgs[x] = aliasMap[y];
           }
         }
       }
 
       var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass --splash --icon --v2 --ts'.split(' ');
+      var argsWhitelist = 'add remove list update check debug release search --livereload ' +
+        '--consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email ' +
+        '--debug --release --device --emulator --sass --splash --icon --v2 --ts'.split(' ');
 
       // collect only certain args, skip over everything else
-      for(x=0; x<cmdArgs.length; x++) {
+      for (x = 0; x < cmdArgs.length; x += 1) {
         cmd = cmdArgs[x].toLowerCase();
 
         // gather what platforms this is targeting
-        for(y=0; y<platformWhitelist.length; y++) {
-          if(cmd == platformWhitelist[y]) {
+        for (y = 0; y < platformWhitelist.length; y += 1) {
+          if (cmd === platformWhitelist[y]) {
             platforms.push(cmd); // group them together
             statsData[cmd] = true; // also give them their own property
             break;
           }
         }
+
         // gather only args that are in our list of valid stat args
-        for(y=0; y<argsWhitelist.length; y++) {
-          if(cmd == argsWhitelist[y]) {
+        for (y = 0; y < argsWhitelist.length; y += 1) {
+          if (cmd === argsWhitelist[y]) {
             statsData[cmd] = true;
             break;
           }
@@ -590,59 +594,62 @@ exports.IonicStats = {
       }
 
       // create a platform property only when there is 1 or more
-      if(platforms.length) {
+      if (platforms.length) {
         statsData.platform = platforms.sort().join(',');
       }
 
       // add which ionic lib version they're using
       try {
-        statsData.ionic_version = require( path.resolve('www/lib/ionic/version.json') ).version;
-      } catch(e2) {}
+        statsData.ionic_version = require(path.resolve('www/lib/ionic/version.json')).version;
+      } catch (e2) {} // eslint-disable-line no-empty
 
       // add which cli version is being used
       try {
         statsData.cli_version = packageJson.version;
-      } catch(e2) {}
+      } catch (e2) {} // eslint-disable-line no-empty
 
       try {
         statsData.email = ionicConfig.get('email');
-      } catch (e2) {}
+      } catch (e2) {} // eslint-disable-line no-empty
 
       try {
         statsData.account_id = ionicConfig.get('id');
-      } catch (e2) {}
+      } catch (e2) {} // eslint-disable-line no-empty
 
-      var info = {}
+      var info = {};
       IonicInfo.getNodeVersion(info);
       IonicInfo.getOsEnvironment(info);
       IonicInfo.gatherGulpInfo(info);
 
-      this.mp(cmdName, _.extend(statsData, {
+      this.mp(cmdName, _.extend({}, statsData, {
         os: info.os,
         gulp: info.gulp,
         node: info.node
       }));
 
-    } catch(e) {
-      console.log( ('Error stats: ' + e) );
+    } catch (e) {
+      console.log(('Error stats: ' + e));
     }
   },
   mp: function(e, d) {
     var unique_id = ionicConfig.get('ank');
-    if(!unique_id) {
+    if (!unique_id) {
       this.createId();
       unique_id = ionicConfig.get('ank');
     }
     d.distinct_id = unique_id;
-    mixpanel.track(e, d, function(err, data) {
+    mixpanel.track(e, d, function(err) {
+      if (err) {
+        console.error(err);
+      }
     });
   },
   createId: function() {
     var d = new Date().getTime();
     var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = (d + Math.random()*16)%16 | 0;
-      d = Math.floor(d/16);
-      return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+      var r = (d + Math.random() * 16) % 16 | 0;
+      d = Math.floor(d / 16);
+      return (c === 'x' ? r : (r & 0x7 | 0x8)).toString(16);
     });
 
     ionicConfig.set('ank', uuid);
diff --git a/lib/ionic/store.js b/lib/ionic/store.js
index 18376f4d74..978f1fc681 100644
--- a/lib/ionic/store.js
+++ b/lib/ionic/store.js
@@ -1,14 +1,13 @@
-var fs = require('fs'),
-    path = require('path');
+var fs = require('fs');
+var path = require('path');
 
-
-var IonicStore = function(fileName) {
+function IonicStore(fileName) {
   this.data = {};
 
-  if(!fileName) return this;
+  if (!fileName) return this;
 
   this.fileName = fileName;
-  if(fileName.indexOf('.') < 0) {
+  if (fileName.indexOf('.') < 0) {
     this.fileName += '.data';
   }
 
@@ -16,7 +15,7 @@ var IonicStore = function(fileName) {
 
   this.privateDir = path.join(this.homeDir, '.ionic');
 
-  if(!fs.existsSync(this.privateDir)) {
+  if (!fs.existsSync(this.privateDir)) {
     fs.mkdirSync(this.privateDir);
   }
 
@@ -24,13 +23,15 @@ var IonicStore = function(fileName) {
 
   try {
     this.data = JSON.parse(fs.readFileSync(this.filePath));
-  } catch(e) {}
+  } catch (e) {
+    throw e;
+  }
 
   return this;
-};
+}
 
 IonicStore.prototype.get = function(k) {
-  if(k) {
+  if (k) {
     return this.data[k];
   }
   return this.data;
@@ -49,7 +50,7 @@ IonicStore.prototype.save = function() {
     var dataStoredAsString = JSON.stringify(this.data, null, 2);
     fs.writeFileSync(this.filePath, dataStoredAsString);
     this.data = JSON.parse(dataStoredAsString);
-  } catch(e) {
+  } catch (e) {
     console.error('Unable to save ionic data:', this.filePath, e);
   }
 };
diff --git a/lib/ionic/table.js b/lib/ionic/table.js
index 92c38db85a..05f9e27a0d 100644
--- a/lib/ionic/table.js
+++ b/lib/ionic/table.js
@@ -1,5 +1,5 @@
-var _ = require('underscore'),
-    cliTable = require('cli-table');
+var _ = require('underscore');
+var cliTable = require('cli-table');
 
 function Table(options) {
   if (!options) {
@@ -8,17 +8,17 @@ function Table(options) {
 
   cliTable.call(this, _.extend({
     chars: {
-      'top': '',
+      top: '',
       'top-mid': '',
       'top-left': '',
       'top-right': '',
-      'bottom': '',
+      bottom: '',
       'bottom-mid': '',
       'bottom-left': '',
       'bottom-right': '',
-      'left': ' ',
+      left: ' ',
       'left-mid': '',
-      'right': '',
+      right: '',
       'right-mid': ''
     },
     style: {
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
index 3385c4af82..7f6ef25c85 100644
--- a/lib/ionic/task.js
+++ b/lib/ionic/task.js
@@ -1,8 +1,7 @@
-var Task = function() { };
+function Task() {}
 
 Task.prototype = {
-  run: function(ionic) {
-  }
+  run: function() {}
 };
 
 exports.Task = Task;
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index e768bd4095..0c99f0490f 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -1,13 +1,12 @@
-var colors = require('colors'),
-    path = require('path'),
-    _ = require('underscore'),
-    Q = require('q'),
-    Task = require('./task').Task,
-    request = require('request'),
-    log = require('ionic-app-lib').logging.logger;
-    // starterTemplates = require('./starter-templates')
+require('colors');
 
-var IonicTask = function() {};
+var _ = require('underscore');
+var Q = require('q');
+var Task = require('./task').Task;
+var request = require('request');
+var log = require('ionic-app-lib').logging.logger;
+
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -16,7 +15,6 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
   // log.info('About to fetch template');
   var downloadUrl = 'http://code.ionicframework.com/content/starter-templates.json';
-  var starterTemplateJsonPath = path.resolve(__dirname, 'starter-templates.json');
 
   // log.info('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
   log.info('\nDownloading Starter Templates'.bold, '-', downloadUrl);
@@ -25,13 +23,13 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
   var proxy = process.env.PROXY || null;
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-    if(!err && res && res.statusCode === 200) {
+    if (!err && res && res.statusCode === 200) {
       var templatesJson = {};
       try {
         templatesJson = JSON.parse(html);
-      } catch(ex) {
+      } catch (ex) {
         log.error('ex', ex);
-        q.reject('Error occured in download templates:', ex)
+        q.reject('Error occured in download templates:', ex);
         self.ionic.fail(ex);
         return;
       }
@@ -45,25 +43,27 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 };
 
 IonicTask.prototype.list = function list(templates) {
-  //Should have array of [{ name: 'name', description: 'desc' }]
-  log.info('\n')
+
+  // Should have array of [{ name: 'name', description: 'desc' }]
+  log.info('\n');
   _.each(templates, function(template) {
-    var rightColumn = 20, dots = '';
+    var rightColumn = 20;
+    var dots = '';
     var shortName = template.name.replace('ionic-starter-', '');
-    while( (shortName + dots).length < rightColumn + 1) {
+
+    while ((shortName + dots).length < rightColumn + 1) {
       dots += '.';
     }
-    var outStr = []
     log.info(shortName.green, dots, template.description);
-  })
+  });
 };
 
-IonicTask.prototype.run = function(ionic) {
+IonicTask.prototype.run = function() {
   var self = this;
 
   self.fetchStarterTemplates()
   .then(function(starterTemplates) {
-    var templates = _.sortBy(starterTemplates.items, function(template){ return template.name; });
+    var templates = _.sortBy(starterTemplates.items, function(template) { return template.name; });
     log.info('Ionic Starter templates'.green);
     self.list(templates);
   });
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 081b59b044..d1a2ed03ef 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,13 +1,12 @@
-var IonicAppLib = require('ionic-app-lib'),
-    IonicLoginTask = require('./login').IonicTask,
-    Login = IonicAppLib.login,
-    LoginTask = require('./login'),
-    Task = require('./task').Task,
-    Upload = IonicAppLib.upload,
-    log = IonicAppLib.logging.logger,
-    Utils = IonicAppLib.utils;
+var IonicAppLib = require('ionic-app-lib');
+var Login = IonicAppLib.login;
+var LoginTask = require('./login');
+var Task = require('./task').Task;
+var Upload = IonicAppLib.upload;
+var log = IonicAppLib.logging.logger;
+var Utils = IonicAppLib.utils;
 
-var IonicTask = function() {};
+function IonicTask() {}
 
 IonicTask.prototype = new Task();
 
@@ -16,7 +15,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   var deploy = argv.deploy || false;
 
   return Login.retrieveLogin()
-  .then(function(jar){
+  .then(function(jar) {
     if (!jar) {
       log.info('No previous login existed. Attempting to log in now.');
       return LoginTask.login(argv);
@@ -27,6 +26,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return Upload.doUpload(process.cwd(), jar, note, deploy);
   })
   .catch(function(ex) {
+
     // log.info('Error', ex, ex.stack);
     Utils.fail(ex);
   });
diff --git a/lib/ionic/utils.js b/lib/ionic/utils.js
index 641d4ca5a2..8baec0f1df 100644
--- a/lib/ionic/utils.js
+++ b/lib/ionic/utils.js
@@ -1,18 +1,20 @@
-var transformCookies = function transformCookies(jar) {
+function transformCookies(jar) {
   return jar.map(function(c) {
-    return c.key + "=" + encodeURIComponent(c.value);
-  }).join("; ");
+    return c.key + '=' + encodeURIComponent(c.value);
+  }).join('; ');
 }
 
-var retrieveCsrfToken = function retrieveCsrfToken(jar) {
+function retrieveCsrfToken(jar) {
+
   // console.log('retrieveCsrfToken', jar)
-  if(!jar || typeof jar == 'undefined' || jar.length == 0) {
+  if (!jar || typeof jar == 'undefined' || jar.length === 0) {
+
     // console.log('no jar folks')
     return '';
   }
   var csrftoken = '';
-  for (var i = 0; i < jar.length; i++) {
-    if (jar[i].key == 'csrftoken') {
+  for (var i = 0; i < jar.length; i += 1) {
+    if (jar[i].key === 'csrftoken') {
       csrftoken = jar[i].value;
       break;
     }
@@ -20,14 +22,14 @@ var retrieveCsrfToken = function retrieveCsrfToken(jar) {
   return csrftoken;
 }
 
-var deleteFolderRecursive = function(removePath) {
-  var fs = require('fs'),
-      path = require('path')
+function deleteFolderRecursive(removePath) {
+  var fs = require('fs');
+  var path = require('path');
 
-  if( fs.existsSync(removePath) ) {
-    fs.readdirSync(removePath).forEach(function(file,index){
+  if (fs.existsSync(removePath)) {
+    fs.readdirSync(removePath).forEach(function(file) {
       var curPath = path.join(removePath, file);
-      if(fs.lstatSync(curPath).isDirectory()) { // recurse
+      if (fs.lstatSync(curPath).isDirectory()) { // recurse
         deleteFolderRecursive(curPath);
       } else { // delete file
         fs.unlinkSync(curPath);
@@ -35,10 +37,10 @@ var deleteFolderRecursive = function(removePath) {
     });
     fs.rmdirSync(removePath);
   }
-};
+}
 
 module.exports = {
   deleteFolderRecursive: deleteFolderRecursive,
   retrieveCsrfToken: retrieveCsrfToken,
   transformCookies: transformCookies
-}
+};
diff --git a/lib/tasks/bumpversion.js b/lib/tasks/bumpversion.js
index c3b7327a7c..e8c4cd0aa9 100644
--- a/lib/tasks/bumpversion.js
+++ b/lib/tasks/bumpversion.js
@@ -1,32 +1,32 @@
-var colors = require('colors'),
-    path = require('path'),
-    semver = require('semver'),
-    shelljs = require('shelljs'),
-    args = require('optimist').argv,
-    fs = require('fs'),
-    jsonPath = path.join(__dirname, '../', '../', 'package.json'),
-    packageJson = require(jsonPath),
-    version = null,
-    bumpLevel = null;
+require('colors');
+var path = require('path');
+var semver = require('semver');
+var shelljs = require('shelljs');
+var args = require('optimist').argv;
+var fs = require('fs');
+var jsonPath = path.join(__dirname, '../', '../', 'package.json');
+var packageJson = require(jsonPath);
+var version = null;
+var bumpLevel = null;
 
 // version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel),
 
-if(args.level && args.level == 'pre') {
+if (args.level && args.level === 'pre') {
   var id = args.identifier || 'beta';
   bumpLevel = [args.level, id].join('');
-  version = semver.inc(packageJson.version, args.level, id)
+  version = semver.inc(packageJson.version, args.level, id);
 } else {
   bumpLevel = args.level || 'patch';
-  version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel)
+  version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel);
 }
 
 var bumpVersionMessage = ['Bumping from ', packageJson.version, ' by ', bumpLevel, ' resulting in ', version].join('');
 
-console.log(bumpVersionMessage.green)
+console.log(bumpVersionMessage.green);
 
 packageJson.version = version;
 
-if(args.npmInstall) {
+if (args.npmInstall) {
   shelljs.rm('-rf', 'node_modules');
   shelljs.exec('npm install');
 }
@@ -35,21 +35,23 @@ shelljs.rm('npm-shrinkwrap.json');
 
 fs.writeFileSync(jsonPath, JSON.stringify(packageJson, null, 2));
 
-shelljs.exec('npm shrinkwrap')
+shelljs.exec('npm shrinkwrap');
+
+if (args.git) {
+  console.log('git commands');
 
-if(args.git) {
-  console.log('git commands')
   // shelljs.exec('git add npm-shrinkwrap.json');
   // shelljs.exec(['git commit -m "', bumpVersionMessage, '"'].join(''));
   // shelljs.exec(['git tag ', version].join(''));
   // shelljs.exec(['git push origin ', version].join(''))
 }
 
-if(args.npmPublishTag) {
-  console.log('npm publish commands')
+if (args.npmPublishTag) {
+  console.log('npm publish commands');
   var publishTagCmd = ['npm publish --tag ', version].join('');
   console.log(publishTagCmd);
+
   // shelljs.exec('npm publish');
-} else if(args.npmPublish) {
-  console.log('npm publish')
+} else if (args.npmPublish) {
+  console.log('npm publish');
 }
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
index 70cab1f822..bc6c5c0aa2 100644
--- a/lib/tasks/cliTasks.js
+++ b/lib/tasks/cliTasks.js
@@ -126,7 +126,6 @@ var TASKS = [
   {
     title: 'platform',
     name: 'platform',
-    alt: ['platforms'],
     summary: 'Add platform target for building an Ionic app',
     args: {
       '[options]': '',
@@ -247,7 +246,7 @@ var TASKS = [
     name: 'share',
     summary: 'Share an app with a client, co-worker, friend, or customer',
     args: {
-      '<EMAIL>': 'The email to share the app with',
+      '<EMAIL>': 'The email to share the app with'
     },
     module: './ionic/share'
   },
@@ -297,18 +296,27 @@ var TASKS = [
     name: 'security',
     summary: 'Store your app\'s credentials for the Ionic Platform ' + '(alpha)'.red,
     args: {
-      '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' + 'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
+      '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' +
+        'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
       '[options]': ''
     },
     options: {
-      '--profile <tag>': '(' + 'credentials <platform>'.yellow + ') Specify the profile on which these credentials are saved',
-      '--keystore|-s <path>': '(' + 'credentials android'.yellow + ') Specify the location of your keystore file',
-      '--keystore-password|-p <password>': '(' + 'credentials android'.yellow + ') Specify your keystore password (exclude for prompt)',
-      '--key-alias|-k <alias>': '(' + 'credentials android'.yellow + ') Specify your key alias for this app',
-      '--key-password|-w <password>': '(' + 'credentials android'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'credentials ios'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'credentials ios'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow + ') Specify the location of your .mobileprovision file',
+      '--profile <tag>': '(' + 'credentials <platform>'.yellow +
+        ') Specify the profile on which these credentials are saved',
+      '--keystore|-s <path>': '(' + 'credentials android'.yellow +
+        ') Specify the location of your keystore file',
+      '--keystore-password|-p <password>': '(' + 'credentials android'.yellow +
+        ') Specify your keystore password (exclude for prompt)',
+      '--key-alias|-k <alias>': '(' + 'credentials android'.yellow +
+        ') Specify your key alias for this app',
+      '--key-password|-w <password>': '(' + 'credentials android'.yellow +
+        ') Specify your key password for this app (exclude for prompt)',
+      '--cert|-c <path>': '(' + 'credentials ios'.yellow +
+        ') Specify the location of your .p12 file',
+      '--cert-password|-p <password>': '(' + 'credentials ios'.yellow +
+        ') Specify your certificate password (exclude for prompt)',
+      '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow +
+        ') Specify the location of your .mobileprovision file'
     },
     module: './ionic/security'
   },
@@ -329,14 +337,19 @@ var TASKS = [
     name: 'package',
     summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
     args: {
-      '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow + ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
+      '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow +
+        ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
       '[options]': ''
     },
     options: {
-      '--release': '(' + 'build <platform>'.yellow + ') Mark this build as a release',
-      '--profile|-p <tag>': '(' + 'build <platform>'.yellow + ') Specify the Security Profile to use with this build',
-      '--noresources': '(' + 'build <platform>'.yellow + ') Do not generate icon and splash screen resources during this build',
-      '--destination|-d <path>': '(' + 'download'.yellow + ') Specify the destination directory to download your packaged app.'
+      '--release': '(' + 'build <platform>'.yellow +
+        ') Mark this build as a release',
+      '--profile|-p <tag>': '(' + 'build <platform>'.yellow +
+        ') Specify the Security Profile to use with this build',
+      '--noresources': '(' + 'build <platform>'.yellow +
+        ') Do not generate icon and splash screen resources during this build',
+      '--destination|-d <path>': '(' + 'download'.yellow +
+        ') Specify the destination directory to download your packaged app.'
     },
     module: './ionic/package'
   },
@@ -376,8 +389,8 @@ var TASKS = [
       '<SPEC>': 'Can be a service name or a git url'
     },
     module: './ionic/service'
-   },
-   {
+  },
+  {
     title: 'add',
     name: 'add',
     summary: 'Add an Ion, bower component, or addon to the project',
@@ -385,8 +398,8 @@ var TASKS = [
       '[name]': 'The name of the ion, bower component, or addon you wish to install'
     },
     module: './ionic/add'
-   },
-   {
+  },
+  {
     title: 'remove',
     name: 'remove',
     summary: 'Remove an Ion, bower component, or addon from the project',
@@ -395,45 +408,46 @@ var TASKS = [
     },
     module: './ionic/add',
     alt: ['rm']
-   },
-   {
+  },
+  {
     title: 'list',
     name: 'list',
     summary: 'List Ions, bower components, or addons in the project',
     module: './ionic/add',
     alt: ['ls']
-   },
-   /*
-   {
+  },
+
+  /*
+  {
     title: 'ions',
     name: 'ions',
     summary: 'List available ions to add to your project',
     module: './ionic/ions'
-   },
-   {
+  },
+  {
     title: 'templates',
     name: 'templates',
     summary: 'List available Ionic starter templates',
     module: './ionic/templates'
-   },
-   */
-   {
-     title: 'info',
-     name: 'info',
-     summary: 'List information about the users runtime environment',
-     module: './ionic/info'
-   },
-   {
-     title: 'help',
-     name: 'help',
-     summary: 'Provides help for a certain command',
-     args: {
-       '[command]': 'The command you desire help with'
-     },
-     module: './ionic/help',
-     disableChangePwd: true
-   },
-   {
+  },
+  */
+  {
+    title: 'info',
+    name: 'info',
+    summary: 'List information about the users runtime environment',
+    module: './ionic/info'
+  },
+  {
+    title: 'help',
+    name: 'help',
+    summary: 'Provides help for a certain command',
+    args: {
+      '[command]': 'The command you desire help with'
+    },
+    module: './ionic/help',
+    disableChangePwd: true
+  },
+  {
     title: 'link',
     name: 'link',
     summary: 'Sets your Ionic App ID for your project',
@@ -447,9 +461,8 @@ var TASKS = [
       }
     },
     module: './ionic/link'
-   },
-   {
-
+  },
+  {
     title: 'hooks',
     name: 'hooks',
     summary: 'Manage your Ionic Cordova hooks',
@@ -466,10 +479,11 @@ var TASKS = [
       '<COMMAND>': '[ save | restore | clear | reset ]'
     },
     options: {
-      'save': 'Save the platforms and plugins into package.json',
-      'restore': 'Restore the platforms and plugins from package.json',
-      'clear': 'Clear the package.json of cordovaPlugins and cordovaPlatforms, as well as clear out the platforms and plugins folders',
-      'reset': 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
+      save: 'Save the platforms and plugins into package.json',
+      restore: 'Restore the platforms and plugins from package.json',
+      clear: 'Clear the package.json of cordovaPlugins and cordovaPlatforms, ' +
+        'as well as clear out the platforms and plugins folders',
+      reset: 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
       '--plugins': {
         title: 'Only do operations with plugins',
         boolean: true
@@ -480,8 +494,8 @@ var TASKS = [
       }
     },
     module: './ionic/state'
-   },
-   {
+  },
+  {
     title: 'docs',
     name: 'docs',
     summary: 'Opens up the documentation for Ionic',
@@ -490,8 +504,8 @@ var TASKS = [
     },
     module: './ionic/docs',
     disableChangePwd: true
-   },
-   {
+  },
+  {
     title: 'generate',
     alt: ['g'],
     name: 'generate',
@@ -506,8 +520,8 @@ var TASKS = [
         boolean: true,
         title: '(with --v2 only) Use TypeScript in generation'
       }
-    },
-   }
+    }
+  }
 ];
 
 
diff --git a/lib/tasks/createDocsJson.js b/lib/tasks/createDocsJson.js
index 44dc396227..3132024eff 100644
--- a/lib/tasks/createDocsJson.js
+++ b/lib/tasks/createDocsJson.js
@@ -1,15 +1,12 @@
-var fs = require('fs'),
-    path = require('path'),
-    cl = console.log;
-
-
+var fs = require('fs');
+var path = require('path');
+var cl = console.log;
 
 function crawlDocsCreateJson() {
-  
   var docsJson = {
     versions: [],
     api: {}
-  }
+  };
 
   var docsPath = path.resolve('docs');
   var docsApiPath = path.join(docsPath, 'api');
@@ -17,31 +14,31 @@ function crawlDocsCreateJson() {
   var docsDirs = fs.readdirSync(docsPath);
 
   docsDirs.forEach(function(doc) {
-    var isDocVersion = !isNaN(doc[0])
-    if(isDocVersion) {
-      docsJson.versions.push(doc)
+    var isDocVersion = !isNaN(doc[0]);
+    if (isDocVersion) {
+      docsJson.versions.push(doc);
     }
-  })
+  });
 
   var apiDocsDirs = fs.readdirSync(docsApiPath);
 
   apiDocsDirs.forEach(function(docs) {
     console.log('docs:', docs);
-    if(docs.indexOf('.md') != -1) {
-      return
+    if (docs.indexOf('.md') !== -1) {
+      return;
     }
-    docsJson.api[docs] = {id: docs, docs: []};
+    docsJson.api[docs] = { id: docs, docs: [] };
 
-    var apiDocPath = path.join(docsApiPath, docs)
-    console.log('apiDocPath:', apiDocPath)
+    var apiDocPath = path.join(docsApiPath, docs);
+    console.log('apiDocPath:', apiDocPath);
 
-    var apiSubDocs = fs.readdirSync(apiDocPath)
+    var apiSubDocs = fs.readdirSync(apiDocPath);
 
     apiSubDocs.forEach(function(subdoc) {
-      console.log('subdoc: ', subdoc)
+      console.log('subdoc: ', subdoc);
       docsJson.api[docs].docs.push(subdoc);
-    })
-  })
+    });
+  });
 
   // cl('json:')
   // cl(docsJson)
@@ -51,8 +48,7 @@ function crawlDocsCreateJson() {
   //   cl(e)
   // })
 
-  cl(JSON.stringify(docsJson))
-
+  cl(JSON.stringify(docsJson));
 }
 
 
diff --git a/spec/.eslintrc.js b/spec/.eslintrc.js
index d1f5e00643..3f1a19a2bb 100644
--- a/spec/.eslintrc.js
+++ b/spec/.eslintrc.js
@@ -1,5 +1,8 @@
 module.exports = {
   env: {
     jasmine: true
+  },
+  rules: {
+    'no-underscore-dangle': 0
   }
 };
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 22bbf6263d..8faeffe051 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -1,13 +1,13 @@
-var IonicAppLib = require('ionic-app-lib'),
-    Ionitron = require('../lib/ionic/ionitron'),
-    IonicCli = require('../lib/cli'),
-    Q = require('q'),
-    IonicStats = require('../lib/ionic/stats').IonicStats,
-    Task = require('../lib/ionic/task').Task,
-    Info = IonicAppLib.info,
-    Utils = IonicAppLib.utils,
-    Project = IonicAppLib.project,
-    rewire = require('rewire');
+var IonicAppLib = require('ionic-app-lib');
+var Ionitron = require('../lib/ionic/ionitron');
+var IonicCli = require('../lib/cli');
+var Q = require('q');
+var IonicStats = require('../lib/ionic/stats').IonicStats;
+var Task = require('../lib/ionic/task').Task;
+var Info = IonicAppLib.info;
+var Utils = IonicAppLib.utils;
+var Project = IonicAppLib.project;
+var rewire = require('rewire');
 
 describe('Cli', function() {
 
@@ -21,7 +21,7 @@ describe('Cli', function() {
     spyOn(Utils, 'cdIonicRoot');
     spyOn(Project, 'load');
 
-    spyOn(Utils, 'fail').andCallFake(function(err){
+    spyOn(Utils, 'fail').andCallFake(function(err) {
       console.log(err);
       console.log(err.stack);
       throw err;
@@ -39,7 +39,7 @@ describe('Cli', function() {
   describe('#run', function() {
 
     beforeEach(function() {
-      var fakeTask = function() {};
+      function fakeTask() {}
       fakeTask.prototype = new Task();
       fakeTask.prototype.run = function() {};
 
@@ -112,10 +112,10 @@ describe('Cli', function() {
       });
 
       it('should get boolean options from start task', function() {
-        var tasks = require('../lib/tasks/cliTasks');
         var task = IonicCli.getTaskWithName('start');
         var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
-        //We expect 6 total = 3 options, each with short hand notation.
+
+        // We expect 6 total = 3 options, each with short hand notation.
         expect(booleanOptions.length).toBe(11);
       });
 
@@ -151,14 +151,14 @@ describe('Cli', function() {
     });
 
     it('should parse start options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
         expect(taskArgv._.length).toBe(2);
@@ -178,18 +178,18 @@ describe('Cli', function() {
     });
 
     it('should parse serve options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
-        // console.log('taskArgv', taskArgv);
-        //should only have serve in the command args
+
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(1);
         expect(taskArgv.browser).toBe('firefox');
         expect(taskArgv.nogulp).toBe(true);
@@ -203,18 +203,19 @@ describe('Cli', function() {
 
     it('should parse upload options correctly', function(done) {
       var note = 'A note for notes';
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'upload', '--email', 'user@ionic.io', '--password', 'pass', '--note', note];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'upload', '--email',
+        'user@ionic.io', '--password', 'pass', '--note', note];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(1);
         expect(taskArgv.note).toBe(note);
         expect(taskArgv.email).toBe('user@ionic.io');
@@ -224,18 +225,18 @@ describe('Cli', function() {
     });
 
     it('should parse login options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(1);
         expect(taskArgv.email).toBe('user@ionic.io');
         expect(taskArgv.password).toBe('pass');
@@ -244,18 +245,19 @@ describe('Cli', function() {
     });
 
     it('should parse run options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload',
+        '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(2);
         expect(taskArgv.r).toBe(35730);
         expect(taskArgv.port).toBe(5000);
@@ -267,18 +269,20 @@ describe('Cli', function() {
       });
     });
 
-    it('should parse emulate options correctly', function() {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'emulate', 'android', '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
+    it('should parse emulate options correctly', function(done) {
+      var processArgs = ['node', '/usr/local/bin/ionic', 'emulate', 'android',
+        '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
-        //should only have serve in the command args
+
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(2);
         expect(taskArgv._[1]).toBe('android');
         expect(taskArgv.r).toBe(35730);
@@ -292,18 +296,18 @@ describe('Cli', function() {
     });
 
     it('should parse state options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(2);
         expect(taskArgv._[1]).toBe('save');
         expect(taskArgv.plugins).toBe(true);
@@ -313,18 +317,19 @@ describe('Cli', function() {
     });
 
     it('should parse plugin options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'plugin', 'add', 'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'plugin', 'add',
+        'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(3);
         expect(taskArgv._[0]).toBe('plugin');
         expect(taskArgv._[1]).toBe('add');
@@ -336,18 +341,18 @@ describe('Cli', function() {
     });
 
     it('should parse build options correctly', function(done) {
-      var processArgs = [ 'node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
+      var processArgs = ['node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
 
       var promise = IonicCli.run(processArgs);
-      var _fakeTask = fakeTask;
+      var fakeTaskRef = fakeTask;
 
-      promise.then(function(){
-        expect(_fakeTask.prototype.run).toHaveBeenCalled();
-        var taskArgs = _fakeTask.prototype.run.mostRecentCall.args;
+      promise.then(function() {
+        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
+        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
-        //should only have serve in the command args
+        // should only have serve in the command args
         expect(taskArgv._.length).toBe(2);
         expect(taskArgv._[0]).toBe('build');
         expect(taskArgv._[1]).toBe('ios');
@@ -363,7 +368,7 @@ describe('Cli', function() {
       });
 
       xit('should do runtime check when version is not checked', function() {
-        var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
+        var IonicConfigSpy = jasmine.createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
         IonicCli.__set__('IonicConfig', IonicConfigSpy);
         IonicCli.doRuntimeCheck('1.6.4');
@@ -373,7 +378,7 @@ describe('Cli', function() {
       });
 
       xit('should do runtime check when version is not checked', function() {
-        var IonicConfigSpy = createSpyObj('IonicConfig', ['get', 'set', 'save']);
+        var IonicConfigSpy = jasmine.createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
         IonicCli.__set__('IonicConfig', IonicConfigSpy);
         IonicCli.doRuntimeCheck('1.6.5');
@@ -382,7 +387,6 @@ describe('Cli', function() {
         expect(IonicConfigSpy.set).toHaveBeenCalledWith('lastVersionChecked', '1.6.5');
         expect(IonicConfigSpy.save).toHaveBeenCalled();
       });
-    })
-
+    });
   });
 });
diff --git a/spec/serve.spec.js b/spec/serve.spec.js
index 0bef54cf0a..9f2c1bd7dc 100644
--- a/spec/serve.spec.js
+++ b/spec/serve.spec.js
@@ -1,14 +1,13 @@
-var IonicAppLib = require('ionic-app-lib'),
-    IonicProject = IonicAppLib.project,
-    Serve = IonicAppLib.serve,
-    Q = require('q'),
-    rewire = require('rewire'),
-    Utils = IonicAppLib.utils;
+var IonicAppLib = require('ionic-app-lib');
+var IonicProject = IonicAppLib.project;
+var Serve = IonicAppLib.serve;
+var Q = require('q');
+var rewire = require('rewire');
 
 var argv = {
   _: ['--livereload'],
   nogulp: false
-}
+};
 
 describe('Serve', function() {
   var serveTask;
@@ -41,13 +40,13 @@ describe('Serve', function() {
     };
 
     Q()
-    .then(function(){
+    .then(function() {
       return serve.run({}, argv);
     })
     .then(function() {
       expect(Serve.start).toHaveBeenCalledWith(options);
     })
-    .catch(function(ex){
+    .catch(function(ex) {
       expect('this').toBe(ex.stack);
     })
     .fin(done);
@@ -70,14 +69,14 @@ describe('Serve', function() {
     var serve = new serveTask.IonicTask();
 
     Q()
-    .then(function(){
+    .then(function() {
       return serve.run({}, argv);
     })
     .then(function() {
       var calls = Serve.start.calls[0].args[0];
       expect(calls.liveReloadPort).toBe(35729);
     })
-    .catch(function(ex){
+    .catch(function(ex) {
       expect('this').toBe(ex.stack);
     })
     .fin(done);
diff --git a/spec/start.spec.js b/spec/start.spec.js
index 2bb971ca8a..60f26969e0 100644
--- a/spec/start.spec.js
+++ b/spec/start.spec.js
@@ -1,13 +1,4 @@
-var IonicAppLib = require('ionic-app-lib'),
-    IonicProject = IonicAppLib.project,
-    Serve = IonicAppLib.serve,
-    Q = require('q'),
-    rewire = require('rewire');
-
-var argv = { 
-  _: ['--livereload'],
-  nogulp: false
-}
+var rewire = require('rewire');
 
 describe('Start', function() {
   var startTask;
diff --git a/spec/stats.spec.js b/spec/stats.spec.js
index 38b0fcc532..cad77d7e97 100644
--- a/spec/stats.spec.js
+++ b/spec/stats.spec.js
@@ -1,13 +1,12 @@
-var Q = require('q'),
-    // IonicStats = require('../lib/ionic/stats').IonicStats,
-    IonicStatsModule,
-    IonicStats,
-    path = require('path'),
-    rewire = require('rewire');
+var IonicStatsModule;
+var IonicInfoModule;
+var IonicStats;
+var rewire = require('rewire');
 
 describe('Stats', function() {
   beforeEach(function() {
     IonicStatsModule = rewire('../lib/ionic/stats');
+    IonicInfoModule = rewire('ionic-app-lib').info;
     IonicStats = IonicStatsModule.IonicStats;
   });
 
@@ -22,7 +21,7 @@ describe('Stats', function() {
 
       spyOn(IonicStats, 'mp');
 
-      var configSpy = createSpyObj('ionicConfig', ['get']);
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
       configSpy.get.andReturn(true);
 
       IonicStatsModule.__set__('ionicConfig', configSpy);
@@ -35,9 +34,9 @@ describe('Stats', function() {
     });
 
     it('should not track stats if opted out', function() {
-      var configSpy = createSpyObj('ionicConfig', ['get']);
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
       configSpy.get.andReturn(true);
-      spyOn(IonicStatsModule, 'getVersion').andReturn({version: '1.6.4'});
+      spyOn(IonicStatsModule, 'getVersion').andReturn({ version: '1.6.4' });
 
       IonicStatsModule.__set__('ionicConfig', configSpy);
 
@@ -53,15 +52,27 @@ describe('Stats', function() {
 
       spyOn(IonicStats, 'mp');
       spyOn(IonicStatsModule, 'getVersion').andReturn(packageJson);
+      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
+        info.os = 'Mac OS X El Capitan';
+        info.node = 'v5.10.1';
+        info.gulp = 'v3.0.0';
+      });
 
-      var configSpy = createSpyObj('ionicConfig', ['get']);
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
       configSpy.get.andReturn(false);
 
       IonicStatsModule.__set__('ionicConfig', configSpy);
 
       IonicStats.t();
 
-      expect(IonicStats.mp).toHaveBeenCalledWith('start', { cli_version: packageJson.version, email: false, account_id: false });
+      expect(IonicStats.mp).toHaveBeenCalledWith('start', {
+        cli_version: packageJson.version, // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1'
+      });
       process.argv = oldprocessargv;
     });
   });

From 5e283ce947679acf57f114ab0b4131d12e4edcb6 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 26 Apr 2016 11:20:26 -0500
Subject: [PATCH 0964/1100] fix(eslint): add parseInt to all request response
 checks because type coersion was removed.

---
 lib/cli.js             | 2 +-
 lib/ionic/lib.js       | 8 ++++----
 lib/ionic/push.js      | 6 +++---
 lib/ionic/templates.js | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 90cda0fd16..fb6cd9de5b 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -671,7 +671,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 
   var downloadUrl = 'http://code.ionicframework.com/content/cli-message.json';
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-    if (!err && res && res.statusCode === 200) {
+    if (!err && res && parseInt(res.statusCode, 10) === 200) {
       try {
         var newsId = IonicConfig.get('newsId');
         var messagesJson = JSON.parse(html);
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 1b3b018d8f..68007446f6 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -93,12 +93,12 @@ IonicTask.prototype.getVersionData = function(version) {
         q.reject();
         return;
       }
-      if (res.statusCode === 404) {
+      if (parseInt(res.statusCode, 10) === 404) {
         log.error('Invalid version: ' + version);
         q.reject();
         return;
       }
-      if (res.statusCode >= 400) {
+      if (parseInt(res.statusCode, 10) >= 400) {
         log.error('Unable to load version data');
         q.reject();
         return;
@@ -220,11 +220,11 @@ IonicTask.prototype.downloadZip = function(version) {
       log.error(err);
       return;
     }
-    if (res.statusCode === 404 || res.statusCode === 406) {
+    if (parseInt(res.statusCode, 10) === 404 || parseInt(res.statusCode, 10) === 406) {
       log.error('Invalid version: ' + version);
       return;
     }
-    if (res.statusCode >= 400) {
+    if (parseInt(res.statusCode, 10) >= 400) {
       log.error('Unable to download zip (' + res.statusCode + ')');
       return;
     }
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 04073dba41..a7f6b31e6f 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -97,7 +97,7 @@ IonicTask.prototype.set_webhook_url = function(task, webhook_url) { // eslint-di
         return task.ionic.fail('Error setting Webhook URL: ' + err);
       }
 
-      if (response.statusCode === '200') {
+      if (parseInt(response.statusCode, 10) === '200') {
         log.info('Webhook URL set to', webhook_url);
       } else {
         return task.ionic.fail('App not found');
@@ -141,7 +141,7 @@ IonicTask.prototype.set_google_api_key = function(task, google_api_key) { // esl
         return task.ionic.fail('Error setting Google API Key: ' + err);
       }
 
-      if (response.statusCode === '200') {
+      if (parseInt(response.statusCode, 10) === '200') {
         log.info('Google API Key Saved'.green);
       } else {
         return task.ionic.fail('App not found');
@@ -232,7 +232,7 @@ IonicTask.prototype.send_push = function(task) { // eslint-disable-line camelcas
     };
 
     request(options, function(err, response) {
-      if (!err && response.statusCode === 202) {
+      if (!err && parseInt(response.statusCode, 10) === 202) {
         log.info('Successfully queued push notification');
       } else {
         log.error('Error queueing push notification', err);
diff --git a/lib/ionic/templates.js b/lib/ionic/templates.js
index 0c99f0490f..e7c30dc564 100644
--- a/lib/ionic/templates.js
+++ b/lib/ionic/templates.js
@@ -23,7 +23,7 @@ IonicTask.prototype.fetchStarterTemplates = function() {
 
   var proxy = process.env.PROXY || null;
   request({ url: downloadUrl, proxy: proxy }, function(err, res, html) {
-    if (!err && res && res.statusCode === 200) {
+    if (!err && res && parseInt(res.statusCode, 10) === 200) {
       var templatesJson = {};
       try {
         templatesJson = JSON.parse(html);

From 2dbd92ced0ae565e8adc7b03dfc4527f8568521e Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 26 Apr 2016 15:33:37 -0500
Subject: [PATCH 0965/1100] fix(login): correct email regex that was split to
 change decrease line length.

---
 lib/ionic/login.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 8678cbbe77..73a6f5f3b8 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -52,8 +52,7 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
 
   var schema = [{
     name: 'email',
-    pattern: new RegExp(["^[A-z0-9!#$%&'*+/=?^_{|}~-]+(?:.[A-z0-9!#$%&'*+/=?^_{|}~-]+)",
-                        '*@(?:[A-z0-9](?:[A-z0-9-]*[A-z0-9])?.)+[A-z0-9](?:[A-z0-9-]*[A-z0-9])?$'].join('')),
+    pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/, // eslint-disable-line max-len
     description: 'Email:'.yellow.bold,
     required: true
   }, {

From e89e28a4db23ab359cf10a1d1ba473ac747798dc Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 28 Apr 2016 16:10:38 -0500
Subject: [PATCH 0966/1100] chore(npm): add lint script

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2329b09943..8fc1b2eb3f 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "scripts": {
     "bump": "node lib/tasks/bumpversion",
     "beta-bump": "node lib/tasks/bumpversion --level pre --identifier beta",
+    "lint": "eslint .",
     "publish-release": "node lib/tasks/bumpversion --npmPublish",
     "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
     "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",

From cd725539561caa95a847768ae13be2ba67903fdd Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 28 Apr 2016 16:11:11 -0500
Subject: [PATCH 0967/1100] fix(store): don't error if config isn't found

It will be created on the first set
---
 lib/ionic/store.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/ionic/store.js b/lib/ionic/store.js
index 978f1fc681..92c7eacc5f 100644
--- a/lib/ionic/store.js
+++ b/lib/ionic/store.js
@@ -23,9 +23,7 @@ function IonicStore(fileName) {
 
   try {
     this.data = JSON.parse(fs.readFileSync(this.filePath));
-  } catch (e) {
-    throw e;
-  }
+  } catch (e) {} // eslint-disable-line no-empty
 
   return this;
 }

From 9ead0beb95818bac64bdd4066bf70e57aee1f80a Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Fri, 29 Apr 2016 15:57:36 -0500
Subject: [PATCH 0968/1100] removed mp

---
 lib/ionic/stats.js | 532 ++-------------------------------------------
 1 file changed, 19 insertions(+), 513 deletions(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 41d643da75..7fa788c7ec 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -1,522 +1,29 @@
-var MixpanelAPI, crypto, Buffer, http, querystring, util, path, fs, os, IonicConfig;
-var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-        __slice = Array.prototype.slice;
+var request = require('request'),
+  IonicConfig = require('./config');
 
-var path = require('path'),
-    http = require('http'),
-    querystring = require('querystring'),
-    crypto = require('crypto'),
-    Buffer = require('buffer').Buffer,
-    util = require('util'),
-    es = require('event-stream'),
-    fs = require('fs'),
-    os = require('os'),
-    IonicConfig = require('./config');
+var proxy = process.env.PROXY || process.env.http_proxy || null;
 
-/*
-    Heavily inspired by the original js library copyright Mixpanel, Inc.
-    (http://mixpanel.com/)
-
-    Copyright (c) 2012 Carl Sverre
-
-    Released under the MIT license.
-*/
-
-var create_client = function(token, config) {
-    var metrics = {};
-
-    if(!token) {
-        throw new Error("The Mixpanel Client needs a Mixpanel token: `init(token)`");
-    }
-
-    metrics.config = {
-        test: false,
-        debug: false,
-        verbose: false
-    };
-
-    metrics.token = token;
-
-    /**
-        send_request(data)
-        ---
-        this function sends an async GET request to mixpanel
-
-        data:object                     the data to send in the request
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.send_request = function(endpoint, data, callback) {
-        callback = callback || function() {};
-        var event_data = new Buffer(JSON.stringify(data));
-        var request_data = {
-            'data': event_data.toString('base64'),
-            'ip': 0,
-            'verbose': metrics.config.verbose ? 1 : 0
-        };
-
-        if (endpoint === '/import') {
-            var key = metrics.config.key;
-            if (!key) {
-                throw new Error("The Mixpanel Client needs a Mixpanel api key when importing old events: `init(token, { key: ... })`");
-            }
-            request_data.api_key = key;
-        }
-
-        var request_options = {
-            host: 'api.mixpanel.com',
-            port: 80,
-            headers: {}
-        };
-
-        if (metrics.config.test) { request_data.test = 1; }
-
-        var query = querystring.stringify(request_data);
-
-        request_options.path = [endpoint,"?",query].join("");
-
-        http.get(request_options, function(res) {
-            var data = "";
-            res.on('data', function(chunk) {
-               data += chunk;
-            });
-
-            res.on('end', function() {
-                var e;
-                if(metrics.config.verbose) {
-                    try {
-                        var result = JSON.parse(data);
-                        if(result.status != 1) {
-                            e = new Error("Mixpanel Server Error: " + result.error);
-                        }
-                    }
-                    catch(ex) {
-                        e = new Error("Could not parse response from Mixpanel");
-                    }
-                }
-                else {
-                    e = (data !== '1') ? new Error("Mixpanel Server Error: " + data) : undefined;
-                }
-
-                callback(e);
-            });
-        }).on('error', function(e) {
-            if(metrics.config.debug) {
-                console.log("Got Error: " + e.message);
-            }
-            callback(e);
-        });
-    };
-
-    /**
-        track(event, properties, callback)
-        ---
-        this function sends an event to mixpanel.
-
-        event:string                    the event name
-        properties:object               additional event properties to send
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.track = function(event, properties, callback) {
-        if (typeof(properties) === 'function' || !properties) {
-            callback = properties;
-            properties = {};
-        }
-
-        // if properties.time exists, use import endpoint
-        var endpoint = (typeof(properties.time) === 'number') ? '/import' : '/track';
-
-        properties.token = metrics.token;
-        properties.mp_lib = "node";
-
-        var data = {
-            'event' : event,
-            'properties' : properties
-        };
-
-        if (metrics.config.debug) {
-            console.log("Sending the following event to Mixpanel:");
-            console.log(data);
-        }
-
-        metrics.send_request(endpoint, data, callback);
+var s = {
+  track: function(event, uuid, data, callback) {
+    var data = {
+      '_event' : event,
+      '_uuid': uuid,
+      'data': data
     };
 
-    /**
-        import(event, properties, callback)
-        ---
-        This function sends an event to mixpanel using the import
-        endpoint.  The time argument should be either a Date or Number,
-        and should signify the time the event occurred.
-
-        It is highly recommended that you specify the distinct_id
-        property for each event you import, otherwise the events will be
-        tied to the IP address of the sending machine.
-
-        For more information look at:
-        https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
-
-        event:string                    the event name
-        time:date|number                the time of the event
-        properties:object               additional event properties to send
-        callback:function(err:Error)    callback is called when the request is
-                                        finished or an error occurs
-    */
-    metrics.import = function(event, time, properties, callback) {
-        if (typeof(properties) === 'function' || !properties) {
-            callback = properties;
-            properties = {};
-        }
-
-        if (time === void 0) {
-            throw new Error("The import method requires you to specify the time of the event");
-        } else if (Object.prototype.toString.call(time) === '[object Date]') {
-            time = Math.floor(time.getTime() / 1000);
-        }
-
-        properties.time = time;
-
-        metrics.track(event, properties, callback);
-    };
-
-    /**
-        alias(distinct_id, alias)
-        ---
-        This function creates an alias for distinct_id
-
-        For more information look at:
-        https://mixpanel.com/docs/integration-libraries/using-mixpanel-alias
-
-        distinct_id:string              the current identifier
-        alias:string                    the future alias
-    */
-    metrics.alias = function(distinct_id, alias, callback) {
-        var properties = {
-            distinct_id: distinct_id,
-            alias: alias
-        };
-
-        metrics.track('$create_alias', properties, callback);
-    };
-
-    metrics.people = {
-        /** people.set_once(distinct_id, prop, to, callback)
-            ---
-            The same as people.set but in the words of mixpanel:
-            mixpanel.people.set_once
-
-            " This method allows you to set a user attribute, only if
-             it is not currently set. It can be called multiple times
-             safely, so is perfect for storing things like the first date
-             you saw a user, or the referrer that brought them to your
-             website for the first time. "
-
-        */
-        set_once: function(distinct_id, prop, to, callback) {
-            var $set = {}, data = {};
-
-            if (typeof(prop) === 'object') {
-                callback = to;
-                $set = prop;
-            } else {
-                $set[prop] = to;
-            }
-
-            this._set(distinct_id, $set, callback, { set_once: true });
-        },
-
-        /**
-            people.set(distinct_id, prop, to, callback)
-            ---
-            set properties on an user record in engage
-
-            usage:
-
-                mixpanel.people.set('bob', 'gender', 'm');
-
-                mixpanel.people.set('joe', {
-                    'company': 'acme',
-                    'plan': 'premium'
-                });
-        */
-        set: function(distinct_id, prop, to, callback) {
-            var $set = {}, data = {};
-
-            if (typeof(prop) === 'object') {
-                callback = to;
-                $set = prop;
-            } else {
-                $set[prop] = to;
-            }
-
-            this._set(distinct_id, $set, callback);
-        },
-
-        // used internally by set and set_once
-        _set: function(distinct_id, $set, callback, options) {
-            var set_key = (options && options.set_once) ? "$set_once" : "$set";
-
-            var data = {
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-            data[set_key] = $set;
-
-            if ('ip' in $set) {
-                data.$ip = $set.ip;
-                delete $set.ip;
-            }
-
-            if ($set.$ignore_time) {
-                data.$ignore_time = $set.$ignore_time;
-                delete $set.$ignore_time;
-            }
-
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-            people.increment(distinct_id, prop, to, callback)
-            ---
-            increment/decrement properties on an user record in engage
-
-            usage:
-
-                mixpanel.people.increment('bob', 'page_views', 1);
-
-                // or, for convenience, if you're just incrementing a counter by 1, you can
-                // simply do
-                mixpanel.people.increment('bob', 'page_views');
-
-                // to decrement a counter, pass a negative number
-                mixpanel.people.increment('bob', 'credits_left', -1);
-
-                // like mixpanel.people.set(), you can increment multiple properties at once:
-                mixpanel.people.increment('bob', {
-                    counter1: 1,
-                    counter2: 3,
-                    counter3: -2
-                });
-        */
-        increment: function(distinct_id, prop, by, callback) {
-            var $add = {};
-
-            if (typeof(prop) === 'object') {
-                callback = by;
-                Object.keys(prop).forEach(function(key) {
-                    var val = prop[key];
-
-                    if (isNaN(parseFloat(val))) {
-                        if (metrics.config.debug) {
-                            console.error("Invalid increment value passed to mixpanel.people.increment - must be a number");
-                            console.error("Passed " + key + ":" + val);
-                        }
-                        return;
-                    } else {
-                        $add[key] = val;
-                    }
-                });
-            } else {
-                if (!by) { by = 1; }
-                $add[prop] = by;
-            }
-
-            var data = {
-                '$add': $add,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-            people.track_charge(distinct_id, amount, properties, callback)
-            ---
-            Record that you have charged the current user a certain
-            amount of money.
-
-            usage:
-
-                // charge a user $29.99
-                mixpanel.people.track_charge('bob', 29.99);
-
-                // charge a user $19 on the 1st of february
-                mixpanel.people.track_charge('bob', 19, { '$time': new Date('feb 1 2012') });
-        */
-        track_charge: function(distinct_id, amount, properties, callback) {
-            var $append = {};
-
-            if (!properties) { properties = {}; }
-
-            if (typeof(amount) !== 'number') {
-                amount = parseFloat(amount);
-                if (isNaN(amount)) {
-                    console.error("Invalid value passed to mixpanel.people.track_charge - must be a number");
-                    return;
-                }
-            }
-
-            properties.$amount = amount;
-
-            if (properties.hasOwnProperty('$time')) {
-                var time = properties.$time;
-                if (Object.prototype.toString.call(time) === '[object Date]') {
-                    properties.$time = time.toISOString();
-                }
-            }
-
-            var data = {
-                '$append': { '$transactions': properties },
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-            people.clear_charges(distinct_id, callback)
-            ---
-            Clear all the current user's transactions.
-
-            usage:
-
-                mixpanel.people.clear_charges('bob');
-        */
-        clear_charges: function(distinct_id, callback) {
-            var data = {
-                '$set': { '$transactions': [] },
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Clearing this user's charges:", distinct_id);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-            people.delete_user(distinct_id, callback)
-            ---
-            delete an user record in engage
-
-            usage:
-
-                mixpanel.people.delete_user('bob');
-        */
-        delete_user: function(distinct_id, callback) {
-            var data = {
-                '$delete': distinct_id,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Deleting the user from engage:", distinct_id);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        },
-
-        /**
-         people.unset(distinct_id, prop, callback)
-         ---
-         delete a property on an user record in engage
-
-         usage:
-
-            mixpanel.people.unset('bob', 'page_views');
-
-            mixpanel.people.unset('bob', ['page_views', 'last_login']);
-         */
-        unset: function(distinct_id, prop, callback) {
-            var $unset = [];
-
-            if (util.isArray(prop)) {
-                $unset = prop;
-            } else if (typeof(prop) === 'string') {
-                $unset = [prop];
-            } else {
-                if (metrics.config.debug) {
-                    console.error("Invalid argument passed to mixpanel.people.unset - must be a string or array");
-                    console.error("Passed: " + prop);
-                }
-                return;
-            }
-
-            var data = {
-                '$unset': $unset,
-                '$token': metrics.token,
-                '$distinct_id': distinct_id
-            };
-
-            if(metrics.config.debug) {
-                console.log("Sending the following data to Mixpanel (Engage):");
-                console.log(data);
-            }
-
-            metrics.send_request('/engage', data, callback);
-        }
-    };
-
-    /**
-        set_config(config)
-        ---
-        Modifies the mixpanel config
-
-        config:object       an object with properties to override in the
-                            mixpanel client config
-    */
-    metrics.set_config = function(config) {
-        for (var c in config) {
-            if (config.hasOwnProperty(c)) {
-                metrics.config[c] = config[c];
-            }
-        }
-    };
-
-    if (config) {
-        metrics.set_config(config);
-    }
-
-    return metrics;
-};
-
-// module exporting
-/*
-module.exports = {
-    Client: function(token) {
-        console.warn("The function `Client(token)` is deprecated.  It is now called `init(token)`.");
-        return create_client(token);
-    },
-    init: create_client
+    request({
+      url: 'https://t.ionic.io/event/cli',
+      method: "POST",
+      json: data,
+      proxy: proxy
+    }, function(err, res, body) {
+      callback(err, res, body);
+    });
+  }
 };
-*/
-
-var mixpanel = create_client('69f7271aa8f3d43f2e1b6baf698159b7');
 
 var ionicConfig = IonicConfig.load();
 
-
 exports.IonicStats = {
   t: function(additionalData) {
     try {
@@ -618,8 +125,7 @@ exports.IonicStats = {
       this.createId();
       unique_id = ionicConfig.get('ank');
     }
-    d.distinct_id = unique_id;
-    mixpanel.track(e, d, function(err, data) {
+    s.track(e, unique_id, d, function(err, data) {
     });
   },
   createId: function() {

From 6317e76dc8a35af45affd7cfa01a1c955b9c68d5 Mon Sep 17 00:00:00 2001
From: Ignat Ignatov <i.t.ignatov@gmail.com>
Date: Mon, 2 May 2016 14:57:09 +0200
Subject: [PATCH 0969/1100] fix(share): use app-lib project utility

---
 lib/ionic/share.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 699caccae3..6c9fd33c3f 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,9 +1,9 @@
 require('shelljs/global');
 
-var IonicProject = require('./project');
+var IonicAppLib = require('ionic-app-lib');
+var IonicProject = IonicAppLib.project;
 var Task = require('./task').Task;
 var LoginTask = require('./login');
-var IonicAppLib = require('ionic-app-lib');
 var Share = IonicAppLib.share;
 var log = IonicAppLib.logging.logger;
 var Login = IonicAppLib.login;

From db68467dd8204031fe7f8249b731281bfdd9d100 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 2 May 2016 18:20:05 -0500
Subject: [PATCH 0970/1100] chore(): update CHANGELOG

---
 CHANGELOG.md | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 219 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57483baf70..9ea3fdfda0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,222 @@
+<a name="2.0.0-beta.25"></a>
+# [2.0.0-beta.25](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.24...v2.0.0-beta.25) (2016-04-20)
+
+
+
+<a name="2.0.0-beta.24"></a>
+# [2.0.0-beta.24](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.23...v2.0.0-beta.24) (2016-04-04)
+
+
+### Bug Fixes
+
+* **generate:** use project.get([61ff94f](https://github.com/driftyco/ionic-cli/commit/61ff94f))
+* **start:** don't run start commands if cancelled([021702a](https://github.com/driftyco/ionic-cli/commit/021702a))
+
+
+### Features
+
+* remove postinstall script([3ecebb5](https://github.com/driftyco/ionic-cli/commit/3ecebb5))
+* **app:** remove unused app task([ff99d14](https://github.com/driftyco/ionic-cli/commit/ff99d14))
+
+
+### BREAKING CHANGES
+
+* app: the 'app' task has been removed
+
+
+
+<a name="2.0.0-beta.23"></a>
+# [2.0.0-beta.23](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.22...v2.0.0-beta.23) (2016-03-28)
+
+
+### Bug Fixes
+
+* **cli:** report gulpfile errors([9c53ffc](https://github.com/driftyco/ionic-cli/commit/9c53ffc))
+* **cli:** use github for default gulpfile([86fbce6](https://github.com/driftyco/ionic-cli/commit/86fbce6))
+* **state:** fix state([984f46f](https://github.com/driftyco/ionic-cli/commit/984f46f))
+
+
+### Features
+
+* **cli:** install necessary packages for default gulpfile([89f560b](https://github.com/driftyco/ionic-cli/commit/89f560b))
+
+
+
+<a name="2.0.0-beta.22"></a>
+# [2.0.0-beta.22](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.21...v2.0.0-beta.22) (2016-03-28)
+
+
+
+<a name="2.0.0-beta.21"></a>
+# [2.0.0-beta.21](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.20...v2.0.0-beta.21) (2016-03-28)
+
+
+### Bug Fixes
+
+* **gulp:** check proper hook name([e897dac](https://github.com/driftyco/ionic-cli/commit/e897dac))
+* **hooks:** only warn about missing tasks if they are missing([0ce5642](https://github.com/driftyco/ionic-cli/commit/0ce5642))
+
+
+### Features
+
+* **console:** make console info messages cyan([912dceb](https://github.com/driftyco/ionic-cli/commit/912dceb))
+* **hooks:** download default gulpfile([408a660](https://github.com/driftyco/ionic-cli/commit/408a660))
+* **hooks:** print newline after gulp tasks have finished([c8643b7](https://github.com/driftyco/ionic-cli/commit/c8643b7))
+* **start:** add --skip-npm flag([375ad4b](https://github.com/driftyco/ionic-cli/commit/375ad4b))
+
+
+
+<a name="2.0.0-beta.20"></a>
+# [2.0.0-beta.20](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.19...v2.0.0-beta.20) (2016-03-28)
+
+
+### Bug Fixes
+
+* **cordova:** use cordova command for now([f469d47](https://github.com/driftyco/ionic-cli/commit/f469d47))
+* **gulp:** don't error on missing hooks([0e36814](https://github.com/driftyco/ionic-cli/commit/0e36814))
+* **gulp:** don't warn about gulp hooks in v1 projects([a98b785](https://github.com/driftyco/ionic-cli/commit/a98b785))
+* **gulp:** handle gulpfile edge case([83bbab6](https://github.com/driftyco/ionic-cli/commit/83bbab6))
+* **gulp:** let gulp handle its own errors([5695cfa](https://github.com/driftyco/ionic-cli/commit/5695cfa))
+* **hooks:** don't require Gulpfile twice([c17d268](https://github.com/driftyco/ionic-cli/commit/c17d268))
+* **hooks:** only print build warning for v2([3d69f9d](https://github.com/driftyco/ionic-cli/commit/3d69f9d))
+
+
+### Features
+
+* **gulp:** run gulp tasks([33fc34a](https://github.com/driftyco/ionic-cli/commit/33fc34a))
+* add console.warn colors([745a259](https://github.com/driftyco/ionic-cli/commit/745a259))
+* **hooks:** don't run gulp if node_modules doesn't exist([52f1a8f](https://github.com/driftyco/ionic-cli/commit/52f1a8f))
+* **setup:** deprecate setup task([a48e7b9](https://github.com/driftyco/ionic-cli/commit/a48e7b9))
+
+
+
+<a name="2.0.0-beta.19"></a>
+# [2.0.0-beta.19](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.18...v2.0.0-beta.19) (2016-03-28)
+
+
+
+<a name="2.0.0-beta.18"></a>
+# [2.0.0-beta.18](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.17...v2.0.0-beta.18) (2016-03-28)
+
+
+### Features
+
+* **browser:** deprecate browser cmd([96b79ec](https://github.com/driftyco/ionic-cli/commit/96b79ec))
+* **generate:** support all 3 package locations([db3db0e](https://github.com/driftyco/ionic-cli/commit/db3db0e))
+
+
+### BREAKING CHANGES
+
+* browser: The browser command is deprecated in favor of using the
+Cordova Crosswalk plugin.
+
+
+
+<a name="2.0.0-beta.17"></a>
+# [2.0.0-beta.17](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.16...v2.0.0-beta.17) (2016-03-28)
+
+
+
+<a name="2.0.0-beta.16"></a>
+# [2.0.0-beta.16](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2016-03-28)
+
+
+
+<a name="2.0.0-beta.15"></a>
+# [2.0.0-beta.15](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2016-03-28)
+
+
+### Features
+
+* **cordova:** copy html before building([ef84e59](https://github.com/driftyco/ionic-cli/commit/ef84e59))
+
+
+
+<a name="2.0.0-beta.14"></a>
+# [2.0.0-beta.14](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2016-03-28)
+
+
+### Bug Fixes
+
+* **bundle:** rebuild native bindings postinstall([dfa3b03](https://github.com/driftyco/ionic-cli/commit/dfa3b03))
+
+
+
+<a name="2.0.0-beta.13"></a>
+# [2.0.0-beta.13](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.12...v2.0.0-beta.13) (2016-03-28)
+
+
+### Bug Fixes
+
+* bundle before build, emulate, run and upload([c8930b8](https://github.com/driftyco/ionic-cli/commit/c8930b8))
+* **run:** fix livereload option for v2 run([cc1cc11](https://github.com/driftyco/ionic-cli/commit/cc1cc11))
+
+
+### Features
+
+* run Sass before build commands([d3a1673](https://github.com/driftyco/ionic-cli/commit/d3a1673))
+
+
+
+<a name="2.0.0-beta.1"></a>
+# [2.0.0-beta.1 - 2.0.0-beta.12](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.1...v2.0.0-beta.12) (2016-03-28)
+
+
+### Features
+
+* **v2:** New v2 support([666ae35](https://github.com/driftyco/ionic-cli/commit/666ae35))
+
+
+
+<a name="1.7.14"></a>
+## [1.7.14](https://github.com/driftyco/ionic-cli/compare/1.7.14...v1.7.14) (2016-02-01)
+
+
+### Bug Fixes
+
+* add info back in([fec24f7](https://github.com/driftyco/ionic-cli/commit/fec24f7))
+
+
+
+<a name="1.7.13"></a>
+## [1.7.13](https://github.com/driftyco/ionic-cli/compare/v1.7.12...v1.7.13) (2016-01-20)
+
+
+
+<a name="1.7.12"></a>
+## [1.7.12](https://github.com/driftyco/ionic-cli/compare/v1.7.11...v1.7.12) (2015-12-14)
+
+* Use bundledDependencies([40294f7])(https://github.com/driftyco/ionic-cli/commit/40294f7)
+
+
+
+<a name="1.7.11"></a>
+## [1.7.11](https://github.com/driftyco/ionic-cli/compare/v1.7.10...v1.7.11) (2015-12-02)
+
+
+
+<a name="1.7.10"></a>
+## [1.7.10](https://github.com/driftyco/ionic-cli/compare/v1.7.9...v1.7.10) (2015-11-17)
+
+
+
+<a name="1.7.9"></a>
+## [1.7.9](https://github.com/driftyco/ionic-cli/compare/v1.7.8...v1.7.9) (2015-11-17)
+
+
+### Bug Fixes
+
+* **creator:** creator start zip([9ae25e8](https://github.com/driftyco/ionic-cli/commit/9ae25e8))
+* **state:** Pass the proper variable array to the state save plugin command([2c5c19b](https://github.com/driftyco/ionic-cli/commit/2c5c19b))
+* **docs:** Remove the tests starter([ff1997a](https://github.com/driftyco/ionic-cli/commit/ff1997a))
+* **cordova:** Update ionic build to build all installed platforms and ionic platform to list all available platforms([73f95f8](https://github.com/driftyco/ionic-cli/commit/73f95f8))
+* **emulate/run:** Update cordova run method to respect address for ionic emulate --address localhost - it will remove the --address arg as well as the following IP address to use for passing to cordova CLI.([9cf0ae2](https://github.com/driftyco/ionic-cli/commit/9cf0ae2))
+
+
+
+<a name="1.7.8"></a>
+## [1.7.8](https://github.com/driftyco/ionic-cli/compare/1.7.7...v1.7.8) (2015-11-05)
+
 ### 1.7.7
 
 * `ionic-app-lib` updated to `0.6.3`

From 645ded95cac2be34b85fe30a5f499ce3832aee86 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 2 May 2016 20:25:50 -0500
Subject: [PATCH 0971/1100] chore(): update contributors

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 8fc1b2eb3f..f22f60a6c0 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,10 @@
     {
       "name": "Tim Lancina",
       "web": "https://twitter.com/timlancina"
+    },
+    {
+      "name": "Josh Thomas",
+      "web": "https://twitter.com/jthoms1"
     }
   ],
   "license": "MIT",

From 91548beeddc0bdc58a7b238c48eb26c8d6baac0a Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 2 May 2016 20:25:19 -0500
Subject: [PATCH 0972/1100] chore(): add release script

---
 lib/tasks/bumpversion.js    | 57 -------------------------------------
 lib/tasks/createDocsJson.js | 55 -----------------------------------
 package.json                | 14 ++++-----
 scripts/release.js          | 31 ++++++++++++++++++++
 4 files changed, 37 insertions(+), 120 deletions(-)
 delete mode 100644 lib/tasks/bumpversion.js
 delete mode 100644 lib/tasks/createDocsJson.js
 create mode 100644 scripts/release.js

diff --git a/lib/tasks/bumpversion.js b/lib/tasks/bumpversion.js
deleted file mode 100644
index e8c4cd0aa9..0000000000
--- a/lib/tasks/bumpversion.js
+++ /dev/null
@@ -1,57 +0,0 @@
-require('colors');
-var path = require('path');
-var semver = require('semver');
-var shelljs = require('shelljs');
-var args = require('optimist').argv;
-var fs = require('fs');
-var jsonPath = path.join(__dirname, '../', '../', 'package.json');
-var packageJson = require(jsonPath);
-var version = null;
-var bumpLevel = null;
-
-// version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel),
-
-if (args.level && args.level === 'pre') {
-  var id = args.identifier || 'beta';
-  bumpLevel = [args.level, id].join('');
-  version = semver.inc(packageJson.version, args.level, id);
-} else {
-  bumpLevel = args.level || 'patch';
-  version = args.version ? args.version : semver.inc(packageJson.version, bumpLevel);
-}
-
-var bumpVersionMessage = ['Bumping from ', packageJson.version, ' by ', bumpLevel, ' resulting in ', version].join('');
-
-console.log(bumpVersionMessage.green);
-
-packageJson.version = version;
-
-if (args.npmInstall) {
-  shelljs.rm('-rf', 'node_modules');
-  shelljs.exec('npm install');
-}
-
-shelljs.rm('npm-shrinkwrap.json');
-
-fs.writeFileSync(jsonPath, JSON.stringify(packageJson, null, 2));
-
-shelljs.exec('npm shrinkwrap');
-
-if (args.git) {
-  console.log('git commands');
-
-  // shelljs.exec('git add npm-shrinkwrap.json');
-  // shelljs.exec(['git commit -m "', bumpVersionMessage, '"'].join(''));
-  // shelljs.exec(['git tag ', version].join(''));
-  // shelljs.exec(['git push origin ', version].join(''))
-}
-
-if (args.npmPublishTag) {
-  console.log('npm publish commands');
-  var publishTagCmd = ['npm publish --tag ', version].join('');
-  console.log(publishTagCmd);
-
-  // shelljs.exec('npm publish');
-} else if (args.npmPublish) {
-  console.log('npm publish');
-}
diff --git a/lib/tasks/createDocsJson.js b/lib/tasks/createDocsJson.js
deleted file mode 100644
index 3132024eff..0000000000
--- a/lib/tasks/createDocsJson.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-var cl = console.log;
-
-function crawlDocsCreateJson() {
-  var docsJson = {
-    versions: [],
-    api: {}
-  };
-
-  var docsPath = path.resolve('docs');
-  var docsApiPath = path.join(docsPath, 'api');
-
-  var docsDirs = fs.readdirSync(docsPath);
-
-  docsDirs.forEach(function(doc) {
-    var isDocVersion = !isNaN(doc[0]);
-    if (isDocVersion) {
-      docsJson.versions.push(doc);
-    }
-  });
-
-  var apiDocsDirs = fs.readdirSync(docsApiPath);
-
-  apiDocsDirs.forEach(function(docs) {
-    console.log('docs:', docs);
-    if (docs.indexOf('.md') !== -1) {
-      return;
-    }
-    docsJson.api[docs] = { id: docs, docs: [] };
-
-    var apiDocPath = path.join(docsApiPath, docs);
-    console.log('apiDocPath:', apiDocPath);
-
-    var apiSubDocs = fs.readdirSync(apiDocPath);
-
-    apiSubDocs.forEach(function(subdoc) {
-      console.log('subdoc: ', subdoc);
-      docsJson.api[docs].docs.push(subdoc);
-    });
-  });
-
-  // cl('json:')
-  // cl(docsJson)
-
-  // cl(docsJson.api.controller.docs)
-  // docsJson.api.controller.docs.forEach(function(e) {
-  //   cl(e)
-  // })
-
-  cl(JSON.stringify(docsJson));
-}
-
-
-crawlDocsCreateJson();
diff --git a/package.json b/package.json
index f22f60a6c0..9620cf99fc 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,11 @@
     "ionic": "bin/ionic"
   },
   "scripts": {
-    "bump": "node lib/tasks/bumpversion",
-    "beta-bump": "node lib/tasks/bumpversion --level pre --identifier beta",
-    "lint": "eslint .",
-    "publish-release": "node lib/tasks/bumpversion --npmPublish",
-    "publish-tag": "node lib/tasks/bumpversion --level beta --npmPublishTag",
-    "full-release": "node lib/tasks/bumpversion --npmInstall --git --npmPublish",
-    "test": "npm run jasmine",
+    "gh-release": "node scripts/release",
     "e2e": "jasmine-node --captureExceptions ./e2e",
-    "jasmine": "jasmine-node --captureExceptions  ./spec"
+    "jasmine": "jasmine-node --captureExceptions  ./spec",
+    "lint": "eslint .",
+    "test": "npm run jasmine"
   },
   "keywords": [
     "ionic",
@@ -86,7 +82,9 @@
     "unzip": "0.1.9"
   },
   "devDependencies": {
+    "conventional-changelog-cli": "1.1.1",
     "eslint": "^2.8.0",
+    "github": "0.2.4",
     "jasmine-node": "1.14.5",
     "rewire": "2.5.1"
   },
diff --git a/scripts/release.js b/scripts/release.js
new file mode 100644
index 0000000000..9ffa999755
--- /dev/null
+++ b/scripts/release.js
@@ -0,0 +1,31 @@
+var changelog = require('conventional-changelog');
+var GithubApi = require('github');
+var packageJSON = require('../package.json');
+var through = require('through2');
+
+var github = new GithubApi({
+  version: '3.0.0'
+});
+
+github.authenticate({
+  type: 'oauth',
+  token: process.env.GH_TOKEN
+});
+
+return changelog({
+  preset: 'angular'
+})
+.pipe(through.obj(function(file, enc, cb){
+  github.releases.createRelease({
+    owner: 'driftyco',
+    repo: 'ionic-cli',
+    target_commitish: 'v2',
+    tag_name: 'v' + packageJSON.version,
+    name: packageJSON.version,
+    body: file.toString(),
+    prerelease: true,
+  }, function(err, data){
+    if (err) console.log('error: ' + err);
+    console.log(data);
+  });
+}));

From cf3746b20e6f3b47eebcdb5d6cf49b35168ef932 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Mon, 2 May 2016 20:49:14 -0500
Subject: [PATCH 0973/1100] chore(): add changelog task

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 9620cf99fc..9fe637f100 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "ionic": "bin/ionic"
   },
   "scripts": {
+    "changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
     "gh-release": "node scripts/release",
     "e2e": "jasmine-node --captureExceptions ./e2e",
     "jasmine": "jasmine-node --captureExceptions  ./spec",

From d54dca4c8a679ea4c3c8f83d286dbc7fcdff6079 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 3 May 2016 10:38:43 -0500
Subject: [PATCH 0974/1100] chore(): fix CHANGELOG dates

---
 CHANGELOG.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ea3fdfda0..a1202c010b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,12 +43,12 @@
 
 
 <a name="2.0.0-beta.22"></a>
-# [2.0.0-beta.22](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.21...v2.0.0-beta.22) (2016-03-28)
+# [2.0.0-beta.22](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.21...v2.0.0-beta.22) (2016-03-22)
 
 
 
 <a name="2.0.0-beta.21"></a>
-# [2.0.0-beta.21](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.20...v2.0.0-beta.21) (2016-03-28)
+# [2.0.0-beta.21](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.20...v2.0.0-beta.21) (2016-03-21)
 
 
 ### Bug Fixes
@@ -67,7 +67,7 @@
 
 
 <a name="2.0.0-beta.20"></a>
-# [2.0.0-beta.20](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.19...v2.0.0-beta.20) (2016-03-28)
+# [2.0.0-beta.20](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.19...v2.0.0-beta.20) (2016-03-17)
 
 
 ### Bug Fixes
@@ -91,12 +91,12 @@
 
 
 <a name="2.0.0-beta.19"></a>
-# [2.0.0-beta.19](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.18...v2.0.0-beta.19) (2016-03-28)
+# [2.0.0-beta.19](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.18...v2.0.0-beta.19) (2016-03-01)
 
 
 
 <a name="2.0.0-beta.18"></a>
-# [2.0.0-beta.18](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.17...v2.0.0-beta.18) (2016-03-28)
+# [2.0.0-beta.18](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.17...v2.0.0-beta.18) (2016-02-29)
 
 
 ### Features
@@ -113,17 +113,17 @@ Cordova Crosswalk plugin.
 
 
 <a name="2.0.0-beta.17"></a>
-# [2.0.0-beta.17](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.16...v2.0.0-beta.17) (2016-03-28)
+# [2.0.0-beta.17](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.16...v2.0.0-beta.17) (2016-01-08)
 
 
 
 <a name="2.0.0-beta.16"></a>
-# [2.0.0-beta.16](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2016-03-28)
+# [2.0.0-beta.16](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2016-01-07)
 
 
 
 <a name="2.0.0-beta.15"></a>
-# [2.0.0-beta.15](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2016-03-28)
+# [2.0.0-beta.15](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2015-12-22)
 
 
 ### Features
@@ -133,7 +133,7 @@ Cordova Crosswalk plugin.
 
 
 <a name="2.0.0-beta.14"></a>
-# [2.0.0-beta.14](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2016-03-28)
+# [2.0.0-beta.14](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2015-12-22)
 
 
 ### Bug Fixes
@@ -143,7 +143,7 @@ Cordova Crosswalk plugin.
 
 
 <a name="2.0.0-beta.13"></a>
-# [2.0.0-beta.13](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.12...v2.0.0-beta.13) (2016-03-28)
+# [2.0.0-beta.13](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.12...v2.0.0-beta.13) (2015-12-18)
 
 
 ### Bug Fixes
@@ -186,7 +186,7 @@ Cordova Crosswalk plugin.
 <a name="1.7.12"></a>
 ## [1.7.12](https://github.com/driftyco/ionic-cli/compare/v1.7.11...v1.7.12) (2015-12-14)
 
-* Use bundledDependencies([40294f7])(https://github.com/driftyco/ionic-cli/commit/40294f7)
+* Use bundledDependencies([40294f7](https://github.com/driftyco/ionic-cli/commit/40294f7))
 
 
 

From dddd047fc5f873719615663647a829938cb97b45 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 20 May 2016 12:14:37 -0500
Subject: [PATCH 0975/1100] chore(stats): add cli release tag tracking to
 stats.

---
 lib/ionic/stats.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index 7fa788c7ec..f5ea26aca5 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -112,6 +112,11 @@ exports.IonicStats = {
         statsData.account_id = ionicConfig.get('id');
       } catch (e2) {}
 
+      var releaseTag = statsData.cli_version.split('-')[1];
+      if (releaseTag) {
+        statsData.cli_release_tag = releaseTag.split('.')[0];
+      }
+
       this.mp(cmdName, statsData);
       //console.log(cmdName, statsData);
 

From 959cab01c6b36aaa97de1124ed2ba97a3caf91f5 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 23 May 2016 09:09:24 -0500
Subject: [PATCH 0976/1100] chore(stats): ensure that beta tags are no longer
 ignored for mp.

---
 lib/ionic/stats.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
index f5ea26aca5..4509a10bd3 100644
--- a/lib/ionic/stats.js
+++ b/lib/ionic/stats.js
@@ -101,7 +101,6 @@ exports.IonicStats = {
       // add which cli version is being used
       try {
         statsData.cli_version = require('../../package.json').version;
-        if(statsData.cli_version.indexOf('beta') > -1) return;
       } catch(e2) {}
 
       try {

From 1e37f4fd57a77c84b6fb4e7492937b2bbd54ddea Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 23 May 2016 09:53:01 -0500
Subject: [PATCH 0977/1100] fix(serve): add mp to the ionic serve command.

---
 lib/ionic/serve.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 41f9e14549..38c7f8044d 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -43,6 +43,7 @@ IonicTask.prototype.run = function(ionic, argv) {
 
   options.nogulp = argv.nogulp;
 
+  IonicStats.t();
   var promise;
 
   try {

From e4b9393d82cd412e7fdd6cefb4a57fe50b5716af Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 23 May 2016 15:05:28 -0500
Subject: [PATCH 0978/1100] Copy adjustments

---
 lib/cli.js         | 6 +++---
 lib/ionic/start.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 94a6b2c0f1..81dcf28ede 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -451,9 +451,9 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
           return q.promise;
         }
 
-        process.stdout.write('+---------------------------------------------------------+\n'.green);
+        process.stdout.write('\n+---------------------------------------------------------+\n');
 
-        var monthMessage = ['+ New Ionic Updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').green;
+        var monthMessage = ['+ Extra! Extra! Fresh Ionic updates for ', monthNames[d.getMonth()], ' ', d.getFullYear(), '\n+\n'].join('').bold;
         process.stdout.write(monthMessage);
 
         for(var i = 0, j = messagesJson.list.length; i < j; i++) {
@@ -461,7 +461,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
           var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.yellow, '\n+\n'].join('');
           process.stdout.write(entryMessage);
         }
-        process.stdout.write('+---------------------------------------------------------+\n'.green);
+        process.stdout.write('+---------------------------------------------------------+\n\n');
       } catch(ex) {
         console.log('ex', ex.stack);
         q.reject('Error occurred in downloading the CLI messages:', ex)
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 5427d5ce41..543270cdad 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -28,7 +28,7 @@ IonicTask.prototype.run = function run(ionic, argv) {
   }
 
   if (argv._[1] == '.') {
-    console.log('Please name your Ionic project something meaningful other than \'.\''.red);
+    console.log('Please name your Ionic project something more meaningful than \'.\''.red);
     return
   }
 

From 957596cecf029184f097778aef89ebe95072d56b Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 23 May 2016 15:35:05 -0500
Subject: [PATCH 0979/1100] chore(npm): update package.json file to use new
 ionic-app-lib and to deploy latest to npm.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0bc9fc67e0..8c0e844ea3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.14",
+  "version": "1.7.15",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -68,7 +68,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.7.0",
+    "ionic-app-lib": "0.7.2",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From 6c7a0403d28a85841486120b9066b54a72d179a8 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 1 Jun 2016 15:20:47 -0500
Subject: [PATCH 0980/1100] Cli refactor (#969)

* chore(test): add test coverage and ensure circleci runs coveralls.

* chore(docs): update badges on readme to include appveyor and npm

* refactor(cli.js): changed cli to allow for promises and created acceptance test to use those.

* refactor(help): change help command to use new array print mechanism

* refactor(task): remove the task parent prototype from all available ionic tasks

* refactor(task): removed prototypes from tasks.

* refactor(tasks): change ionic task so that their settings are decentralized and easier to maintain

* refactor(cordova): split cordova commands off into seperate modules.

* refactor(help): move help commands to help task and create a util to house helper functions.

* fix(help): update help list so that it is ordered.

* refactor(tasks): remove unneeded underscorejs dependency and replace with utils extend.

* chore(test): setup tests for the build task.

* refactor(task): pass processArguments on to child tasks.

* refactor(tests): ensure all tests pass for cli and cordova commands

* fix(store): ensure that cli can run even if home directory ionic file does not exist.

* chore(tests): added coveralls to the branch and appveyor testing.

* chore(tests): add istanbul to npm test and add tests for hooks and lib.

* chore(tests): ensure all rewire tests reset themselves.

* chore(tests): create tests for help, ionitron, and prompt utils.

* chore(tests): add tests for gulp task before and after events.

* fix(help): ensure help does not print duplicate lines between tasks.

* chore(tests): add tests for table and template utils.

* chore(tests): correct tests around stats and ensure stats is tracking cli_release_tag.

* chore(tests): add test coverage to stats utility.

* chore(tests): ensure cordova utlity functions are covered by tests.

* chore(tests): add test coverage to bower util.

* fix(stats): ensure stats code works on node 0.12 by using extend with only 2 arguments.

* chore(tests): add tests to utility modules.

* chore(tests): write tests for config task.

* chore(tests): add tests for ionic task add.

* chore(tests): add tests for list task.

* chore(tests): add tests for add, io, start and state tasks.

* chore(tests): add tests to cover info task.

* chore(tests): add tests to the upload task.

* chore(tests): add tests to the remove task.

* chore(tests): add tests to the help task.

* chore(tests): add tests for resources task.

* chore(tests): add tests for share task.

* chore(tests): write tests for login task.

* refactor(): replace disableChangePwd with isProjectTask

* chore(tests): add tests to cover compile task.

* chore(tests): add tests to cover build task.

* chore(tests): add tests to cover emulate task.

* chore(tests): add tests to cover platform task.

* chore(tests): add tests to cover plugin task.

* chore(tests): add tests to cover prepare task.

* chore(tests): add tests to cover run task.

* chore(tests): add tests to cover the cordova util.

* test(cli): warning if no node_modules and v2

* test(cli): change test description to match isProjectTask

* test(cli): don't runWithGulp if no node_modules and not v2

* feat(cli): remove gulp upgrade help

* test(): remove inquirer assertions

* test(cli): warn if no gulpfile and cmd requires build step

* test(cli): assert specific log message

* feat(cli): add gulp functions to Cli object

* feat(ionic): catch unhandled promise rejections

* refactor(cli): refactor gulp logic

* feat(cli): remove unnecessary lookupTask function

* chore(cli): add comments, cleanup logs a little

* feat(cli): pull out build command test into its own fn

* test(cli): add runWithGulp test

* test(cli): fix runWithGulp test

* feat(cli): improve gulpfile error formatting

* refactor(cli): don't run gulp unnecessarily if hook doesn't exist

* feat(cli): remove old project upgrade check

* fix(cli): remove unnecessary catch

* fix(stats): only split version number for release number if version is available.

* chore(): update gitignore

* refactor(cli): move error handling out of loadGulpfile

* test(cli): add loadGulpfile tests

* chore(tests): Update address command to remove from serve file and add tests for it.

* chore(tests): add more tests to the serve command.
---
 .gitignore                               |   4 +-
 README.md                                |  11 +-
 appveyor.yml                             |  31 +
 bin/ionic                                |   4 +-
 circle.yml                               |   6 +
 lib/cli.js                               | 720 ++++++++--------------
 lib/config/commands.js                   |  79 +++
 lib/ionic/add.js                         | 110 ++--
 lib/ionic/address.js                     |  24 +
 lib/ionic/bower.js                       |  63 --
 lib/ionic/browser.js                     |  31 +-
 lib/ionic/build.js                       |  67 ++
 lib/ionic/compile.js                     |  31 +
 lib/ionic/config.js                      |  57 ++
 lib/ionic/cordova.js                     | 450 --------------
 lib/ionic/docs.js                        |  55 +-
 lib/ionic/emulate.js                     |  87 +++
 lib/ionic/generate.js                    |  52 +-
 lib/ionic/help.js                        |  58 +-
 lib/ionic/hooks.js                       |  28 +-
 lib/ionic/info.js                        |  32 +-
 lib/ionic/io-config.js                   |  57 --
 lib/ionic/{io-init.js => io.js}          |  41 +-
 lib/ionic/ions.js                        |  60 --
 lib/ionic/lib.js                         | 189 +++---
 lib/ionic/link.js                        |  45 +-
 lib/ionic/list.js                        |  50 ++
 lib/ionic/login.js                       |  42 +-
 lib/ionic/package.js                     |  62 +-
 lib/ionic/platform.js                    |  79 +++
 lib/ionic/plugin.js                      |  78 +++
 lib/ionic/prepare.js                     |  32 +
 lib/ionic/push.js                        | 137 +++--
 lib/ionic/remove.js                      |  67 ++
 lib/ionic/resources.js                   |  53 +-
 lib/ionic/run.js                         |  87 +++
 lib/ionic/security.js                    |  70 ++-
 lib/ionic/serve.js                       |  83 ++-
 lib/ionic/service.js                     | 126 ++--
 lib/ionic/setup.js                       |  22 +-
 lib/ionic/share.js                       |  38 +-
 lib/ionic/start.js                       |  75 ++-
 lib/ionic/starter-templates.json         |  66 --
 lib/ionic/state.js                       |  46 +-
 lib/ionic/stats.js                       | 657 --------------------
 lib/ionic/task.js                        |   7 -
 lib/ionic/upload.js                      |  33 +-
 lib/ionic/utils.js                       |  46 --
 lib/tasks/cliTasks.js                    | 528 ----------------
 lib/utils/bower.js                       |  67 ++
 lib/utils/cordova.js                     | 278 +++++++++
 lib/utils/help.js                        | 243 ++++++++
 lib/{ionic => utils}/ionitron.js         |  19 +-
 lib/{ionic/assets => utils}/ionitron.txt |   0
 lib/{ionic => utils}/prompt.js           |   0
 lib/utils/stats.js                       | 164 +++++
 lib/{ionic => utils}/store.js            |   2 +-
 lib/{ionic => utils}/table.js            |   0
 lib/{ionic => utils}/templates.js        |  45 +-
 package.json                             |   8 +-
 spec/cli.spec.js                         | 748 +++++++++++++++++++----
 spec/helpers/ionic.js                    |  19 +
 spec/serve.spec.js                       |  84 ---
 spec/start.spec.js                       |  13 -
 spec/stats.spec.js                       |  79 ---
 spec/tasks/add.spec.js                   | 134 ++++
 spec/tasks/address.spec.js               |  45 ++
 spec/tasks/build.spec.js                 | 138 +++++
 spec/tasks/compile.spec.js               |  56 ++
 spec/tasks/config.spec.js                | 135 ++++
 spec/tasks/docs.spec.js                  |  80 +++
 spec/tasks/emulate.spec.js               | 193 ++++++
 spec/tasks/generate.spec.js              |   0
 spec/tasks/help.spec.js                  |  91 +++
 spec/tasks/hooks.spec.js                 |  99 +++
 spec/tasks/info.spec.js                  |  72 +++
 spec/tasks/io.spec.js                    | 115 ++++
 spec/tasks/lib.spec.js                   | 124 ++++
 spec/tasks/link.spec.js                  |   0
 spec/tasks/list.spec.js                  |  95 +++
 spec/tasks/login.spec.js                 | 183 ++++++
 spec/tasks/package.spec.js               |   0
 spec/tasks/platform.spec.js              | 105 ++++
 spec/tasks/plugin.spec.js                | 102 ++++
 spec/tasks/prepare.spec.js               |  45 ++
 spec/tasks/push.spec.js                  |   0
 spec/tasks/remove.spec.js                | 135 ++++
 spec/tasks/resources.spec.js             |  86 +++
 spec/tasks/run.spec.js                   | 190 ++++++
 spec/tasks/security.spec.js              |   0
 spec/tasks/serve.spec.js                 | 254 ++++++++
 spec/tasks/service.spec.js               |   0
 spec/tasks/setup.spec.js                 |   0
 spec/tasks/share.spec.js                 | 161 +++++
 spec/tasks/start.spec.js                 | 179 ++++++
 spec/tasks/state.spec.js                 | 154 +++++
 spec/tasks/upload.spec.js                |  99 +++
 spec/utils/bower.spec.js                 | 174 ++++++
 spec/utils/cordova.spec.js               | 415 +++++++++++++
 spec/utils/help.spec.js                  | 162 +++++
 spec/utils/ionitron.spec.js              |  31 +
 spec/utils/prompt.spec.js                |  36 ++
 spec/utils/stats.spec.js                 | 297 +++++++++
 spec/utils/store.spec.js                 | 211 +++++++
 spec/utils/table.spec.js                 |  63 ++
 spec/utils/templates.spec.js             | 162 +++++
 106 files changed, 7971 insertions(+), 3295 deletions(-)
 create mode 100644 appveyor.yml
 create mode 100644 circle.yml
 create mode 100644 lib/config/commands.js
 create mode 100644 lib/ionic/address.js
 delete mode 100644 lib/ionic/bower.js
 create mode 100644 lib/ionic/build.js
 create mode 100644 lib/ionic/compile.js
 create mode 100644 lib/ionic/config.js
 delete mode 100644 lib/ionic/cordova.js
 create mode 100644 lib/ionic/emulate.js
 delete mode 100644 lib/ionic/io-config.js
 rename lib/ionic/{io-init.js => io.js} (50%)
 delete mode 100644 lib/ionic/ions.js
 create mode 100644 lib/ionic/list.js
 create mode 100644 lib/ionic/platform.js
 create mode 100644 lib/ionic/plugin.js
 create mode 100644 lib/ionic/prepare.js
 create mode 100644 lib/ionic/remove.js
 create mode 100644 lib/ionic/run.js
 delete mode 100644 lib/ionic/starter-templates.json
 delete mode 100644 lib/ionic/stats.js
 delete mode 100644 lib/ionic/task.js
 delete mode 100644 lib/ionic/utils.js
 delete mode 100644 lib/tasks/cliTasks.js
 create mode 100644 lib/utils/bower.js
 create mode 100644 lib/utils/cordova.js
 create mode 100644 lib/utils/help.js
 rename lib/{ionic => utils}/ionitron.js (88%)
 rename lib/{ionic/assets => utils}/ionitron.txt (100%)
 rename lib/{ionic => utils}/prompt.js (100%)
 create mode 100644 lib/utils/stats.js
 rename lib/{ionic => utils}/store.js (97%)
 rename lib/{ionic => utils}/table.js (100%)
 rename lib/{ionic => utils}/templates.js (62%)
 create mode 100644 spec/helpers/ionic.js
 delete mode 100644 spec/serve.spec.js
 delete mode 100644 spec/start.spec.js
 delete mode 100644 spec/stats.spec.js
 create mode 100644 spec/tasks/add.spec.js
 create mode 100644 spec/tasks/address.spec.js
 create mode 100644 spec/tasks/build.spec.js
 create mode 100644 spec/tasks/compile.spec.js
 create mode 100644 spec/tasks/config.spec.js
 create mode 100644 spec/tasks/docs.spec.js
 create mode 100644 spec/tasks/emulate.spec.js
 create mode 100644 spec/tasks/generate.spec.js
 create mode 100644 spec/tasks/help.spec.js
 create mode 100644 spec/tasks/hooks.spec.js
 create mode 100644 spec/tasks/info.spec.js
 create mode 100644 spec/tasks/io.spec.js
 create mode 100644 spec/tasks/lib.spec.js
 create mode 100644 spec/tasks/link.spec.js
 create mode 100644 spec/tasks/list.spec.js
 create mode 100644 spec/tasks/login.spec.js
 create mode 100644 spec/tasks/package.spec.js
 create mode 100644 spec/tasks/platform.spec.js
 create mode 100644 spec/tasks/plugin.spec.js
 create mode 100644 spec/tasks/prepare.spec.js
 create mode 100644 spec/tasks/push.spec.js
 create mode 100644 spec/tasks/remove.spec.js
 create mode 100644 spec/tasks/resources.spec.js
 create mode 100644 spec/tasks/run.spec.js
 create mode 100644 spec/tasks/security.spec.js
 create mode 100644 spec/tasks/serve.spec.js
 create mode 100644 spec/tasks/service.spec.js
 create mode 100644 spec/tasks/setup.spec.js
 create mode 100644 spec/tasks/share.spec.js
 create mode 100644 spec/tasks/start.spec.js
 create mode 100644 spec/tasks/state.spec.js
 create mode 100644 spec/tasks/upload.spec.js
 create mode 100644 spec/utils/bower.spec.js
 create mode 100644 spec/utils/cordova.spec.js
 create mode 100644 spec/utils/help.spec.js
 create mode 100644 spec/utils/ionitron.spec.js
 create mode 100644 spec/utils/prompt.spec.js
 create mode 100644 spec/utils/stats.spec.js
 create mode 100644 spec/utils/store.spec.js
 create mode 100644 spec/utils/table.spec.js
 create mode 100644 spec/utils/templates.spec.js

diff --git a/.gitignore b/.gitignore
index 8a6b50dbe4..be0f60da64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 *.cookies
 node_modules/
 .idea/
-coverage/
 .vscode/
+coverage/
+.coveralls.yml
+npm-debug.log
diff --git a/README.md b/README.md
index ede0734da3..c922812ee6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-[![Circle CI](https://circleci.com/gh/driftyco/ionic-cli.svg?style=svg)](https://circleci.com/gh/driftyco/ionic-cli)
+[![Build Status][circle-badge]][circle-badge-url]
+[![Build status][appveyor-badge]][appveyor-badge-url]
+[![npm][npm-badge]][npm-badge-url]
 
 Ionic-Cli
 =========
@@ -583,3 +585,10 @@ Usage:
 List:
 
 View all generators: `ionic g --list`.
+
+[circle-badge]: https://circleci.com/gh/driftyco/ionic-cli.svg?style=shield
+[circle-badge-url]: https://circleci.com/gh/driftyco/ionic-cli
+[appveyor-badge]: https://ci.appveyor.com/api/projects/status/oqaqa7fdc7y9mma3?svg=true
+[appveyor-badge-url]: https://ci.appveyor.com/project/jthoms1/ionic-cli
+[npm-badge]: https://img.shields.io/npm/v/ionic.svg
+[npm-badge-url]: https://www.npmjs.com/package/ionic
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..eac8ee9a94
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,31 @@
+# http://www.appveyor.com/docs/appveyor-yml
+
+# Test against these versions of Node.js.
+environment:
+  matrix:
+    - nodejs_version: "0.12"
+    - nodejs_version: "4.2"
+
+# Install scripts. (runs after repo cloning)
+install:
+  - git rev-parse HEAD
+  # Get the latest stable version of Node 0.STABLE.latest
+  - ps: Install-Product node $env:nodejs_version
+  # Typical npm stuff.
+  - npm version
+  - npm install
+
+cache:
+  - '%APPDATA%\npm-cache'
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - npm version
+  - cmd: npm run test
+
+# Don't actually build.
+build: off
+
+# Set build version format here instead of in the admin panel.
+version: "{build}"
diff --git a/bin/ionic b/bin/ionic
index 6734e73f1b..521a82b43f 100755
--- a/bin/ionic
+++ b/bin/ionic
@@ -10,4 +10,6 @@ process.on('uncaughtException', function(err) {
 
 var IonicCli = require('../lib/cli');
 
-IonicCli.run(process.argv);
+IonicCli.run(process.argv).catch(function(err){
+  console.error('Caught exception:\n', err.stack, '\n\nMind letting us know? https://github.com/driftyco/ionic-cli/issues\n');
+});
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000..a0d097163d
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,6 @@
+test:
+  override:
+    - nvm use 0.12 && npm test
+    - nvm use 4.0 && npm test
+  post:
+    - npm run coveralls
diff --git a/lib/cli.js b/lib/cli.js
index fb6cd9de5b..b39089bb65 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -1,311 +1,281 @@
-var Cli = module.exports;
+require('colors');
+
+var Cli = {};
 var IonicAppLib = require('ionic-app-lib');
-var IonicStats = require('./ionic/stats').IonicStats;
-var IonicStore = require('./ionic/store').IonicStore;
+var IonicStats = require('./utils/stats');
+var IonicStore = require('./utils/store');
 var IonicConfig = new IonicStore('ionic.config');
 var Info = IonicAppLib.info;
 var IonicProject = IonicAppLib.project;
-var Ionitron = require('./ionic/ionitron');
 var optimist = require('optimist');
 var path = require('path');
 var fs = require('fs');
 var settings = require('../package.json');
-var Tasks = require('./tasks/cliTasks');
+var Tasks = require('./config/commands').allCommands;
+var orderedListOfTasks = require('./config/commands').orderedListOfCommands;
 var Utils = IonicAppLib.utils;
 var Logging = IonicAppLib.logging;
 var log = Logging.logger;
 var Q = require('q');
-var semver = require('semver');
-var gutil = require('gulp-util');
-var prettyTime = require('pretty-hrtime');
-
-var TASKS = Cli.Tasks = Tasks;
+var helpUtil = require('./utils/help');
 
+Cli.ALL_TASKS = Tasks;
 Cli.IONIC_DASH = 'https://apps.ionic.io';
 Cli.IONIC_API = '/api/v1/';
 Cli.PRIVATE_PATH = '.ionic';
+Cli.VERSION = settings.version;
 
 // This is where the logger for the app-lib can be configured (or replaced).
 log.level = 'info';
 
-
-// Cli.dev = function dev() {
-//   if (settings.version.contains('dev') || settings.version.contains('beta') || settings.version.contains('alpha')) {
-//     return true;
-//   }
-//   return false;
-// };
-
-// The main entry point for the CLI
-// This takes the process.argv array for arguments
-// The args passed should be unfiltered.
-// From here, we will filter the options/args out
-// using optimist. Each command is responsible for
-// parsing out the args/options in the way they need.
-// This way, we can still test with passing in arguments.
+/**
+ * The main entry point for the CLI
+ * This takes the process.argv array for arguments
+ * The args passed should be unfiltered.
+ * From here, we will filter the options/args out
+ * using optimist. Each command is responsible for
+ * parsing out the args/options in the way they need.
+ * This way, we can still test with passing in arguments.
+ *
+ * @method run
+ * @param {Array} processArgv a list of command line arguments including
+ * @return {Promise}
+ */
 Cli.run = function run(processArgv) {
   try {
 
-    // First we parse out the args to use them.
-    // Later, we will fetch the command they are trying to
-    // execute, grab those options, and reparse the arguments.
-    var argv = optimist(processArgv.slice(2)).argv;
+    /*
+     * First we parse out the args to use them.
+     * Later, we will fetch the command they are trying to
+     * execute, grab those options, and reparse the arguments.
+     */
+    var rawCliArguments = processArgv.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var taskList;
 
     Cli.attachErrorHandling();
-    Cli.checkLatestVersion();
+    Cli.latestVersion = Cli.checkLatestVersion();
 
     process.on('exit', function() {
-      Cli.printVersionWarning();
+      Cli.printVersionWarning(settings.version, Cli.npmVersion);
     });
 
-    // Before taking any more steps, lets check their
-    // environment and display any upgrade warnings
+    /*
+     * Before taking any more steps, lets check their
+     * environment and display any upgrade warnings
+     */
     Cli.doRuntimeCheck(settings.version);
 
+    /*
+     * Print version if '--version' or '--v' is an option
+     * TODO: version should probably also be a command
+     *       and this should just map the option to a command
+     */
     if ((argv.version || argv.v) && !argv._.length) {
-      return Cli.version();
+      return Q.fcall(Cli.version);
     }
 
+    /*
+     * Print ionitron if '--ionitron' is an option
+     * TODO: ionitron should probably also be a command
+     *       and this should just map the option to a command
+     */
     if (argv.ionitron) {
+      var Ionitron = require('./utils/ionitron');
       var lang = argv.es ? 'es' : 'en';
-      return Ionitron.print(lang);
+      return Q.fcall(Ionitron.print, lang);
     }
 
+    /*
+     * Set log level to debug if '--verbose' is an option
+     * TODO: This might be better to handle the verbose flag
+     *       in each individual command
+     */
     if (argv.verbose) {
       log.level = 'debug';
     }
 
+    /*
+     * Print help if '--help' or '-h' is an option
+     * TODO: help should probably be a command and option on commands
+     *       $ ionic help start (ALREADY WORKS)
+     *       $ ionic start --help
+     */
     if (argv.help || argv.h) {
-      return Cli.printHelpLines();
+      taskList = Cli.getAllTaskSettings();
+      return Q.fcall(helpUtil.printTaskListUsage, taskList, Cli.VERSION);
     }
 
+    /*
+     * TODO: Change stats-opt-out to be a command that updates config rather
+     * than an option that is passed.
+     */
     if (argv['stats-opt-out']) {
       IonicConfig.set('statsOptOut', true);
       IonicConfig.save();
       log.info('Successful stats opt-out');
-      return;
-    } else {
-      IonicStats.t();
+      return Q.fcall(function() {
+        return 'saved';
+      });
     }
 
-    var taskSetting = Cli.tryBuildingTask(argv);
-    if (!taskSetting) {
-      return Cli.printAvailableTasks();
+    // Gather stats on the current command execution
+    IonicStats.t();
+
+    var taskName = argv._[0];
+    var task = Cli.getTaskSettingsByName(taskName);
+    log.debug('Task:', task);
+
+    // If no task is found then just provide the list of tasks available
+    if (!task) {
+      taskList = Cli.getAllTaskSettings();
+      return Q.fcall(helpUtil.printTaskListShortUsage, taskList, taskName, Cli.VERSION);
     }
-    log.debug('Task setting:', taskSetting);
-    var booleanOptions = Cli.getBooleanOptionsForTask(taskSetting);
-    argv = optimist(processArgv.slice(2)).boolean(booleanOptions).argv;
-    var TaskModule = Cli.lookupTask(taskSetting.module);
-    var taskInstance = new TaskModule();
-
-    // this should be tracked by each task
-    if (!taskSetting.disableChangePwd) {
-      var root = Utils.cdIonicRoot();
-      var project = IonicProject.load(root);
-      argv.v2 = project && project.get('v2');
-      argv.v2 && log.debug('Ionic 2 project.');
-
-      if (fs.existsSync('node_modules')) {
-
-        // run with gulp hooks
-        return runWithGulp(argv, taskInstance);
-      } else if (argv.v2) {
+
+    var booleanOptions = Cli.getListOfBooleanOptions(task.options);
+
+    // Remove all possible task boolean options from the args
+    argv = optimist(rawCliArguments)
+      .boolean(booleanOptions)
+      .argv;
+
+    // No need to do project specific actions, cd to root, etc.
+    if (!task.isProjectTask) {
+      return Q.fcall(task.run.bind(task), Cli, argv);
+    }
+
+    var root = Utils.cdIonicRoot();
+    var project = IonicProject.load(root);
+    argv.v2 = project && project.get('v2');
+
+    // For v1 projects ignore as this could have been skipped for faster start
+    // and gulp hooks aren't required
+    // For v2, print a warning as this is most likely not what they want
+    if (!fs.existsSync('node_modules')) {
+      if (argv.v2) {
         log.warn('WARN: No node_modules directory found, do you need to run npm install?'.yellow);
       }
+      log.debug('node_modules directory not found, not running gulp hooks');
+
+      return Q.fcall(task.run.bind(task), Cli, argv);
+    }
+
+    try {
+      var gulpLoaded = Cli.loadGulpfile();
+    } catch (e) {
+      if (e.code === 'MODULE_NOT_FOUND') {
+        log.info('Uh oh! Looks like you\'re missing a module in your gulpfile:');
+        log.error(e.message);
+        log.info('\nDo you need to run `npm install`?\n');
+        process.exit(1);
+      }
+      log.error('\nThere is an error in your gulpfile: '.red);
+      log.error(e.stack + '\n');
+      process.exit(1);
+    }
+
+    if (!gulpLoaded) {
+
+      // warn if no gulpfile and it's a command that requires a build step
+      // but still run the command with no hooks
+      if (Cli.isBuildCommand(taskName) && argv.v2) {
+        log.warn('WARN: No gulpfile found!');
+        log.warn('If your app requires a build step, you may want to ensure it runs before ' + taskName + '.\n');
+      }
+      log.debug('No gulpfile found, not running gulp hooks');
+
+      return Q.fcall(task.run.bind(task), Cli, argv);
     }
-    return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+
+    return Cli.runWithGulp(argv, task);
 
   } catch (ex) {
     return Utils.fail(ex);
   }
 };
 
-function runWithGulp(argv, taskInstance) {
+Cli.runWithGulp = function runWithGulp(argv, taskInstance) {
   var cmdName = argv._[0];
   var beforeHook = cmdName + ':before';
   var afterHook = cmdName + ':after';
 
-  if (loadGulpfile()) {
-    log.verbose('Gulpfile found');
+  try {
+    var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
+  } catch (e) {
 
-    try {
-      var gulp = require(path.resolve(process.cwd() + '/node_modules/gulp'));
-    } catch (e) {
+    // Empty gulpfile (or one that doesn't require gulp?), and no gulp
+    log.error('\nGulpfile detected, but gulp is not installed'.red);
+    log.error('Do you need to run `npm install`?\n'.red);
+    return process.exit(1);
+  }
 
-      // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-      log.error('\nGulpfile detected, but gulp is not installed'.red);
-      log.error('Do you need to run `npm install`?\n'.red);
-      process.exit(1);
-    }
-    logEvents(gulp, [beforeHook, afterHook]);
+  // setup gulp logging
+  Cli.logEvents(gulp, [beforeHook, afterHook]);
 
-    if (gulp.tasks[beforeHook]) {
-      log.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
-    }
-    return Q.nfcall(gulp.start.bind(gulp), beforeHook).then(
-      function() {
-
-        // Only some commands return promises, so wrap it
-        return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-      },
-      function(e) { // task error, let gulp handle it
-
-        // if there is no hook task, but it's a v2 app and a command that usually needs a hook
-        if (e.missingTask && /serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
-          var taskName = (cmdName === 'serve') ? 'watch' : 'build';
-          log.warn(('WARN: No \'' + beforeHook + '\' gulp task found!').yellow);
-
-          // The task exists, but there are no hooks for it
-          // They have the old config file, so we're safe to yell at them
-          // With new config, may intentionally not have hooks if running their own build
-          if (gulp.tasks[taskName] && fs.existsSync('ionic.config.js')) {
-            log.info(('Your gulpfile contains a \'' + taskName + '\' task already! Add:\n').cyan);
-            log.info(('    gulp.task(\'' + cmdName + ':before\', [\'' + taskName + '\']);\n').cyan);
-            log.info(('to your gulpfile to have Ionic CLI run \'' + taskName + '\' before ' + cmdName + '.\n').cyan);
-          } else {
-            log.warn(('If your app requires a build step, you may want to ensure it runs before ' +
-                      cmdName + '.\n').yellow);
-          }
-        }
+  // if there is no before hook there's no need to run gulp
+  var beforeHookPromise = Q(true);
+  if (gulp.tasks[beforeHook]) {
+    log.info('\nRunning \'' + beforeHook + '\' gulp task before ' + cmdName);
+    beforeHookPromise = Cli.runGulpHook(gulp, beforeHook);
 
-        // Only some commands return promises, so wrap it
-        return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-      }
-    ).then(function() {
+  } else if (Cli.isBuildCommand(cmdName) && argv.v2) {
+    log.warn(('WARN: No \'' + beforeHook + '\' gulp task found!').yellow);
+    log.warn(('If your app requires a build step, you may want to ensure it runs before ' +
+              cmdName + '.\n').yellow);
+  }
+
+  // run beforeHook
+  return beforeHookPromise
+
+  // run cmd
+    .then(function() {
+      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+    })
+
+  // run afterHook
+    .then(function() {
       if (gulp.tasks[afterHook]) {
         log.info('\nRunning \'' + afterHook + '\' gulp task after ' + cmdName);
+
+        return Cli.runGulpHook(gulp, afterHook);
       }
-      return Q.nfcall(gulp.start.bind(gulp), afterHook);
     });
-  }
+};
 
-  // No gulpfile
-  if (/serve|build|run|emulate|upload/.test(cmdName) && argv.v2) {
-    log.warn('WARN: No gulpfile found!');
-    log.warn('If your app requires a build step, you may want to ensure it runs before ' + cmdName + '.\n');
-
-    if (fs.existsSync('ionic.config.js')) {
-      var inquirer = require('inquirer');
-      var deferred = Q.defer();
-
-      log.info('Looks like you are using the deprecated ionic.config.js and have no gulpfile!');
-      log.info('As of beta.21 the Ionic CLI relies on gulp hooks to build your web assets\n');
-      inquirer.prompt([{
-        type: 'confirm',
-        name: 'downloadGulp',
-        message: 'Would you like to download the default gulpfile?'.cyan
-      }],
-      function(answers) {
-        answers.downloadGulp ? deferred.resolve() : deferred.reject();
-      });
-      return deferred.promise.then(
-        function() {
-          return downloadDefaultGulpfile(cmdName).then(
-            installGulpfilePackages,
-            function(err) {
-              log.error('There was an error downloading the default gulpfile: ' + err);
-              process.exit(1);
-            }
-          ).then(
-            function() {
-              log.info('Npm packages installed successfully. Try running \'' + cmdName + '\' again.');
-            },
-            function() {
-              log.warn('There was an error installing the packages required by the gulpfile.');
-              log.warn('You\'ll need to install the following packages manually: ');
-            }
-          );
-        },
-        function() {
-          return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-        }
-      );
-    }
-  }
+Cli.runGulpHook = function runGulpHook(gulp, hookName) {
 
-  return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
-}
+  // swallow errors because we already check to make sure the task exists
+  // so not a missingTask error, and gulp already reports its own errors
+  // which we set up with Cli.logEvents
+  return Q.nfcall(gulp.start.bind(gulp), hookName)
+    .catch(function() {});
+};
 
-function loadGulpfile() {
+Cli.loadGulpfile = function loadGulpfile() {
 
   // TODO add babel support?
   var names = ['gulpfile.js', 'Gulpfile.js'];
   for (var i = 0, ii = names.length; i < ii; i += 1) {
     try {
       require(path.resolve(process.cwd() + '/' + names[i]));
+      log.verbose('Gulpfile found');
       return true;
     } catch (e) {
-      if (e.code === 'MODULE_NOT_FOUND') {
-        if (e.message.indexOf(names[i]) === -1) {
-          log.info('Uh oh! Looks like you\'re missing a module in your gulpfile:');
-          log.error(e.message);
-          log.info('\nDo you need to run `npm install`?\n');
-          process.exit(1);
-        } else {
+      if (e.code === 'MODULE_NOT_FOUND' && e.message.indexOf(names[i]) !== -1) {
 
-          // ignore missing gulpfile
-          continue;
-        }
+        // ignore missing gulpfile
+        continue;
       }
-      log.error('There is an error in your gulpfile: ');
-      log.error(e.stack);
-      process.exit(1);
+      throw e;
     }
   }
   return false;
-}
-
-function downloadDefaultGulpfile() {
-  var https = require('https');
-  var fileStream = fs.createWriteStream('gulpfile.js');
-  var deferred = Q.defer();
-  var project = IonicProject.load();
-  var branch = project.get('typescript') ? 'typescript' : 'master';
-  var url = 'https://raw.githubusercontent.com/driftyco/ionic2-app-base/' + branch + '/gulpfile.js';
-
-  log.info('\nDownloading default gulpfile from: ' + url);
-
-  fileStream.on('open', function() {
-    https.get(url, function(res) {
-      res.on('error', function(err) {
-        deferred.reject(err);
-      });
-
-      res.pipe(fileStream);
-    });
-  }).on('error', function(err) {
-    deferred.reject(err);
-  }).on('finish', function() {
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
-
-function installGulpfilePackages() {
-  var detective = require('detective');
-  var requires = detective(fs.readFileSync('gulpfile.js'));
-  var deferred = Q.defer();
-
-  log.info('Successfully downloaded gulpfile.\n'.green);
-  log.info('Now installing npm packages used by the gulpfile: ');
-  log.info('    ' + requires.join(' ') + '\n');
-
-  var npmInstall = require('child_process').spawn('npm', ['install', '--save-dev'].concat(requires));
-  npmInstall.stdout.on('data', function(data) { log.debug(data); });
-  npmInstall.stderr.on('data', function(data) { log.debug(data); });
-  npmInstall.on('error', function(err) {
-    log.error('Error in gulp npm install: ' + err.stack);
-  });
-  npmInstall.on('exit', function(code) {
-    code !== 0 ? deferred.reject() : deferred.resolve();
-  });
-
-  return deferred.promise;
-}
+};
 
+Cli.logEvents = function logEvents(gulpInst, finalTaskNames) {
+  var prettyTime = require('pretty-hrtime');
+  var gutil = require('gulp-util');
 
-function logEvents(gulpInst, finalTaskNames) {
   gulpInst.on('task_start', function(e) {
 
     // TODO: batch these
@@ -325,7 +295,7 @@ function logEvents(gulpInst, finalTaskNames) {
   });
 
   gulpInst.on('task_err', function(e) {
-    var msg = formatGulpError(e);
+    var msg = Cli.formatGulpError(e);
     var time = prettyTime(e.hrDuration);
     gutil.log(
       '\'' + e.task.cyan + '\'',
@@ -342,10 +312,10 @@ function logEvents(gulpInst, finalTaskNames) {
   //   gutil.log('Please check the documentation for proper gulpfile formatting');
   //   process.exit(1);
   // });
-}
+};
 
 // Format orchestrator errors
-function formatGulpError(e) {
+Cli.formatGulpError = function formatGulpError(e) {
   if (!e.err) {
     return e.message;
   }
@@ -362,63 +332,65 @@ function formatGulpError(e) {
 
   // Unknown (string, number, etc.)
   return new Error(String(e.err)).stack;
-}
+};
 
-Cli.getBooleanOptionsForTask = function getBooleanOptionsForTask(task) {
-  var availableTaskOptions = task.options;
-  var booleanOptions = [];
+Cli.isBuildCommand = function isBuildCommand(cmdName) {
+  return /serve|build|run|emulate|upload/.test(cmdName);
+};
 
-  if (availableTaskOptions) {
-    for (var key in availableTaskOptions) {
-      if (typeof availableTaskOptions[key] == 'string') {
-        continue;
-      }
-      var optionWithPipe = key;
-      var optionsSplit = optionWithPipe.split('|');
-      booleanOptions.push(optionsSplit[0].substring(2));
-      if (optionsSplit.length === 2) {
-        booleanOptions.push(optionsSplit[1].substring(1));
-      }
-    }
+/**
+ * Method accepts an object of 'task options' and returns all
+ * boolean options that are available
+ *
+ * @method getListOfBooleanOptions
+ * @param {Object} taskOptionsObj
+ * @return {Array} Returns array of all available boolean options
+ */
+Cli.getListOfBooleanOptions = function getListOfBooleanOptions(taskOptionsObj) {
+
+  if (typeof taskOptionsObj !== 'object' || Object.keys(taskOptionsObj) === 0) {
+    return [];
   }
 
-  return booleanOptions;
+  return Object.keys(taskOptionsObj)
+    .filter(function(key) {
+      return typeof taskOptionsObj[key] !== 'string';
+    })
+    .reduce(function(list, key) {
+      var keyItems = key
+        .split('|')
+        .map(function(item) {
+          return item.replace(/^-{1,2}/, '');
+        });
+      return list.concat(keyItems);
+    }, []);
 };
 
-Cli.lookupTask = function lookupTask(module) {
-  try {
-    var taskModule = require(module).IonicTask;
-    return taskModule;
-  } catch (ex) {
-    throw ex;
-  }
-};
 
-Cli.printVersionWarning = function printVersionWarning() {
-  if (settings.version.indexOf('beta') > -1 || settings.version.indexOf('alpha') > -1) {
+Cli.printVersionWarning = function printVersionWarning(version, npmVersion) {
+  if (version.indexOf('beta') > -1 || version.indexOf('alpha') > -1) {
     return;
   }
 
-  if (Cli.npmVersion && Cli.npmVersion !== settings.version.trim()) {
-    process.stdout.write('\n------------------------------------\n'.red);
-    process.stdout.write('Ionic CLI is out of date:\n'.bold.yellow);
-    process.stdout.write((' * Locally installed version: ' + settings.version + '\n').yellow);
-    process.stdout.write((' * Latest version: ' + Cli.npmVersion + '\n').yellow);
-    process.stdout.write((' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow);
-    process.stdout.write(' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow);
-    process.stdout.write('------------------------------------\n\n'.red);
-    Cli.npmVersion = null;
+  if (npmVersion && npmVersion !== version.trim()) {
+    log.warn('\n------------------------------------\n'.red);
+    log.warn('Ionic CLI is out of date:\n'.bold.yellow);
+    log.warn((' * Locally installed version: ' + version + '\n').yellow);
+    log.warn((' * Latest version: ' + npmVersion + '\n').yellow);
+    log.warn((' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow);
+    log.warn(' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow);
+    log.warn('------------------------------------\n\n'.red);
   }
 };
 
-Cli.checkLatestVersion = function checkLatestVersion() {
-  Cli.latestVersion = Q.defer();
+Cli.checkLatestVersion = function checkLatestVersion(settingsVersion) {
+  var resultsDeferred = Q.defer();
 
   try {
-    if (settings.version.indexOf('beta') > -1 || settings.version.indexOf('alpha') > -1) {
+    if (settingsVersion.indexOf('beta') > -1 || settingsVersion.indexOf('alpha') > -1) {
 
       // don't bother checking if its a beta
-      Cli.latestVersion.resolve();
+      resultsDeferred.resolve();
       return;
     }
 
@@ -426,12 +398,13 @@ Cli.checkLatestVersion = function checkLatestVersion() {
     if (versionCheck && ((versionCheck + 86400000) > Date.now())) {
 
       // we've recently checked for the latest version, so don't bother again
-      Cli.latestVersion.resolve();
+      resultsDeferred.resolve();
       return;
     }
 
     var proxy = process.env.PROXY || process.env.http_proxy || null;
     var request = require('request');
+
     request({ url: 'http://registry.npmjs.org/ionic/latest', proxy: proxy }, function(err, res, body) {
       if (err) {
         return console.log(err);
@@ -443,201 +416,46 @@ Cli.checkLatestVersion = function checkLatestVersion() {
       } catch (e) {
         console.log(e);
       }
-      Cli.latestVersion.resolve();
+      resultsDeferred.resolve();
     });
   } catch (e) {
-    Cli.latestVersion.resolve();
-  }
-
-  return Cli.latestVersion.promise;
-};
-
-Cli.tryBuildingTask = function tryBuildingTask(argv) {
-  if (argv._.length === 0) {
-    return false;
-  }
-  var taskName = argv._[0];
-
-  return Cli.getTaskWithName(taskName);
-};
-
-Cli.getTaskWithName = function getTaskWithName(name) {
-  for (var i = 0; i < TASKS.length; i += 1) {
-    var t = TASKS[i];
-    if (t.name === name) {
-      return t;
-    }
-    if (t.alt) {
-      for (var j = 0; j < t.alt.length; j += 1) {
-        var alt = t.alt[j];
-        if (alt === name) {
-          return t;
-        }
-      }
-    }
-  }
-};
-
-Cli.printIonic = function printIonic() {
-  function w(s) {
-    process.stdout.write(s);
+    resultsDeferred.resolve();
   }
 
-  w('  _             _     \n');
-  w(' (_)           (_)     \n');
-  w('  _  ___  _ __  _  ___ \n');
-  w(' | |/ _ \\| \'_ \\| |/ __|\n');
-  w(' | | (_) | | | | | (__ \n');
-  w(' |_|\\___/|_| |_|_|\\___|  CLI v' + settings.version + '\n');
+  return resultsDeferred.promise;
 };
 
-Cli.printAvailableTasks = function printAvailableTasks() {
-  Cli.printIonic();
-  process.stderr.write('\nUsage: ionic task args\n\n=======================\n\n');
-
-  if (process.argv.length > 2) {
-    process.stderr.write((process.argv[2] + ' is not a valid task\n\n').bold.red);
-  }
 
-  process.stderr.write('Available tasks: '.bold);
-  process.stderr.write('(use --help or -h for more info)\n\n');
+/**
+ * @method getTaskSettingsByName
+ * @param {String} taskName task name to look for
+ * @return {Object} Returns the task settings object that matches
+ */
+Cli.getTaskSettingsByName = function getTaskSettingsByName(taskName) {
+  var task;
 
-  for (var i = 0; i < TASKS.length; i += 1) {
-    var task = TASKS[i];
-    if (task.summary) {
-      var name = '   ' + task.name + '  ';
-      var dots = '';
-      while ((name + dots).length < 20) {
-        dots += '.';
-      }
-      process.stderr.write(name.green.bold + dots.grey + '  ' + task.summary.bold + '\n');
+  Object.keys(Cli.ALL_TASKS).every(function(listName) {
+    if (listName === taskName) {
+      task = require(Cli.ALL_TASKS[listName]);
+      return false;
     }
-  }
+    return true;
+  });
 
-  process.stderr.write('\n');
-  Cli.processExit(1);
+  return task;
 };
 
-Cli.printHelpLines = function printHelpLines() {
-  Cli.printIonic();
-  process.stderr.write('\n=======================\n');
 
-  for (var i = 0; i < TASKS.length; i += 1) {
-    var task = TASKS[i];
-    if (task.summary) {
-      Cli.printUsage(task);
-    }
-  }
-
-  process.stderr.write('\n');
-  Cli.processExit(1);
+/**
+ * @method getAllTaskSettings
+ * @return {Array} Returns an array of task settings objects
+ */
+Cli.getAllTaskSettings = function getAllTaskSettings() {
+  return orderedListOfTasks.map(function(listName) {
+    return require(Cli.ALL_TASKS[listName]);
+  });
 };
 
-Cli.printUsage = function printUsage(d) {
-  function w(s) {
-    process.stdout.write(s);
-  }
-
-  w('\n');
-
-  var rightColumn = 45;
-  var dots = '';
-  var indent = '';
-  var x;
-  var arg;
-
-  var taskArgs = d.title;
-
-  for (arg in d.args) {
-    if ({}.hasOwnProperty.call(d.args, arg)) {
-      taskArgs += ' ' + arg;
-    }
-  }
-
-  w(taskArgs.green.bold);
-
-  while ((taskArgs + dots).length < rightColumn + 1) {
-    dots += '.';
-  }
-
-  w(' ' + dots.grey + '  ');
-
-  if (d.summary) {
-    w(d.summary.bold);
-  }
-
-  for (arg in d.args) {
-    if (!d.args[arg]) continue;
-
-    indent = '';
-    w('\n');
-    while (indent.length < rightColumn) {
-      indent += ' ';
-    }
-    w((indent + '    ' + arg + ' ').bold);
-
-    var argDescs = d.args[arg].split('\n');
-    var argIndent = indent + '    ';
-
-    for (x = 0; x < arg.length + 1; x += 1) {
-      argIndent += ' ';
-    }
-
-    for (x = 0; x < argDescs.length; x += 1) {
-      if (x === 0) {
-        w(argDescs[x].bold);
-      } else {
-        w('\n' + argIndent + argDescs[x].bold);
-      }
-    }
-  }
-
-  indent = '';
-  while (indent.length < d.name.length + 1) {
-    indent += ' ';
-  }
-
-  var optIndent = indent;
-  while (optIndent.length < rightColumn + 4) {
-    optIndent += ' ';
-  }
-
-  for (var opt in d.options) {
-    if ({}.hasOwnProperty.call(d.options, opt)) {
-      w('\n');
-      dots = '';
-
-      var optLine = indent + '[' + opt + ']  ';
-
-      w(optLine.yellow.bold);
-
-      if (d.options[opt]) {
-        while ((dots.length + optLine.length - 2) < rightColumn) {
-          dots += '.';
-        }
-        w(dots.grey + '  ');
-
-        var taskOpt = d.options[opt];
-        var optDescs;
-
-        if (typeof taskOpt == 'string') {
-          optDescs = taskOpt.split('\n');
-        } else {
-          optDescs = taskOpt.title.split('\n');
-        }
-        for (x = 0; x < optDescs.length; x += 1) {
-          if (x === 0) {
-            w(optDescs[x].bold);
-          } else {
-            w('\n' + optIndent + optDescs[x].bold);
-          }
-        }
-      }
-    }
-
-    w('\n');
-  }
-};
 
 Cli.processExit = function processExit(code) {
   if (Cli.cliNews && Cli.cliNews.promise) {
@@ -652,10 +470,12 @@ Cli.processExit = function processExit(code) {
   }
 };
 
+
 Cli.version = function version() {
   log.info(settings.version + '\n');
 };
 
+
 Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   if (typeof skipNewsCheck == 'undefined') {
     skipNewsCheck = true;
@@ -675,6 +495,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
       try {
         var newsId = IonicConfig.get('newsId');
         var messagesJson = JSON.parse(html);
+
         if (skipNewsCheck || typeof newsId == 'undefined' || newsId !== messagesJson.id) {
           IonicConfig.set('newsId', messagesJson.id);
           IonicConfig.save();
@@ -683,28 +504,28 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
           return q.promise;
         }
 
-        process.stdout.write('+---------------------------------------------------------+\n');
+        log.info('+---------------------------------------------------------+\n');
 
         var monthMessage = ['+ Extra! Extra! Ionic Updates for ',
           monthNames[d.getMonth()],
           ' ',
           d.getFullYear(),
           '\n+\n'].join('');
-        process.stdout.write(monthMessage);
+        log.info(monthMessage);
 
         for (var i = 0, j = messagesJson.list.length; i < j; i += 1) {
           var entry = messagesJson.list[i];
           var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.blue.bold, '\n+\n'].join('');
-          process.stdout.write(entryMessage);
+          log.info(entryMessage);
         }
-        process.stdout.write('+---------------------------------------------------------+\n'.green);
+        log.info('+---------------------------------------------------------+\n'.green);
       } catch (ex) {
         q.reject('Error occurred in downloading the CLI messages:', ex);
         Utils.fail(ex);
       }
       q.resolve(messagesJson);
     } else {
-      process.stdout.write('Unable to fetch', err, res.statusCode);
+      log.error('Unable to fetch', err, res.statusCode);
       q.reject(res);
     }
   });
@@ -719,7 +540,7 @@ Cli.gatherInfo = function gatherInfo() {
 };
 
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
-  console.log('An uncaught exception occurred and has been reported to Ionic'.error.bold);
+  log.error('An uncaught exception occurred and has been reported to Ionic'.red.bold);
   var errorMessage = typeof err === 'string' ? err : err.message;
   Utils.errorHandler(errorMessage);
   process.exit(1);
@@ -757,8 +578,6 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 // Backwards compatability for those commands that havent been
 // converted yet.
 Cli.fail = function fail(err, taskHelp) {
-
-  // var error = typeof err == 'string' ? new Error(err) : err;
   Utils.fail(err, taskHelp);
 };
 
@@ -767,6 +586,7 @@ Cli.getContentSrc = function getContentSrc() {
 };
 
 Cli.doRuntimeCheck = function doRuntimeCheck(version) {
+  var semver = require('semver');
   var lastVersionChecked = IonicConfig.get('lastVersionChecked');
   var versionHasBeenChecked;
 
@@ -782,3 +602,5 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
     IonicConfig.save();
   }
 };
+
+module.exports = Cli;
diff --git a/lib/config/commands.js b/lib/config/commands.js
new file mode 100644
index 0000000000..203b4eff41
--- /dev/null
+++ b/lib/config/commands.js
@@ -0,0 +1,79 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var path = require('path');
+
+var COMMAND_DIRECTORY = 'ionic';
+
+/**
+ * List of shorthands that are available for each command
+ */
+var shorthands = {
+  g: 'generate',
+  ls: 'list',
+  rm: 'remove',
+  up: 'upload'
+};
+
+/**
+ * List of affordances that are available for each command
+ * Sometimes we will add misspellings here or if we change a command name
+ */
+var affordances = {
+  platforms: 'platform',
+  plugins: 'plugin',
+  address: 'serve'
+};
+
+/**
+ * List of commands that are available from ionic cli
+ * Each command as a 1-to-1 mapping to a module with the same name
+ */
+var orderedListOfCommands = [
+  'start',
+  'serve',
+  'platform',
+  'run',
+  'emulate',
+  'build',
+  'plugin',
+  'resources',
+  'upload',
+  'share',
+  'lib',
+  'setup',
+  'login',
+  'io',
+  'security',
+  'push',
+  'package',
+  'config',
+  'browser',
+  'service',
+  'add',
+  'remove',
+  'list',
+  'info',
+  'help',
+  'link',
+  'hooks',
+  'state',
+  'docs'
+];
+
+var cmdMap = orderedListOfCommands.reduce(function(completeObj, commandName) {
+  completeObj[commandName] = commandName;
+  return completeObj;
+}, {});
+
+var allCommands = extend(extend(extend({}, shorthands), affordances), cmdMap);
+allCommands = Object.keys(allCommands).reduce(function(allCmds, commandName) {
+  allCmds[commandName] = './' + path.join(COMMAND_DIRECTORY, allCommands[commandName]);
+  return allCmds;
+}, {});
+
+
+module.exports = {
+  orderedListOfCommands: orderedListOfCommands,
+  allCommands: allCommands
+};
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 6770fd9464..5073376ce2 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -1,22 +1,29 @@
-require('shelljs/global');
+'use strict';
 
-var path = require('path');
-var exec = require('child_process').exec;
+require('colors');
 
-var Task = require('./task').Task;
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var childProcess = require('child_process');
 var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
 var ioLib = IonicAppLib.ioConfig;
 var log = IonicAppLib.logging.logger;
-var bower = require('./bower');
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var bower = require('../utils/bower');
+
+var settings = {
+  title: 'add',
+  name: 'add',
+  summary: 'Add an Ion, bower component, or addon to the project',
+  args: {
+    '[name]': 'The name of the ion, bower component, or addon you wish to install'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.installBowerComponent = function installBowerComponent(componentName) {
+function installBowerComponent(componentName) {
   var bowerInstallCommand = 'bower install --save-dev ' + componentName;
 
-  var result = exec(bowerInstallCommand);
+  var result = childProcess.exec(bowerInstallCommand);
 
   if (result.code !== 0) {
 
@@ -24,82 +31,41 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(compo
     var errorMessage = 'Bower error, check that "'.red.bold + componentName.verbose + '"'.red.bold +
       ' exists,'.red.bold + '\nor try running "'.red.bold + bowerInstallCommand.verbose + '" for more info.'.red.bold;
 
-    this.ionic.fail(errorMessage, 'add');
+    appLibUtils.fail(errorMessage, 'add');
   } else {
     log.info('Bower component installed - ' + componentName);
   }
-};
-
-IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(componentName) {
-  var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
-
-  var result = exec(bowerUninstallCommand);
-
-  if (result.code !== 0) {
-    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose +
-      '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
-
-    this.ionic.fail(errorMessage, 'add');
-  } else {
-    var message = 'Bower component removed - ' + componentName;
-    log.info(message.red);
-  }
-};
-
-IonicTask.prototype.listComponents = function listComponents() {
-  try {
-    var bowerJson = require(path.join(process.cwd(), 'bower.json'));
-    log.info('Ions, bower components, or addons installed: ');
-    for (var bowerCompIndex in bowerJson.devDependencies) {
-      if ({}.hasOwnProperty.call(bowerJson.devDependencies, bowerCompIndex)) {
-        log.info(bowerCompIndex.green);
-      }
-    }
-  } catch (ex) {
-    log.error('This command can only be used when in an Ionic project directory'.red.bold);
-  }
-};
-
-// Need to look at bower.json of package just installed and look for any cordova plugins required
-// Check the directory in the projects `.bowerrc` file
-// Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
-// For each plugins - call 'ionic add plugin <current-required-plugin>'
-IonicTask.prototype.run = function(ionic, argv) {
-  this.ionic = ionic;
-
-  if (!bower.IonicBower.checkForBower()) {
-    this.ionic.fail(bower.IonicBower.installMessage, 'add');
+}
+
+/**
+ * Need to look at bower.json of package just installed and look for any cordova plugins required
+ * Check the directory in the projects `.bowerrc` file
+ * Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
+ * For each plugins - call 'ionic add plugin <current-required-plugin>'
+ */
+function run(ionic, argv) {
+
+  if (!bower.checkForBower()) {
+    appLibUtils.fail(bower.installMessage, 'add');
     return;
   }
 
-  var action = argv._[0];
   var componentName = argv._[1];
   var ioSet = false;
 
   try {
-    switch (action) {
-    case 'add':
-      ioSet = true;
-      this.installBowerComponent(componentName);
-      break;
-    case 'remove':
-    case 'rm':
-      this.uninstallBowerComponent(componentName);
-      break;
-    case 'list':
-    case 'ls':
-    case '':
-      this.listComponents();
-      break;
-    }
+    ioSet = true;
+    installBowerComponent(componentName);
   } catch (error) {
     var errorMessage = error.message ? error.message : error;
-    this.ionic.fail(errorMessage, 'service');
+    appLibUtils.fail(errorMessage, 'service');
   }
 
   // Inject the component into our index.html, if necessary, and save the app_id
   ioLib.injectIoComponent(ioSet, componentName);
   ioLib.warnMissingData();
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/address.js b/lib/ionic/address.js
new file mode 100644
index 0000000000..035049cc78
--- /dev/null
+++ b/lib/ionic/address.js
@@ -0,0 +1,24 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var Serve = IonicAppLib.serve;
+
+var settings =  {
+  title: 'address',
+  name: 'address',
+  isProjectTask: true
+};
+
+function run(ionic, argv) { // eslint-disable-line no-unused-vars
+
+  // reset any address configs
+  var ionicConfig = IonicAppLib.config.load();
+  ionicConfig.set('ionicServeAddress', null);
+  ionicConfig.set('platformServeAddress', null);
+  return Serve.getAddress({ isAddressCmd: true });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/bower.js b/lib/ionic/bower.js
deleted file mode 100644
index d031f983cb..0000000000
--- a/lib/ionic/bower.js
+++ /dev/null
@@ -1,63 +0,0 @@
-require('shelljs/global');
-require('colors');
-
-var fs = require('fs');
-var path = require('path');
-var exec = require('child_process').exec;
-
-exports.IonicBower = {
-
-  setIonicVersion: function(newVersion) {
-    var bowerData = this.getData();
-    if (!bowerData.devDependencies) bowerData.devDependencies = {};
-    bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
-    this.saveData(bowerData);
-  },
-
-  setAppName: function(newAppName) {
-    var bowerData = this.getData();
-    bowerData.name = newAppName;
-    this.saveData(bowerData);
-  },
-
-  getData: function() {
-    var bowerFilePath = path.resolve('bower.json');
-
-    try {
-      if (fs.existsSync(bowerFilePath)) {
-        return require(bowerFilePath);
-      }
-    } catch (e) {
-      throw e;
-    }
-
-    return {
-      name: 'HelloIonic',
-      private: 'true'
-    };
-  },
-
-  saveData: function(bowerData) {
-    try {
-      var bowerFilePath = path.resolve('bower.json');
-      fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
-    } catch (e) {
-      console.log(('Error saving ' + bowerFilePath + ': ' + e).red.bold);
-    }
-  },
-
-  checkForBower: function checkForBower() {
-    var installed = false;
-    try {
-      var result = exec('bower -v', { silent: true });
-      if (result.output.indexOf('command not found') === -1 && result.output.indexOf('not recognized') === -1) {
-        installed = true;
-      }
-    } catch (ex) {
-      throw ex;
-    }
-    return installed;
-  },
-
-  installMessage: 'You must have bower installed to continue. \nType `npm install -g bower`'
-};
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index f5a91df996..bb9249dbb5 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -1,16 +1,35 @@
 // Deprecated
-var Task = require('./task').Task;
+'use strict';
 
-function IonicTask() {}
-IonicTask.prototype = new Task();
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 
-IonicTask.prototype.run = function run() {
+var settings = {
+  title: 'browser',
+  name: 'browser',
+  summary: 'Add another browser for a platform ' + '(beta)'.yellow,
+  args: {
+    '<command>': '"add remove rm info versions upgrade list ls revert"',
+    '[browser]': 'The browser you wish to add or remove (Crosswalk)'
+  },
+  options: {
+    '--nosave|-n': {
+      title: 'Do not save the platforms and plugins to the package.json file',
+      boolean: true
+    }
+  },
+  module: './ionic/browser',
+  isProjectTask: true
+};
+
+function run() {
   console.log(
     'The browser task has been deprecated.\n' +
     'Please use the Cordova Crosswalk plugin instead:\n\n' +
     'ionic platform add android\n' +
     'ionic plugin add cordova-plugin-crosswalk-webview\n'
   );
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
new file mode 100644
index 0000000000..85eb723527
--- /dev/null
+++ b/lib/ionic/build.js
@@ -0,0 +1,67 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var os = require('os');
+var Q = require('q');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var cordovaUtils = require('../utils/cordova');
+
+var settings = {
+  title: 'build',
+  name: 'build',
+  summary: 'Build (prepare + compile) an Ionic project for a given platform.\n',
+  args: {
+    '[options]': '',
+    '<PLATFORM>': ''
+  },
+  options: {
+    '--nohooks|-n': {
+      title: 'Do not add default Ionic hooks for Cordova',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = settings.name;
+
+  // If platform was not passed then add it to the rawArgs
+  var runPlatform = argv._[1];
+  if (!runPlatform) {
+    runPlatform = 'ios';
+    rawArgs.push(runPlatform);
+  }
+
+  if (runPlatform === 'ios' && os.platform() !== 'darwin') {
+    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+  }
+
+  var promiseList = []
+    .concat(!cordovaUtils.isPlatformInstalled(runPlatform, appDirectory) ?
+      cordovaUtils.installPlatform(runPlatform) :
+      [])
+    .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
+      cordovaUtils.installPlugins() :
+      []);
+
+  return Q.all(promiseList).then(function() {
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(appDirectory, {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
+  })
+  .then(function() {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList);
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/compile.js b/lib/ionic/compile.js
new file mode 100644
index 0000000000..b368179e0d
--- /dev/null
+++ b/lib/ionic/compile.js
@@ -0,0 +1,31 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var cordovaUtils = require('../utils/cordova');
+
+var settings = {
+  title: 'compile',
+  name: 'compile',
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = argv._[0].toLowerCase();
+
+  // ensure the content node was set back to its original
+  return ConfigXml.setConfigXml(appDirectory, {
+    resetContent: true,
+    errorWhenNotFound: false
+  }).then(function() {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList);
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
new file mode 100644
index 0000000000..c06c35eeab
--- /dev/null
+++ b/lib/ionic/config.js
@@ -0,0 +1,57 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var ioLib = IonicAppLib.ioConfig;
+var IonicProject = IonicAppLib.project;
+var appLibUtils = IonicAppLib.utils;
+
+var settings = {
+  title: 'config',
+  name: 'config',
+  summary: 'Set configuration variables for your ionic app ' + '(alpha)'.red,
+  args: {
+    '<command>': 'set'.yellow + ', ' + 'unset'.yellow + ', ' + 'build'.yellow + ', or ' + 'info'.yellow,
+    '[key]': 'The key to set',
+    '[value]': 'The value to set'
+  },
+  isProjectTask: true
+};
+
+function run(ionic, argv) {
+
+  try {
+    IonicProject.load();
+  } catch (ex) {
+    return appLibUtils.fail(ex.message);
+  }
+
+  var set = false;
+  var key = '';
+  var val = '';
+
+  switch (argv['_'][1]) {
+  case 'build':
+    return ioLib.writeIoConfig(false, false, true);
+  case 'info':
+    return ioLib.listConfig();
+  case 'set':
+  case 'unset':
+    if (!argv['_'][2]) {
+      return appLibUtils.fail("Invalid syntax, use 'ionic config <command> key value'");
+    }
+    set = argv['_'][1] === 'set';
+    key = argv['_'][2];
+    if (argv['_'][3] && set) {
+      val = argv['_'][3];
+    }
+    ioLib.writeIoConfig(key, val, set);
+    break;
+  default:
+    return appLibUtils.fail("Invalid command, must use 'set', 'unset', 'build', or 'info'");
+  }
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/cordova.js b/lib/ionic/cordova.js
deleted file mode 100644
index effdd38b36..0000000000
--- a/lib/ionic/cordova.js
+++ /dev/null
@@ -1,450 +0,0 @@
-var Task = require('./task').Task;
-var fs = require('fs');
-var os = require('os');
-var Q = require('q');
-var path = require('path');
-var exec = require('child_process').exec;
-var shelljs = require('shelljs');
-var IonicAppLib = require('ionic-app-lib');
-var IonicResources = IonicAppLib.resources;
-var ConfigXml = IonicAppLib.configXml;
-var Cordova = IonicAppLib.cordova;
-var State = IonicAppLib.state;
-var Utils = IonicAppLib.utils;
-var log = IonicAppLib.logging.logger;
-var Serve = IonicAppLib.serve;
-var IonicProject = IonicAppLib.project;
-
-function IonicTask() {}
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic, argv) {
-  this.ionic = ionic;
-
-  var self = this;
-  var cmdName = process.argv[2].toLowerCase();
-  var appDirectory = process.cwd();
-  var q;
-
-  try {
-
-    // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
-    // if not, try to install it.
-    if (argv._.indexOf('run') !== -1 || argv._.indexOf('build') !== -1 || argv._.indexOf('emulate') !== -1) {
-
-      if (runPlatform === 'ios' && os.platform() !== 'darwin') {
-        return log.error('✗ You cannot run iOS unless you are on Mac OSX.');
-      }
-
-      var runPlatform = argv._[1] || 'ios';
-      var platformInstalled = self.checkIfPlatformInstalled(runPlatform);
-      var pluginsInstalled = self.checkForPlugins();
-
-      if (!platformInstalled) {
-        var notInstalledMsg = [
-          '• You\'re trying to build for ',
-          runPlatform,
-          ', but don\'t have the platform installed yet.'].join('').yellow;
-        var installingMsg = ['∆ Installing ', runPlatform, ' for you.'].join('');
-        var installedMessage = ['√ Installed platform ', runPlatform].join('');
-        var installCmd = 'cordova platform add ' + runPlatform;
-
-        log.info(notInstalledMsg);
-        log.info(installingMsg);
-        shelljs.exec(installCmd);
-        log.info(installedMessage);
-      }
-
-      if (!pluginsInstalled) {
-        q = Q(true);
-      } else {
-        q = Q(false);
-      }
-    } else {
-      q = Q(false);
-    }
-
-    this.isLiveReload = ((cmdName === 'run' || cmdName === 'emulate') &&
-                         (argv.livereload || argv['live-reload'] || argv.l));
-
-    this.addIcons = !(argv.noresources || argv.r);
-
-    var addDefaultResources = false;
-    var isPlatformCmd = argv._.indexOf('platform') !== -1 || argv._.indexOf('platforms') !== -1;
-    var isAddCmd = argv._.indexOf('add') !== -1;
-    var isPluginCmd = argv._.indexOf('plugin') !== -1 || argv._.indexOf('plugins') !== -1;
-    var isRmCmd = argv._.indexOf('rm') !== -1 || argv._.indexOf('remove') !== -1;
-
-    // if (isAddCmd || isRmCmd) {
-    //   ('this this this', isAddCmd, isRmCmd)
-    //   Hooks.setHooksPermission(process.cwd());
-    // }
-
-    if (isPlatformCmd && isAddCmd) {
-      addDefaultResources = true;
-    }
-
-    return q.then(function(installPlugins) {
-      if (!installPlugins) {
-        return;
-      }
-      var plugins = [
-        'cordova-plugin-device',
-        'cordova-plugin-console',
-        'cordova-plugin-whitelist',
-        'cordova-plugin-splashscreen',
-        'cordova-plugin-statusbar',
-        'ionic-plugin-keyboard'
-      ];
-
-      plugins.forEach(function(plugin) {
-        log.info(['Installing ', plugin].join(''));
-        shelljs.exec('cordova plugin add --save' + plugin);
-      });
-    })
-    .then(function() {
-      if (self.isLiveReload) {
-        return self.setupLiveReload(argv);
-      } else {
-
-        // ensure the content node was set back to its original
-        return ConfigXml.setConfigXml(process.cwd(), {
-          resetContent: true,
-          errorWhenNotFound: false
-        });
-      }
-    })
-    .then(function(serveOptions) {
-      if (self.isLiveReload) {
-        self.options = serveOptions;
-      }
-      if (addDefaultResources && self.addIcons) {
-        return IonicResources.copyIconFilesIntoResources(appDirectory)
-        .then(function() {
-          return IonicResources.addIonicIcons(appDirectory, argv._[2]);
-        });
-      } else {
-        return false;
-      }
-    })
-    .then(function() {
-      return self.runCordova(cmdName, argv);
-    })
-    .then(function(runCode) {
-
-      // We dont want to do anything if the cordova command failed
-      if (runCode !== 0 || argv.nosave) {
-        return;
-      }
-      var argumentName = argv._[2];
-      if (isPlatformCmd && isAddCmd) {
-        addDefaultResources = true;
-        log.info('Saving platform to package.json file');
-
-        return State.savePlatform(process.cwd(), argumentName);
-      } else if (isPlatformCmd && isRmCmd) {
-        log.info('Removing platform from package.json file');
-
-        return State.removePlatform(process.cwd(), argumentName);
-      } else if (isPluginCmd && isAddCmd) {
-        var variables;
-
-        log.info('Saving plugin to package.json file');
-        if (argv.variable && (typeof argv.variable === 'string')) {
-          variables = [argv.variable];
-        } else {
-          variables = argv.variable;
-        }
-        return State.savePlugin(process.cwd(), argumentName, variables);
-      } else if (isPluginCmd && isRmCmd) {
-        log.info('Removing plugin from package.json file');
-        return State.removePlugin(process.cwd(), argumentName);
-      }
-    })
-    .catch(function(ex) {
-      log.error('Error happened', ex);
-      log.error(ex.stack);
-      throw ex;
-    });
-  } catch (ex) {
-    Utils.fail('An error occurred running a Cordova command:' + ex);
-  }
-};
-
-IonicTask.prototype.runCordova = function(cmdName, argv) {
-  var deferred = Q.defer();
-  var self = this;
-  var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []);
-  var cmdArg;
-  var x;
-  var y;
-
-  // backwards compatibility prior to fully wrapping cordova cmds
-  if (cmdName === 'platform' && cmdArgs.length > 0) {
-
-    // `ionic platform <PLATFORM>` used to actually run `ionic platform add <PLATFORM>`
-    // if a cordova platform cmd isn't the cmd then automatically insert `add`
-    var hasCordovaCmd = false;
-    var validCommands = 'add remove rm list ls update up check'.split(' ');
-    for (x = 0; x < cmdArgs.length; x += 1) {
-      cmdArg = cmdArgs[x].toLowerCase();
-      for (y = 0; y < validCommands.length; y += 1) {
-        if (cmdArg === validCommands[y]) {
-          hasCordovaCmd = true;
-          break;
-        }
-      }
-    }
-
-    if (!hasCordovaCmd) {
-      cmdArgs.unshift('add');
-    }
-  }
-
-  cmdArgs.unshift(cmdName);
-
-  // clean out any cmds that may confuse cordova
-  var cleanArgs = [];
-  var port = argv.port || argv.p || '';
-  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.r || '';
-  var ignoreCmds = '--livereload -l --consolelogs -c --serverlogs -s --port -p --livereload-port' +
-    ' -i -r --address'.split(' ');
-  var isValdCmd;
-  var foundAddressCmd = false;
-
-  for (x = 0; x < cmdArgs.length; x += 1) {
-    cmdArg = cmdArgs[x];
-    if (port && cmdArg === port) continue;
-    if (liveReloadPort && cmdArg === liveReloadPort) continue;
-    isValdCmd = true;
-    for (y = 0; y < ignoreCmds.length; y += 1) {
-      if (cmdArg === ignoreCmds[y]) {
-        isValdCmd = false;
-
-        // if address is passed, the arg after it will need to be taken out as well.
-        // also note, if they use --address="localhost", this will not happen
-        if (cmdArg === '--address') {
-          foundAddressCmd = true;
-        }
-        break;
-      }
-    }
-    if (isValdCmd && !foundAddressCmd) {
-
-      // make sure --target= has double quotes around it (process.argv removes them)
-      if (cmdArg.indexOf('--target=') === 0 && cmdArg.indexOf('"') === -1) {
-        cmdArg = cmdArg.replace('--target=', '--target="') + '"';
-      }
-
-      cleanArgs.push(cmdArg);
-    } else {
-      foundAddressCmd = true;
-    }
-  }
-  var cordovaIsInstalled = Utils.cordovaInstalled();
-
-  log.debug('Cordova is installed:', cordovaIsInstalled);
-  if (!cordovaIsInstalled) {
-    log.debug('Executing cordova without CLI: ' + cleanArgs);
-
-    // If no cordova CLI is installed, fall back to local cordova-lib.
-    // TODO: Add ability to be smart = only use this if cordova CLI is not installed.
-    // TODO: Enable passing variables with the plugins
-    // TODO: Enable checking for multiple platforms/plugins/ls
-    // ex: (multiple plugin ids) ionic plugin add cordova-plugin-camera cordova-plugin-geolocation
-    //    (multiple platforms) ionic platform add ios android
-    //    (listing) ionic plugin ls
-    //    (version) ionic platform add ios@8.1.1
-    //    (variables) ionic plugin add cordova-plugin-facebook --variable APP_ID=1 --variable APP_NAME="Goofballs"
-    try {
-      var promise;
-      if (cleanArgs[0] === 'run') {
-        promise = Cordova.runPlatform(process.cwd(), cleanArgs[1]);
-      } else if (cleanArgs[0] === 'platform') {
-        if (cleanArgs[1] === 'add') {
-          promise = Cordova.addPlatform(process.cwd(), cleanArgs[2], true);
-        } else if (cleanArgs[1] === 'remove') {
-          promise = Cordova.removePlatform(process.cwd(), cleanArgs[2], true);
-        }
-      } else if (cleanArgs[0] === 'plugin') {
-        if (cleanArgs[1] === 'add') {
-          promise = Cordova.addPlugin(process.cwd(), cleanArgs[2], null, true);
-        } else if (cleanArgs[1] === 'remove') {
-          promise = Cordova.removePlugin(process.cwd(), cleanArgs[2]);
-        }
-      }
-
-      return promise.then(function(result) {
-        log.info('cleanArgs[0]', cleanArgs[0], 'completed');
-        log.debug('Result from cordova-lib:', result);
-        deferred.resolve(result);
-      })
-      .catch(function(ex) {
-        deferred.reject(ex);
-      });
-    } catch (ex) {
-      log.error('An Error occurred trying to fall back to Cordova-lib execution:', ex);
-      throw ex;
-    }
-  }
-
-  log.debug('Executing cordova cli: ' + cleanArgs.join(' '));
-  var cordovaProcess = exec('cordova ' + cleanArgs.join(' '));
-
-  cordovaProcess.stdout.on('data', function(data) {
-    process.stdout.write(data);
-  });
-
-  cordovaProcess.stderr.on('data', function(data) {
-    if (data) {
-      process.stderr.write(data.toString().bold);
-    }
-  });
-
-  cordovaProcess.on('close', function(code) {
-    deferred.resolve(code);
-  });
-
-  if (self.isLiveReload) {
-    cordovaProcess.on('exit', function() {
-
-      // Serve.showFinishedServeMessage(self.options);
-      Serve.printCommandTips(self.options);
-      setTimeout(function() {
-
-        // set it back to the original src after a few seconds
-        ConfigXml.setConfigXml(process.cwd(), {
-          resetContent: true,
-          errorWhenNotFound: true
-        });
-
-        // deferred.resolve();
-      }, 5000);
-    });
-
-    process.on('exit', function() {
-
-      // verify it was set back
-      ConfigXml.setConfigXml(process.cwd(), {
-        resetContent: true,
-        errorWhenNotFound: false
-      });
-    });
-
-    var readLine = require('readline');
-    if (process.platform === 'win32') {
-      var rl = readLine.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-
-      rl.on('SIGINT', function() {
-        process.emit('SIGINT');
-      });
-    }
-
-    process.on('SIGINT', function() {
-      process.exit();
-    });
-  }
-
-  return deferred.promise;
-};
-
-
-IonicTask.prototype.setupLiveReload = function(argv) {
-  var d = Q.defer();
-
-  log.info('Setup Live Reload'.green.bold);
-
-  var project = null;
-
-  try {
-    var cwd = process.cwd();
-    project = IonicProject.load(cwd);
-  } catch (ex) {
-    log.info('Error occured', ex);
-    return Utils.fail(ex.message);
-  }
-
-  var options = Serve.loadSettings(argv, project);
-
-  // options.address = '0.0.0.0';
-  options.appDirectory = process.cwd(); // called from cli - ionic serve - cwd is this
-  options.runLivereload = true;
-  options.launchBrowser = false;
-  options.launchLab = false;
-  options.isPlatformServe = true;
-
-  // First ask user for the IP selection
-  // Check ports not used
-  // Set up config.xml src url
-  // run the cordova command
-
-  var promise;
-
-  if (argv.all) {
-    promise = Q();
-    log.info('Defaulting address to 0.0.0.0');
-    options.address = '0.0.0.0';
-  } else if (argv.address) {
-    options.address = argv.address;
-    promise = Q();
-  } else {
-    promise = Serve.getAddress(options);
-  }
-
-  return promise
-  .then(function() {
-    options.devServer = Serve.host(options.address, options.port);
-    return Serve.checkPorts(true, options.port, options.address, options);
-  })
-  .then(function() {
-    if (options.runLivereload) {
-      return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
-    }
-  })
-  .then(function() {
-    ConfigXml.setConfigXml(process.cwd(), {
-      devServer: Serve.host(options.address, options.port)
-    }).then(function() {
-      d.resolve();
-    });
-    return Serve.start(options);
-  })
-  .then(function() {
-    Serve.showFinishedServeMessage(options);
-    return options;
-  })
-  .catch(function(error) {
-    log.info('There was an error serving your Ionic application for run', error);
-    log.info(error.stack);
-    throw error;
-  });
-};
-
-IonicTask.prototype.checkIfPlatformInstalled = function checkIfPlatformInstalled(platform) {
-  platform = platform || 'ios';
-
-  var platformPath = path.join(process.cwd(), 'platforms', platform);
-
-  try {
-    fs.statSync(platformPath);
-    return true;
-  } catch (ex) {
-    return false;
-  }
-};
-
-IonicTask.prototype.checkForPlugins = function checkForPlugins() {
-  var pluginPath = path.join(process.cwd(), 'plugins');
-
-  try {
-    fs.statSync(pluginPath);
-    return true;
-  } catch (ex) {
-    return false;
-  }
-};
-
-exports.IonicTask = IonicTask;
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 566a7f6694..d2cb860ea3 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -1,23 +1,27 @@
-var argv = require('optimist').argv;
+'use strict';
+
 var prompt = require('prompt');
-var Task = require('./task').Task;
 var _ = require('underscore');
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicDocs = require('./resources/docs.json');
 var log = require('ionic-app-lib').logging.logger;
 var COLUMN_LIMIT = 3;
 
-
-var Docs = module.exports;
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var settings = {
+  title: 'docs',
+  name: 'docs',
+  summary: 'Opens up the documentation for Ionic',
+  args: {
+    '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
+  },
+  isProjectTask: false
+};
 
 function sanitizeUrl(url) {
   return url.replace(/\$/g, '%24');
 }
 
-Docs.list = function list() {
+function list() {
   try {
     var Table = require('cli-table');
     var docsList = IonicDocs.api;
@@ -46,9 +50,9 @@ Docs.list = function list() {
     log.error('Error listing docs:', ex);
   }
   log.info('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold);
-};
+}
 
-Docs.openDefault = function openDefault() {
+function openDefault() {
   var Info = require('ionic-app-lib').info;
 
   var envInfo = Info.gatherInfo();
@@ -60,9 +64,9 @@ Docs.openDefault = function openDefault() {
     log.info('Ionic version:', ionicVersion);
   }
   return require('open')(sanitizeUrl(url));
-};
+}
 
-Docs.lookUpCommand = function lookUpCommand(helpDoc) {
+function lookUpCommand(helpDoc) {
 
   // log.info('Going thru doc commands', helpDoc)
   // Go through all the different help topics
@@ -148,28 +152,27 @@ Docs.lookUpCommand = function lookUpCommand(helpDoc) {
     log.info('Opening Ionic document:'.green.bold, url.green.bold);
     return require('open')(url);
   }
-};
-
-IonicTask.prototype.run = function run(ionic) {
-  this.ionic = ionic;
+}
 
+function run(ionic, argv) {
   var docCmd = argv._[1];
 
-  // log.info('docCmd', docCmd);
-
   if (docCmd === 'ls') {
-    Docs.list();
+    list();
   } else if (!docCmd) {
 
-    // log.info('openDefault')
-    Docs.openDefault();
+    openDefault();
   } else {
 
     // log.info('look up command', docCmd)
     // Look up what it was
-    Docs.lookUpCommand(docCmd);
+    lookUpCommand(docCmd);
   }
+}
 
-};
-
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  list: list,
+  openDefault: openDefault,
+  lookUpCommand: lookUpCommand,
+  run: run
+});
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
new file mode 100644
index 0000000000..c54e0f6981
--- /dev/null
+++ b/lib/ionic/emulate.js
@@ -0,0 +1,87 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var os = require('os');
+var Q = require('q');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var cordovaUtils = require('../utils/cordova');
+
+var cordovaRunEmulateOptions = {
+  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--address': 'Use specific address (livereload req.)',
+  '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
+  '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+  '--consolelogs|-c': {
+    title: 'Print app console logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--serverlogs|-s': {
+    title: 'Print dev server logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--debug|--release': {
+    title: '',
+    boolean: true
+  },
+  '--device|--emulator|--target=FOO': ''
+};
+
+var settings = {
+  title: 'emulate',
+  name: 'emulate',
+  summary: 'Emulate an Ionic project on a simulator or emulator',
+  args: {
+    '[options]': '',
+    '<PLATFORM>': ''
+  },
+  options: cordovaRunEmulateOptions,
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = argv._[0].toLowerCase();
+
+  var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
+
+  // If platform was not passed then add it to the rawArgs
+  var runPlatform = argv._[1];
+  if (!runPlatform) {
+    runPlatform = 'ios';
+    rawArgs.push(runPlatform);
+  }
+
+  if (runPlatform === 'ios' && os.platform() !== 'darwin') {
+    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+  }
+
+  var promiseList = []
+    .concat(!cordovaUtils.isPlatformInstalled(runPlatform, appDirectory) ?
+      cordovaUtils.installPlatform(runPlatform) :
+      [])
+    .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
+      cordovaUtils.installPlugins() :
+      []);
+
+  return Q.all(promiseList).then(function() {
+    if (isLiveReload) {
+      return cordovaUtils.setupLiveReload(argv);
+    }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(process.cwd(), {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
+  })
+  .then(function(serveOptions) {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index d54a7b8e45..f98d760daa 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -1,31 +1,47 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var path = require('path');
-var Task = require('./task').Task;
 var ionicAppLib = require('ionic-app-lib');
-var Utils = ionicAppLib.utils;
 var log = ionicAppLib.logging.logger;
 var Project =  ionicAppLib.project;
+var fail = ionicAppLib.utils.fail;
+
+var settings = {
+  title: 'generate',
+  alt: ['g'],
+  name: 'generate',
+  summary: 'Generate pages and components',
+  options: {
+    '--list': {
+      title: 'List available generators',
+      boolean: true
+    },
+    '--typescript|--ts': {
+      boolean: true,
+      title: '(with --v2 only) Use TypeScript in generation'
+    }
+  },
+  isProjectTask: true
+};
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic, argv) {
+function run(ionic, argv) {
   try {
     if (!argv.list && argv._.length < 3) {
 
       // TODO should have a mechanism for printing usage on invalid tasks
-      Utils.fail('Invalid arguments. Usage: ionic generate <generator> <name>');
+      fail('Invalid arguments. Usage: ionic generate <generator> <name>');
     }
 
     if (!argv.v2) {
-      return Utils.fail('Generators are only available for Ionic 2 projects');
+      return fail('Generators are only available for Ionic 2 projects');
     }
 
     var project;
     try {
       project = Project.load(process.cwd());
     } catch (err) {
-      return Utils.fail(err);
+      return fail(err);
     }
 
     var generator = argv._[1];
@@ -48,14 +64,14 @@ IonicTask.prototype.run = function(ionic, argv) {
         ionicModule.Generate.printAvailableGenerators();
         return;
       }
-      return Utils.fail(err);
+      return fail(err);
     }
     return promise;
 
   } catch (err) {
-    Utils.fail('There was an error generating your item:', err);
+    fail('There was an error generating your item:', err);
   }
-};
+}
 
 function loadToolingModule() {
 
@@ -70,7 +86,7 @@ function loadToolingModule() {
 
     // if this isn't found, that's fine, check for ionic-framework
     if (err.code !== 'MODULE_NOT_FOUND') {
-      Utils.fail('Error when requiring ' + toolingPath + ':\n  ' + err);
+      fail('Error when requiring ' + toolingPath + ':\n  ' + err);
     }
   }
 
@@ -80,7 +96,7 @@ function loadToolingModule() {
       ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework', 'tooling'));
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {
-        Utils.fail('No ionic-angular package found, do you have Ionic installed?');
+        fail('No ionic-angular package found, do you have Ionic installed?');
       }
     }
   }
@@ -90,10 +106,12 @@ function loadToolingModule() {
     try {
       ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
     } catch (err) {
-      Utils.fail(err);
+      fail(err);
     }
   }
   return ionicModule;
 }
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index ddc18b699d..9aa180dccd 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,34 +1,36 @@
-var argv = require('optimist').argv;
-var Task = require('./task').Task;
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic) {
-
-  // var self = this;
-
-  // self.ionic = ionic;
-
-  var command = argv._[1] ? argv._[1] : '';
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var helpUtil = require('../utils/help');
+
+var settings = {
+  title: 'help',
+  name: 'help',
+  summary: 'Provides help for a certain command',
+  args: {
+    '[command]': 'The command you desire help with'
+  },
+  isProjectTask: false
+};
 
-  var task = ionic.getTaskWithName(command);
+function run(ionic, argv) {
+  var taskName = argv._[1] ? argv._[1] : '';
 
-  if (command === '') {
-    ionic.printHelpLines();
-    return;
-  } else if (!task) {
-    console.log('Command not found.'.red.bold);
-    return;
+  // If no task name is provided then print all help available
+  if (taskName === '') {
+    var taskList = ionic.getAllTaskSettings();
+    return helpUtil.printTaskListUsage(taskList, ionic.VERSION);
   }
 
-  ionic.printIonic();
-  process.stderr.write('\n=======================\n');
-
-  ionic.printUsage(task);
+  // If a task name is provided and is valid then print Usage
+  var task = ionic.getTaskSettingsByName(taskName);
+  if (task) {
+    return helpUtil.printTaskUsage(task, ionic.VERSION);
+  }
 
-  process.stderr.write('\n\n');
-};
+  return console.log('Command not found.'.red.bold);
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 01bea3c577..0b5b9f67d1 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -1,19 +1,24 @@
-var argv = require('optimist').argv;
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var shelljs = require('shelljs');
-var Task = require('./task').Task;
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
 var Hooks = IonicAppLib.hooks;
 
 shelljs.config.silent = true;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function run(ionic) {
-  this.ionic = ionic;
+var settings = {
+  title: 'hooks',
+  name: 'hooks',
+  summary: 'Manage your Ionic Cordova hooks',
+  args: {
+    '[add|remove|permissions|perm]': 'Add, remove, or modify permissions on the default Ionic Cordova hooks'
+  },
+  isProjectTask: true
+};
 
+function run(ionic, argv) {
   var cmd = argv._[1];
   try {
 
@@ -34,7 +39,8 @@ IonicTask.prototype.run = function run(ionic) {
   } catch (ex) {
     log.error('There was an error running the hooks command: ', ex.stack);
   }
+}
 
-};
-
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 6ebcde1a98..db3692644f 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -1,15 +1,19 @@
-var path = require('path');
-var Task = require('./task').Task;
-var ionicAppLib = require('ionic-app-lib');
-var Info = ionicAppLib.info;
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+'use strict';
 
-IonicTask.prototype.run = function(ionic) {
-  this.ionic = ionic;
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var path = require('path');
+var IonicAppLib = require('ionic-app-lib');
+var Info = IonicAppLib.info;
+var appLibUtils = IonicAppLib.utils;
+
+var settings = {
+  title: 'info',
+  name: 'info',
+  summary: 'List information about the users runtime environment',
+  isProjectTask: false
+};
 
+function run() {
   try {
 
     var info = Info.gatherInfo();
@@ -21,8 +25,10 @@ IonicTask.prototype.run = function(ionic) {
 
     Info.checkRuntime();
   } catch (ex) {
-    this.ionic.fail('There was an error retrieving your environment information:', ex);
+    appLibUtils.fail('There was an error retrieving your environment information:', ex);
   }
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/io-config.js b/lib/ionic/io-config.js
deleted file mode 100644
index 4de448bfc1..0000000000
--- a/lib/ionic/io-config.js
+++ /dev/null
@@ -1,57 +0,0 @@
-var IonicAppLib = require('ionic-app-lib');
-var ioLib = IonicAppLib.ioConfig;
-var argv = require('optimist').argv;
-var IonicProject = IonicAppLib.project;
-var Task = require('./task').Task;
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-  self.ionic = ionic;
-
-  self.project = null;
-
-  try {
-    self.project = IonicProject.load();
-  } catch (ex) {
-    self.ionic.fail(ex.message);
-    return;
-  }
-
-  var set = false;
-  var write = false;
-  var key = '';
-  var val = '';
-
-  if (argv['_'][1] === 'set' || argv['_'][1] === 'unset' || argv['_'][1] === 'build' || argv['_'][1] === 'info') {
-    if (argv['_'][1] === 'build') {
-      write = true;
-      ioLib.writeIoConfig(false, false, true);
-    } else if (argv['_'][1] === 'info') {
-      write = true;
-      ioLib.listConfig();
-    } else {
-      if (argv['_'][1] === 'set') {
-        set = true;
-      }
-      if (argv['_'][2]) {
-        key = argv['_'][2];
-        if (argv['_'][3] && set) {
-          val = argv['_'][3];
-        }
-      } else {
-        self.ionic.fail("Invalid syntax, use 'ionic config <command> key value'");
-      }
-    }
-  } else {
-    self.ionic.fail("Invalid command, must use 'set', 'unset', 'build', or 'info'");
-  }
-  if (!write) {
-    ioLib.writeIoConfig(key, val, set);
-  }
-};
-
-exports.IonicTask = IonicTask;
diff --git a/lib/ionic/io-init.js b/lib/ionic/io.js
similarity index 50%
rename from lib/ionic/io-init.js
rename to lib/ionic/io.js
index 7fe31ee03b..32510d3fc7 100644
--- a/lib/ionic/io-init.js
+++ b/lib/ionic/io.js
@@ -1,31 +1,34 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var ioLib = IonicAppLib.ioConfig;
-var argv = require('optimist').argv;
 var IonicProject = IonicAppLib.project;
 var log = IonicAppLib.logging.logger;
-var Task = require('./task').Task;
+var appLibUtils = IonicAppLib.utils;
 var Login = IonicAppLib.login;
 var LoginTask = require('./login');
-var Utils = require('./utils');
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-  self.ionic = ionic;
+var settings = {
+  title: 'io',
+  name: 'io',
+  summary: 'Integrate your app with the ionic.io platform services ' + '(alpha)'.red,
+  args: {
+    '<command>': 'init'.yellow
+  },
+  isProjectTask: true
+};
 
-  self.project = null;
+function run(ionic, argv) {
 
   try {
-    self.project = IonicProject.load();
+    IonicProject.load();
   } catch (ex) {
-    self.ionic.fail(ex.message);
+    appLibUtils.fail(ex.message);
     return;
   }
 
-  Login.retrieveLogin()
+  return Login.retrieveLogin()
   .then(function(jar) {
     if (!jar) {
       log.info('No previous login existed. Attempting to log in now.');
@@ -37,12 +40,14 @@ IonicTask.prototype.run = function(ionic) {
     if (argv['_'][1] === 'init') {
       ioLib.initIoPlatform(process.cwd(), jar);
     } else {
-      self.ionic.fail('Invalid command');
+      appLibUtils.fail('Invalid command');
     }
   })
   .catch(function(ex) {
-    Utils.fail(ex);
+    return appLibUtils.fail(ex);
   });
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/ions.js b/lib/ionic/ions.js
deleted file mode 100644
index d04c4eb4d1..0000000000
--- a/lib/ionic/ions.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var log = require('ionic-app-lib').logging.logger;
-var Task = require('./task').Task;
-var _ = require('underscore');
-
-var ions = [
-  {
-    ion: 'ionic-ion-header-shrink',
-    name: 'Header Shrink',
-    description: 'A shrinking header effect like Facebook\'s'
-  },
-  {
-    ion: 'ionic-ion-drawer',
-    name: 'Android Drawer',
-    description: 'Android-style drawer menu'
-  },
-  {
-    ion: 'ionic-ion-ios-buttons',
-    name: 'iOS Rounded Buttons',
-    description: 'iOS "Squircle" style icons'
-  },
-  {
-    ion: 'ionic-ion-swipe-cards',
-    name: 'Swipeable Cards',
-    description: 'Swiping interaction as seen in Jelly'
-  },
-  {
-    ion: 'ionic-ion-tinder-cards',
-    name: 'Tinder Cards',
-    description: 'Tinder style card swiping interaction'
-  }
-];
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function() {
-  log.info('Ionic Ions - ions power your app to be awesome.');
-  log.info('A curated collection of useful addons, components, and ux interactions for extending ionic.');
-  log.info('\n');
-
-  _.each(ions, function(ion) {
-
-    var rightColumn = 20;
-    var dots = '';
-    var startStr = ion.name;
-
-
-    while ((startStr + dots).length < rightColumn + 1) {
-      dots += '.';
-    }
-
-    // Header Shrink ... A shrinking header effect like Facebook\'s ..
-    var installStr = ['\'ionic add ', ion.ion, '\''].join('');
-    log.info(ion.name, dots, installStr);
-    log.info(ion.description, '\n');
-  });
-};
-
-exports.IonicTask = IonicTask;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 68007446f6..8e9c015c7e 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -1,5 +1,8 @@
+'use strict';
+
 require('colors');
 
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var fs = require('fs');
 var path = require('path');
 var shell = require('shelljs');
@@ -7,76 +10,91 @@ var request = require('request');
 var unzip = require('unzip');
 var argv = require('optimist').argv;
 var prompt = require('prompt');
+var IonicAppLib = require('ionic-app-lib');
+var utils = IonicAppLib.utils;
 var exec = require('child_process').exec;
 var Q = require('q');
 var log = require('ionic-app-lib').logging.logger;
-var Task = require('./task').Task;
-
-function IonicTask() {}
 
-IonicTask.prototype = new Task();
+var settings =  {
+  title: 'lib',
+  name: 'lib',
+  summary: 'Gets Ionic library version or updates the Ionic library',
+  args: {
+    '[options]': '',
+    '[update]': 'Updates the Ionic Framework in www/lib/ionic'
+  },
+  options: {
+    '--version|-v': 'Specific Ionic version\nOtherwise it defaults to the latest version'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function(ionic) {
-  var self = this;
-  self.local = {};
-  self.versionData = {};
-  self.usesBower = false;
+function run(ionic, argv) {
 
   if (!fs.existsSync(path.resolve('www'))) {
-    return ionic.fail('"www" directory cannot be found. Make sure the working directory ' +
+    return utils.fail('"www" directory cannot be found. Make sure the working directory ' +
                       'is at the top level of an Ionic project.', 'lib');
   }
 
-  this.loadVersionData();
+  // Gather version data from version.json or bower.json files
+  var data = loadVersionData();
 
-  if (argv._.length > 1 && (argv._[1].toLowerCase() === 'update' || argv._[1].toLowerCase() === 'up')) {
-    this.updateLibVersion();
-  } else {
-
-    // just version info
-    this.printLibVersions();
+  // If this is an update command then do an update and exit
+  if (argv._.length > 1 &&
+      (argv._[1].toLowerCase() === 'update' || argv._[1].toLowerCase() === 'up')) {
+    return updateLibVersion(data);
   }
 
-};
+  // Otherwise lets print the version info
+  return printLibVersions(data);
+}
 
 
-IonicTask.prototype.loadVersionData = function() {
-  this.versionFilePath = path.resolve('www/lib/ionic/version.json');
+function loadVersionData() {
 
-  if (!fs.existsSync(this.versionFilePath)) {
-    this.versionFilePath = path.resolve('www/lib/ionic/bower.json');
-    this.usesBower = fs.existsSync(this.versionFilePath);
+  var versionFilePath = path.resolve('www/lib/ionic/version.json');
+  var usesBower = false;
+  var local = {};
+
+  if (!fs.existsSync(versionFilePath)) {
+    versionFilePath = path.resolve('www/lib/ionic/bower.json');
+    usesBower = fs.existsSync(versionFilePath);
   }
 
   try {
-    this.local = require(this.versionFilePath);
+    local = JSON.parse(fs.readFileSync(versionFilePath));
   } catch (e) {
     log.error('Unable to load ionic lib version information');
   }
-};
 
+  return {
+    versionFilePath: versionFilePath,
+    usesBower: usesBower,
+    local: local
+  };
+}
 
-IonicTask.prototype.printLibVersions = function() {
-  var self = this;
 
-  log.info('Local Ionic version: '.bold.green + this.local.version + '  (' + this.versionFilePath + ')');
+function printLibVersions(data) {
 
-  this.getVersionData('latest').then(function() {
-    log.info('Latest Ionic version: '.bold.green + self.versionData.version_number +
-             '  (released ' + self.versionData.release_date + ')');
+  log.info('Local Ionic version: '.bold.green + data.local.version + '  (' + data.versionFilePath + ')');
 
-    if (self.local.version !== self.versionData.version_number) {
+  getVersionData('latest').then(function(versionData) {
+    log.info('Latest Ionic version: '.bold.green + versionData.version_number +
+             '  (released ' + versionData.release_date + ')');
+
+    if (data.local.version !== versionData.version_number) {
       log.info(' * Local version is out of date'.yellow);
     } else {
       log.info(' * Local version up to date'.green);
     }
   });
-};
+}
 
 
-IonicTask.prototype.getVersionData = function(version) {
+function getVersionData(data, version) {
   var q = Q.defer();
-  var self = this;
 
   var url = 'http://code.ionicframework.com';
   if (version === 'latest') {
@@ -103,12 +121,12 @@ IonicTask.prototype.getVersionData = function(version) {
         q.reject();
         return;
       }
-      self.versionData = JSON.parse(body);
-      self.versionData['version_number'] = self.versionData.version_number || self.versionData.version;
-      self.versionData['version_codename'] = self.versionData.version_codename || self.versionData.codename;
-      self.versionData['release_date'] = self.versionData.release_date || self.versionData.date;
+      var versionData = JSON.parse(body);
+      versionData['version_number'] = versionData.version_number || versionData.version;
+      versionData['version_codename'] = versionData.version_codename || versionData.codename;
+      versionData['release_date'] = versionData.release_date || versionData.date;
 
-      q.resolve();
+      q.resolve(versionData);
     } catch (e) {
       log.error('Error loading ' + version.bold + ' version information');
       q.reject();
@@ -116,13 +134,12 @@ IonicTask.prototype.getVersionData = function(version) {
   });
 
   return q.promise;
-};
+}
 
 
-IonicTask.prototype.updateLibVersion = function() {
-  var self = this;
+function updateLibVersion(data) {
 
-  if (self.usesBower) {
+  if (data.usesBower) {
     var bowerCmd = exec('bower update ionic');
 
     bowerCmd.stdout.on('data', function(data) {
@@ -162,15 +179,13 @@ IonicTask.prototype.updateLibVersion = function() {
 
     var areYouSure = promptResult.areYouSure.toLowerCase().trim();
     if (areYouSure === 'yes' || areYouSure === 'y') {
-      self.getLatest();
+      getLatest(data);
     }
   });
-};
-
+}
 
-IonicTask.prototype.getLatest = function() {
-  var self = this;
 
+function getLatest() {
   var dirPath = path.resolve('www/lib/');
   if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath);
@@ -186,30 +201,27 @@ IonicTask.prototype.getLatest = function() {
     version = 'latest';
   }
 
-  this.getVersionData(version).then(function() {
+  getVersionData(version).then(function(versionData) {
     if (version === 'latest') {
-      log.info('Latest version: '.bold.green + self.versionData.version_number +
-               '  (released ' + self.versionData.release_date + ')');
+      log.info('Latest version: '.bold.green + versionData.version_number +
+               '  (released ' + versionData.release_date + ')');
     } else {
-      log.info('Version: '.bold.green + self.versionData.version_number +
-               '  (released ' + self.versionData.release_date + ')');
+      log.info('Version: '.bold.green + versionData.version_number +
+               '  (released ' + versionData.release_date + ')');
     }
-    self.downloadZip(self.versionData.version_number);
+    downloadZip(versionData.version_number);
   });
+}
 
-};
-
-
-IonicTask.prototype.downloadZip = function(version) {
-  var self = this;
 
+function downloadZip(data, version) {
   var archivePath = 'https://github.com/driftyco/ionic-bower/archive/v' + version + '.zip';
 
-  self.tmpExtractPath = path.resolve('www/lib/.ionic');
-  self.tmpZipPath = path.join(self.tmpExtractPath, 'ionic.zip');
+  var tmpExtractPath = path.resolve('www/lib/.ionic');
+  var tmpZipPath = path.join(data.tmpExtractPath, 'ionic.zip');
 
-  if (!fs.existsSync(self.tmpExtractPath)) {
-    fs.mkdirSync(self.tmpExtractPath);
+  if (!fs.existsSync(data.tmpExtractPath)) {
+    fs.mkdirSync(data.tmpExtractPath);
   }
 
   log.info('Downloading: '.green.bold + archivePath);
@@ -229,8 +241,8 @@ IonicTask.prototype.downloadZip = function(version) {
       return;
     }
     try {
-      fs.writeFileSync(self.tmpZipPath, body);
-      self.updateFiles();
+      fs.writeFileSync(tmpZipPath, body);
+      updateFiles(data, tmpZipPath, tmpExtractPath);
     } catch (e) {
       log.error(e);
     }
@@ -254,40 +266,38 @@ IonicTask.prototype.downloadZip = function(version) {
 
   }).on('error', function(err) {
     try {
-      fs.unlink(self.tmpZipPath);
+      fs.unlink(tmpZipPath);
     } catch (e) {
       log.error(e);
     }
     log.error(err);
   });
-
-};
+}
 
 
-IonicTask.prototype.updateFiles = function() {
-  var self = this;
+function updateFiles(data, tmpZipPath, tmpExtractPath) {
   var ionicLibDir = path.resolve('www/lib/ionic');
 
   try {
-    var readStream = fs.createReadStream(self.tmpZipPath);
+    var readStream = fs.createReadStream(tmpZipPath);
     readStream.on('error', function(err) {
       log.debug('updateFiles readStream error: ' + err);
     });
 
-    var writeStream = unzip.Extract({ path: self.tmpExtractPath }); // eslint-disable-line new-cap
+    var writeStream = unzip.Extract({ path: tmpExtractPath }); // eslint-disable-line new-cap
     writeStream.on('close', function() {
       try {
-        shell.rm('-rf', self.tmpZipPath);
+        shell.rm('-rf', tmpZipPath);
       } catch (e) {
         log.error(e);
       }
 
       try {
-        var dir = fs.readdirSync(self.tmpExtractPath);
+        var dir = fs.readdirSync(tmpExtractPath);
         var copyFrom;
         for (var x = 0; x < dir.length; x += 1) {
           if (dir[x].indexOf('ionic') === 0) {
-            copyFrom = path.join(self.tmpExtractPath, dir[x], '*');
+            copyFrom = path.join(tmpExtractPath, dir[x], '*');
           }
         }
         if (!copyFrom) {
@@ -298,7 +308,7 @@ IonicTask.prototype.updateFiles = function() {
         shell.cp('-Rf', copyFrom, ionicLibDir);
 
         try {
-          shell.rm('-rf', self.tmpExtractPath);
+          shell.rm('-rf', tmpExtractPath);
         } catch (e) {
           log.error(e);
         }
@@ -315,12 +325,12 @@ IonicTask.prototype.updateFiles = function() {
           log.error(e);
         }
 
-        log.info('Ionic version updated to: '.bold.green + self.versionData.version_number.bold);
+        log.info('Ionic version updated to: '.bold.green + data.versionData.version_number.bold);
 
-        self.writeVersionData();
+        writeVersionData(data);
 
-        var ionicBower = require('./bower').IonicBower;
-        ionicBower.setIonicVersion(self.versionData.version_number);
+        var ionicBower = require('../utils/bower').IonicBower;
+        ionicBower.setIonicVersion(data.versionData.version_number);
 
       } catch (e) {
         log.error('updateFiles Error: ' + e);
@@ -334,15 +344,14 @@ IonicTask.prototype.updateFiles = function() {
   } catch (e) {
     log.error('updateFiles Error: ' + e);
   }
+}
 
-};
-
-IonicTask.prototype.writeVersionData = function() {
+function writeVersionData(data) {
   try {
     var versionData = {
-      version: this.versionData.version_number || this.versionData.version,
-      codename: this.versionData.version_codename || this.versionData.codename,
-      date: this.versionData.release_date || this.versionData.date
+      version: data.versionData.version_number || data.versionData.version,
+      codename: data.versionData.version_codename || data.versionData.codename,
+      date: data.versionData.release_date || data.versionData.date
     };
 
     fs.writeFileSync(path.resolve('www/lib/ionic/version.json'),
@@ -351,6 +360,8 @@ IonicTask.prototype.writeVersionData = function() {
   } catch (e) {
     log.error('Error writing version data: ' + e);
   }
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 57796d86b1..31f92016b0 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,18 +1,30 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var fs = require('fs');
 var path = require('path');
-var argv = require('optimist').argv;
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
+var fail = IonicAppLib.utils.fail;
 var IonicProject = IonicAppLib.project;
-var Task = require('./task').Task;
-
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
 
-IonicTask.prototype.run = function run(ionic) {
-  this.ionic = ionic;
+var settings = {
+  title: 'link',
+  name: 'link',
+  summary: 'Sets your Ionic App ID for your project',
+  args: {
+    '[appId]': 'The app ID you wish to set for this project'
+  },
+  options: {
+    '--reset|-r': {
+      title: 'This will reset the Ionic App ID',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
 
+function run(ionic, argv) {
   var ionicProjectFile = path.resolve('.', 'ionic.project');
 
   if (!fs.existsSync(ionicProjectFile)) {
@@ -26,15 +38,15 @@ IonicTask.prototype.run = function run(ionic) {
   }
 
   if (argv.reset || argv.r) {
-    this.setAppId('');
+    setAppId(ionic, '');
   } else {
-    this.setAppId(argv._[1]);
+    setAppId(ionic, argv._[1]);
   }
 
   log.info('Your Ionic App ID was set'.green);
-};
+}
 
-IonicTask.prototype.setAppId = function setAppId(appId) {
+function setAppId(ionic, appId) {
   var project = null;
 
   try {
@@ -42,9 +54,12 @@ IonicTask.prototype.setAppId = function setAppId(appId) {
     project.set('app_id', appId);
     project.save();
   } catch (ex) {
-    this.ionic.fail(ex.message);
+    fail(ex.message);
     return;
   }
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run,
+  setAppId: setAppId
+});
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
new file mode 100644
index 0000000000..dd84ccc511
--- /dev/null
+++ b/lib/ionic/list.js
@@ -0,0 +1,50 @@
+'use strict';
+
+require('colors');
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var path = require('path');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
+var fs = require('fs');
+
+var settings = {
+  title: 'list',
+  name: 'list',
+  summary: 'List Ions, bower components, or addons in the project',
+  isProjectTask: true
+};
+
+function listComponents() {
+  try {
+    var bowerJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'bower.json')));
+    log.info('Ions, bower components, or addons installed:');
+
+    Object.keys(bowerJson.devDependencies).forEach(function(bowerComponentName) {
+      log.info(bowerComponentName.green);
+    });
+  } catch (ex) {
+    log.error('This command can only be used when in an Ionic project directory'.red.bold);
+  }
+}
+
+/**
+ * Need to look at bower.json of package just installed and look for any cordova plugins required
+ * Check the directory in the projects `.bowerrc` file
+ * Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
+ * For each plugins - call 'ionic add plugin <current-required-plugin>'
+ */
+function run() {
+
+  try {
+    listComponents();
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    appLibUtils.fail(errorMessage, 'list');
+  }
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 73a6f5f3b8..a4cf977eb0 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,12 +1,22 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var Login = IonicAppLib.login;
 var log = IonicAppLib.logging.logger;
 var prompt = require('prompt');
 var Q = require('q');
-var settings = IonicAppLib.settings;
-var Task = require('./task').Task;
+var appLibSettings = IonicAppLib.settings;
+
+var settings =  {
+  title: 'login',
+  name: 'login',
+  isProjectTask: false
+};
 
-var LoginTask = module.exports;
+function run(ionic, argv) {
+  return login(argv);
+}
 
 // Login is set up a little differently than other tasks
 // First of all - we need a way to prompt the user for email/pw
@@ -14,7 +24,7 @@ var LoginTask = module.exports;
 // Any other calls to login in the lib take email/pw to login
 // The login task itself just runs LoginTask.login()
 
-LoginTask.login = function login(argv) {
+function login(argv) {
   var email = argv.email || argv.e || process.env.IONIC_EMAIL;
   var password = argv.password || argv.p || process.env.IONIC_PASSWORD;
 
@@ -23,7 +33,7 @@ LoginTask.login = function login(argv) {
   if (email && password) {
     promise = Q({ email: email, password: password });
   } else {
-    promise = LoginTask.promptForLogin(argv);
+    promise = promptForLogin(argv);
   }
 
   return promise
@@ -41,13 +51,9 @@ LoginTask.login = function login(argv) {
     // log.info(ex);
     // log.info(ex.stack);
   });
-};
-
-function IonicTask() {}
+}
 
-IonicTask.prototype = new Task();
-
-LoginTask.promptForLogin = function promptForLogin(argv) {
+function promptForLogin(argv) {
   var q = Q.defer();
 
   var schema = [{
@@ -64,7 +70,7 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
 
   // prompt for log
   log.info('\nTo continue, please login to your Ionic account.'.bold.green);
-  log.info('Don\'t have one? Create one at: '.bold + (settings.IONIC_DASH + '/signup').bold + '\n');
+  log.info('Don\'t have one? Create one at: '.bold + (appLibSettings.IONIC_DASH + '/signup').bold + '\n');
 
   prompt.override = argv;
   prompt.message = '';
@@ -80,10 +86,10 @@ LoginTask.promptForLogin = function promptForLogin(argv) {
   });
 
   return q.promise;
-};
-
-IonicTask.prototype.run = function(ionic, argv) {
-  return LoginTask.login(argv);
-};
+}
 
-LoginTask.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run,
+  login: login,
+  promptForLogin: promptForLogin
+});
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 956b89eba0..3cb921a6ea 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,26 +1,46 @@
+'use strict';
+
 var path = require('path');
 var _ = require('underscore');
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var Q = require('q');
 var moment = require('moment');
 var expandTilde = require('expand-tilde');
 var ProgressBar = require('progress');
 var IonicAppLib = require('ionic-app-lib');
-var Utils = IonicAppLib.utils;
+var fail = IonicAppLib.utils.fail;
 var Login = IonicAppLib.login;
 var log = IonicAppLib.logging.logger;
 var Package = IonicAppLib.package;
 var LoginTask = require('./login');
-var Table = require('./table');
-var Task = require('./task').Task;
+var Table = require('../utils/table');
 
 var Project = IonicAppLib.project;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic, argv) {
+var settings = {
+  title: 'package',
+  name: 'package',
+  summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
+  args: {
+    '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow +
+      ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
+    '[options]': ''
+  },
+  options: {
+    '--release': '(' + 'build <platform>'.yellow +
+      ') Mark this build as a release',
+    '--profile|-p <tag>': '(' + 'build <platform>'.yellow +
+      ') Specify the Security Profile to use with this build',
+    '--noresources': '(' + 'build <platform>'.yellow +
+      ') Do not generate icon and splash screen resources during this build',
+    '--destination|-d <path>': '(' + 'download'.yellow +
+      ') Specify the destination directory to download your packaged app.'
+  },
+  module: './ionic/package',
+  isProjectTask: true
+};
 
+function run(ionic, argv) {
   var cmd;
 
   if (argv._.length < 2) {
@@ -42,7 +62,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       throw new Error('Missing Ionic App ID.');
     }
   } catch (ex) {
-    return Utils.fail(ex, 'package');
+    return fail(ex, 'package');
   }
 
   switch (cmd) {
@@ -56,13 +76,13 @@ IonicTask.prototype.run = function(ionic, argv) {
     return packageDownload(ionic, argv, dir, project, appId);
   }
 
-  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'package');
-};
+  return fail("Unknown subcommand '" + cmd + "'.", 'package');
+}
 
 function packageBuild(ionic, argv, dir, project, appId) {
 
   if (argv._.length < 3) {
-    return Utils.fail('Specify a valid platform (android or ios).', 'package');
+    return fail('Specify a valid platform (android or ios).', 'package');
   }
 
   var jar;
@@ -70,7 +90,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
   var buildMode = argv.release ? 'release' : 'debug';
 
   if (!_.contains(['android', 'ios'], platform)) {
-    return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'package');
+    return fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'package');
   }
 
   return Login.retrieveLogin()
@@ -98,14 +118,14 @@ function packageBuild(ionic, argv, dir, project, appId) {
           return Package.buildAndroidDebug(dir, jar, appId, options);
         } else if (buildMode === 'release') {
           if (typeof argv.profile === 'undefined') {
-            return Utils.fail('Must specify security profile for android release builds (--profile <tag>).', 'package');
+            return fail('Must specify security profile for android release builds (--profile <tag>).', 'package');
           }
 
           return Package.buildAndroidRelease(dir, jar, appId, argv.profile, options);
         }
       } else if (platform === 'ios') {
         if (typeof argv.profile === 'undefined') {
-          return Utils.fail('Must specify security profile for ios builds (--profile <tag>).', 'package');
+          return fail('Must specify security profile for ios builds (--profile <tag>).', 'package');
         }
 
         return Package.buildIOS(dir, jar, appId, argv.profile, buildMode, options);
@@ -114,7 +134,7 @@ function packageBuild(ionic, argv, dir, project, appId) {
       return Q.reject('Unrecognized platform/build mode.');
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'package');
+      fail(ex, 'package');
     });
 }
 
@@ -198,7 +218,7 @@ function packageList(ionic, argv, dir, project, appId) {
       }
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'package');
+      fail(ex, 'package');
     });
 
 }
@@ -256,7 +276,7 @@ function packageInfo(ionic, argv, dir, project, appId) {
 
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'package');
+      fail(ex, 'package');
     });
 }
 
@@ -316,9 +336,11 @@ function packageDownload(ionic, argv, dir, project, appId) {
       bar.tick(state.received);
     })
     .catch(function(ex) {
-      Utils.fail(ex);
+      fail(ex);
     });
 
 }
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
new file mode 100644
index 0000000000..5f4a4d17d2
--- /dev/null
+++ b/lib/ionic/platform.js
@@ -0,0 +1,79 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var IonicResources = IonicAppLib.resources;
+var ConfigXml = IonicAppLib.configXml;
+var State = IonicAppLib.state;
+var log = IonicAppLib.logging.logger;
+var cordovaUtils = require('../utils/cordova');
+
+var settings = {
+  title: 'platform',
+  name: 'platform',
+  summary: 'Add platform target for building an Ionic app',
+  args: {
+    '[options]': '',
+    '<PLATFORM>': ''
+  },
+  options: {
+    '--noresources|-r': {
+      title: 'Do not add default Ionic icons and splash screen resources',
+      boolean: true
+    },
+    '--nosave|-e': {
+      title: 'Do not save the platform to the package.json file',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var cmdName = process.argv[2].toLowerCase();
+  var rawArgs = rawCliArguments.slice(0);
+  var argumentName = argv._[2];
+
+  var isAddCmd = argv._.indexOf('add') !== -1;
+  var isRmCmd = argv._.indexOf('rm') !== -1 || argv._.indexOf('remove') !== -1;
+  var addResources = isAddCmd &&  !(argv.noresources || argv.r);
+
+  // ensure the content node was set back to its original
+  return ConfigXml.setConfigXml(appDirectory, {
+    resetContent: true,
+    errorWhenNotFound: false
+  })
+  .then(function() {
+    if (addResources) {
+      return IonicResources.copyIconFilesIntoResources(appDirectory)
+        .then(function() {
+          return IonicResources.addIonicIcons(appDirectory, argumentName);
+        });
+    }
+  })
+  .then(function() {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList);
+  })
+  .then(function(runCode) {
+
+    // We dont want to do anything if the cordova command failed
+    if (runCode !== 0 || argv.nosave) {
+      return;
+    }
+
+    if (isAddCmd) {
+      log.info('Saving platform to package.json file');
+      return State.savePlatform(appDirectory, argumentName);
+    }
+    if (isRmCmd) {
+      log.info('Removing platform from package.json file');
+      return State.removePlatform(appDirectory, argumentName);
+    }
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/plugin.js b/lib/ionic/plugin.js
new file mode 100644
index 0000000000..f5493e0735
--- /dev/null
+++ b/lib/ionic/plugin.js
@@ -0,0 +1,78 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var State = IonicAppLib.state;
+var log = IonicAppLib.logging.logger;
+var cordovaUtils = require('../utils/cordova');
+
+var settings = {
+  title: 'plugin add',
+  name: 'plugin',
+  summary: 'Add a Cordova plugin',
+  args: {
+    '[options]': '',
+    '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
+  },
+  options: {
+    '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
+                                'and subdirectories first for the plugin before\n' +
+                                'looking it up in the registry.',
+    '--nosave|-e': {
+      title: 'Do not save the plugin to the package.json file',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = settings.name;
+  var argumentName = argv._[2];
+
+  var isAddCmd = argv._.indexOf('add') !== -1;
+  var isRmCmd = argv._.indexOf('rm') !== -1 || argv._.indexOf('remove') !== -1;
+
+  // ensure the content node was set back to its original
+  return ConfigXml.setConfigXml(appDirectory, {
+    resetContent: true,
+    errorWhenNotFound: false
+  })
+  .then(function() {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList);
+  })
+  .then(function(runCode) {
+
+    // We dont want to do anything if the cordova command failed
+    if (runCode !== 0 || argv.nosave) {
+      return;
+    }
+
+    // Is the plugin being added
+    if (isAddCmd) {
+      var variables;
+
+      log.info('Saving plugin to package.json file');
+      if (argv.variable && (typeof argv.variable === 'string')) {
+        variables = [argv.variable];
+      } else {
+        variables = argv.variable;
+      }
+      return State.savePlugin(appDirectory, argumentName, variables);
+    }
+
+    // Is the plugin being removed
+    if (isRmCmd) {
+      log.info('Removing plugin from package.json file');
+      return State.removePlugin(appDirectory, argumentName);
+    }
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/prepare.js b/lib/ionic/prepare.js
new file mode 100644
index 0000000000..f780130e66
--- /dev/null
+++ b/lib/ionic/prepare.js
@@ -0,0 +1,32 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var cordovaUtils = require('../utils/cordova');
+
+var settings = {
+  title: 'prepare',
+  name: 'prepare',
+  isProjectTask: true
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = argv._[0].toLowerCase();
+
+  // ensure the content node was set back to its original
+  return ConfigXml.setConfigXml(appDirectory, {
+    resetContent: true,
+    errorWhenNotFound: false
+  })
+  .then(function() {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList);
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index a7f6b31e6f..5f93b4bcbe 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -1,3 +1,6 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var fs = require('fs');
 var path = require('path');
 var parseUrl = require('url').parse;
@@ -5,25 +8,35 @@ var request = require('request');
 var argv = require('optimist').argv;
 var prompt = require('prompt');
 var FormData = require('form-data');
-var Task = require('./task').Task;
 var IonicAppLib = require('ionic-app-lib');
 var IonicProject = IonicAppLib.project;
 var Login = IonicAppLib.login;
 var log = IonicAppLib.logging.logger;
+var fail = IonicAppLib.utils.fail;
 var LoginTask = require('./login');
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var settings =  {
+  title: 'push',
+  name: 'push',
+  summary: 'Upload APNS and GCM credentials to Ionic Push ' + '(alpha)'.red,
+  options: {
+    '--ios-dev-cert': 'Upload your development .p12 file to Ionic Push',
+    '--ios-prod-cert': 'Upload your production .p12 file to Ionic Push',
+    '--production-mode=y,n': 'Tell Ionic Push to use production (y) or sandbox (n) APNS servers',
+    '--google-api-key <your-gcm-api-key>': "Set your app's GCM API key on Ionic Push"
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function(ionic, argv) {
-  var self = this;
-  self.ionic = ionic;
-  self.inputValues = {};
-  self.inputFiles = {};
-  self.useCmdArgs = false;
+function run(ionic, argv) {
+  var task = {
+    ionic: ionic,
+    inputValues: {},
+    inputFiles: {},
+    useCmdArgs: false
+  };
 
-  this.getCmdLineOptions();
+  getCmdLineOptions();
 
   Login.retrieveLogin()
   .then(function(jar) {
@@ -34,38 +47,38 @@ IonicTask.prototype.run = function(ionic, argv) {
     return jar;
   })
   .then(function(jar) {
-    self.jar = jar;
+    task.jar = jar;
 
     if (argv._[1] && argv._[1].trim() === 'webhook_url') {
       if (argv._[2]) {
-        self.set_webhook_url(self, argv._[2].trim());
+        set_webhook_url(task, argv._[2].trim());
       } else {
         log.error('You need to specify a webhook url!'.bold.red);
       }
     } else if (argv['google-api-key']) {
-      self.set_google_api_key(self, argv['google-api-key'].trim());
+      set_google_api_key(task, argv['google-api-key'].trim());
     } else if (argv['send'] || argv.s) {
 
       // Dev wants to send a push notification
-      self.send_push(self);
+      send_push(task);
     } else if (argv['ios-dev-cert'] || argv['ios-prod-cert'] || argv.d || argv.p) {
 
       // Dev wants to upload an ios push cert
-      self.upload_cert(self);
+      upload_cert(task);
     } else if (argv['production-mode'] || argv.l) {
 
       // Dev wants to switch between test/live mode
       // this will look like --live-mode=[y/n]
       // where y will put into live and n will put into dev
-      self.set_production_mode(self);
+      set_production_mode(task);
     }
   })
   .catch(function(ex) {
     log.error('An error occurred', ex);
   });
-};
+}
 
-IonicTask.prototype.set_webhook_url = function(task, webhook_url) { // eslint-disable-line camelcase
+function set_webhook_url(task, webhook_url) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
@@ -77,7 +90,7 @@ IonicTask.prototype.set_webhook_url = function(task, webhook_url) { // eslint-di
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
+  form.append('csrfmiddlewaretoken', getCsrfToken(task.jar));
   form.append('webhook_url', webhook_url);
 
   form.submit({
@@ -94,22 +107,22 @@ IonicTask.prototype.set_webhook_url = function(task, webhook_url) { // eslint-di
   function(err, response) {
     response.on('data', function() {
       if (err) {
-        return task.ionic.fail('Error setting Webhook URL: ' + err);
+        return fail('Error setting Webhook URL: ' + err);
       }
 
       if (parseInt(response.statusCode, 10) === '200') {
         log.info('Webhook URL set to', webhook_url);
       } else {
-        return task.ionic.fail('App not found');
+        return fail('App not found');
       }
     });
   });
 
   return true;
-};
+}
 
 
-IonicTask.prototype.set_google_api_key = function(task, google_api_key) { // eslint-disable-line camelcase
+function set_google_api_key(task, google_api_key) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
@@ -121,7 +134,7 @@ IonicTask.prototype.set_google_api_key = function(task, google_api_key) { // esl
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
+  form.append('csrfmiddlewaretoken', getCsrfToken(task.jar));
   form.append('android_api_key', google_api_key);
 
   form.submit({
@@ -138,22 +151,22 @@ IonicTask.prototype.set_google_api_key = function(task, google_api_key) { // esl
   function(err, response) {
     response.on('data', function() {
       if (err) {
-        return task.ionic.fail('Error setting Google API Key: ' + err);
+        return fail('Error setting Google API Key: ' + err);
       }
 
       if (parseInt(response.statusCode, 10) === '200') {
         log.info('Google API Key Saved'.green);
       } else {
-        return task.ionic.fail('App not found');
+        return fail('App not found');
       }
     });
   });
 
   return true;
-};
+}
 
 
-IonicTask.prototype.send_push = function(task) { // eslint-disable-line camelcase
+function send_push() { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
@@ -203,7 +216,7 @@ IonicTask.prototype.send_push = function(task) { // eslint-disable-line camelcas
 
   prompt.get({ properties: promptProperties }, function(err, promptResult) {
     if (err) {
-      return task.ionic.fail('Error: ' + err);
+      return fail('Error: ' + err);
     }
 
     var apiKey = promptResult['push-api-key'];
@@ -239,9 +252,9 @@ IonicTask.prototype.send_push = function(task) { // eslint-disable-line camelcas
       }
     });
   });
-};
+}
 
-IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-line camelcase
+function set_production_mode(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
@@ -265,7 +278,7 @@ IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-lin
   var params = parseUrl(url);
 
   var form = new FormData();
-  form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
+  form.append('csrfmiddlewaretoken', getCsrfToken(task.jar));
   form.append('production_mode', task.inputValues['production-mode']);
 
   form.submit({
@@ -281,13 +294,13 @@ IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-lin
   },
   function(err, response) {
     if (err) {
-      return task.ionic.fail('Error uploading certificate: ' + err);
+      return fail('Error uploading certificate: ' + err);
     }
 
     response.setEncoding('utf8');
     response.on('data', function(data) {
       if (err) {
-        return task.ionic.fail('Error setting mode: ' + err);
+        return fail('Error setting mode: ' + err);
       }
 
       try {
@@ -296,7 +309,7 @@ IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-lin
           for (var j = 0; j < d.errors.length; j += 1) {
             log.error((d.errors[j]).bold.red);
           }
-          return task.ionic.fail('Unable to set mode');
+          return fail('Unable to set mode');
         }
 
         if (task.inputValues['production-mode'] === 'y') {
@@ -306,13 +319,13 @@ IonicTask.prototype.set_production_mode = function(task) { // eslint-disable-lin
         }
 
       } catch (parseEx) {
-        return task.ionic.fail('Error response: ' + parseEx);
+        return fail('Error response: ' + parseEx);
       }
     });
   });
-};
+}
 
-IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelcase
+function upload_cert(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
@@ -348,14 +361,14 @@ IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelc
 
   prompt.get({ properties: promptProperties }, function(err, promptResult) {
     if (err) {
-      return task.ionic.fail('Error: ' + err);
+      return fail('Error: ' + err);
     }
 
     var url = task.ionic.IONIC_DASH + task.ionic.IONIC_API + 'app/' + project.get('app_id') + '/push/upload-push-cert';
     var params = parseUrl(url);
 
     var form = new FormData();
-    form.append('csrfmiddlewaretoken', task.getCsrfToken(task.jar));
+    form.append('csrfmiddlewaretoken', getCsrfToken(task.jar));
 
     var inputFile;
 
@@ -363,7 +376,7 @@ IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelc
       inputFile = promptResult['ios-push-cert'].replace(/\\ /g, ' ').trim();
       form.append('ios_push_cert', fs.createReadStream(resolvePath(inputFile)));
     } catch (e) {
-      return task.ionic.fail('Error loading ' + resolvePath(inputFile));
+      return fail('Error loading ' + resolvePath(inputFile));
     }
 
     // Set the flag for if this is a production or dev cert
@@ -382,13 +395,13 @@ IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelc
     },
     function(err, response) {
       if (err) {
-        return task.ionic.fail('Error uploading certificate: ' + err);
+        return fail('Error uploading certificate: ' + err);
       }
 
       response.setEncoding('utf8');
       response.on('data', function(data) {
         if (err) {
-          return task.ionic.fail('Error uploading certificate: ' + err);
+          return fail('Error uploading certificate: ' + err);
         }
 
         try {
@@ -397,27 +410,26 @@ IonicTask.prototype.upload_cert = function(task) { // eslint-disable-line camelc
             for (var j = 0; j < d.errors.length; j += 1) {
               log.error((d.errors[j]).bold.red);
             }
-            return task.ionic.fail('Unable to upload certificate');
+            return fail('Unable to upload certificate');
           }
 
           log.info('Successfully uploaded certificate');
 
         } catch (parseEx) {
-          return task.ionic.fail('Error response: ' + parseEx);
+          return fail('Error response: ' + parseEx);
         }
       });
     });
   });
-};
+}
 
-IonicTask.prototype.getCmdLineOptions = function() {
-  var self = this;
+function getCmdLineOptions(task) {
 
   function getCmdArgValue(propertyName, shortName) {
     var value = argv[propertyName] || argv[shortName];
     if (value) {
-      self.inputValues[propertyName] = value;
-      self.useCmdArgs = true;
+      task.inputValues[propertyName] = value;
+      task.useCmdArgs = true;
     }
   }
 
@@ -425,10 +437,10 @@ IonicTask.prototype.getCmdLineOptions = function() {
     var value = argv[propertyName] || argv[shortName];
     if (value) {
       if (!fileExists(value)) {
-        return self.ionic.fail('Unable to find file: ' + argv[propertyName]);
+        return fail('Unable to find file: ' + argv[propertyName]);
       }
-      self.inputFiles[propertyName] = value;
-      self.useCmdArgs = true;
+      task.inputFiles[propertyName] = value;
+      task.useCmdArgs = true;
     }
   }
 
@@ -436,16 +448,16 @@ IonicTask.prototype.getCmdLineOptions = function() {
 
   getCmdArgFile('ios-push-dev-cert', 'd');
   getCmdArgFile('ios-push-prod-cert', 'p');
-};
+}
 
-IonicTask.prototype.getCsrfToken = function(jar) {
+function getCsrfToken(jar) {
   for (var i = 0; i < jar.length; i += 1) {
     if (jar[i].key === 'csrftoken') {
       return jar[i].value;
     }
   }
   return '';
-};
+}
 
 function fileExists(filePath) {
 
@@ -461,4 +473,13 @@ function resolvePath(p) {
   return path.resolve(p);
 }
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run,
+  set_webhook_url: set_webhook_url, // eslint-disable-line camelcase
+  set_google_api_key: set_google_api_key, // eslint-disable-line camelcase
+  send_push: send_push, // eslint-disable-line camelcase
+  set_production_mode: set_production_mode, // eslint-disable-line camelcase
+  upload_cert: upload_cert, // eslint-disable-line camelcase
+  getCmdLineOptions: getCmdLineOptions,
+  getCsrfToken: getCsrfToken
+});
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
new file mode 100644
index 0000000000..17f429b5b7
--- /dev/null
+++ b/lib/ionic/remove.js
@@ -0,0 +1,67 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var childProcess = require('child_process');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var ioLib = IonicAppLib.ioConfig;
+var log = IonicAppLib.logging.logger;
+var bower = require('../utils/bower');
+
+var settings = {
+  title: 'remove',
+  name: 'remove',
+  summary: 'Remove an Ion, bower component, or addon from the project',
+  args: {
+    '[name]': 'The name of the Ion, bower component, or addon you wish to remove'
+  },
+  isProjectTask: true
+};
+
+function uninstallBowerComponent(componentName) {
+  var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
+
+  var result = childProcess.exec(bowerUninstallCommand);
+
+  if (result.code !== 0) {
+    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose +
+      '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
+
+    appLibUtils.fail(errorMessage, 'remove');
+  } else {
+    var message = 'Bower component removed - ' + componentName;
+    log.info(message.red);
+  }
+}
+
+/**
+ * Need to look at bower.json of package just installed and look for any cordova plugins required
+ * Check the directory in the projects `.bowerrc` file
+ * Then go to /path/to/bower/components/<ionic-service-componentName>/ionic-plugins.json - 'plugins'
+ * For each plugins - call 'ionic add plugin <current-required-plugin>'
+ */
+function run(ionic, argv) {
+
+  if (!bower.checkForBower()) {
+    appLibUtils.fail(bower.installMessage, 'remove');
+    return;
+  }
+
+  var componentName = argv._[1];
+  var ioSet = false;
+
+  try {
+    uninstallBowerComponent(componentName);
+  } catch (error) {
+    var errorMessage = error.message ? error.message : error;
+    appLibUtils.fail(errorMessage, 'service');
+  }
+
+  // Inject the component into our index.html, if necessary, and save the app_id
+  ioLib.injectIoComponent(ioSet, componentName);
+  ioLib.warnMissingData();
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 9d81bd4c69..9f02faad48 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,38 +1,57 @@
-var argv = require('optimist').argv;
-var Task = require('./task').Task;
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var IonicResources = IonicAppLib.resources;
-var IonicStats = require('./stats').IonicStats;
-var Utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var Project = IonicAppLib.project;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var resourcesSummary = [
+  'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
+  'Put your images in the ./resources directory, named splash or icon.',
+  'Accepted file types are .png, .ai, and .psd.',
+  'Icons should be 192x192 px without rounded corners.',
+  'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
+].join('\n\t\t      ');
+
+var settings = {
+  title: 'resources',
+  name: 'resources',
+  summary: resourcesSummary,
+  options: {
+    '--icon|-i': {
+      title: 'Generate icon resources',
+      boolean: true
+    },
+    '--splash|-s': {
+      title: 'Generate splash screen resources',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function() {
+function run(ionic, argv) {
   var dir = null;
 
   try {
     dir = process.cwd();
     Project.load(dir);
   } catch (ex) {
-    return Utils.fail(ex, 'resources');
+    return appLibUtils.fail(ex, 'resources');
   }
 
   var options = argv;
   options.platforms = argv._;
 
-  IonicResources.generate(dir, options)
+  return IonicResources.generate(dir, options)
     .catch(function(ex) {
       if (ex instanceof Error) {
-        Utils.fail(ex, 'resources');
+        appLibUtils.fail(ex, 'resources');
       }
     });
+}
 
-  IonicStats.t();
-};
-
-module.exports = {
-  IonicTask: IonicTask
-};
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
new file mode 100644
index 0000000000..c0b2cc01d5
--- /dev/null
+++ b/lib/ionic/run.js
@@ -0,0 +1,87 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var os = require('os');
+var Q = require('q');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var cordovaUtils = require('../utils/cordova');
+
+var cordovaRunEmulateOptions = {
+  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--address': 'Use specific address (livereload req.)',
+  '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
+  '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
+  '--consolelogs|-c': {
+    title: 'Print app console logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--serverlogs|-s': {
+    title: 'Print dev server logs to Ionic CLI (livereload req.)',
+    boolean: true
+  },
+  '--debug|--release': {
+    title: '',
+    boolean: true
+  },
+  '--device|--emulator|--target=FOO': '',
+  isProjectTask: true
+};
+
+var settings = {
+  title: 'run',
+  name: 'run',
+  summary: 'Run an Ionic project on a connected device',
+  args: {
+    '[options]': '',
+    '<PLATFORM>': ''
+  },
+  options: cordovaRunEmulateOptions
+};
+
+function run(ionic, argv, rawCliArguments) {
+  var appDirectory = process.cwd();
+  var rawArgs = rawCliArguments.slice(0);
+  var cmdName = argv._[0].toLowerCase();
+
+  var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
+
+  // If platform was not passed then add it to the rawArgs
+  var runPlatform = argv._[1];
+  if (!runPlatform) {
+    runPlatform = 'ios';
+    rawArgs.push(runPlatform);
+  }
+
+  if (runPlatform === 'ios' && os.platform() !== 'darwin') {
+    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+  }
+
+  var promiseList = []
+    .concat(!cordovaUtils.isPlatformInstalled(runPlatform, appDirectory) ?
+      cordovaUtils.installPlatform(runPlatform) :
+      [])
+    .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
+      cordovaUtils.installPlugins() :
+      []);
+
+  return Q.all(promiseList).then(function() {
+    if (isLiveReload) {
+      return cordovaUtils.setupLiveReload(argv);
+    }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(process.cwd(), {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
+  })
+  .then(function(serveOptions) {
+    var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
+    return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
+  });
+}
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 4b5945c5a0..42b7fdbfa3 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -1,25 +1,53 @@
+'use strict';
+
 var fs = require('fs');
 var path = require('path');
 var Q = require('q');
 var expandTilde = require('expand-tilde');
 var _ = require('underscore');
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
-var Utils = IonicAppLib.utils;
+var fail = IonicAppLib.utils.fail;
 var Login = IonicAppLib.login;
 var Security = IonicAppLib.security;
 var log = IonicAppLib.logging.logger;
 var LoginTask = require('./login');
-var Prompt = require('./prompt');
-var Table = require('./table');
-var Task = require('./task').Task;
+var Prompt = require('../utils/prompt');
+var Table = require('../utils/table');
 
 var Project = IonicAppLib.project;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var settings = {
+  title: 'security',
+  name: 'security',
+  summary: 'Store your app\'s credentials for the Ionic Platform ' + '(alpha)'.red,
+  args: {
+    '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' +
+      'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
+    '[options]': ''
+  },
+  options: {
+    '--profile <tag>': '(' + 'credentials <platform>'.yellow +
+      ') Specify the profile on which these credentials are saved',
+    '--keystore|-s <path>': '(' + 'credentials android'.yellow +
+      ') Specify the location of your keystore file',
+    '--keystore-password|-p <password>': '(' + 'credentials android'.yellow +
+      ') Specify your keystore password (exclude for prompt)',
+    '--key-alias|-k <alias>': '(' + 'credentials android'.yellow +
+      ') Specify your key alias for this app',
+    '--key-password|-w <password>': '(' + 'credentials android'.yellow +
+      ') Specify your key password for this app (exclude for prompt)',
+    '--cert|-c <path>': '(' + 'credentials ios'.yellow +
+      ') Specify the location of your .p12 file',
+    '--cert-password|-p <password>': '(' + 'credentials ios'.yellow +
+      ') Specify your certificate password (exclude for prompt)',
+    '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow +
+      ') Specify the location of your .mobileprovision file'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function(ionic, argv) {
+function run(ionic, argv) {
 
   var cmd;
   var subcmd;
@@ -43,7 +71,7 @@ IonicTask.prototype.run = function(ionic, argv) {
       throw new Error('Missing Ionic App ID.');
     }
   } catch (ex) {
-    return Utils.fail(ex, 'security');
+    return fail(ex, 'security');
   }
 
   switch (cmd) {
@@ -60,19 +88,19 @@ IonicTask.prototype.run = function(ionic, argv) {
     case 'list':
       return listSecurityProfiles(ionic, argv, dir, appId);
     default:
-      return Utils.fail("Unknown subcommand 'profiles " + subcmd + "'.", 'security');
+      return fail("Unknown subcommand 'profiles " + subcmd + "'.", 'security');
     }
   case 'credentials':
     return addSecurityCredentials(ionic, argv, dir, appId);
   }
 
-  return Utils.fail("Unknown subcommand '" + cmd + "'.", 'security');
-};
+  return fail("Unknown subcommand '" + cmd + "'.", 'security');
+}
 
 function addSecurityProfile(ionic, argv, dir, appId) {
 
   if (argv._.length < 4) {
-    return Utils.fail('Specify a name for this Security Profile. Example: ' +
+    return fail('Specify a name for this Security Profile. Example: ' +
                       "'ionic security profile add \"My New Profile\"'.", 'security');
   }
 
@@ -104,7 +132,7 @@ function addSecurityProfile(ionic, argv, dir, appId) {
       }
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'package');
+      fail(ex, 'package');
     });
 
 }
@@ -148,18 +176,18 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
       }
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'security');
+      fail(ex, 'security');
     });
 }
 
 function addSecurityCredentials(ionic, argv, dir, appId) {
 
   if (argv._.length < 3) {
-    return Utils.fail('Specify a valid platform (android or ios).', 'security');
+    return fail('Specify a valid platform (android or ios).', 'security');
   }
 
   if (typeof argv.profile === 'undefined') {
-    return Utils.fail('Specify the Security Profile on which these credentials are saved ' +
+    return fail('Specify the Security Profile on which these credentials are saved ' +
                       '(--profile <tag>).', 'security');
   }
 
@@ -168,7 +196,7 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
   var profile = argv.profile;
 
   if (!_.contains(['android', 'ios'], platform)) {
-    return Utils.fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'security');
+    return fail("Invalid platform '" + platform + "', please choose either 'android' or 'ios'.", 'security');
   }
 
   return Login.retrieveLogin()
@@ -278,8 +306,10 @@ function addSecurityCredentials(ionic, argv, dir, appId) {
       }
     })
     .catch(function(ex) {
-      Utils.fail(ex, 'package');
+      fail(ex, 'package');
     });
 }
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index c66d67f78a..147ba75488 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,30 +1,65 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
-var Utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var events = IonicAppLib.events;
 var Q = require('q');
-var Task = require('./task').Task;
 var Serve = IonicAppLib.serve;
 var log = IonicAppLib.logging.logger;
 var IonicProject = IonicAppLib.project;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function(ionic, argv) {
-  this.ionic = ionic;
-  this.port = argv._[1];
-  this.liveReloadPort = argv._[2];
-
-  if (argv._[0] === 'address') {
-
-    // reset any address configs
-    var ionicConfig = IonicAppLib.config.load();
-    ionicConfig.set('ionicServeAddress', null);
-    ionicConfig.set('platformServeAddress', null);
-    return Serve.getAddress({ isAddressCmd: true });
-  }
+var settings =  {
+  title: 'serve',
+  name: 'serve',
+  summary: 'Start a local development server for app dev/testing',
+  args: {
+    '[options]': ''
+  },
+  options: {
+    '--consolelogs|-c': {
+      title: 'Print app console logs to Ionic CLI',
+      boolean: true
+    },
+    '--serverlogs|-s': {
+      title: 'Print dev server logs to Ionic CLI',
+      boolean: true
+    },
+    '--port|-p': 'Dev server HTTP port (8100 default)',
+    '--livereload-port|-r': 'Live Reload port (35729 default)',
+    '--nobrowser|-b': {
+      title: 'Disable launching a browser',
+      boolean: true
+    },
+    '--nolivereload|-d': {
+      title: 'Do not start live reload',
+      boolean: true
+    },
+    '--noproxy|-x': {
+      title: 'Do not add proxies',
+      boolean: true
+    },
+    '--address': 'Use specific address or return with failure',
+    '--all|-a': {
+      title: 'Have the server listen on all addresses (0.0.0.0)',
+      boolean: true
+    },
+    '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
+    '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
+    '--lab|-l': {
+      title: 'Test your apps on multiple screen sizes and platform types',
+      boolean: true
+    },
+    '--nogulp': {
+      title: 'Disable running gulp during serve',
+      boolean: true
+    },
+    '--platform|-t': 'Start serve with a specific platform (ios/android)'
+  },
+  isProjectTask: true
+};
 
+function run(ionic, argv) {
   var project = null;
   var cwd = process.cwd();
 
@@ -32,7 +67,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     project = IonicProject.load(cwd);
   } catch (ex) {
     log.error('Error occured', ex);
-    return Utils.fail(ex.message);
+    return appLibUtils.fail(ex.message);
   }
 
   var options = Serve.loadSettings(argv, project);
@@ -83,8 +118,10 @@ IonicTask.prototype.run = function(ionic, argv) {
       throw error;
     });
   } catch (ex) {
-    Utils.fail('Error with serve- ' + ex);
+    appLibUtils.fail('Error with serve- ' + ex);
   }
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 2d5ffe2dbc..3feeb7e0f3 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -1,18 +1,27 @@
-require('shelljs/global');
+'use strict';
 
-var Task = require('./task').Task;
 var fs = require('fs');
 var path = require('path');
 var exec = require('child_process').exec;
 var _ = require('underscore');
-var bower = require('./bower');
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var bower = require('../utils/bower');
 var log = require('ionic-app-lib').logging.logger;
+var IonicAppLib = require('ionic-app-lib');
+var fail = IonicAppLib.utils.fail;
+
+var settings = {
+  title: 'service add',
+  name: 'service',
+  summary: 'Add an Ionic service package and install any required plugins',
+  args: {
+    '[options]': '',
+    '<SPEC>': 'Can be a service name or a git url'
+  },
+  isProjectTask: true
+};
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.readIonicProjectJson = function readIonicProjectJson() {
+function readIonicProjectJson() {
   var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
   var ionicProjectJson = null;
   try {
@@ -23,13 +32,13 @@ IonicTask.prototype.readIonicProjectJson = function readIonicProjectJson() {
   }
 
   return ionicProjectJson;
-};
+}
 
-IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(serviceName) {
+function addServiceToIonicJson(serviceName) {
   var ionicProjectFile = path.join(process.cwd(), 'ionic.project');
 
   try {
-    var ionicProjectJson = this.readIonicProjectJson() || {};
+    var ionicProjectJson = readIonicProjectJson() || {};
 
     if (!ionicProjectJson.services) {
       ionicProjectJson.services = [];
@@ -44,11 +53,11 @@ IonicTask.prototype.addServiceToIonicJson = function addServiceToIonicJson(servi
     fs.writeFileSync(ionicProjectFile, JSON.stringify(ionicProjectJson, null, 2), 'utf8');
 
   } catch (ex) {
-    this.ionic.fail('Failed to update the ionic.project settings for the service', 'service');
+    fail('Failed to update the ionic.project settings for the service', 'service');
   }
-};
+}
 
-IonicTask.prototype.installBowerComponent = function installBowerComponent(serviceName) {
+function installBowerComponent(serviceName) {
   var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
   var result = exec(bowerInstallCommand);
 
@@ -57,13 +66,13 @@ IonicTask.prototype.installBowerComponent = function installBowerComponent(servi
     // Error happened, report it.
     var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
       '"'.bold + '.\nAre you sure it exists?'.bold;
-    this.ionic.fail(errorMessage, 'service');
+    fail(errorMessage, 'service');
   } else {
-    this.addServiceToIonicJson(serviceName);
+    addServiceToIonicJson(serviceName);
   }
-};
+}
 
-IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(serviceName) {
+function uninstallBowerComponent(serviceName) {
   var bowerUninstallCommand = 'bower unlink ionic-service-' + serviceName;
 
   var result = exec(bowerUninstallCommand);
@@ -71,11 +80,11 @@ IonicTask.prototype.uninstallBowerComponent = function uninstallBowerComponent(s
   if (result.code !== 0) {
     var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
       '"'.bold + '.\nAre you sure it exists?'.bold;
-    this.ionic.fail(errorMessage, 'service');
+    fail(errorMessage, 'service');
   }
-};
+}
 
-IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLocation() {
+function getBowerComponentsLocation() {
   var bowerRcFileLocation = path.join(process.cwd(), '.bowerrc');
   var bowerRc = null;
 
@@ -93,16 +102,16 @@ IonicTask.prototype.getBowerComponentsLocation = function getBowerComponentsLoca
   }
 
   return directory;
-};
+}
 
-IonicTask.prototype.getBowerJson = function getBowerJson(directory, serviceName) {
+function getBowerJson(directory, serviceName) {
   var bowerJsonLocation = path.join(process.cwd(), directory, 'ionic-service-' + serviceName, 'ionic-plugins.json');
   var packageBowerJson = require(bowerJsonLocation);
   return packageBowerJson;
-};
+}
 
-IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory, serviceName) {
-  var packageBowerJson = this.getBowerJson(directory, serviceName);
+function installBowerPlugins(directory, serviceName) {
+  var packageBowerJson = getBowerJson(directory, serviceName);
 
   _.each(packageBowerJson.plugins, function(plugin) {
     log.info('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
@@ -112,12 +121,12 @@ IonicTask.prototype.installBowerPlugins = function installBowerPlugins(directory
 
     if (pluginInstallResult.code !== 0) {
       var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
-      this.ionic.fail(errorMessage, 'service');
+      fail(errorMessage, 'service');
     }
   });
-};
+}
 
-IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bowerJson) {
+function uninstallBowerPlugins(bowerJson) {
   _.each(bowerJson.plugins, function(plugin) {
     log.info('Uninstalling cordova plugin -  ' + plugin.name);
     var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
@@ -126,43 +135,39 @@ IonicTask.prototype.uninstallBowerPlugins = function uninstallBowerPlugins(bower
 
     if (pluginRemoveResult.code !== 0) {
       var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
-      this.ionic.fail(errorMessage, 'service');
+      fail(errorMessage, 'service');
     }
   });
-};
+}
 
-IonicTask.prototype.addService = function addService(serviceName) {
-  this.installBowerComponent(serviceName);
+function addService(serviceName) {
+  installBowerComponent(serviceName);
 
-  var directory = this.getBowerComponentsLocation();
+  var directory = getBowerComponentsLocation();
 
   log.info('Checking for any plugins required by service package');
 
-  this.installBowerPlugins(directory, serviceName);
+  installBowerPlugins(directory, serviceName);
   log.info('ionic service add completed');
-};
+}
 
-IonicTask.prototype.removeService = function removeService(serviceName) {
-  var directory = this.getBowerComponentsLocation();
+function removeService(serviceName) {
+  var directory = getBowerComponentsLocation();
   var packageBowerJson = this.getBowerJson(directory, serviceName);
 
-  this.uninstallBowerComponent(serviceName);
+  uninstallBowerComponent(serviceName);
 
-  this.uninstallBowerPlugins(packageBowerJson);
-};
-
-IonicTask.prototype.listServices = function listServices() {
-};
+  uninstallBowerPlugins(packageBowerJson);
+}
 
 // Need to look at bower.json of package just installed and look for any cordova plugins required
 // Check the directory in the projects `.bowerrc` file
 // Then go to /path/to/bower/components/<ionic-service-serviceName>/ionic-plugins.json - 'plugins'
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
-IonicTask.prototype.run = function run(ionic, argv) {
-  this.ionic = ionic;
+function run(ionic, argv) {
 
   if (!bower.IonicBower.checkForBower()) {
-    this.ionic.fail(bower.IonicBower.installMessage, 'service');
+    fail(bower.IonicBower.installMessage, 'service');
     return;
   }
 
@@ -172,19 +177,28 @@ IonicTask.prototype.run = function run(ionic, argv) {
   try {
     switch (action) {
     case 'add':
-      this.addService(serviceName);
+      addService(serviceName);
       break;
     case 'remove':
-      this.removeService(serviceName);
-      break;
-    case 'list':
-      this.listServices();
+      removeService(serviceName);
       break;
     }
   } catch (error) {
     var errorMessage = error.message ? error.message : error;
-    this.ionic.fail(errorMessage, 'service');
+    fail(errorMessage, 'service');
   }
-};
-
-exports.IonicTask = IonicTask;
+}
+
+module.exports = extend(settings, {
+  readIonicProjectJson: readIonicProjectJson,
+  addServiceToIonicJson: addServiceToIonicJson,
+  installBowerComponent: installBowerComponent,
+  uninstallBowerComponent: uninstallBowerComponent,
+  getBowerComponentsLocation: getBowerComponentsLocation,
+  getBowerJson: getBowerJson,
+  installBowerPlugins: installBowerPlugins,
+  uninstallBowerPlugins: uninstallBowerPlugins,
+  addService: addService,
+  removeService: removeService,
+  run: run
+});
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 5bba986374..e27ce3d4ff 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,13 +1,23 @@
-var Task = require('./task').Task;
+'use strict';
 
-function IonicTask() {}
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 
-IonicTask.prototype = new Task();
+var settings =  {
+  title: 'setup',
+  name: 'setup',
+  summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
+  args: {
+    '[sass]': 'Setup the project to use Sass CSS precompiling'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function() {
+function run() {
 
   // TODO link to gulp hook docs
   console.log('The setup task has been deprecated.\n');
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index 6c9fd33c3f..cbdb8c909e 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,40 +1,46 @@
-require('shelljs/global');
+'use strict';
 
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var LoginTask = require('./login');
 var IonicAppLib = require('ionic-app-lib');
 var IonicProject = IonicAppLib.project;
-var Task = require('./task').Task;
-var LoginTask = require('./login');
 var Share = IonicAppLib.share;
 var log = IonicAppLib.logging.logger;
 var Login = IonicAppLib.login;
-var Utils = IonicAppLib.utils;
-
-function IonicTask() {}
+var appLibUtils = IonicAppLib.utils;
 
-IonicTask.prototype = new Task();
+var settings = {
+  title: 'share',
+  name: 'share',
+  summary: 'Share an app with a client, co-worker, friend, or customer',
+  args: {
+    '<EMAIL>': 'The email to share the app with'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function(ionic, argv) {
+function run(ionic, argv) {
   var project;
 
   if (argv._.length < 2) {
-    return ionic.fail('Invalid command', 'share');
+    return appLibUtils.fail('Invalid command', 'share');
   }
 
   try {
     project = IonicProject.load();
   } catch (ex) {
-    ionic.fail(ex.message);
+    appLibUtils.fail(ex.message);
     return;
   }
 
   if (project.get('app_id') === '') {
-    return ionic.fail('You must first upload the app to share it');
+    return appLibUtils.fail('You must first upload the app to share it');
   }
 
   var email = argv._[1];
 
   if (email.indexOf('@') < 0) {
-    return ionic.fail('Invalid email address', 'share');
+    return appLibUtils.fail('Invalid email address', 'share');
   }
 
   log.info(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
@@ -51,8 +57,10 @@ IonicTask.prototype.run = function(ionic, argv) {
     return Share.shareApp(process.cwd(), jar, email);
   })
   .catch(function(ex) {
-    return Utils.fail(ex);
+    return appLibUtils.fail(ex);
   });
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 07debdbb54..72d540c10b 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,38 +1,77 @@
 require('shelljs/global');
 require('colors');
 
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var fs = require('fs');
 var Q = require('q');
-var IonicTemplates = require('./templates').IonicTask;
-var Task = require('./task').Task;
+var templateUtils = require('../utils/templates');
 var IonicAppLib = require('ionic-app-lib');
 var Start = IonicAppLib.start;
 var log = IonicAppLib.logging.logger;
-var Utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 
+var settings = {
+  title: 'start',
+  name: 'start',
+  summary: 'Starts a new Ionic project in the specified PATH',
+  args: {
+    '[options]': 'any flags for the command',
+    '<PATH>': 'directory for the new project',
+    '[template]': 'Starter templates can either come from a named template, \n' +
+                  '(ex: tabs, sidemenu, blank),\n' +
+                  'a Github repo, a Codepen url, or a local directory.\n' +
+                  'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
+                  'Defaults to Ionic "tabs" starter template'
+  },
+  options: {
+    '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
+    '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
+    '--skip-npm': {
+      title: 'Skip npm package installation',
+      boolean: true
+    },
+    '--no-cordova|-w': {
+      title: 'Create a basic structure without Cordova requirements',
+      boolean: true
+    },
+    '--sass|-s': {
+      title: 'Setup the project to use Sass CSS precompiling',
+      boolean: true
+    },
+    '--list|-l': {
+      title: 'List starter templates available',
+      boolean: true
+    },
+    '--io-app-id': 'The Ionic.io app ID to use',
+    '--template|-t': 'Project starter template',
+    '--v2|-v': {
+      boolean: true,
+      title: 'Start a Ionic v2 project'
+    },
+    '--typescript|--ts': {
+      boolean: true,
+      title: '(with --v2 only) Use TypeScript in starter'
+    },
+    '--zip-file|-z': 'URL to download zipfile for starter template'
+  },
+  isProjectTask: false
+};
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.run = function run(ionic, argv) {
-
+function run(ionic, argv) {
   if (argv.list || argv.l) {
-    new IonicTemplates().run(ionic);
-    return;
+    return templateUtils.listTemplates();
   }
 
   if (argv._.length < 2) {
-    return ionic.fail('Invalid command', 'start');
+    return appLibUtils.fail('Invalid command', 'start');
   }
 
   if (argv._[1] === '.') {
-    log.error('Please name your Ionic project something meaningful other than \'.\''.red);
-    return;
+    return log.error('Please name your Ionic project something meaningful other than \'.\''.red);
   }
 
   var promptPromise;
-  var options = Utils.preprocessCliOptions(argv);
+  var options = appLibUtils.preprocessCliOptions(argv);
   var startingApp = true;
 
   // Grab the app's relative directory name
@@ -70,6 +109,8 @@ IonicTask.prototype.run = function run(ionic, argv) {
     log.error(error);
     throw error;
   });
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/starter-templates.json b/lib/ionic/starter-templates.json
deleted file mode 100644
index db0a21623f..0000000000
--- a/lib/ionic/starter-templates.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "total_count": "7",
-  "incomplete_results": false,
-  "items": [
-    {
-      "name": "ionic-starter-maps",
-      "description": "An Ionic starter project using Google Maps and a side menu",
-      "created_at": "2014-04-28T20:16:01Z",
-      "updated_at": "2015-01-14T19:14:08Z",
-      "pushed_at": "2014-09-03T07:20:28Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-maps.git"
-    },
-    {
-      "name": "ionic-starter-tabs",
-      "description": "A starting project for Ionic using a simple tabbed interface",
-      "created_at": "2014-03-21T17:56:04Z",
-      "updated_at": "2015-01-11T16:54:23Z",
-      "pushed_at": "2014-12-29T21:09:20Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-tabs.git"
-    },
-    {
-      "name": "ionic-starter-sidemenu",
-      "description": "A starting project for Ionic using a side menu with navigation in the content area",
-      "created_at": "2014-03-24T22:31:35Z",
-      "updated_at": "2015-01-12T06:33:31Z",
-      "pushed_at": "2014-12-15T20:47:21Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-sidemenu.git"
-    },
-    {
-      "id": 17983811,
-      "name": "ionic-starter-blank",
-      "description": "A blank starter project for Ionic",
-      "created_at": "2014-03-21T15:14:45Z",
-      "updated_at": "2014-12-10T23:36:01Z",
-      "pushed_at": "2014-05-14T15:26:21Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-blank.git"
-    },
-    {
-      "id": 24473944,
-      "name": "ionic-starter-salesforce",
-      "description": "A starter project for Ionic and Salesforce",
-      "created_at": "2014-09-25T20:22:13Z",
-      "updated_at": "2015-01-06T10:08:01Z",
-      "pushed_at": "2014-11-06T18:57:36Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-salesforce.git"
-    },
-    {
-      "id": 24610601,
-      "name": "ionic-starter-tests",
-      "description": "A test of different kinds of page navigation",
-      "created_at": "2014-09-29T19:57:25Z",
-      "updated_at": "2015-01-17T17:12:18Z",
-      "pushed_at": "2015-01-17T17:12:17Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-tests.git"
-    },
-    {
-      "id": 27608851,
-      "name": "ionic-starter-complex-list",
-      "description": "A complex list starter template",
-      "created_at": "2014-12-05T20:29:34Z",
-      "updated_at": "2014-12-06T05:12:52Z",
-      "pushed_at": "2014-12-05T20:29:34Z",
-      "git_url": "git://github.com/driftyco/ionic-starter-complex-list.git"
-    }
-  ]
-}
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index 809bb467ba..c5bbf2072e 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -1,27 +1,47 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var shelljs = require('shelljs');
-var Task = require('./task').Task;
 var IonicAppLib = require('ionic-app-lib');
 var IonicProject = IonicAppLib.project;
 var State = IonicAppLib.state;
 var log = IonicAppLib.logging.logger;
-
-// var State = module.exports;
+var appLibUtils = IonicAppLib.utils;
 
 shelljs.config.silent = true;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
+var settings = {
+  title: 'state',
+  name: 'state',
+  summary: 'Saves or restores state of your Ionic Application using the package.json file',
+  args: {
+    '<COMMAND>': '[ save | restore | clear | reset ]'
+  },
+  options: {
+    save: 'Save the platforms and plugins into package.json',
+    restore: 'Restore the platforms and plugins from package.json',
+    clear: 'Clear the package.json of cordovaPlugins and cordovaPlatforms, ' +
+      'as well as clear out the platforms and plugins folders',
+    reset: 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
+    '--plugins': {
+      title: 'Only do operations with plugins',
+      boolean: true
+    },
+    '--platforms': {
+      title: 'Only do operations with platforms',
+      boolean: true
+    }
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function run(ionic, argv) {
+function run(ionic, argv) {
   var options = { platforms: true, plugins: true };
 
-  this.ionic = ionic;
-
   try {
     IonicProject.load();
   } catch (ex) {
-    this.ionic.fail(ex.message);
+    appLibUtils.fail(ex.message);
     return;
   }
 
@@ -46,6 +66,8 @@ IonicTask.prototype.run = function run(ionic, argv) {
   default:
     log.error('Please specify a command [ save | restore | reset | clear ] for the state command.');
   }
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
deleted file mode 100644
index f5cf1b2884..0000000000
--- a/lib/ionic/stats.js
+++ /dev/null
@@ -1,657 +0,0 @@
-/* eslint-disable camelcase, no-underscore-dangle */
-
-var path = require('path');
-var http = require('http');
-var _ = require('underscore');
-var querystring = require('querystring');
-var Buffer = require('buffer').Buffer;
-var util = require('util');
-var IonicConfig = require('ionic-app-lib').config;
-var IonicInfo = require('ionic-app-lib').info;
-
-exports.getVersion = function getVersion() {
-  var packageJson = require('../../package.json');
-  return packageJson;
-};
-
-/**
- *  Heavily inspired by the original js library copyright Mixpanel, Inc.
- *  (http://mixpanel.com/)
- *
- *  Copyright (c) 2012 Carl Sverre
- *
- *  Released under the MIT license.
- */
-
-function create_client(token, config) {
-  var metrics = {};
-
-  if (!token) {
-    throw new Error('The Mixpanel Client needs a Mixpanel token: `init(token)`');
-  }
-
-  metrics.config = {
-    test: false,
-    debug: false,
-    verbose: false
-  };
-
-  metrics.token = token;
-
-  /**
-   * send_request(data)
-   *     ---
-   * this function sends an async GET request to mixpanel
-   *
-   *   data:object                     the data to send in the request
-   *   callback:function(err:Error)    callback is called when the request is
-   *                                   finished or an error occurs
-   */
-  metrics.send_request = function(endpoint, data, callback) {
-    callback = callback || function() {};
-    var event_data = new Buffer(JSON.stringify(data));
-    var request_data = {
-      data: event_data.toString('base64'),
-      ip: 0,
-      verbose: metrics.config.verbose ? 1 : 0
-    };
-
-    if (endpoint === '/import') {
-      var key = metrics.config.key;
-      if (!key) {
-        throw new Error('The Mixpanel Client needs a Mixpanel api key when importing old events: ' +
-                        ' `init(token, { key: ... })`');
-      }
-      request_data.api_key = key;
-    }
-
-    var request_options = {
-      host: 'api.mixpanel.com',
-      port: 80,
-      headers: {}
-    };
-
-    if (metrics.config.test) { request_data.test = 1; }
-
-    var query = querystring.stringify(request_data);
-
-    request_options.path = [endpoint, '?', query].join('');
-
-    http.get(request_options, function(res) {
-      var data = '';
-      res.on('data', function(chunk) {
-        data += chunk;
-      });
-
-      res.on('end', function() {
-        var e;
-
-        if (metrics.config.verbose) {
-          try {
-            var result = JSON.parse(data);
-            if (result.status !== 1) {
-              e = new Error('Mixpanel Server Error: ' + result.error);
-            }
-          } catch (ex) {
-            e = new Error('Could not parse response from Mixpanel');
-          }
-        } else {
-          e = (data !== '1') ? new Error('Mixpanel Server Error: ' + data) : undefined;
-        }
-
-        callback(e);
-      });
-    }).on('error', function(e) {
-      if (metrics.config.debug) {
-        console.log('Got Error: ' + e.message);
-      }
-      callback(e);
-    });
-  };
-
-  /**
-   *  track(event, properties, callback)
-   *  ---
-   *  this function sends an event to mixpanel.
-   *
-   *  event:string                    the event name
-   *  properties:object               additional event properties to send
-   *  callback:function(err:Error)    callback is called when the request is
-   *                                  finished or an error occurs
-   */
-  metrics.track = function(event, properties, callback) {
-    if (typeof(properties) === 'function' || !properties) {
-      callback = properties;
-      properties = {};
-    }
-
-    // if properties.time exists, use import endpoint
-    var endpoint = (typeof(properties.time) === 'number') ? '/import' : '/track';
-
-    properties.token = metrics.token;
-    properties.mp_lib = 'node';
-
-    var data = {
-      event: event,
-      properties: properties
-    };
-
-    if (metrics.config.debug) {
-      console.log('Sending the following event to Mixpanel:');
-      console.log(data);
-    }
-
-    metrics.send_request(endpoint, data, callback);
-  };
-
-  /**
-   *  import(event, properties, callback)
-   *  ---
-   *  This function sends an event to mixpanel using the import
-   *  endpoint.  The time argument should be either a Date or Number,
-   *  and should signify the time the event occurred.
-   *
-   *  It is highly recommended that you specify the distinct_id
-   *  property for each event you import, otherwise the events will be
-   *  tied to the IP address of the sending machine.
-   *
-   *  For more information look at:
-   *  https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
-   *
-   *  event:string                    the event name
-   *  time:date|number                the time of the event
-   *  properties:object               additional event properties to send
-   *  callback:function(err:Error)    callback is called when the request is
-   *                                  finished or an error occurs
-   */
-  metrics.import = function(event, time, properties, callback) {
-    if (typeof(properties) === 'function' || !properties) {
-      callback = properties;
-      properties = {};
-    }
-
-    if (time === void 0) {
-      throw new Error('The import method requires you to specify the time of the event');
-    } else if (Object.prototype.toString.call(time) === '[object Date]') {
-      time = Math.floor(time.getTime() / 1000);
-    }
-
-    properties.time = time;
-
-    metrics.track(event, properties, callback);
-  };
-
-  /**
-   *  alias(distinct_id, alias)
-   *  ---
-   *  This function creates an alias for distinct_id
-   *
-   *  For more information look at:
-   *  https://mixpanel.com/docs/integration-libraries/using-mixpanel-alias
-   *
-   *  distinct_id:string              the current identifier
-   *  alias:string                    the future alias
-   */
-  metrics.alias = function(distinct_id, alias, callback) {
-    var properties = {
-      distinct_id: distinct_id,
-      alias: alias
-    };
-
-    metrics.track('$create_alias', properties, callback);
-  };
-
-  metrics.people = {
-
-    /** people.set_once(distinct_id, prop, to, callback)
-     *  ---
-     *  The same as people.set but in the words of mixpanel:
-     *  mixpanel.people.set_once
-     *
-     *  " This method allows you to set a user attribute, only if
-     *   it is not currently set. It can be called multiple times
-     *   safely, so is perfect for storing things like the first date
-     *   you saw a user, or the referrer that brought them to your
-     *   website for the first time. "
-     *
-     */
-    set_once: function(distinct_id, prop, to, callback) {
-      var $set = {};
-
-      if (typeof(prop) === 'object') {
-        callback = to;
-        $set = prop;
-      } else {
-        $set[prop] = to;
-      }
-
-      this._set(distinct_id, $set, callback, { set_once: true });
-    },
-
-    /**
-     *  people.set(distinct_id, prop, to, callback)
-     *  ---
-     *  set properties on an user record in engage
-     *
-     *  usage:
-     *
-     *      mixpanel.people.set('bob', 'gender', 'm');
-     *
-     *      mixpanel.people.set('joe', {
-     *          'company': 'acme',
-     *          'plan': 'premium'
-     *      });
-     */
-    set: function(distinct_id, prop, to, callback) {
-      var $set = {};
-
-      if (typeof(prop) === 'object') {
-        callback = to;
-        $set = prop;
-      } else {
-        $set[prop] = to;
-      }
-
-      this._set(distinct_id, $set, callback);
-    },
-
-    // used internally by set and set_once
-    _set: function(distinct_id, $set, callback, options) {
-      var set_key = (options && options.set_once) ? '$set_once' : '$set';
-
-      var data = {
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-      data[set_key] = $set;
-
-      if ('ip' in $set) {
-        data.$ip = $set.ip;
-        delete $set.ip;
-      }
-
-      if ($set.$ignore_time) {
-        data.$ignore_time = $set.$ignore_time;
-        delete $set.$ignore_time;
-      }
-
-      if (metrics.config.debug) {
-        console.log('Sending the following data to Mixpanel (Engage):');
-        console.log(data);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    },
-
-    /**
-     * people.increment(distinct_id, prop, to, callback)
-     * ---
-     * increment/decrement properties on an user record in engage
-     *
-     * usage:
-     *
-     * mixpanel.people.increment('bob', 'page_views', 1);
-     *
-     * // or, for convenience, if you're just incrementing a counter by 1, you can
-     * // simply do
-     * mixpanel.people.increment('bob', 'page_views');
-     *
-     * // to decrement a counter, pass a negative number
-     * mixpanel.people.increment('bob', 'credits_left', -1);
-     *
-     * // like mixpanel.people.set(), you can increment multiple properties at once:
-     * mixpanel.people.increment('bob', {
-     *   counter1: 1,
-     *   counter2: 3,
-     *   counter3: -2
-     * });
-     */
-    increment: function(distinct_id, prop, by, callback) {
-      var $add = {};
-
-      if (typeof(prop) === 'object') {
-        callback = by;
-        Object.keys(prop).forEach(function(key) {
-          var val = prop[key];
-
-          if (isNaN(parseFloat(val))) {
-            if (metrics.config.debug) {
-              console.error('Invalid increment value passed to mixpanel.people.increment - must be a number');
-              console.error('Passed ' + key + ':' + val);
-            }
-            return;
-          } else {
-            $add[key] = val;
-          }
-        });
-      } else {
-        if (!by) { by = 1; }
-        $add[prop] = by;
-      }
-
-      var data = {
-        $add: $add,
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-
-      if (metrics.config.debug) {
-        console.log('Sending the following data to Mixpanel (Engage):');
-        console.log(data);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    },
-
-    /**
-     *  people.track_charge(distinct_id, amount, properties, callback)
-     *  ---
-     *  Record that you have charged the current user a certain
-     *  amount of money.
-     *
-     *  usage:
-     *
-     *      // charge a user $29.99
-     *      mixpanel.people.track_charge('bob', 29.99);
-     *
-     *      // charge a user $19 on the 1st of february
-     *      mixpanel.people.track_charge('bob', 19, { '$time': new Date('feb 1 2012') });
-     */
-    track_charge: function(distinct_id, amount, properties, callback) {
-
-      if (!properties) { properties = {}; }
-
-      if (typeof(amount) !== 'number') {
-        amount = parseFloat(amount);
-        if (isNaN(amount)) {
-          console.error('Invalid value passed to mixpanel.people.track_charge - must be a number');
-          return;
-        }
-      }
-
-      properties.$amount = amount;
-
-      if (properties.hasOwnProperty('$time')) {
-        var time = properties.$time;
-        if (Object.prototype.toString.call(time) === '[object Date]') {
-          properties.$time = time.toISOString();
-        }
-      }
-
-      var data = {
-        $append: {
-          $transactions: properties
-        },
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-
-      if (metrics.config.debug) {
-        console.log('Sending the following data to Mixpanel (Engage):');
-        console.log(data);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    },
-
-    /**
-     *  people.clear_charges(distinct_id, callback)
-     *  ---
-     *  Clear all the current user's transactions.
-     *
-     *  usage:
-     *
-     *      mixpanel.people.clear_charges('bob');
-     */
-    clear_charges: function(distinct_id, callback) {
-      var data = {
-        $set: {
-          $transactions: []
-        },
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-
-      if (metrics.config.debug) {
-        console.log("Clearing this user's charges:", distinct_id);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    },
-
-    /**
-     *  people.delete_user(distinct_id, callback)
-     *  ---
-     *  delete an user record in engage
-     *
-     *  usage:
-     *
-     *      mixpanel.people.delete_user('bob');
-     */
-    delete_user: function(distinct_id, callback) {
-      var data = {
-        $delete: distinct_id,
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-
-      if (metrics.config.debug) {
-        console.log('Deleting the user from engage:', distinct_id);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    },
-
-    /**
-     *  people.unset(distinct_id, prop, callback)
-     *  ---
-     *  delete a property on an user record in engage
-     *
-     *  usage:
-     *
-     *    mixpanel.people.unset('bob', 'page_views');
-     *
-     *    mixpanel.people.unset('bob', ['page_views', 'last_login']);
-     */
-    unset: function(distinct_id, prop, callback) {
-      var $unset = [];
-
-      if (util.isArray(prop)) {
-        $unset = prop;
-      } else if (typeof(prop) === 'string') {
-        $unset = [prop];
-      } else {
-        if (metrics.config.debug) {
-          console.error('Invalid argument passed to mixpanel.people.unset - must be a string or array');
-          console.error('Passed: ' + prop);
-        }
-        return;
-      }
-
-      var data = {
-        $unset: $unset,
-        $token: metrics.token,
-        $distinct_id: distinct_id
-      };
-
-      if (metrics.config.debug) {
-        console.log('Sending the following data to Mixpanel (Engage):');
-        console.log(data);
-      }
-
-      metrics.send_request('/engage', data, callback);
-    }
-  };
-
-  /**
-   *  set_config(config)
-   *  ---
-   *  Modifies the mixpanel config
-   *
-   *  config:object       an object with properties to override in the
-   *                      mixpanel client config
-   */
-  metrics.set_config = function(config) {
-    for (var c in config) {
-      if (config.hasOwnProperty(c)) {
-        metrics.config[c] = config[c];
-      }
-    }
-  };
-
-  if (config) {
-    metrics.set_config(config);
-  }
-
-  return metrics;
-}
-
-// module exporting
-/*
-module.exports = {
-    Client: function(token) {
-        console.warn("The function `Client(token)` is deprecated.  It is now called `init(token)`.");
-        return create_client(token);
-    },
-    init: create_client
-};
-*/
-
-var mixpanel = create_client('69f7271aa8f3d43f2e1b6baf698159b7');
-
-var ionicConfig = IonicConfig.load();
-
-
-exports.IonicStats = {
-  t: function(additionalData) {
-    try {
-
-      var packageJson = exports.getVersion();
-
-      if (process.argv.length < 3) return;
-
-      if (ionicConfig.get('statsOptOut') === true) {
-        return;
-      }
-
-      var cmdName = process.argv[2].toLowerCase();
-      var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []); // skip the cmdName
-
-      var statsData = additionalData || {};
-      var platforms = [];
-      var x;
-      var y;
-      var cmd;
-
-      // update any aliases with the full cmd so there's a common property
-      // TODO: This probably does not work correctly
-      var aliasMap = {
-        rm: 'remove',
-        ls: 'list',
-        up: 'update',
-        '-w': '--no-cordova',
-        '-b': '--nobrowser',
-        '-r': '--nolivereload',
-        '-x': '--noproxy',
-        '-l': '--livereload',
-        '-c': '--consolelogs',
-        '-s': '--serverlogs',
-        '-n': '--no-email'
-      };
-      for (x = 0; x < cmdArgs.length; x += 1) {
-        for (y in aliasMap) {
-          if (cmdArgs[x].toLowerCase() === y) {
-            cmdArgs[x] = aliasMap[y];
-          }
-        }
-      }
-
-      var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload ' +
-        '--consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email ' +
-        '--debug --release --device --emulator --sass --splash --icon --v2 --ts'.split(' ');
-
-      // collect only certain args, skip over everything else
-      for (x = 0; x < cmdArgs.length; x += 1) {
-        cmd = cmdArgs[x].toLowerCase();
-
-        // gather what platforms this is targeting
-        for (y = 0; y < platformWhitelist.length; y += 1) {
-          if (cmd === platformWhitelist[y]) {
-            platforms.push(cmd); // group them together
-            statsData[cmd] = true; // also give them their own property
-            break;
-          }
-        }
-
-        // gather only args that are in our list of valid stat args
-        for (y = 0; y < argsWhitelist.length; y += 1) {
-          if (cmd === argsWhitelist[y]) {
-            statsData[cmd] = true;
-            break;
-          }
-        }
-      }
-
-      // create a platform property only when there is 1 or more
-      if (platforms.length) {
-        statsData.platform = platforms.sort().join(',');
-      }
-
-      // add which ionic lib version they're using
-      try {
-        statsData.ionic_version = require(path.resolve('www/lib/ionic/version.json')).version;
-      } catch (e2) {} // eslint-disable-line no-empty
-
-      // add which cli version is being used
-      try {
-        statsData.cli_version = packageJson.version;
-      } catch (e2) {} // eslint-disable-line no-empty
-
-      try {
-        statsData.email = ionicConfig.get('email');
-      } catch (e2) {} // eslint-disable-line no-empty
-
-      try {
-        statsData.account_id = ionicConfig.get('id');
-      } catch (e2) {} // eslint-disable-line no-empty
-
-      var info = {};
-      IonicInfo.getNodeVersion(info);
-      IonicInfo.getOsEnvironment(info);
-      IonicInfo.gatherGulpInfo(info);
-
-      this.mp(cmdName, _.extend({}, statsData, {
-        os: info.os,
-        gulp: info.gulp,
-        node: info.node
-      }));
-
-    } catch (e) {
-      console.log(('Error stats: ' + e));
-    }
-  },
-  mp: function(e, d) {
-    var unique_id = ionicConfig.get('ank');
-    if (!unique_id) {
-      this.createId();
-      unique_id = ionicConfig.get('ank');
-    }
-    d.distinct_id = unique_id;
-    mixpanel.track(e, d, function(err) {
-      if (err) {
-        console.error(err);
-      }
-    });
-  },
-  createId: function() {
-    var d = new Date().getTime();
-    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = (d + Math.random() * 16) % 16 | 0;
-      d = Math.floor(d / 16);
-      return (c === 'x' ? r : (r & 0x7 | 0x8)).toString(16);
-    });
-
-    ionicConfig.set('ank', uuid);
-  }
-};
diff --git a/lib/ionic/task.js b/lib/ionic/task.js
deleted file mode 100644
index 7f6ef25c85..0000000000
--- a/lib/ionic/task.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function Task() {}
-
-Task.prototype = {
-  run: function() {}
-};
-
-exports.Task = Task;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index d1a2ed03ef..5ac346937d 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,16 +1,27 @@
+'use strict';
+
+var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var Login = IonicAppLib.login;
 var LoginTask = require('./login');
-var Task = require('./task').Task;
 var Upload = IonicAppLib.upload;
 var log = IonicAppLib.logging.logger;
-var Utils = IonicAppLib.utils;
-
-function IonicTask() {}
+var appLibUtils = IonicAppLib.utils;
 
-IonicTask.prototype = new Task();
+var settings = {
+  title: 'upload',
+  name: 'upload',
+  summary: 'Upload an app to your Ionic account',
+  options: {
+    '--email|-e': 'Ionic account email',
+    '--password|-p': 'Ionic account password',
+    '--note': 'The note to signify the upload',
+    '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
+  },
+  isProjectTask: true
+};
 
-IonicTask.prototype.run = function run(ionic, argv) {
+function run(ionic, argv) {
   var note = argv.note;
   var deploy = argv.deploy || false;
 
@@ -26,10 +37,10 @@ IonicTask.prototype.run = function run(ionic, argv) {
     return Upload.doUpload(process.cwd(), jar, note, deploy);
   })
   .catch(function(ex) {
-
-    // log.info('Error', ex, ex.stack);
-    Utils.fail(ex);
+    appLibUtils.fail(ex);
   });
-};
+}
 
-exports.IonicTask = IonicTask;
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/lib/ionic/utils.js b/lib/ionic/utils.js
deleted file mode 100644
index 8baec0f1df..0000000000
--- a/lib/ionic/utils.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function transformCookies(jar) {
-  return jar.map(function(c) {
-    return c.key + '=' + encodeURIComponent(c.value);
-  }).join('; ');
-}
-
-function retrieveCsrfToken(jar) {
-
-  // console.log('retrieveCsrfToken', jar)
-  if (!jar || typeof jar == 'undefined' || jar.length === 0) {
-
-    // console.log('no jar folks')
-    return '';
-  }
-  var csrftoken = '';
-  for (var i = 0; i < jar.length; i += 1) {
-    if (jar[i].key === 'csrftoken') {
-      csrftoken = jar[i].value;
-      break;
-    }
-  }
-  return csrftoken;
-}
-
-function deleteFolderRecursive(removePath) {
-  var fs = require('fs');
-  var path = require('path');
-
-  if (fs.existsSync(removePath)) {
-    fs.readdirSync(removePath).forEach(function(file) {
-      var curPath = path.join(removePath, file);
-      if (fs.lstatSync(curPath).isDirectory()) { // recurse
-        deleteFolderRecursive(curPath);
-      } else { // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(removePath);
-  }
-}
-
-module.exports = {
-  deleteFolderRecursive: deleteFolderRecursive,
-  retrieveCsrfToken: retrieveCsrfToken,
-  transformCookies: transformCookies
-};
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
deleted file mode 100644
index bc6c5c0aa2..0000000000
--- a/lib/tasks/cliTasks.js
+++ /dev/null
@@ -1,528 +0,0 @@
-var resourcesSummary = [
-  'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
-  'Put your images in the ./resources directory, named splash or icon.',
-  'Accepted file types are .png, .ai, and .psd.',
-  'Icons should be 192x192 px without rounded corners.',
-  'Splashscreens should be 2208x2208 px, with the image centered in the middle.\n'
-].join('\n\t\t      ');
-
-var cordovaRunEmulateOptions = {
-  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
-  '--address': 'Use specific address (livereload req.)',
-  '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
-  '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
-  '--consolelogs|-c': {
-    title: 'Print app console logs to Ionic CLI (livereload req.)',
-    boolean: true
-  },
-  '--serverlogs|-s': {
-    title: 'Print dev server logs to Ionic CLI (livereload req.)',
-    boolean: true
-  },
-  '--debug|--release': {
-    title: '',
-    boolean: true
-  },
-  '--device|--emulator|--target=FOO': ''
-};
-
-var TASKS = [
-  {
-    title: 'start',
-    name: 'start',
-    summary: 'Starts a new Ionic project in the specified PATH',
-    args: {
-      '[options]': 'any flags for the command',
-      '<PATH>': 'directory for the new project',
-      '[template]': 'Starter templates can either come from a named template, \n' +
-                    '(ex: tabs, sidemenu, blank),\n' +
-                    'a Github repo, a Codepen url, or a local directory.\n' +
-                    'Codepen url, ex: http://codepen.io/ionic/pen/odqCz\n' +
-                    'Defaults to Ionic "tabs" starter template'
-    },
-    options: {
-      '--appname|-a': 'Human readable name for the app (Use quotes around the name)',
-      '--id|-i': 'Package name for <widget id> config, ex: com.mycompany.myapp',
-      '--skip-npm': {
-        title: 'Skip npm package installation',
-        boolean: true
-      },
-      '--no-cordova|-w': {
-        title: 'Create a basic structure without Cordova requirements',
-        boolean: true
-      },
-      '--sass|-s': {
-        title: 'Setup the project to use Sass CSS precompiling',
-        boolean: true
-      },
-      '--list|-l': {
-        title: 'List starter templates available',
-        boolean: true
-      },
-      '--io-app-id': 'The Ionic.io app ID to use',
-      '--template|-t': 'Project starter template',
-      '--v2|-v': {
-        boolean: true,
-        title: 'Start a Ionic v2 project'
-      },
-      '--typescript|--ts': {
-        boolean: true,
-        title: '(with --v2 only) Use TypeScript in starter'
-      },
-      '--zip-file|-z': 'URL to download zipfile for starter template'
-    },
-    module: './ionic/start',
-    disableChangePwd: true
-  },
-  {
-    title: 'serve',
-    name: 'serve',
-    summary: 'Start a local development server for app dev/testing',
-    args: {
-      '[options]': ''
-    },
-    options: {
-      '--consolelogs|-c': {
-        title: 'Print app console logs to Ionic CLI',
-        boolean: true
-      },
-      '--serverlogs|-s': {
-        title: 'Print dev server logs to Ionic CLI',
-        boolean: true
-      },
-      '--port|-p': 'Dev server HTTP port (8100 default)',
-      '--livereload-port|-r': 'Live Reload port (35729 default)',
-      '--nobrowser|-b': {
-        title: 'Disable launching a browser',
-        boolean: true
-      },
-      '--nolivereload|-d': {
-        title: 'Do not start live reload',
-        boolean: true
-      },
-      '--noproxy|-x': {
-        title: 'Do not add proxies',
-        boolean: true
-      },
-      '--address': 'Use specific address or return with failure',
-      '--all|-a': {
-        title: 'Have the server listen on all addresses (0.0.0.0)',
-        boolean: true
-      },
-      '--browser|-w': 'Specifies the browser to use (safari, firefox, chrome)',
-      '--browseroption|-o': 'Specifies a path to open to (/#/tab/dash)',
-      '--lab|-l': {
-        title: 'Test your apps on multiple screen sizes and platform types',
-        boolean: true
-      },
-      '--nogulp': {
-        title: 'Disable running gulp during serve',
-        boolean: true
-      },
-      '--platform|-t': 'Start serve with a specific platform (ios/android)'
-    },
-    module: './ionic/serve'
-  },
-  {
-    title: 'platform',
-    name: 'platform',
-    summary: 'Add platform target for building an Ionic app',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--noresources|-r': {
-        title: 'Do not add default Ionic icons and splash screen resources',
-        boolean: true
-      },
-      '--nosave|-e': {
-        title: 'Do not save the platform to the package.json file',
-        boolean: true
-      }
-    },
-    module: './ionic/cordova',
-    alt: ['platforms']
-  },
-  {
-    title: 'run',
-    name: 'run',
-    summary: 'Run an Ionic project on a connected device',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: cordovaRunEmulateOptions,
-    module: './ionic/cordova'
-  },
-  {
-    title: 'emulate',
-    name: 'emulate',
-    summary: 'Emulate an Ionic project on a simulator or emulator',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: cordovaRunEmulateOptions,
-    module: './ionic/cordova'
-  },
-  {
-    title: 'build',
-    name: 'build',
-    summary: 'Build (prepare + compile) an Ionic project for a given platform.\n',
-    args: {
-      '[options]': '',
-      '<PLATFORM>': ''
-    },
-    options: {
-      '--nohooks|-n': {
-        title: 'Do not add default Ionic hooks for Cordova',
-        boolean: true
-      }
-    },
-    module: './ionic/cordova'
-  },
-  {
-    title: 'plugin add',
-    name: 'plugin',
-    summary: 'Add a Cordova plugin',
-    args: {
-      '[options]': '',
-      '<SPEC>': 'Can be a plugin ID, a local path, or a git URL.'
-    },
-    options: {
-      '--searchpath <directory>': 'When looking up plugins by ID, look in this directory\n' +
-                                  'and subdirectories first for the plugin before\n' +
-                                  'looking it up in the registry.',
-      '--nosave|-e': {
-        title: 'Do not save the plugin to the package.json file',
-        boolean: true
-      }
-    },
-    alt: ['plugins'],
-    module: './ionic/cordova'
-  },
-  {
-    title: 'prepare',
-    name: 'prepare',
-    module: './ionic/cordova'
-  },
-  {
-    title: 'compile',
-    name: 'compile',
-    module: './ionic/cordova'
-  },
-  {
-    title: 'resources',
-    name: 'resources',
-    summary: resourcesSummary,
-    options: {
-      '--icon|-i': {
-        title: 'Generate icon resources',
-        boolean: true
-      },
-      '--splash|-s': {
-        title: 'Generate splash screen resources',
-        boolean: true
-      }
-    },
-    module: './ionic/resources'
-  },
-  {
-    title: 'upload',
-    name: 'upload',
-    summary: 'Upload an app to your Ionic account',
-    options: {
-      '--email|-e': 'Ionic account email',
-      '--password|-p': 'Ionic account password',
-      '--note': 'The note to signify the upload',
-      '--deploy <channel_tag>': 'Deploys the upload to the given channel. Defaults to the Dev channel'
-    },
-    alt: ['up'],
-    module: './ionic/upload'
-  },
-  {
-    title: 'share',
-    name: 'share',
-    summary: 'Share an app with a client, co-worker, friend, or customer',
-    args: {
-      '<EMAIL>': 'The email to share the app with'
-    },
-    module: './ionic/share'
-  },
-  {
-    title: 'lib',
-    name: 'lib',
-    summary: 'Gets Ionic library version or updates the Ionic library',
-    args: {
-      '[options]': '',
-      '[update]': 'Updates the Ionic Framework in www/lib/ionic'
-    },
-    options: {
-      '--version|-v': 'Specific Ionic version\nOtherwise it defaults to the latest version'
-    },
-    module: './ionic/lib'
-  },
-  {
-    title: 'setup',
-    name: 'setup',
-    summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
-    args: {
-      '[sass]': 'Setup the project to use Sass CSS precompiling'
-    },
-    module: './ionic/setup'
-  },
-  {
-    title: 'login',
-    name: 'login',
-    module: './ionic/login'
-  },
-  {
-    title: 'address',
-    name: 'address',
-    module: './ionic/serve'
-  },
-  {
-    title: 'io',
-    name: 'io',
-    summary: 'Integrate your app with the ionic.io platform services ' + '(alpha)'.red,
-    args: {
-      '<command>': 'init'.yellow
-    },
-    module: './ionic/io-init'
-  },
-  {
-    title: 'security',
-    name: 'security',
-    summary: 'Store your app\'s credentials for the Ionic Platform ' + '(alpha)'.red,
-    args: {
-      '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' +
-        'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
-      '[options]': ''
-    },
-    options: {
-      '--profile <tag>': '(' + 'credentials <platform>'.yellow +
-        ') Specify the profile on which these credentials are saved',
-      '--keystore|-s <path>': '(' + 'credentials android'.yellow +
-        ') Specify the location of your keystore file',
-      '--keystore-password|-p <password>': '(' + 'credentials android'.yellow +
-        ') Specify your keystore password (exclude for prompt)',
-      '--key-alias|-k <alias>': '(' + 'credentials android'.yellow +
-        ') Specify your key alias for this app',
-      '--key-password|-w <password>': '(' + 'credentials android'.yellow +
-        ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'credentials ios'.yellow +
-        ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'credentials ios'.yellow +
-        ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow +
-        ') Specify the location of your .mobileprovision file'
-    },
-    module: './ionic/security'
-  },
-  {
-    title: 'push',
-    name: 'push',
-    summary: 'Upload APNS and GCM credentials to Ionic Push ' + '(alpha)'.red,
-    options: {
-      '--ios-dev-cert': 'Upload your development .p12 file to Ionic Push',
-      '--ios-prod-cert': 'Upload your production .p12 file to Ionic Push',
-      '--production-mode=y,n': 'Tell Ionic Push to use production (y) or sandbox (n) APNS servers',
-      '--google-api-key <your-gcm-api-key>': "Set your app's GCM API key on Ionic Push"
-    },
-    module: './ionic/push'
-  },
-  {
-    title: 'package',
-    name: 'package',
-    summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
-    args: {
-      '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow +
-        ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
-      '[options]': ''
-    },
-    options: {
-      '--release': '(' + 'build <platform>'.yellow +
-        ') Mark this build as a release',
-      '--profile|-p <tag>': '(' + 'build <platform>'.yellow +
-        ') Specify the Security Profile to use with this build',
-      '--noresources': '(' + 'build <platform>'.yellow +
-        ') Do not generate icon and splash screen resources during this build',
-      '--destination|-d <path>': '(' + 'download'.yellow +
-        ') Specify the destination directory to download your packaged app.'
-    },
-    module: './ionic/package'
-  },
-  {
-    title: 'config',
-    name: 'config',
-    summary: 'Set configuration variables for your ionic app ' + '(alpha)'.red,
-    args: {
-      '<command>': 'set'.yellow + ', ' + 'unset'.yellow + ', ' + 'build'.yellow + ', or ' + 'info'.yellow,
-      '[key]': 'The key to set',
-      '[value]': 'The value to set'
-    },
-    module: './ionic/io-config'
-  },
-  {
-    title: 'browser',
-    name: 'browser',
-    summary: 'Add another browser for a platform ' + '(beta)'.yellow,
-    args: {
-      '<command>': '"add remove rm info versions upgrade list ls revert"',
-      '[browser]': 'The browser you wish to add or remove (Crosswalk)'
-    },
-    options: {
-      '--nosave|-n': {
-        title: 'Do not save the platforms and plugins to the package.json file',
-        boolean: true
-      }
-    },
-    module: './ionic/browser'
-  },
-  {
-    title: 'service add',
-    name: 'service',
-    summary: 'Add an Ionic service package and install any required plugins',
-    args: {
-      '[options]': '',
-      '<SPEC>': 'Can be a service name or a git url'
-    },
-    module: './ionic/service'
-  },
-  {
-    title: 'add',
-    name: 'add',
-    summary: 'Add an Ion, bower component, or addon to the project',
-    args: {
-      '[name]': 'The name of the ion, bower component, or addon you wish to install'
-    },
-    module: './ionic/add'
-  },
-  {
-    title: 'remove',
-    name: 'remove',
-    summary: 'Remove an Ion, bower component, or addon from the project',
-    args: {
-      '[name]': 'The name of the Ion, bower component, or addon you wish to remove'
-    },
-    module: './ionic/add',
-    alt: ['rm']
-  },
-  {
-    title: 'list',
-    name: 'list',
-    summary: 'List Ions, bower components, or addons in the project',
-    module: './ionic/add',
-    alt: ['ls']
-  },
-
-  /*
-  {
-    title: 'ions',
-    name: 'ions',
-    summary: 'List available ions to add to your project',
-    module: './ionic/ions'
-  },
-  {
-    title: 'templates',
-    name: 'templates',
-    summary: 'List available Ionic starter templates',
-    module: './ionic/templates'
-  },
-  */
-  {
-    title: 'info',
-    name: 'info',
-    summary: 'List information about the users runtime environment',
-    module: './ionic/info'
-  },
-  {
-    title: 'help',
-    name: 'help',
-    summary: 'Provides help for a certain command',
-    args: {
-      '[command]': 'The command you desire help with'
-    },
-    module: './ionic/help',
-    disableChangePwd: true
-  },
-  {
-    title: 'link',
-    name: 'link',
-    summary: 'Sets your Ionic App ID for your project',
-    args: {
-      '[appId]': 'The app ID you wish to set for this project'
-    },
-    options: {
-      '--reset|-r': {
-        title: 'This will reset the Ionic App ID',
-        boolean: true
-      }
-    },
-    module: './ionic/link'
-  },
-  {
-    title: 'hooks',
-    name: 'hooks',
-    summary: 'Manage your Ionic Cordova hooks',
-    args: {
-      '[add|remove|permissions|perm]': 'Add, remove, or modify permissions on the default Ionic Cordova hooks'
-    },
-    module: './ionic/hooks'
-  },
-  {
-    title: 'state',
-    name: 'state',
-    summary: 'Saves or restores state of your Ionic Application using the package.json file',
-    args: {
-      '<COMMAND>': '[ save | restore | clear | reset ]'
-    },
-    options: {
-      save: 'Save the platforms and plugins into package.json',
-      restore: 'Restore the platforms and plugins from package.json',
-      clear: 'Clear the package.json of cordovaPlugins and cordovaPlatforms, ' +
-        'as well as clear out the platforms and plugins folders',
-      reset: 'Clear out the platforms and plugins directories, and reinstall plugins and platforms',
-      '--plugins': {
-        title: 'Only do operations with plugins',
-        boolean: true
-      },
-      '--platforms': {
-        title: 'Only do operations with platforms',
-        boolean: true
-      }
-    },
-    module: './ionic/state'
-  },
-  {
-    title: 'docs',
-    name: 'docs',
-    summary: 'Opens up the documentation for Ionic',
-    args: {
-      '<TOPIC>': 'the topic to view help documentation for. Use "ls" to view all topics'
-    },
-    module: './ionic/docs',
-    disableChangePwd: true
-  },
-  {
-    title: 'generate',
-    alt: ['g'],
-    name: 'generate',
-    summary: 'Generate pages and components',
-    module: './ionic/generate',
-    options: {
-      '--list': {
-        title: 'List available generators',
-        boolean: true
-      },
-      '--typescript|--ts': {
-        boolean: true,
-        title: '(with --v2 only) Use TypeScript in generation'
-      }
-    }
-  }
-];
-
-
-module.exports = TASKS;
diff --git a/lib/utils/bower.js b/lib/utils/bower.js
new file mode 100644
index 0000000000..66c88e967d
--- /dev/null
+++ b/lib/utils/bower.js
@@ -0,0 +1,67 @@
+'use strict';
+
+require('colors');
+
+var fs = require('fs');
+var path = require('path');
+var childProcess = require('child_process');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+function setIonicVersion(newVersion) {
+  var bowerData = this.getData();
+  if (!bowerData.devDependencies) bowerData.devDependencies = {};
+  bowerData.devDependencies.ionic = 'driftyco/ionic-bower#' + newVersion;
+  this.saveData(bowerData);
+}
+
+function setAppName(newAppName) {
+  var bowerData = this.getData();
+  bowerData.name = newAppName;
+  this.saveData(bowerData);
+}
+
+function getData() {
+  var bowerFilePath = path.resolve('bower.json');
+
+  try {
+    if (fs.existsSync(bowerFilePath)) {
+      return JSON.parse(fs.readFileSync(bowerFilePath));
+    }
+  } catch (e) {
+    throw e;
+  }
+
+  return {
+    name: 'HelloIonic',
+    private: 'true'
+  };
+}
+
+function saveData(bowerData) {
+  try {
+    var bowerFilePath = path.resolve('bower.json');
+    fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
+  } catch (e) {
+    log.error(('Error saving ' + bowerFilePath + ': ' + e).red.bold);
+  }
+}
+
+function checkForBower() {
+  var result = childProcess.exec('bower -v', { silent: true });
+  if (result.output.indexOf('command not found') === -1 && result.output.indexOf('not recognized') === -1) {
+    return true;
+  }
+  return false;
+}
+
+var installMessage = 'You must have bower installed to continue. \nType `npm install -g bower`';
+
+module.exports = {
+  setIonicVersion: setIonicVersion,
+  setAppName: setAppName,
+  getData: getData,
+  saveData: saveData,
+  checkForBower: checkForBower,
+  installMessage: installMessage
+};
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
new file mode 100644
index 0000000000..3e1b02378e
--- /dev/null
+++ b/lib/utils/cordova.js
@@ -0,0 +1,278 @@
+'use strict';
+
+require('colors');
+
+var Q = require('q');
+var _ = require('underscore');
+var path = require('path');
+var fs = require('fs');
+var IonicAppLib = require('ionic-app-lib');
+var Serve = IonicAppLib.serve;
+var Project = IonicAppLib.project;
+var log = IonicAppLib.logging.logger;
+var ConfigXml = IonicAppLib.configXml;
+var childProcess = require('child_process');
+var childExec = childProcess.exec;
+var promiseExec = Q.denodeify(childExec);
+
+/**
+ * Returns true or false after checking if the platform exists
+ * Synchronous
+ *
+ * @param {String} platform The platform to check for
+ * @param {String} baseDir The projects base directory
+ * @return {Boolean} True if platform is installed
+ */
+function isPlatformInstalled(platform, baseDir) {
+  var platformPath = path.join(baseDir, 'platforms', platform);
+
+  try {
+    fs.statSync(platformPath);
+    return true;
+  } catch (ex) {
+    return false;
+  }
+}
+
+/**
+ * Returns true or false after checking if any plugin is installed
+ * Synchronous
+ *
+ * @param {String} baseDir The projects base directory
+ * @return {Boolean} True if any plugin is installed
+ */
+function arePluginsInstalled(baseDir) {
+  var pluginPath = path.join(baseDir, 'plugins');
+
+  try {
+    fs.statSync(pluginPath);
+    return true;
+  } catch (ex) {
+    return false;
+  }
+}
+
+/**
+ * Install the platform specified using cordova
+ *
+ * @param {String} platform The platform to install (ios, android, etc.)
+ * @return {Promise} Promise upon completion
+ */
+function installPlatform(platform) {
+  log.info(('• You\'re trying to build for ' + platform + 'but don\'t have the platform installed yet.').yellow);
+  log.info('∆ Installing ' + platform + ' for you.');
+
+  return promiseExec('cordova platform add ' + platform).then(function() {
+    log.info('√ Installed platform ' + platform);
+  });
+}
+
+function execCordovaCommand(optionList, isLiveReload, serveOptions) {
+  var deferred = Q.defer();
+  isLiveReload = !!isLiveReload;
+
+  log.debug('Executing cordova cli: ' + optionList.join(' '));
+  var cordovaProcess = childProcess.exec('cordova ' + optionList.join(' '));
+
+  cordovaProcess.stdout.on('data', function(data) {
+    log.info(data);
+  });
+
+  cordovaProcess.stderr.on('data', function(data) {
+    if (data) {
+      log.error(data.toString().bold);
+    }
+  });
+
+  cordovaProcess.on('close', function(code) {
+    if (code > 0) {
+      return deferred.reject(code);
+    }
+    return deferred.resolve();
+  });
+
+  if (isLiveReload) {
+    cordovaProcess.on('exit', function() {
+
+      Serve.printCommandTips(serveOptions);
+      setTimeout(function() {
+
+        // set it back to the original src after a few seconds
+        ConfigXml.setConfigXml(process.cwd(), {
+          resetContent: true,
+          errorWhenNotFound: true
+        });
+
+        // deferred.resolve();
+      }, 5000);
+    });
+
+    process.on('exit', function() {
+
+      // verify it was set back
+      ConfigXml.setConfigXml(process.cwd(), {
+        resetContent: true,
+        errorWhenNotFound: false
+      });
+    });
+
+    var readLine = require('readline');
+    if (process.platform === 'win32') {
+      var rl = readLine.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+
+      rl.on('SIGINT', function() {
+        process.emit('SIGINT');
+      });
+    }
+
+    process.on('SIGINT', function() {
+      process.exit();
+    });
+  }
+
+  return deferred.promise;
+}
+
+/**
+ * Install ionic required plugins
+ *
+ * @return {Promise} Promise upon completion
+ */
+function installPlugins() {
+  var plugins = [
+    'cordova-plugin-device',
+    'cordova-plugin-console',
+    'cordova-plugin-whitelist',
+    'cordova-plugin-splashscreen',
+    'cordova-plugin-statusbar',
+    'ionic-plugin-keyboard'
+  ];
+
+  return Q.all(plugins.map(function(plugin) {
+    log.info(['Installing ', plugin].join(''));
+    return promiseExec('cordova plugin add --save ' + plugin);
+  }));
+}
+
+/**
+ * Filter and gather arguments from command line to be passed to Cordova
+ *
+ * @param {String} cmdName The command that is being executed (ie run, build, etc)
+ * @param {Object} argv An optimist object
+ * @return {Array} Returns a list of commands to use with cordova
+ */
+function filterArgumentsForCordova(cmdName, argv, rawCliArguments) {
+
+  // clean out any cmds that may confuse cordova
+  var port = argv.port || argv.p || '';
+  var liveReloadPort = argv.livereloadport || argv['livereload-port'] || argv.r || '';
+  var ignoreCmds = [
+    '--livereload', '-l',
+    '--consolelogs', '-c',
+    '--serverlogs', '-s',
+    '--port', '-p',
+    '--livereload-port',
+    '-i', '-r'
+  ];
+
+  return rawCliArguments.filter(function(arg, index, fullList) {
+
+    // Remove address parameter and the param that follows it
+    if (arg === '--address' || fullList[index - 1] === '--address') { return false; }
+
+    // If arg is equal to what we identifed as the port reject it
+    if (port && parseInt(arg, 10) === parseInt(port, 10)) { return false; }
+
+    // If arg is equal to what we identifed as the liveReloadPort reject it
+    if (liveReloadPort && parseInt(arg, 10) === parseInt(liveReloadPort, 10)) { return false; }
+
+    // Only return true if the arg is not found in the ignore Cmds list
+    return ignoreCmds.indexOf(arg) === -1;
+  }).map(function(arg) {
+
+    // If the arg is the target command and it does not contain double quotes add them
+    // because process.argv removes them
+    if (arg.indexOf('--target=') === 0 && arg.indexOf('"') === -1) {
+      return arg.replace('--target=', '--target="') + '"';
+    }
+    return arg;
+  });
+}
+
+/**
+ * Setup the live reload server for ionic
+ *
+ * @param {Array} argv List of arguments
+ * @param {String} baseDir The projects base directory
+ * @return {Promise} Promise upon completion
+ */
+function setupLiveReload(argv, baseDir) {
+  log.info(('Setup Live Reload').green.bold);
+
+  var project = Project.load(baseDir);
+  var options = _.extend(Serve.loadSettings(argv, project), {
+    appDirectory: baseDir,
+    runLivereload: true,
+    launchBrowser: false,
+    launchLab: false,
+    isPlatformServe: true
+  });
+
+
+  // First ask user for the IP selection
+  // Check ports not used
+  // Set up config.xml src url
+  // run the cordova command
+
+  var promises = [];
+
+  if (argv.all) {
+    log.info('Defaulting address to 0.0.0.0');
+    options.address = '0.0.0.0';
+  } else if (argv.address) {
+    options.address = argv.address;
+  } else {
+    promises = promises.concat(Serve.getAddress(options));
+  }
+
+  return Q.all(promises)
+  .then(function() {
+    options.devServer = Serve.host(options.address, options.port);
+    return Serve.checkPorts(true, options.port, options.address, options);
+  })
+  .then(function() {
+    if (options.runLivereload) {
+      return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
+    }
+  })
+  .then(function() {
+    return ConfigXml.setConfigXml(process.cwd(), {
+      devServer: Serve.host(options.address, options.port)
+    });
+  })
+  .then(function() {
+    return Serve.start(options);
+  })
+  .then(function() {
+    Serve.showFinishedServeMessage(options);
+    return options;
+  })
+  .catch(function(error) {
+    log.info('There was an error serving your Ionic application for run', error);
+    log.info(error.stack);
+    throw error;
+  });
+}
+
+module.exports = {
+  isPlatformInstalled: isPlatformInstalled,
+  arePluginsInstalled: arePluginsInstalled,
+  installPlatform: installPlatform,
+  installPlugins: installPlugins,
+  execCordovaCommand: execCordovaCommand,
+  filterArgumentsForCordova: filterArgumentsForCordova,
+  setupLiveReload: setupLiveReload
+};
diff --git a/lib/utils/help.js b/lib/utils/help.js
new file mode 100644
index 0000000000..144adbdbc2
--- /dev/null
+++ b/lib/utils/help.js
@@ -0,0 +1,243 @@
+'use strict';
+
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+require('colors');
+
+/**
+ * @method printIonic
+ * @return {Array} Returns array of lines to print for ionic name
+ */
+function printIonic(ionicVersion) {
+  return [
+    '  _             _          ',
+    ' (_)           (_)         ',
+    '  _  ___  _ __  _  ___     ',
+    ' | |/ _ \\| \'_ \\| |/ __| ',
+    ' | | (_) | | | | | (__     ',
+    ' |_|\\___/|_| |_|_|\\___|  CLI v' + ionicVersion
+  ];
+}
+
+
+/**
+ * @method printTemplate
+ * @param {Array} lineArray list of lines to print
+ * @return {Null} no return value
+ */
+function printTemplate(lineArray) {
+  log.info(lineArray.reduce(function(all, line) {
+    all += (line !== null) ? line + '\n' : '';
+    return all;
+  }, ''));
+}
+
+
+/**
+ * @method printAvailableTasks
+ * @param {String} taskName task name supplied to cli
+ * @return {Null} no return value
+ */
+function printTaskListShortUsage(taskList, taskName, ionicVersion) {
+  var taskLines = taskList
+    .filter(function(task) {
+      return task.summary;
+    })
+    .map(function(task) {
+      var name = '   ' + task.name + '  ';
+      var dots = '';
+      while ((name + dots).length < 20) {
+        dots += '.';
+      }
+      return name.green.bold + dots.grey + '  ' + task.summary.bold;
+    });
+
+  var lines = [].concat(
+    printIonic(ionicVersion),
+    [
+      '',
+      'Usage: ionic task args',
+      '',
+      '',
+      '=======================',
+      (taskName ?
+        (taskName + ' is not a valid task\n\n').bold.red
+        : null),
+      'Available tasks: '.bold,
+      '(use --help or -h for more info)',
+      '',
+      ''
+    ],
+    taskLines
+  );
+
+  printTemplate(lines);
+}
+
+
+/**
+ * @method printTaskUsage
+ * @return {Null} no return value
+ */
+function printTaskUsage(task, ionicVersion) {
+  var lines = [].concat(
+    printIonic(ionicVersion),
+    [
+      '',
+      '=======================',
+      ''
+    ]
+  );
+  printTemplate(lines);
+
+  printTaskDetails(task);
+
+  printTemplate([
+    ''
+  ]);
+}
+
+
+/**
+ * @method printAllTaskUsage
+ * @return {Null} no return value
+ */
+function printTaskListUsage(taskList, ionicVersion) {
+  var lines = [].concat(
+    printIonic(ionicVersion),
+    [
+      '',
+      '=======================',
+      ''
+    ]
+  );
+  printTemplate(lines);
+
+  taskList
+    .filter(function(task) {
+      return task.summary;
+    }).forEach(function(task) {
+      return printTaskDetails(task);
+    });
+
+  printTemplate([
+    ''
+  ]);
+}
+
+
+/**
+ * @method printTaskDetails
+ * @return {Null} no return value
+ */
+function printTaskDetails(d) {
+  function w(s) {
+    process.stdout.write(s);
+  }
+
+  w('\n');
+
+  var rightColumn = 45;
+  var dots = '';
+  var indent = '';
+  var x;
+  var arg;
+
+  var taskArgs = d.title;
+
+  for (arg in d.args) {
+    if ({}.hasOwnProperty.call(d.args, arg)) {
+      taskArgs += ' ' + arg;
+    }
+  }
+
+  w(taskArgs.green.bold);
+
+  while ((taskArgs + dots).length < rightColumn + 1) {
+    dots += '.';
+  }
+
+  w(' ' + dots.grey + '  ');
+
+  if (d.summary) {
+    w(d.summary.bold);
+  }
+
+  for (arg in d.args) {
+    if (!d.args[arg]) continue;
+
+    indent = '';
+    w('\n');
+    while (indent.length < rightColumn) {
+      indent += ' ';
+    }
+    w((indent + '    ' + arg + ' ').bold);
+
+    var argDescs = d.args[arg].split('\n');
+    var argIndent = indent + '    ';
+
+    for (x = 0; x < arg.length + 1; x += 1) {
+      argIndent += ' ';
+    }
+
+    for (x = 0; x < argDescs.length; x += 1) {
+      if (x === 0) {
+        w(argDescs[x].bold);
+      } else {
+        w('\n' + argIndent + argDescs[x].bold);
+      }
+    }
+  }
+
+  indent = '';
+  while (indent.length < d.name.length + 1) {
+    indent += ' ';
+  }
+
+  var optIndent = indent;
+  while (optIndent.length < rightColumn + 4) {
+    optIndent += ' ';
+  }
+
+  for (var opt in d.options) {
+    if ({}.hasOwnProperty.call(d.options, opt)) {
+      w('\n');
+      dots = '';
+
+      var optLine = indent + '[' + opt + ']  ';
+
+      w(optLine.yellow.bold);
+
+      if (d.options[opt]) {
+        while ((dots.length + optLine.length - 2) < rightColumn) {
+          dots += '.';
+        }
+        w(dots.grey + '  ');
+
+        var taskOpt = d.options[opt];
+        var optDescs;
+
+        if (typeof taskOpt == 'string') {
+          optDescs = taskOpt.split('\n');
+        } else {
+          optDescs = taskOpt.title.split('\n');
+        }
+        for (x = 0; x < optDescs.length; x += 1) {
+          if (x === 0) {
+            w(optDescs[x].bold);
+          } else {
+            w('\n' + optIndent + optDescs[x].bold);
+          }
+        }
+      }
+    }
+
+    w('\n');
+  }
+}
+
+module.exports = {
+  printTaskListShortUsage: printTaskListShortUsage,
+  printTaskListUsage: printTaskListUsage,
+  printTaskUsage: printTaskUsage
+};
diff --git a/lib/ionic/ionitron.js b/lib/utils/ionitron.js
similarity index 88%
rename from lib/ionic/ionitron.js
rename to lib/utils/ionitron.js
index 3befddc537..fd630f04e8 100644
--- a/lib/ionic/ionitron.js
+++ b/lib/utils/ionitron.js
@@ -1,7 +1,10 @@
-require('colors');
+'use strict';
 
+var colors = require('colors');
 var path = require('path');
 var fs = require('fs');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
 
 var ionitronStatements = [
   'Hello human, what shall we build today?',
@@ -31,11 +34,11 @@ var ionitronStatementsEs = [
   'Bif\u00Farcate! Oh, Lo siento, rama equivocada. '
 ];
 
-var ionictronAsciiFile = 'ionitron.txt';
+var ASCII_ART_FILE = 'ionitron.txt';
 
-module.exports.print = function print(lang) {
+function print(lang) {
 
-  var ionitronPath = path.join(__dirname, 'assets', ionictronAsciiFile);
+  var ionitronPath = path.join(__dirname, ASCII_ART_FILE);
   var contents = fs.readFileSync(ionitronPath, 'utf8');
   var messageContent;
 
@@ -54,19 +57,21 @@ module.exports.print = function print(lang) {
 
   var replaceString = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@';
 
-  // console.log(messageContent.length, replaceString.length)
   if (messageContent.length < replaceString.length) {
     var diff = (replaceString.length) - messageContent.length;
     var i = 0;
 
-    // console.log(diff, i)
     while (i < diff) {
       messageContent = messageContent + ' ';
       i += 1;
     }
   }
   contents = contents.replace(replaceString, messageContent);
-  console.log(contents.cyan);
+  log.info(colors.cyan(contents));
 
   return;
+}
+
+module.exports = {
+  print: print
 };
diff --git a/lib/ionic/assets/ionitron.txt b/lib/utils/ionitron.txt
similarity index 100%
rename from lib/ionic/assets/ionitron.txt
rename to lib/utils/ionitron.txt
diff --git a/lib/ionic/prompt.js b/lib/utils/prompt.js
similarity index 100%
rename from lib/ionic/prompt.js
rename to lib/utils/prompt.js
diff --git a/lib/utils/stats.js b/lib/utils/stats.js
new file mode 100644
index 0000000000..2f3f42aeca
--- /dev/null
+++ b/lib/utils/stats.js
@@ -0,0 +1,164 @@
+/* eslint-disable camelcase, no-underscore-dangle */
+'use strict';
+
+var request = require('request');
+var IonicConfig = require('ionic-app-lib').config;
+var IonicInfo = require('ionic-app-lib').info;
+var log = require('ionic-app-lib').logging.logger;
+var path = require('path');
+var fs = require('fs');
+
+var proxy = process.env.PROXY || process.env.http_proxy || null;
+
+function track(event, uuid, data, callback) {
+  data = {
+    _event : event,
+    _uuid: uuid,
+    data: data
+  };
+
+  request({
+    url: 'https://t.ionic.io/event/cli',
+    method: 'POST',
+    json: data,
+    proxy: proxy
+  }, function(err, res, body) {
+    callback(err, res, body);
+  });
+}
+
+var ionicConfig = IonicConfig.load();
+
+function createId() {
+  var d = new Date().getTime();
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c === 'x' ? r : (r & 0x7 | 0x8)).toString(16);
+  });
+}
+
+// update any aliases with the full cmd so there's a common property
+function mapAliases(args) {
+  var aliasMap = {
+    rm: 'remove',
+    ls: 'list',
+    up: 'update',
+    '-w': '--no-cordova',
+    '-b': '--nobrowser',
+    '-r': '--nolivereload',
+    '-x': '--noproxy',
+    '-l': '--livereload',
+    '-c': '--consolelogs',
+    '-s': '--serverlogs',
+    '-n': '--no-email'
+  };
+
+  return args.map(function(arg) {
+    var lowerCaseArg = arg.toLowerCase();
+    return (aliasMap[lowerCaseArg]) ? aliasMap[lowerCaseArg] : arg;
+  });
+}
+
+function mp(e, d) {
+  var uniqueId = ionicConfig.get('ank');
+  if (!uniqueId) {
+    uniqueId = createId();
+    ionicConfig.set('ank', uniqueId);
+  }
+  track(e, uniqueId, d, function(err, data) { // eslint-disable-line no-unused-vars,handle-callback-err
+  });
+}
+
+function t(additionalData) {
+  try {
+
+    if (process.argv.length < 3) return;
+
+    if (ionicConfig.get('statsOptOut') === true) {
+      return;
+    }
+
+    var cmdName = process.argv[2].toLowerCase();
+    var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []); // skip the cmdName
+
+    var statsData = additionalData || {};
+    var platforms = [];
+    var filePath;
+    var releaseTag;
+
+    // update any aliases with the full cmd so there's a common property
+    cmdArgs = mapAliases(cmdArgs);
+
+    var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
+    var argsWhitelist = ('add remove list update check debug release search --livereload --consolelogs --serverlogs ' +
+      '--no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass ' +
+      '--splash --icon').split(' ');
+
+    platforms = cmdArgs.filter(function(cmd) {
+      return platformWhitelist.indexOf(cmd) !== -1;
+    });
+
+    // create a platform property only when there is 1 or more
+    if (platforms.length) {
+      statsData.platform = platforms.sort().join(',');
+    }
+
+    statsData = cmdArgs
+      .filter(function(cmd) {
+        return argsWhitelist.indexOf(cmd) !== -1;
+      })
+      .concat(platforms)
+      .reduce(function(argObj, cmd) {
+        argObj[cmd] = true;
+        return argObj;
+      }, statsData);
+
+    // add which ionic lib version they're using
+    try {
+      filePath = path.resolve('www/lib/ionic/version.json');
+      statsData.ionic_version = JSON.parse(fs.readFileSync(filePath)).version;
+    } catch (e2) {} // eslint-disable-line no-empty
+
+    // add which cli version is being used
+    try {
+      filePath = '../../package.json';
+      statsData.cli_version = JSON.parse(fs.readFileSync(filePath)).version;
+    } catch (e2) {} // eslint-disable-line no-empty
+
+    try {
+      statsData.email = ionicConfig.get('email');
+    } catch (e2) {} // eslint-disable-line no-empty
+
+    try {
+      statsData.account_id = ionicConfig.get('id');
+    } catch (e2) {} // eslint-disable-line no-empty
+
+    if (statsData.cli_version) {
+      releaseTag = statsData.cli_version.split('-')[1];
+    }
+    if (releaseTag) {
+      statsData.cli_release_tag = releaseTag.split('.')[0];
+    }
+
+    var info = {};
+    IonicInfo.getNodeVersion(info);
+    IonicInfo.getOsEnvironment(info);
+    IonicInfo.gatherGulpInfo(info);
+
+    mp(cmdName, ({
+      os: info.os,
+      gulp: info.gulp,
+      node: info.node
+    }, statsData));
+
+    // console.log(cmdName, statsData);
+
+  } catch (e) {
+    log.error(('Error stats: ' + e));
+  }
+}
+
+module.exports = {
+  t: t
+};
diff --git a/lib/ionic/store.js b/lib/utils/store.js
similarity index 97%
rename from lib/ionic/store.js
rename to lib/utils/store.js
index 92c7eacc5f..f027f044cb 100644
--- a/lib/ionic/store.js
+++ b/lib/utils/store.js
@@ -53,4 +53,4 @@ IonicStore.prototype.save = function() {
   }
 };
 
-exports.IonicStore = IonicStore;
+module.exports = IonicStore;
diff --git a/lib/ionic/table.js b/lib/utils/table.js
similarity index 100%
rename from lib/ionic/table.js
rename to lib/utils/table.js
diff --git a/lib/ionic/templates.js b/lib/utils/templates.js
similarity index 62%
rename from lib/ionic/templates.js
rename to lib/utils/templates.js
index e7c30dc564..1f58639602 100644
--- a/lib/ionic/templates.js
+++ b/lib/utils/templates.js
@@ -2,16 +2,11 @@ require('colors');
 
 var _ = require('underscore');
 var Q = require('q');
-var Task = require('./task').Task;
 var request = require('request');
-var log = require('ionic-app-lib').logging.logger;
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
 
-function IonicTask() {}
-
-IonicTask.prototype = new Task();
-
-IonicTask.prototype.fetchStarterTemplates = function() {
-  var self = this;
+function fetchStarterTemplates() {
 
   // log.info('About to fetch template');
   var downloadUrl = 'http://code.ionicframework.com/content/starter-templates.json';
@@ -29,20 +24,18 @@ IonicTask.prototype.fetchStarterTemplates = function() {
         templatesJson = JSON.parse(html);
       } catch (ex) {
         log.error('ex', ex);
-        q.reject('Error occured in download templates:', ex);
-        self.ionic.fail(ex);
-        return;
+        return q.reject('Error occured in download templates:', ex);
       }
-      q.resolve(templatesJson);
+      return q.resolve(templatesJson);
     } else {
       log.error('Unable to fetch the starter templates. Please check your internet connection');
-      q.reject(res);
+      return q.reject(res);
     }
   });
   return q.promise;
-};
+}
 
-IonicTask.prototype.list = function list(templates) {
+function list(templates) {
 
   // Should have array of [{ name: 'name', description: 'desc' }]
   log.info('\n');
@@ -56,18 +49,18 @@ IonicTask.prototype.list = function list(templates) {
     }
     log.info(shortName.green, dots, template.description);
   });
-};
+}
 
-IonicTask.prototype.run = function() {
-  var self = this;
+function listTemplates() {
 
-  self.fetchStarterTemplates()
-  .then(function(starterTemplates) {
-    var templates = _.sortBy(starterTemplates.items, function(template) { return template.name; });
-    log.info('Ionic Starter templates'.green);
-    self.list(templates);
-  });
+  return fetchStarterTemplates()
+    .then(function(starterTemplates) {
+      var templates = _.sortBy(starterTemplates.items, function(template) { return template.name; });
+      log.info('Ionic Starter templates'.green);
+      return list(templates);
+    });
+}
 
+module.exports = {
+  listTemplates: listTemplates
 };
-
-exports.IonicTask = IonicTask;
diff --git a/package.json b/package.json
index 9fe637f100..7c5af1585c 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,11 @@
   "scripts": {
     "changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
     "gh-release": "node scripts/release",
+    "coveralls": "istanbul cover node_modules/jasmine-node/bin/jasmine-node --captureExceptions spec/ && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js && rm -rf coverage",
     "e2e": "jasmine-node --captureExceptions ./e2e",
     "jasmine": "jasmine-node --captureExceptions  ./spec",
     "lint": "eslint .",
-    "test": "npm run jasmine"
+    "test": "istanbul cover node_modules/jasmine-node/bin/jasmine-node --captureExceptions spec/"
   },
   "keywords": [
     "ionic",
@@ -61,7 +62,6 @@
   "dependencies": {
     "cli-table": "0.3.1",
     "colors": "0.6.2",
-    "detective": "4.3.1",
     "expand-tilde": "1.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
@@ -84,15 +84,17 @@
   },
   "devDependencies": {
     "conventional-changelog-cli": "1.1.1",
+    "coveralls": "^2.2.0",
     "eslint": "^2.8.0",
     "github": "0.2.4",
+    "istanbul": "^0.4.3",
     "jasmine-node": "1.14.5",
+    "mock-require": "1.3.0",
     "rewire": "2.5.1"
   },
   "bundledDependencies": [
     "cli-table",
     "colors",
-    "detective",
     "expand-tilde",
     "form-data",
     "gulp",
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 8faeffe051..14e249227d 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -1,20 +1,30 @@
+'use strict';
+
 var IonicAppLib = require('ionic-app-lib');
-var Ionitron = require('../lib/ionic/ionitron');
-var IonicCli = require('../lib/cli');
+var semver = require('semver');
+var Ionitron = require('../lib/utils/ionitron');
 var Q = require('q');
-var IonicStats = require('../lib/ionic/stats').IonicStats;
-var Task = require('../lib/ionic/task').Task;
+var helpUtils = require('../lib/utils/help');
+var IonicStore = require('../lib/utils/store');
+var IonicStats = require('../lib/utils/stats');
 var Info = IonicAppLib.info;
 var Utils = IonicAppLib.utils;
 var Project = IonicAppLib.project;
+var Logging = IonicAppLib.logging;
+var log = Logging.logger;
+var fs = require('fs');
+var path = require('path');
 var rewire = require('rewire');
+var IonicCli = rewire('../lib/cli');
+var gulp = require('gulp');
 
 describe('Cli', function() {
 
   beforeEach(function() {
+    spyOn(IonicStats, 't');
     spyOn(IonicCli, 'processExit');
-    spyOn(IonicCli, 'printAvailableTasks');
-    spyOn(IonicCli, 'doRuntimeCheck');
+    spyOn(helpUtils, 'printTaskListShortUsage');
+    spyOn(helpUtils, 'printTaskListUsage');
     spyOn(IonicAppLib.events, 'on');
     spyOn(process, 'on');
     spyOn(Info, 'checkRuntime');
@@ -24,7 +34,6 @@ describe('Cli', function() {
     spyOn(Utils, 'fail').andCallFake(function(err) {
       console.log(err);
       console.log(err.stack);
-      throw err;
     });
   });
 
@@ -33,132 +42,291 @@ describe('Cli', function() {
   });
 
   it('should have cli tasks defined', function() {
-    expect(IonicCli.Tasks).toBeDefined();
+    expect(IonicCli.ALL_TASKS).toBeDefined();
   });
 
   describe('#run', function() {
 
     beforeEach(function() {
-      function fakeTask() {}
-      fakeTask.prototype = new Task();
-      fakeTask.prototype.run = function() {};
-
-      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
+      spyOn(IonicCli, 'doRuntimeCheck');
     });
 
     describe('#Cli methods', function() {
-      it('should run checkLatestVersion on run', function() {
-        var deferred = Q.defer();
-        deferred.resolve();
-        spyOn(IonicCli, 'checkLatestVersion').andReturn(deferred);
-        IonicCli.run(['node', 'bin/ionic', 'run', 'ios']);
-        expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
+      it('should run checkLatestVersion on run', function(done) {
+        spyOn(IonicCli, 'checkLatestVersion').andReturn(Q(true));
+
+        IonicCli.run(['node', 'bin/ionic', '--h'])
+        .then(function() {
+          expect(IonicCli.checkLatestVersion).toHaveBeenCalled();
+          done();
+        });
       });
 
-      xit('should run info doRuntimeCheck on run', function() {
-        spyOn(IonicCli, 'printHelpLines');
-        IonicCli.run(['node', 'bin/ionic', '--h']);
-        expect(IonicCli.doRuntimeCheck).toHaveBeenCalled();
+      it('should run info doRuntimeCheck on run', function(done) {
+        IonicCli.run(['node', 'bin/ionic', '--h'])
+        .then(function() {
+          expect(IonicCli.doRuntimeCheck).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should run ionitron when argument is passed', function() {
+      it('should run ionitron when argument is passed', function(done) {
         spyOn(Ionitron, 'print');
-        IonicCli.run(['node', 'bin/ionic', '--ionitron']);
-        expect(Ionitron.print).toHaveBeenCalled();
+
+        IonicCli.run(['node', 'bin/ionic', '--ionitron'])
+        .then(function() {
+          expect(Ionitron.print).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should change log level to debug when verbose arg is passed', function() {
-        spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
+      it('should change log level to debug when verbose arg is passed', function(done) {
         expect(IonicAppLib.logging.logger.level).toBe('info');
-        IonicCli.run(['node', 'bin/ionic', '--verbose']);
-        expect(IonicAppLib.logging.logger.level).toBe('debug');
+
+        IonicCli.run(['node', 'bin/ionic', '--verbose'])
+        .then(function() {
+          expect(IonicAppLib.logging.logger.level).toBe('debug');
+          done();
+        });
       });
 
-      it('should get version when version flag passed', function() {
+      it('should get version when version flag passed', function(done) {
         spyOn(IonicCli, 'version');
-        IonicCli.run(['node', 'bin/ionic', '--version']);
-        expect(IonicCli.version).toHaveBeenCalled();
+
+        IonicCli.run(['node', 'bin/ionic', '--version'])
+        .then(function() {
+          expect(IonicCli.version).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should call help when help argument passed', function() {
-        spyOn(IonicCli, 'printHelpLines');
-        IonicCli.run(['node', 'bin/ionic', '--help']);
-        expect(IonicCli.printHelpLines).toHaveBeenCalled();
+      it('should call help when help argument passed', function(done) {
+
+        IonicCli.run(['node', 'bin/ionic', '--help'])
+        .then(function() {
+          expect(helpUtils.printTaskListUsage).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should call help when help shorthand argument passed', function() {
-        spyOn(IonicCli, 'printHelpLines');
-        IonicCli.run(['node', 'bin/ionic', '--h']);
-        expect(IonicCli.printHelpLines).toHaveBeenCalled();
+      it('should call help when help shorthand argument passed', function(done) {
+
+        IonicCli.run(['node', 'bin/ionic', '--h'])
+        .then(function() {
+          expect(helpUtils.printTaskListUsage).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should print available tasks if no valid command is passed', function() {
-        spyOn(IonicCli, 'tryBuildingTask').andReturn(false);
-        IonicCli.run(['node', 'bin/ionic']);
-        expect(IonicCli.printAvailableTasks).toHaveBeenCalled();
+      it('should print available tasks if no valid command is passed', function(done) {
+
+        IonicCli.run(['node', 'bin/ionic'])
+        .then(function() {
+          expect(helpUtils.printTaskListShortUsage).toHaveBeenCalled();
+          done();
+        });
       });
 
       it('should get the correct task by name', function() {
-        var task = IonicCli.getTaskWithName('start');
+        var task = IonicCli.getTaskSettingsByName('start');
         expect(task).toBeDefined();
         expect(task.name).toBe('start');
         expect(task.args).toBeDefined();
       });
 
-      it('should call attachErrorHandling', function() {
+      it('should call attachErrorHandling', function(done) {
         spyOn(IonicCli, 'attachErrorHandling');
-        IonicCli.run(['node', 'bin/ionic']);
-        expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
+
+        IonicCli.run(['node', 'bin/ionic'])
+        .then(function() {
+          expect(IonicCli.attachErrorHandling).toHaveBeenCalled();
+          done();
+        });
       });
 
       it('should get boolean options from start task', function() {
-        var task = IonicCli.getTaskWithName('start');
-        var booleanOptions = IonicCli.getBooleanOptionsForTask(task);
+        var task = IonicCli.getTaskSettingsByName('start');
+        var booleanOptions = IonicCli.getListOfBooleanOptions(task.options);
 
         // We expect 6 total = 3 options, each with short hand notation.
         expect(booleanOptions.length).toBe(11);
       });
 
-      it('should track stats for cli', function() {
-        spyOn(IonicStats, 't');
-        IonicCli.run(['node', 'bin/ionic', 'run', 'ios']);
-        expect(IonicStats.t).toHaveBeenCalled();
+      it('should track stats for cli', function(done) {
+
+        IonicCli.run(['node', 'bin/ionic', 'help'])
+        .then(function() {
+          expect(IonicStats.t).toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should change cwd to project root for project tasks', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {
+            return Q(true);
+          },
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(Utils.cdIonicRoot).toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should not change cwd to project root for non project tasks', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {
+            return Q(true);
+          },
+          isProjectTask: false
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(Utils.cdIonicRoot).not.toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should print a warning if node_modules doesn\'t exist and using v2', function(done) {
+        spyOn(fs, 'existsSync').andReturn(false);
+        Project.load = function() {
+          return {
+            get: function() { return true; } // return v2 === true
+          };
+        };
+
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {
+            return Q(true);
+          },
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp');
+        spyOn(log, 'warn');
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(log.warn.calls[0].args[0]).toMatch(
+            'WARN: No node_modules directory found, do you need to run npm install?'
+          );
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should warn if cmd requires build step and gulpfile doesn\'t exist and using v2', function(done) {
+        var FakeTask = {
+          name: 'build',
+          title: 'build',
+          run: function() {},
+          isProjectTask: true
+        };
+        Project.load = function() {
+          return {
+            get: function() { return true; } // return v2 === true
+          };
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(FakeTask, 'run').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(log, 'warn');
+
+        IonicCli.run(['node', 'bin/ionic', 'build'])
+        .then(function() {
+          expect(log.warn).toHaveBeenCalledWith('WARN: No gulpfile found!');
+          done();
+        });
+      });
+
+      it('should not runWithGulp if a gulpfile doesn\'t exist', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {},
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp');
+        spyOn(FakeTask, 'run').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(IonicCli.loadGulpfile).toHaveBeenCalled();
+          expect(FakeTask.run).toHaveBeenCalled();
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should change pwd for commands', function() {
-        IonicCli.run(['node', 'bin/ionic', 'serve']);
-        expect(Utils.cdIonicRoot).toHaveBeenCalled();
+      it('should runWithGulp', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(true);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(IonicCli.runWithGulp).toHaveBeenCalled();
+          done();
+        });
       });
 
-      it('should not change pwd for commands', function() {
-        IonicCli.run(['node', 'bin/ionic', 'start']);
-        expect(Utils.cdIonicRoot).not.toHaveBeenCalled();
+      it('should call Utils.fail if an exception occurrs within run', function() {
+        var error = new Error('error happened');
+        spyOn(IonicCli, 'checkLatestVersion').andCallFake(function() {
+          throw error;
+        });
+
+        IonicCli.run(['node', 'bin/ionic', '--stats-opt-out']);
+        expect(Utils.fail).toHaveBeenCalledWith(error);
+      });
+
+      it('should save to the config if stats-opt-out is passed', function(done) {
+        spyOn(IonicStore.prototype, 'set');
+        spyOn(IonicStore.prototype, 'save');
+
+        IonicCli.run(['node', 'bin/ionic', '--stats-opt-out'])
+        .then(function() {
+          expect(IonicStore.prototype.set).toHaveBeenCalledWith('statsOptOut', true);
+          expect(IonicStore.prototype.save).toHaveBeenCalled();
+          done();
+        });
       });
     });
   });
 
   describe('#commands options', function() {
-    var fakeTask;
-
     beforeEach(function() {
-      fakeTask = function() {};
-      fakeTask.prototype = new Task();
-      fakeTask.prototype.run = function() {};
-
-      spyOn(IonicCli, 'lookupTask').andReturn(fakeTask);
-      spyOn(fakeTask.prototype, 'run').andCallThrough();
-
+      spyOn(IonicCli, 'doRuntimeCheck');
     });
 
     it('should parse start options correctly', function(done) {
-      var processArgs = ['node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
+      var Start = require('../lib/ionic/start');
+      spyOn(Start, 'run').andReturn(Q(true));
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
+      var processArgs = ['node', '/usr/local/bin/ionic', 'start', 's1', '-w', '--appname', 'asdf'];
 
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Start.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
         expect(taskArgv._.length).toBe(2);
@@ -178,14 +346,13 @@ describe('Cli', function() {
     });
 
     it('should parse serve options correctly', function(done) {
-      var processArgs = ['node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
+      var Serve = require('../lib/ionic/serve');
+      spyOn(Serve, 'run').andReturn(Q(true));
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
+      var processArgs = ['node', '/usr/local/bin/ionic', 'serve', '--nogulp', '--all', '--browser', 'firefox'];
 
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Serve.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -200,18 +367,16 @@ describe('Cli', function() {
       });
     });
 
-
     it('should parse upload options correctly', function(done) {
+      var Upload = require('../lib/ionic/upload');
+      spyOn(Upload, 'run').andReturn(Q(true));
+
       var note = 'A note for notes';
       var processArgs = ['node', '/usr/local/bin/ionic', 'upload', '--email',
         'user@ionic.io', '--password', 'pass', '--note', note];
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
-
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Upload.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -225,14 +390,13 @@ describe('Cli', function() {
     });
 
     it('should parse login options correctly', function(done) {
-      var processArgs = ['node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
+      var Login = require('../lib/ionic/login');
+      spyOn(Login, 'run').andReturn(Q(true));
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
+      var processArgs = ['node', '/usr/local/bin/ionic', 'login', '--email', 'user@ionic.io', '--password', 'pass'];
 
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Login.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -241,19 +405,18 @@ describe('Cli', function() {
         expect(taskArgv.email).toBe('user@ionic.io');
         expect(taskArgv.password).toBe('pass');
         done();
-      });
+      }).catch(done);
     });
 
     it('should parse run options correctly', function(done) {
+      var Run = require('../lib/ionic/run');
+      spyOn(Run, 'run').andReturn(Q(true));
+
       var processArgs = ['node', '/usr/local/bin/ionic', 'run', 'ios', '--livereload',
         '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs', '--device'];
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
-
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Run.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -270,15 +433,14 @@ describe('Cli', function() {
     });
 
     it('should parse emulate options correctly', function(done) {
+      var Emulate = require('../lib/ionic/emulate');
+      spyOn(Emulate, 'run').andReturn(Q(true));
+
       var processArgs = ['node', '/usr/local/bin/ionic', 'emulate', 'android',
         '--livereload', '--address', 'localhost', '--port', '5000', '-r', '35730', '--consolelogs', '--serverlogs'];
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
-
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Emulate.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -296,14 +458,13 @@ describe('Cli', function() {
     });
 
     it('should parse state options correctly', function(done) {
-      var processArgs = ['node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
+      var State = require('../lib/ionic/state');
+      spyOn(State, 'run').andReturn(Q(true));
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
+      var processArgs = ['node', '/usr/local/bin/ionic', 'state', 'save', '--plugins'];
 
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = State.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -317,15 +478,14 @@ describe('Cli', function() {
     });
 
     it('should parse plugin options correctly', function(done) {
+      var Plugin = require('../lib/ionic/plugin');
+      spyOn(Plugin, 'run').andReturn(Q(true));
+
       var processArgs = ['node', '/usr/local/bin/ionic', 'plugin', 'add',
         'org.apache.cordova.splashscreen', '--nosave', '--searchpath', '../'];
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
-
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Plugin.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -341,14 +501,13 @@ describe('Cli', function() {
     });
 
     it('should parse build options correctly', function(done) {
-      var processArgs = ['node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
+      var Build = require('../lib/ionic/build');
+      spyOn(Build, 'run').andReturn(Q(true));
 
-      var promise = IonicCli.run(processArgs);
-      var fakeTaskRef = fakeTask;
+      var processArgs = ['node', '/usr/local/bin/ionic', 'build', 'ios', '--nohooks'];
 
-      promise.then(function() {
-        expect(fakeTaskRef.prototype.run).toHaveBeenCalled();
-        var taskArgs = fakeTaskRef.prototype.run.mostRecentCall.args;
+      IonicCli.run(processArgs).then(function() {
+        var taskArgs = Build.run.mostRecentCall.args;
 
         var taskArgv = taskArgs[1];
 
@@ -363,6 +522,7 @@ describe('Cli', function() {
 
     describe('version checking for checkRuntime', function() {
       var IonicCli;
+
       beforeEach(function() {
         IonicCli = rewire('../lib/cli');
       });
@@ -370,23 +530,355 @@ describe('Cli', function() {
       xit('should do runtime check when version is not checked', function() {
         var IonicConfigSpy = jasmine.createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
-        IonicCli.__set__('IonicConfig', IonicConfigSpy);
+        var revertConfig = IonicCli.__set__('IonicConfig', IonicConfigSpy);
         IonicCli.doRuntimeCheck('1.6.4');
+
         expect(Info.checkRuntime).not.toHaveBeenCalled();
         expect(IonicConfigSpy.set).not.toHaveBeenCalled();
         expect(IonicConfigSpy.save).not.toHaveBeenCalled();
+        revertConfig();
       });
 
       xit('should do runtime check when version is not checked', function() {
         var IonicConfigSpy = jasmine.createSpyObj('IonicConfig', ['get', 'set', 'save']);
         IonicConfigSpy.get.andReturn('1.6.4');
-        IonicCli.__set__('IonicConfig', IonicConfigSpy);
+        var revertConfig = IonicCli.__set__('IonicConfig', IonicConfigSpy);
         IonicCli.doRuntimeCheck('1.6.5');
+
         expect(Info.checkRuntime).toHaveBeenCalled();
         expect(IonicConfigSpy.get).toHaveBeenCalled();
         expect(IonicConfigSpy.set).toHaveBeenCalledWith('lastVersionChecked', '1.6.5');
         expect(IonicConfigSpy.save).toHaveBeenCalled();
+        revertConfig();
+      });
+    });
+  });
+
+  describe('runWithGulp function', function() {
+    var fakeTask;
+    var argv;
+    var qCallbacks;
+
+    beforeEach(function() {
+      fakeTask = {
+        name: 'fake',
+        title: 'fake',
+        run: function() {
+          return Q(true);
+        },
+        isProjectTask: true
+      };
+      argv = {
+        _: ['fake'],
+        v2: true
+      };
+      gulp.tasks = {
+        'fake:before': function() {},
+        'fake:after': function() {}
+      };
+      qCallbacks = [];
+
+      // gulp.start gets called with nfcall because it's async with a callback
+      // so we stub our own function with a callback instead of creating a spy
+      // (which is sync). We also track the callbacks because they are created
+      // at runtime by Q.nfcall so we can tell jasmine what to expect.
+      gulp.start = function(taskName, cb) {
+        qCallbacks.push(cb);
+        cb();
+      };
+      spyOn(gulp, 'start').andCallThrough();
+      spyOn(IonicCli, 'loadGulpfile').andReturn(true);
+      spyOn(fakeTask, 'run').andCallThrough();
+      spyOn(process, 'exit');
+      spyOn(IonicCli, 'logEvents');
+      spyOn(log, 'error');
+      spyOn(fs, 'existsSync');
+    });
+
+    it('should try to load gulp, exit if it fails', function() {
+      spyOn(path, 'resolve').andReturn('./wrong_path');
+
+      IonicCli.runWithGulp(argv, fakeTask);
+
+      expect(log.error).toHaveBeenCalledWith('\nGulpfile detected, but gulp is not installed'.red);
+      expect(log.error).toHaveBeenCalledWith('Do you need to run `npm install`?\n'.red);
+      expect(process.exit).toHaveBeenCalled();
+
+      expect(IonicCli.logEvents).not.toHaveBeenCalled();
+      expect(fakeTask.run).not.toHaveBeenCalled();
+      expect(gulp.start).not.toHaveBeenCalled();
+    });
+
+
+    it('should run logEvents, the command and the gulp hooks', function(done) {
+      IonicCli.runWithGulp(argv, fakeTask).then(function() {
+
+        expect(IonicCli.logEvents).toHaveBeenCalled();
+        expect(gulp.start).toHaveBeenCalledWith('fake:before', qCallbacks[0]);
+        expect(gulp.start).toHaveBeenCalledWith('fake:after', qCallbacks[1]);
+        expect(fakeTask.run).toHaveBeenCalledWith(IonicCli, argv);
+
+        expect(log.error).not.toHaveBeenCalled();
+        expect(process.exit).not.toHaveBeenCalled();
+        expect(fs.existsSync).not.toHaveBeenCalled();
+        done();
+      }).catch(done);
+    });
+
+    it('should warn if no gulp task and using v2 and cmd requires build', function(done) {
+      argv._[0] = 'build';
+      spyOn(log, 'warn');
+      gulp.start = function(taskName, cb) {
+        cb({
+          missingTask: true
+        });
+      };
+      IonicCli.runWithGulp(argv, fakeTask).then(function() {
+        expect(log.warn).toHaveBeenCalledWith(('WARN: No \'build:before\' gulp task found!').yellow);
+        done();
+      });
+    });
+  });
+
+  describe('loadGulpfile function', function() {
+    it('should return true if gulpfile found', function() {
+      var mock = require('mock-require');
+      var gulpfilePath = path.resolve(process.cwd() + '/gulpfile.js');
+      mock(gulpfilePath, {});
+
+      var result = IonicCli.loadGulpfile();
+      expect(result).toBe(true);
+
+      mock.stop(gulpfilePath);
+    });
+
+    it('should return false if gulpfile not found', function() {
+      var result = IonicCli.loadGulpfile();
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('processExit method', function() {
+  });
+
+  describe('gatherInfo method', function() {
+    it('should return an object and gather info from Info function from app-lib', function() {
+      spyOn(Info, 'gatherInfo').andReturn({});
+      spyOn(Info, 'getIonicVersion');
+      spyOn(Info, 'getIonicCliVersion');
+
+      var info = IonicCli.gatherInfo();
+
+      expect(info).toEqual(jasmine.any(Object));
+    });
+  });
+
+  describe('printVersionWarning method', function() {
+    it('should write out a warning if the version is not equal to version specified by the cli', function() {
+      spyOn(log, 'warn');
+
+      IonicCli.printVersionWarning('2.0.1', '2.0.2');
+      expect(log.warn).toHaveBeenCalled();
+    });
+    it('should not write out a warning if the version is equal to version specified by the cli', function() {
+      spyOn(log, 'warn');
+
+      IonicCli.printVersionWarning('2.0.1', '2.0.1');
+      expect(log.warn).not.toHaveBeenCalled();
+    });
+
+    it('should not write out a warning if the version is in beta', function() {
+      spyOn(log, 'warn');
+
+      IonicCli.printVersionWarning('2.0.1-beta', '2.0.1');
+      expect(log.warn).not.toHaveBeenCalled();
+    });
+
+    it('should not write out a warning if the version is in alpha', function() {
+      spyOn(log, 'warn');
+
+      IonicCli.printVersionWarning('2.0.1-alpha', '2.0.1');
+      expect(log.warn).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('formatGulpError function', function() {
+    it('should return e.message if e.err is null', function() {
+      var error = new Error('gulp broke');
+      error.err = null;
+
+      var results = IonicCli.formatGulpError(error);
+      expect(results).toEqual(error.message);
+    });
+
+    it('should return a string if the error is in a plugin', function() {
+      var error = {
+        err: {
+          showStack: 'boolean'
+        }
+      };
+
+      var results = IonicCli.formatGulpError(error);
+      expect(results).toEqual(jasmine.any(String));
+    });
+
+    it('should return a stack if it exists', function() {
+      var testError = new Error('gulp broke');
+      var error = {
+        err: testError
+      };
+
+      var results = IonicCli.formatGulpError(error);
+      expect(results).toEqual(testError.stack);
+    });
+
+    it('should return a new error if it does not understand the error', function() {
+      var error = {
+        err: 'Something broke somewhere'
+      };
+      var results = IonicCli.formatGulpError(error);
+      expect(results).toContain(error.err);
+    });
+  });
+
+  describe('checkLatestVersion method', function() {
+    it('should not check npm if current version is a beta', function() {
+      spyOn(IonicStore.prototype, 'get');
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+      var npmVersion = IonicCli.npmVersion;
+
+      var result = IonicCli.checkLatestVersion('2.0.1-beta');
+      expect(result).toEqual(null);
+      expect(npmVersion).toEqual(IonicCli.npmVersion);
+      expect(IonicStore.prototype.get).not.toHaveBeenCalled();
+      expect(IonicStore.prototype.set).not.toHaveBeenCalled();
+      expect(IonicStore.prototype.save).not.toHaveBeenCalled();
+    });
+
+    it('should not check npm if timestamp is recent', function() {
+      spyOn(IonicStore.prototype, 'get').andReturn(new Date().getTime());
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+      var npmVersion = IonicCli.npmVersion;
+
+      var result = IonicCli.checkLatestVersion('2.0.1');
+      expect(result).toEqual(null);
+      expect(npmVersion).toEqual(IonicCli.npmVersion);
+      expect(IonicStore.prototype.set).not.toHaveBeenCalled();
+      expect(IonicStore.prototype.save).not.toHaveBeenCalled();
+    });
+
+    it('should check npm if timestamp is recent', function(done) {
+      spyOn(IonicStore.prototype, 'get').andReturn(new Date(2016, 1, 1).getTime());
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+      var revertRequest = IonicCli.__set__('request', function(options, callback) {
+        callback(null, null, '{ "version": "1.0.1" }');
+      });
+
+      IonicCli.checkLatestVersion('2.0.1').then(function() {
+        expect(IonicStore.prototype.set).toHaveBeenCalledWith('versionCheck', jasmine.any(Number));
+        expect(IonicStore.prototype.save).toHaveBeenCalled();
+        revertRequest();
+        done();
+      });
+    });
+  });
+
+  describe('printNewsUpdates method', function() {
+    it('should log request info if a valid response is returned', function(done) {
+      spyOn(log, 'info');
+      var revertRequest = IonicCli.__set__('request', function(options, callback) {
+        callback(null, { statusCode: '200' }, '{ "version": "1.0.1" }');
+      });
+      IonicCli.printNewsUpdates().then(function() {
+        expect(log.info).toHaveBeenCalled();
+        revertRequest();
+        done();
+      });
+    });
+  });
+
+  describe('doRuntimeCheck method', function() {
+    it('should update IonicConfig if semver is not met', function() {
+      var version = '0.2.0';
+      var error = new Error('semver failure');
+      spyOn(IonicStore.prototype, 'get').andReturn('0.1.0');
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+      spyOn(semver, 'satisfies').andCallFake(function() {
+        throw error;
+      });
+
+      IonicCli.doRuntimeCheck(version);
+      expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
+      expect(IonicStore.prototype.save).toHaveBeenCalled();
+    });
+
+    it('should update IonicConfig if lastVersionChecked from IonicConfig is not available', function() {
+      var version = '0.2.0';
+      spyOn(IonicStore.prototype, 'get').andReturn(null);
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+
+      IonicCli.doRuntimeCheck(version);
+      expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
+      expect(IonicStore.prototype.save).toHaveBeenCalled();
+    });
+
+    it('should not update IonicConfig if lastVersionChecked is available and semver is met', function() {
+      var version = '0.2.0';
+      spyOn(IonicStore.prototype, 'get').andReturn('0.2.0');
+      spyOn(IonicStore.prototype, 'set');
+      spyOn(IonicStore.prototype, 'save');
+      spyOn(semver, 'satisfies').andReturn(true);
+
+      IonicCli.doRuntimeCheck(version);
+      expect(IonicStore.prototype.set).not.toHaveBeenCalled();
+      expect(IonicStore.prototype.save).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getContentSrc method', function() {
+    it('should call getContentSrc util for process cwd.', function() {
+      spyOn(process, 'cwd').andReturn('/some/dir');
+      spyOn(Utils, 'getContentSrc').andCallFake(function(param) {
+        return param;
       });
+      var result = IonicCli.getContentSrc();
+      expect(process.cwd).toHaveBeenCalled();
+      expect(Utils.getContentSrc).toHaveBeenCalledWith('/some/dir');
+      expect(result).toEqual('/some/dir');
+    });
+  });
+
+  describe('fail method', function() {
+    it('should call fail util.', function() {
+      IonicCli.fail('some error', 'task help text');
+      expect(Utils.fail).toHaveBeenCalledWith('some error', 'task help text');
+    });
+  });
+
+  describe('handleUncaughtExceptions method', function() {
+    it('log an error and then exit if param is a string', function() {
+      spyOn(log, 'error');
+      spyOn(process, 'exit');
+      spyOn(Utils, 'errorHandler');
+
+      IonicCli.handleUncaughtExceptions('error message');
+      expect(Utils.errorHandler).toHaveBeenCalledWith('error message');
+      expect(process.exit).toHaveBeenCalledWith(1);
+    });
+
+    it('log an error and then exit if param is an object', function() {
+      spyOn(log, 'error');
+      spyOn(process, 'exit');
+      spyOn(Utils, 'errorHandler');
+
+      IonicCli.handleUncaughtExceptions({ message: 'error message' });
+      expect(Utils.errorHandler).toHaveBeenCalledWith('error message');
+      expect(process.exit).toHaveBeenCalledWith(1);
     });
   });
 });
diff --git a/spec/helpers/ionic.js b/spec/helpers/ionic.js
new file mode 100644
index 0000000000..84044e3fc9
--- /dev/null
+++ b/spec/helpers/ionic.js
@@ -0,0 +1,19 @@
+'use strict';
+
+var cli = require('../../lib/cli');
+
+/*
+ * args
+ * [0] = node
+ * [1] = ionic
+ * [2] = command
+ *
+ */
+module.exports = function ionic(ionicArgs) {
+  var cliArgs = [
+    'node',
+    'bin/ionic'
+  ];
+
+  return cli.run(cliArgs.concat(ionicArgs));
+};
diff --git a/spec/serve.spec.js b/spec/serve.spec.js
deleted file mode 100644
index 9f2c1bd7dc..0000000000
--- a/spec/serve.spec.js
+++ /dev/null
@@ -1,84 +0,0 @@
-var IonicAppLib = require('ionic-app-lib');
-var IonicProject = IonicAppLib.project;
-var Serve = IonicAppLib.serve;
-var Q = require('q');
-var rewire = require('rewire');
-
-var argv = {
-  _: ['--livereload'],
-  nogulp: false
-};
-
-describe('Serve', function() {
-  var serveTask;
-
-  beforeEach(function() {
-    serveTask = rewire('../lib/ionic/serve');
-  });
-
-  it('should have serve defined', function() {
-    expect(serveTask).toBeDefined();
-  });
-
-  it('should use connect live reload port from env var', function(done) {
-    spyOn(IonicProject, 'load').andReturn({});
-    spyOn(Serve, 'loadSettings').andReturn({});
-    spyOn(Serve, 'getAddress').andReturn(Q());
-
-    spyOn(Serve, 'checkPorts');
-    spyOn(Serve, 'start');
-    spyOn(Serve, 'showFinishedServeMessage');
-    spyOn(process, 'cwd').andReturn('/ionic/app/path');
-
-    process.env = { CONNECT_LIVE_RELOAD_PORT: 5000 };
-
-    var serve = new serveTask.IonicTask();
-    var options = {
-      appDirectory: '/ionic/app/path',
-      liveReloadPort: 5000,
-      nogulp: false
-    };
-
-    Q()
-    .then(function() {
-      return serve.run({}, argv);
-    })
-    .then(function() {
-      expect(Serve.start).toHaveBeenCalledWith(options);
-    })
-    .catch(function(ex) {
-      expect('this').toBe(ex.stack);
-    })
-    .fin(done);
-  });
-
-  it('should use connect live reload port from env var', function(done) {
-    spyOn(IonicProject, 'load').andReturn({
-      get: function() {
-        return false;
-      }
-    });
-    process.env = {};
-    spyOn(Serve, 'getAddress').andReturn(Q());
-
-    spyOn(Serve, 'checkPorts');
-    spyOn(Serve, 'start');
-    spyOn(Serve, 'showFinishedServeMessage');
-    spyOn(process, 'cwd').andReturn('/ionic/app/path');
-
-    var serve = new serveTask.IonicTask();
-
-    Q()
-    .then(function() {
-      return serve.run({}, argv);
-    })
-    .then(function() {
-      var calls = Serve.start.calls[0].args[0];
-      expect(calls.liveReloadPort).toBe(35729);
-    })
-    .catch(function(ex) {
-      expect('this').toBe(ex.stack);
-    })
-    .fin(done);
-  });
-});
diff --git a/spec/start.spec.js b/spec/start.spec.js
deleted file mode 100644
index 60f26969e0..0000000000
--- a/spec/start.spec.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var rewire = require('rewire');
-
-describe('Start', function() {
-  var startTask;
-
-  beforeEach(function() {
-    startTask = rewire('../lib/ionic/serve');
-  });
-
-  it('should have serve defined', function() {
-    expect(startTask).toBeDefined();
-  });
-});
diff --git a/spec/stats.spec.js b/spec/stats.spec.js
deleted file mode 100644
index cad77d7e97..0000000000
--- a/spec/stats.spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-var IonicStatsModule;
-var IonicInfoModule;
-var IonicStats;
-var rewire = require('rewire');
-
-describe('Stats', function() {
-  beforeEach(function() {
-    IonicStatsModule = rewire('../lib/ionic/stats');
-    IonicInfoModule = rewire('ionic-app-lib').info;
-    IonicStats = IonicStatsModule.IonicStats;
-  });
-
-  it('should have stats defined', function() {
-    expect(IonicStats).toBeDefined();
-  });
-
-  describe('#t', function() {
-    it('should not track if process.argv is less than 3', function() {
-      var oldprocessargv = process.argv;
-      process.argv = ['node', 'bin/ionic'];
-
-      spyOn(IonicStats, 'mp');
-
-      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
-      configSpy.get.andReturn(true);
-
-      IonicStatsModule.__set__('ionicConfig', configSpy);
-
-      IonicStats.t();
-
-      expect(configSpy.get).not.toHaveBeenCalled();
-      expect(IonicStats.mp).not.toHaveBeenCalled();
-      process.argv = oldprocessargv;
-    });
-
-    it('should not track stats if opted out', function() {
-      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
-      configSpy.get.andReturn(true);
-      spyOn(IonicStatsModule, 'getVersion').andReturn({ version: '1.6.4' });
-
-      IonicStatsModule.__set__('ionicConfig', configSpy);
-
-      IonicStats.t();
-
-      expect(configSpy.get).toHaveBeenCalled();
-    });
-
-    it('should track the correct command', function() {
-      var oldprocessargv = process.argv;
-      process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
-      var packageJson = { version: '1.6.4' };
-
-      spyOn(IonicStats, 'mp');
-      spyOn(IonicStatsModule, 'getVersion').andReturn(packageJson);
-      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
-        info.os = 'Mac OS X El Capitan';
-        info.node = 'v5.10.1';
-        info.gulp = 'v3.0.0';
-      });
-
-      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
-      configSpy.get.andReturn(false);
-
-      IonicStatsModule.__set__('ionicConfig', configSpy);
-
-      IonicStats.t();
-
-      expect(IonicStats.mp).toHaveBeenCalledWith('start', {
-        cli_version: packageJson.version, // eslint-disable-line camelcase
-        email: false,
-        account_id: false, // eslint-disable-line camelcase
-        os: 'Mac OS X El Capitan',
-        gulp: 'v3.0.0',
-        node: 'v5.10.1'
-      });
-      process.argv = oldprocessargv;
-    });
-  });
-});
diff --git a/spec/tasks/add.spec.js b/spec/tasks/add.spec.js
new file mode 100644
index 0000000000..4cf2811309
--- /dev/null
+++ b/spec/tasks/add.spec.js
@@ -0,0 +1,134 @@
+'use strict';
+
+var optimist = require('optimist');
+var childProcess = require('child_process');
+var rewire = require('rewire');
+var add = rewire('../../lib/ionic/add');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var ioLib = IonicAppLib.ioConfig;
+var log = IonicAppLib.logging.logger;
+var bower = require('../../lib/utils/bower');
+
+describe('add command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(add.title).toBeDefined();
+      expect(add.title).not.toBeNull();
+      expect(add.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(add.summary).toBeDefined();
+      expect(add.summary).not.toBeNull();
+      expect(add.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a boolean option of --nohooks or -n that defaults to true', function() {
+      expect(add.args).toEqual(jasmine.any(Object));
+      expect(add.args['[name]']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'add', 'thing'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(childProcess, 'exec');
+    });
+
+    it('should fail if bower is not installed', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(false);
+
+      // Expect failure
+      add.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(bower.installMessage, 'add');
+    });
+
+    it('should fail if installBowerComponent throws an error obj message if the error has a message value', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(true);
+      var installBowerSpy = jasmine.createSpy('installBowerSpy');
+      installBowerSpy.andCallFake(function() {
+        throw new Error('something failed');
+      });
+      var revertInstallBowerSpy = add.__set__('installBowerComponent', installBowerSpy);
+
+      // Expect failure
+      add.run(null, argv, rawCliArguments);
+      expect(installBowerSpy).toHaveBeenCalledWith('thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something failed', 'service');
+
+      // TODO: things seems incorrect
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(true, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertInstallBowerSpy();
+    });
+
+    it('should fail if installBowerComponent throws an error if the error has a message value', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(true);
+      var installBowerSpy = jasmine.createSpy('installBowerSpy');
+      installBowerSpy.andCallFake(function() {
+        throw 'something';
+      });
+      var revertInstallBowerSpy = add.__set__('installBowerComponent', installBowerSpy);
+
+      // Expect failure
+      add.run(null, argv, rawCliArguments);
+      expect(installBowerSpy).toHaveBeenCalledWith('thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something', 'service');
+
+      // TODO: things seems incorrect
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(true, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertInstallBowerSpy();
+    });
+
+    it('should call injectIoComponent and warnMissingData on install success.', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(bower, 'checkForBower').andReturn(true);
+
+      var installBowerSpy = jasmine.createSpy('installBowerSpy');
+      var revertInstallBowerSpy = add.__set__('installBowerComponent', installBowerSpy);
+
+      add.run(null, argv, rawCliArguments);
+      expect(bower.checkForBower).toHaveBeenCalled();
+      expect(installBowerSpy).toHaveBeenCalledWith('thing');
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(true, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertInstallBowerSpy();
+    });
+  });
+
+  describe('installBowerComponent function', function() {
+
+    it('should call childProcess exec to install the bower component', function() {
+      spyOn(log, 'info');
+      spyOn(childProcess, 'exec').andReturn({ code: 0 });
+
+      var installBowerComponent = add.__get__('installBowerComponent');
+      installBowerComponent('thing');
+      expect(childProcess.exec).toHaveBeenCalledWith('bower install --save-dev thing');
+      expect(log.info).toHaveBeenCalledWith('Bower component installed - thing');
+    });
+
+    it('should call childProcess exec and call util fail if result.code is not equal to 0', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(childProcess, 'exec').andReturn({ code: 1 });
+
+      var installBowerComponent = add.__get__('installBowerComponent');
+      installBowerComponent('thing');
+      expect(childProcess.exec).toHaveBeenCalledWith('bower install --save-dev thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String), 'add');
+    });
+  });
+});
diff --git a/spec/tasks/address.spec.js b/spec/tasks/address.spec.js
new file mode 100644
index 0000000000..fc0ce0b9a9
--- /dev/null
+++ b/spec/tasks/address.spec.js
@@ -0,0 +1,45 @@
+'use strict';
+
+var optimist = require('optimist');
+var rewire = require('rewire');
+var Q = require('q');
+var addressTask = rewire('../../lib/ionic/address');
+var IonicAppLib = require('ionic-app-lib');
+var Serve = IonicAppLib.serve;
+var log = IonicAppLib.logging.logger;
+
+describe('Serve', function() {
+
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(addressTask.title).toBeDefined();
+      expect(addressTask.title).not.toBeNull();
+      expect(addressTask.title.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('run command', function() {
+    it('should update config and gather the current address', function(done) {
+      var processArguments = ['node', 'ionic', 'address'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var configSpy = jasmine.createSpyObj('config', ['set']);
+
+      spyOn(IonicAppLib.config, 'load').andReturn(configSpy);
+      spyOn(Serve, 'getAddress').andReturn(Q(true));
+
+      addressTask.run({}, argv).then(function() {
+        expect(IonicAppLib.config.load).toHaveBeenCalled();
+        expect(configSpy.set.calls[0].args).toEqual(['ionicServeAddress', null]);
+        expect(configSpy.set.calls[1].args).toEqual(['platformServeAddress', null]);
+        expect(Serve.getAddress).toHaveBeenCalledWith({ isAddressCmd: true });
+        done();
+      }).catch(done);
+    });
+  });
+});
diff --git a/spec/tasks/build.spec.js b/spec/tasks/build.spec.js
new file mode 100644
index 0000000000..4fdf6a5d9c
--- /dev/null
+++ b/spec/tasks/build.spec.js
@@ -0,0 +1,138 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var os = require('os');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var build = require('../../lib/ionic/build');
+
+describe('build command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(build.title).toBeDefined();
+      expect(build.title).not.toBeNull();
+      expect(build.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(build.summary).toBeDefined();
+      expect(build.summary).not.toBeNull();
+      expect(build.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(build.args).toEqual(jasmine.any(Object));
+      expect(build.args['[options]']).toEqual(jasmine.any(String));
+      expect(build.args['<PLATFORM>']).toEqual(jasmine.any(String));
+    });
+
+    it('should have options', function() {
+      expect(build.options).toEqual(jasmine.any(Object));
+      expect(build.options['--nohooks|-n']).toEqual(jasmine.any(Object));
+    });
+  });
+
+
+  describe('cordova platform checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'build', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should default to iOS for the platform', function(done) {
+      spyOn(os, 'platform').andReturn('darwin');
+
+      // Expect failure
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.isPlatformInstalled).toHaveBeenCalledWith('ios', appDirectory);
+        done();
+      });
+    });
+
+    it('should fail if the system is not Mac and the platform is iOS', function(done) {
+      spyOn(os, 'platform').andReturn('windows');
+
+      build.run(null, argv, rawCliArguments).catch(function(error) {
+        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+        done();
+      });
+    });
+  });
+
+
+  describe('cordova platform and plugin checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'build', 'ios', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(os, 'platform').andReturn('darwin');
+      spyOn(process, 'cwd').andReturn(appDirectory);
+
+      spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
+      spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+    });
+
+    it('should try to install the cordova platform if it is not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(false);
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).toHaveBeenCalledWith('ios');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['build', 'ios', '-n']);
+        done();
+      });
+    });
+
+    it('should not try to install the cordova platform if it is installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should install plugins if they are not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(false);
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should not install plugins if they are installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/compile.spec.js b/spec/tasks/compile.spec.js
new file mode 100644
index 0000000000..eaeae971e1
--- /dev/null
+++ b/spec/tasks/compile.spec.js
@@ -0,0 +1,56 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var compile = require('../../lib/ionic/compile');
+
+describe('compile command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(process, 'cwd').andReturn('/some/directory');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(compile.title).toBeDefined();
+      expect(compile.title).not.toBeNull();
+      expect(compile.title.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'compile', 'set'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    it('should fail if any functions throw', function(done) {
+      var error = new Error('error occurred');
+      spyOn(ConfigXml, 'setConfigXml').andReturn(Q.reject(error));
+
+      compile.run({}, argv, rawCliArguments).catch(function(ex) {
+        expect(ex).toEqual(error);
+        done();
+      });
+    });
+
+    it('should call execCordovaCommand and return a promise', function(done) {
+      spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+      spyOn(cordovaUtils, 'filterArgumentsForCordova').andReturn(['compile', 'set']);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
+      compile.run({}, argv, rawCliArguments).then(function(results) {
+        expect(ConfigXml.setConfigXml).toHaveBeenCalledWith('/some/directory', {
+          resetContent: true,
+          errorWhenNotFound: false
+        });
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['compile', 'set']);
+        expect(results).toEqual(true);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/config.spec.js b/spec/tasks/config.spec.js
new file mode 100644
index 0000000000..dd4026105d
--- /dev/null
+++ b/spec/tasks/config.spec.js
@@ -0,0 +1,135 @@
+'use strict';
+
+var optimist = require('optimist');
+var configTask = require('../../lib/ionic/config');
+var IonicAppLib = require('ionic-app-lib');
+var ioLib = IonicAppLib.ioConfig;
+var IonicProject = IonicAppLib.project;
+var appLibUtils = IonicAppLib.utils;
+
+describe('config command', function() {
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(configTask.title).toBeDefined();
+      expect(configTask.title).not.toBeNull();
+      expect(configTask.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(configTask.summary).toBeDefined();
+      expect(configTask.summary).not.toBeNull();
+      expect(configTask.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a boolean option of --nohooks or -n that defaults to true', function() {
+      expect(configTask.args).toEqual(jasmine.any(Object));
+      expect(configTask.args['<command>']).toEqual(jasmine.any(String));
+      expect(configTask.args['[key]']).toEqual(jasmine.any(String));
+      expect(configTask.args['[value]']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    it('should fail if the project cannot be loaded', function() {
+      var processArguments = ['node', 'ionic', 'config', 'set'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andCallFake(function() {
+        throw new Error('error happened');
+      });
+      spyOn(appLibUtils, 'fail');
+
+      configTask.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('error happened');
+    });
+
+    it('should fail if the command passed is not valid', function() {
+      var processArguments = ['node', 'ionic', 'config', 'stuff'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(appLibUtils, 'fail');
+
+      configTask.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String));
+    });
+
+    it('should call ioLib.writeIoConfig if build command is passed', function() {
+      var processArguments = ['node', 'ionic', 'config', 'build'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'writeIoConfig');
+
+      configTask.run({}, argv);
+      expect(ioLib.writeIoConfig).toHaveBeenCalledWith(false, false, true);
+    });
+
+    it('should call ioLib.listConfig if info command is passed', function() {
+      var processArguments = ['node', 'ionic', 'config', 'info'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'listConfig');
+
+      configTask.run({}, argv);
+      expect(ioLib.listConfig).toHaveBeenCalled();
+    });
+
+    it('should fail if set is called without a key', function() {
+      var processArguments = ['node', 'ionic', 'config', 'set'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'writeIoConfig');
+      spyOn(appLibUtils, 'fail');
+
+      configTask.run({}, argv);
+      expect(ioLib.writeIoConfig).not.toHaveBeenCalled();
+      expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String));
+    });
+
+    it('should call ioLib.writeIoConfig if unset command is used', function() {
+      var processArguments = ['node', 'ionic', 'config', 'unset', 'red'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'writeIoConfig');
+
+      configTask.run({}, argv);
+      expect(ioLib.writeIoConfig).toHaveBeenCalledWith('red', '', false);
+    });
+
+    it('should call ioLib.writeIoConfig if set command and pass empty string if no value is provided', function() {
+      var processArguments = ['node', 'ionic', 'config', 'set', 'red'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'writeIoConfig');
+
+      configTask.run({}, argv);
+      expect(ioLib.writeIoConfig).toHaveBeenCalledWith('red', '', true);
+    });
+
+    it('should call ioLib.writeIoConfig if set command', function() {
+      var processArguments = ['node', 'ionic', 'config', 'set', 'red', 'yes'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(ioLib, 'writeIoConfig');
+
+      configTask.run({}, argv);
+      expect(ioLib.writeIoConfig).toHaveBeenCalledWith('red', 'yes', true);
+    });
+  });
+});
diff --git a/spec/tasks/docs.spec.js b/spec/tasks/docs.spec.js
new file mode 100644
index 0000000000..bcd997dd22
--- /dev/null
+++ b/spec/tasks/docs.spec.js
@@ -0,0 +1,80 @@
+'use strict';
+
+var rewire = require('rewire');
+var docs = rewire('../../lib/ionic/docs');
+
+describe('docs command', function() {
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(docs.title).toBeDefined();
+      expect(docs.title).not.toBeNull();
+      expect(docs.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(docs.summary).toBeDefined();
+      expect(docs.summary).not.toBeNull();
+      expect(docs.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a set of options with boolean defaults to true', function() {
+      expect(docs.options).not.toEqual(jasmine.any(Object));
+    });
+  });
+
+  describe('sanitizeUrl function', function() {
+    it('should replace $ with %24', function() {
+      var sanitizeUrl = docs.__get__('sanitizeUrl');
+      var results = sanitizeUrl('http://ionic.io/$yo');
+      expect(results).toEqual('http://ionic.io/%24yo');
+    });
+  });
+
+  describe('list function', function() {
+
+  });
+
+  describe('openDefault function', function() {
+
+  });
+
+  describe('lookupCommand function', function() {
+
+  });
+
+  describe('run', function() {
+    it('should call list if command is ls', function() {
+      var listSpy = jasmine.createSpy('listSpy');
+      var revert = docs.__set__('list', listSpy);
+      var argv = {
+        _: ['docs', 'ls']
+      };
+      docs.run({}, argv);
+      expect(listSpy).toHaveBeenCalled();
+      revert();
+    });
+
+    it('should call openDefault if command is missing', function() {
+      var openDefaultSpy = jasmine.createSpy('openDefaultSpy');
+      var revert = docs.__set__('openDefault', openDefaultSpy);
+      var argv = {
+        _: ['docs']
+      };
+      docs.run({}, argv);
+      expect(openDefaultSpy).toHaveBeenCalled();
+      revert();
+    });
+
+    it('should call list if command is not ls', function() {
+      var lookUpCommandSpy = jasmine.createSpy('lookUpCommandSpy');
+      var revert = docs.__set__('lookUpCommand', lookUpCommandSpy);
+      var argv = {
+        _: ['docs', 'other']
+      };
+      docs.run({}, argv);
+      expect(lookUpCommandSpy).toHaveBeenCalledWith('other');
+      revert();
+    });
+  });
+});
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
new file mode 100644
index 0000000000..b0dc4bee9d
--- /dev/null
+++ b/spec/tasks/emulate.spec.js
@@ -0,0 +1,193 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var os = require('os');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var emulate = require('../../lib/ionic/emulate');
+
+describe('emulate command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(emulate.title).toBeDefined();
+      expect(emulate.title).not.toBeNull();
+      expect(emulate.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(emulate.summary).toBeDefined();
+      expect(emulate.summary).not.toBeNull();
+      expect(emulate.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a set of options with boolean defaults to true', function() {
+      expect(emulate.options).toEqual(jasmine.any(Object));
+      expect(emulate.options['--consolelogs|-c']).toEqual(jasmine.any(Object));
+      expect(emulate.options['--consolelogs|-c'].boolean).toEqual(true);
+      expect(emulate.options['--serverlogs|-s']).toEqual(jasmine.any(Object));
+      expect(emulate.options['--serverlogs|-s'].boolean).toEqual(true);
+      expect(emulate.options['--debug|--release']).toEqual(jasmine.any(Object));
+      expect(emulate.options['--debug|--release'].boolean).toEqual(true);
+    });
+  });
+
+
+  describe('cordova platform checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'emulate', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+    });
+
+    it('should default to iOS for the platform', function(done) {
+      spyOn(os, 'platform').andReturn('darwin');
+
+      emulate.run(null, argv, rawCliArguments).catch(function() {
+        expect(cordovaUtils.isPlatformInstalled).toHaveBeenCalledWith('ios', appDirectory);
+        done();
+      });
+    });
+
+    it('should fail if the system is not Mac and the platform is iOS', function(done) {
+      spyOn(os, 'platform').andReturn('windows');
+
+      emulate.run(null, argv, rawCliArguments).catch(function(error) {
+        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+        done();
+      });
+    });
+  });
+
+
+  describe('cordova platform and plugin checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'emulate', 'ios', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(os, 'platform').andReturn('darwin');
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
+      spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should try to install the cordova platform if it is not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(false);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).toHaveBeenCalledWith('ios');
+        done();
+      });
+    });
+
+    it('should not try to install the cordova platform if it is installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should install plugins if they are not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(false);
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should not install plugins if they are installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+  });
+
+  describe('execute cordova command', function() {
+    var appDirectory = '/ionic/app/path';
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(os, 'platform').andReturn('darwin');
+    });
+
+    it('should execute the command against the cordova util', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', '-n', 'ios'], false, true);
+        done();
+      });
+    });
+
+    it('should execute the command against the cordova util using the platform provided', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', 'android'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        done();
+      });
+    });
+
+    it('should execute the command against the cordova util using the platform provided', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', 'android', '--livereload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'setupLiveReload').andReturn(Q({
+        blah: 'blah'
+      }));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
+          ['emulate', 'android'], true, { blah: 'blah' });
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/generate.spec.js b/spec/tasks/generate.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/help.spec.js b/spec/tasks/help.spec.js
new file mode 100644
index 0000000000..e38aa65601
--- /dev/null
+++ b/spec/tasks/help.spec.js
@@ -0,0 +1,91 @@
+'use strict';
+
+var optimist = require('optimist');
+var help = require('../../lib/ionic/help');
+var helpUtils = require('../../lib/utils/help');
+var ionic = require('../../lib/cli');
+
+describe('help command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(help.title).toBeDefined();
+      expect(help.title).not.toBeNull();
+      expect(help.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(help.summary).toBeDefined();
+      expect(help.summary).not.toBeNull();
+      expect(help.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(help.args).toEqual(jasmine.any(Object));
+      expect(help.args['[command]']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    it('should print all task help if a command is not provided', function() {
+      var processArguments = ['node', 'ionic', 'help'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(ionic, 'getAllTaskSettings').andReturn([
+        { name: '1' },
+        { name: '2' },
+        { name: '3' }
+      ]);
+      spyOn(ionic, 'getTaskSettingsByName');
+      spyOn(helpUtils, 'printTaskListUsage');
+
+      // Expect failure
+      help.run(ionic, argv, rawCliArguments);
+      expect(ionic.getAllTaskSettings).toHaveBeenCalled();
+      expect(helpUtils.printTaskListUsage).toHaveBeenCalledWith([
+        { name: '1' },
+        { name: '2' },
+        { name: '3' }
+      ], ionic.VERSION);
+    });
+
+    it('should print a help for a command if provided', function() {
+      var processArguments = ['node', 'ionic', 'help', 'red'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(ionic, 'getAllTaskSettings');
+      spyOn(ionic, 'getTaskSettingsByName').andReturn({
+        name: 'red',
+        summary: 'some summary'
+      });
+      spyOn(helpUtils, 'printTaskListUsage');
+      spyOn(helpUtils, 'printTaskUsage');
+
+      // Expect failure
+      help.run(ionic, argv, rawCliArguments);
+      expect(ionic.getAllTaskSettings).not.toHaveBeenCalled();
+      expect(ionic.getTaskSettingsByName).toHaveBeenCalledWith('red');
+      expect(helpUtils.printTaskUsage).toHaveBeenCalledWith({
+        name: 'red',
+        summary: 'some summary'
+      }, ionic.VERSION);
+    });
+
+    it('should print an error if the command is not found', function() {
+      var processArguments = ['node', 'ionic', 'help', 'black'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(ionic, 'getTaskSettingsByName').andReturn(null);
+      spyOn(helpUtils, 'printTaskListUsage');
+      spyOn(helpUtils, 'printTaskUsage');
+      spyOn(console, 'log');
+
+      // Expect failure
+      help.run(ionic, argv, rawCliArguments);
+      expect(ionic.getTaskSettingsByName).toHaveBeenCalledWith('black');
+      expect(console.log).toHaveBeenCalledWith(jasmine.any(String));
+    });
+  });
+});
diff --git a/spec/tasks/hooks.spec.js b/spec/tasks/hooks.spec.js
new file mode 100644
index 0000000000..a8826de881
--- /dev/null
+++ b/spec/tasks/hooks.spec.js
@@ -0,0 +1,99 @@
+'use strict';
+
+var optimist = require('optimist');
+var IonicAppLib = require('ionic-app-lib');
+var Hooks = IonicAppLib.hooks;
+var log = IonicAppLib.logging.logger;
+var appHooks = require('../../lib/ionic/hooks');
+
+describe('hooks command', function() {
+  var appDirectory = '/ionic/app/path';
+
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(process, 'cwd').andReturn(appDirectory);
+  });
+
+  it('should log an error by default', function() {
+    var processArguments = ['node', 'ionic', 'hooks'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(log.error).toHaveBeenCalledWith('Please supply a command - either add or remove');
+  });
+
+  it('should log an error if the hooks command is unkown', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'other'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(log.error).toHaveBeenCalledWith('Please supply a command - either add or remove');
+  });
+
+  it('should log an error if an error is thrown', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'permissions'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var errorText = 'oh no an error occurred.';
+
+    spyOn(Hooks, 'setHooksPermission').andCallFake(function() {
+      throw new Error(errorText);
+    });
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(log.error).toHaveBeenCalledWith('There was an error running the hooks command: ', jasmine.any(String));
+  });
+
+  it('should call ionic-app-lib when command is add', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'add'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    spyOn(Hooks, 'add');
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(Hooks.add).toHaveBeenCalledWith(appDirectory);
+  });
+
+  it('should call ionic-app-lib when command is remove', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'remove'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    spyOn(Hooks, 'remove');
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(Hooks.remove).toHaveBeenCalledWith(appDirectory);
+  });
+
+  it('should call ionic-app-lib when command is perm', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'perm'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    spyOn(Hooks, 'setHooksPermission');
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(Hooks.setHooksPermission).toHaveBeenCalledWith(appDirectory);
+  });
+
+  it('should call ionic-app-lib when command is permissions', function() {
+    var processArguments = ['node', 'ionic', 'hooks', 'permissions'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    spyOn(Hooks, 'setHooksPermission');
+
+    // Expect failure
+    appHooks.run(null, argv, rawCliArguments);
+    expect(Hooks.setHooksPermission).toHaveBeenCalledWith(appDirectory);
+  });
+});
diff --git a/spec/tasks/info.spec.js b/spec/tasks/info.spec.js
new file mode 100644
index 0000000000..3d532fd2c7
--- /dev/null
+++ b/spec/tasks/info.spec.js
@@ -0,0 +1,72 @@
+'use strict';
+
+var optimist = require('optimist');
+var info = require('../../lib/ionic/info');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var appLibInfo = IonicAppLib.info;
+var log = IonicAppLib.logging.logger;
+
+describe('info command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(info.title).toBeDefined();
+      expect(info.title).not.toBeNull();
+      expect(info.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(info.summary).toBeDefined();
+      expect(info.summary).not.toBeNull();
+      expect(info.summary.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'info'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    it('should fail if any Info task throws', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(appLibInfo, 'gatherInfo').andCallFake(function() {
+        throw new Error('error stuff');
+      });
+      spyOn(appLibInfo, 'getIonicVersion');
+      spyOn(appLibInfo, 'getIonicCliVersion');
+      spyOn(appLibInfo, 'printInfo');
+      spyOn(appLibInfo, 'checkRuntime');
+
+      // Expect failure
+      info.run(null, argv, rawCliArguments);
+      expect(appLibInfo.gatherInfo).toHaveBeenCalled();
+      expect(appLibUtils.fail).toHaveBeenCalled();
+
+      expect(appLibInfo.getIonicVersion).not.toHaveBeenCalled();
+      expect(appLibInfo.getIonicCliVersion).not.toHaveBeenCalled();
+      expect(appLibInfo.printInfo).not.toHaveBeenCalled();
+      expect(appLibInfo.checkRuntime).not.toHaveBeenCalled();
+    });
+
+    it('should fail if any Info task throws', function() {
+      var gatheredInfo = { info: 'hi' };
+      spyOn(appLibUtils, 'fail');
+      spyOn(process, 'cwd').andReturn('/hello/how/areyou');
+      spyOn(appLibInfo, 'gatherInfo').andReturn(gatheredInfo);
+      spyOn(appLibInfo, 'getIonicVersion');
+      spyOn(appLibInfo, 'getIonicCliVersion');
+      spyOn(appLibInfo, 'printInfo');
+      spyOn(appLibInfo, 'checkRuntime');
+
+      // Expect failure
+      info.run(null, argv, rawCliArguments);
+      expect(appLibInfo.gatherInfo).toHaveBeenCalled();
+      expect(appLibInfo.getIonicVersion).toHaveBeenCalledWith(gatheredInfo, '/hello/how/areyou');
+      expect(appLibInfo.getIonicCliVersion).toHaveBeenCalledWith(gatheredInfo, jasmine.any(String));
+      expect(appLibInfo.printInfo).toHaveBeenCalledWith(gatheredInfo);
+      expect(appLibInfo.checkRuntime).toHaveBeenCalled();
+
+      expect(appLibUtils.fail).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/tasks/io.spec.js b/spec/tasks/io.spec.js
new file mode 100644
index 0000000000..266af0bc8c
--- /dev/null
+++ b/spec/tasks/io.spec.js
@@ -0,0 +1,115 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var rewire = require('rewire');
+var io = rewire('../../lib/ionic/io');
+var IonicAppLib = require('ionic-app-lib');
+var Login = IonicAppLib.login;
+var IonicProject = IonicAppLib.project;
+var appLibUtils = IonicAppLib.utils;
+var ioLib = IonicAppLib.ioConfig;
+var log = IonicAppLib.logging.logger;
+
+// TODO: lets not do this
+var LoginTask = require('../../lib/ionic/login');
+
+describe('io command', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(io.title).toBeDefined();
+      expect(io.title).not.toBeNull();
+      expect(io.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(io.summary).toBeDefined();
+      expect(io.summary).not.toBeNull();
+      expect(io.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(io.args).toEqual(jasmine.any(Object));
+      expect(io.args['<command>']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'io', 'init'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    it('should fail if ionic project fails to laod', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(IonicProject, 'load').andCallFake(function() {
+        throw new Error('oh broken');
+      });
+      io.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('oh broken');
+    });
+
+    it('should fail if retrieveLogin returns a rejected promise', function(done) {
+      var error = new Error('blah failed');
+      spyOn(appLibUtils, 'fail');
+      spyOn(IonicProject, 'load');
+      spyOn(Login, 'retrieveLogin').andReturn(Q.reject(error));
+
+      io.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(appLibUtils.fail).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should not call LoginTask if retrieveLogin returns a cookie jar', function(done) {
+      spyOn(IonicProject, 'load');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(true));
+      spyOn(LoginTask, 'login');
+      spyOn(process, 'cwd').andReturn('/blah/dir/');
+      spyOn(ioLib, 'initIoPlatform');
+
+      io.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(LoginTask.login).not.toHaveBeenCalled();
+        expect(ioLib.initIoPlatform).toHaveBeenCalledWith('/blah/dir/', true);
+        done();
+      });
+    });
+
+    it('should call LoginTask if retrieveLogin returns no cookie jar', function(done) {
+      spyOn(IonicProject, 'load');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(null));
+      spyOn(LoginTask, 'login').andReturn(Q(true));
+      spyOn(process, 'cwd').andReturn('/blah/dir/');
+      spyOn(ioLib, 'initIoPlatform');
+
+      io.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(LoginTask.login).toHaveBeenCalledWith(argv);
+        expect(ioLib.initIoPlatform).toHaveBeenCalledWith('/blah/dir/', true);
+        done();
+      });
+    });
+
+    it('should fail if command is not init', function(done) {
+      processArguments = ['node', 'ionic', 'io', 'ini'];
+      rawCliArguments = processArguments.slice(2);
+      argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(true));
+      spyOn(ioLib, 'initIoPlatform');
+      spyOn(appLibUtils, 'fail');
+
+      io.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(appLibUtils.fail).toHaveBeenCalledWith('Invalid command');
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/lib.spec.js b/spec/tasks/lib.spec.js
new file mode 100644
index 0000000000..7923c7f69b
--- /dev/null
+++ b/spec/tasks/lib.spec.js
@@ -0,0 +1,124 @@
+'use strict';
+
+var rewire = require('rewire');
+var path = require('path');
+var fs = require('fs');
+var optimist = require('optimist');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+var utils = IonicAppLib.utils;
+var lib = rewire('../../lib/ionic/lib');
+
+describe('lib command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(utils, 'fail');
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(lib.title).toBeDefined();
+      expect(lib.title).not.toBeNull();
+      expect(lib.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(lib.summary).toBeDefined();
+      expect(lib.summary).not.toBeNull();
+      expect(lib.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a set of options with boolean defaults to true', function() {
+      expect(lib.options).toEqual(jasmine.any(Object));
+      expect(lib.options['--version|-v']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('lib commands', function() {
+
+    it('should throw an error if the www directory is not found', function() {
+      var processArguments = ['node', 'ionic', 'lib', 'update'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+
+      // Expect failure
+      lib.run(null, argv, rawCliArguments);
+      expect(utils.fail).toHaveBeenCalledWith(jasmine.any(String), 'lib');
+    });
+  });
+
+  describe('loadVersionData method testing', function() {
+    var loadVersionData = lib.__get__('loadVersionData');
+
+    it('should load bower.json file if version.json does not exist', function() {
+      spyOn(fs, 'existsSync').andCallFake(function(path) {
+        return path === 'www/lib/ionic/bower.json';
+      });
+      spyOn(path, 'resolve').andCallFake(function(path) {
+        return path;
+      });
+      spyOn(fs, 'readFileSync').andReturn('{ "stuff": "things" }');
+
+      var result = loadVersionData();
+      expect(result.usesBower).toEqual(true);
+      expect(result.versionFilePath).toEqual('www/lib/ionic/bower.json');
+      expect(result.local).toEqual({ stuff: 'things' });
+    });
+
+    it('should load version.json if it does exist', function() {
+      spyOn(fs, 'existsSync').andCallFake(function(path) {
+        return path === 'www/lib/ionic/version.json';
+      });
+      spyOn(path, 'resolve').andCallFake(function(path) {
+        return path;
+      });
+      spyOn(fs, 'readFileSync').andReturn('{ "stuff": "things" }');
+
+      var result = loadVersionData();
+      expect(result.usesBower).toEqual(false);
+      expect(result.versionFilePath).toEqual('www/lib/ionic/version.json');
+      expect(result.local).toEqual({ stuff: 'things' });
+    });
+
+    it('should log error if version.json is malformed', function() {
+      spyOn(fs, 'existsSync').andCallFake(function(path) {
+        return path === 'www/lib/ionic/version.json';
+      });
+      spyOn(path, 'resolve').andCallFake(function(path) {
+        return path;
+      });
+      spyOn(fs, 'readFileSync').andReturn('{ "stuff": "things }');
+
+      loadVersionData();
+      expect(log.error).toHaveBeenCalledWith('Unable to load ionic lib version information');
+    });
+  });
+
+  /*
+  describe('updateLibVersion method testing', function() {
+    var updateLibVersion = lib.__get__('updateLibVersion');
+    it('', function() {
+      updateLibVersion();
+    });
+  });
+
+  describe('printLibVersions method testing', function() {
+    var printLibVersions = lib.__get__('printLibVersions');
+
+    it('', function() {
+      printLibVersions();
+    });
+  });
+
+  describe('getVersionData method testing', function() {
+    var getVersionData = lib.__get__('getVersionData');
+
+    it('', function() {
+      getVersionData();
+    });
+  });
+  */
+});
diff --git a/spec/tasks/link.spec.js b/spec/tasks/link.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/list.spec.js b/spec/tasks/list.spec.js
new file mode 100644
index 0000000000..50cdaa698e
--- /dev/null
+++ b/spec/tasks/list.spec.js
@@ -0,0 +1,95 @@
+'use strict';
+
+var optimist = require('optimist');
+var childProcess = require('child_process');
+var rewire = require('rewire');
+var list = rewire('../../lib/ionic/list');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var fs = require('fs');
+var log = IonicAppLib.logging.logger;
+
+describe('list command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(list.title).toBeDefined();
+      expect(list.title).not.toBeNull();
+      expect(list.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(list.summary).toBeDefined();
+      expect(list.summary).not.toBeNull();
+      expect(list.summary.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'list', 'thing'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(childProcess, 'exec');
+    });
+
+    it('should fail if list Components throws', function() {
+      spyOn(appLibUtils, 'fail');
+      var listComponentsSpy = jasmine.createSpy('listComponentsSpy');
+      listComponentsSpy.andCallFake(function() {
+        throw new Error('something failed');
+      });
+      var revertListComponentsSpy = list.__set__('listComponents', listComponentsSpy);
+
+      // Expect failure
+      list.run(null, argv, rawCliArguments);
+      expect(listComponentsSpy).toHaveBeenCalled();
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something failed', 'list');
+      revertListComponentsSpy();
+    });
+
+    it('should fail if list Components throws an error string', function() {
+      spyOn(appLibUtils, 'fail');
+      var listComponentsSpy = jasmine.createSpy('listComponentsSpy');
+      listComponentsSpy.andCallFake(function() {
+        throw 'something failed';
+      });
+      var revertListComponentsSpy = list.__set__('listComponents', listComponentsSpy);
+
+      // Expect failure
+      list.run(null, argv, rawCliArguments);
+      expect(listComponentsSpy).toHaveBeenCalled();
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something failed', 'list');
+      revertListComponentsSpy();
+    });
+  });
+
+  describe('listComponents function', function() {
+
+    it('should call log.info for every component in devDependencies', function() {
+      spyOn(log, 'info');
+      spyOn(fs, 'readFileSync');
+      spyOn(JSON, 'parse').andReturn({
+        devDependencies: {
+          stuff: '1',
+          things: '1'
+        }
+      });
+
+      var listComponents = list.__get__('listComponents');
+      listComponents('thing');
+      expect(log.info.calls[0].args[0]).toEqual('Ions, bower components, or addons installed:');
+      expect(log.info.calls[1].args[0]).toMatch('stuff');
+      expect(log.info.calls[2].args[0]).toMatch('things');
+    });
+
+    it('should call childProcess exec and call util fail if result.code is not equal to 0', function() {
+      spyOn(log, 'error');
+      spyOn(childProcess, 'exec').andReturn({ code: 1 });
+
+      var listComponents = list.__get__('listComponents');
+      listComponents('thing');
+      expect(log.error).toHaveBeenCalledWith(jasmine.any(String));
+    });
+  });
+});
diff --git a/spec/tasks/login.spec.js b/spec/tasks/login.spec.js
new file mode 100644
index 0000000000..1bad90f05c
--- /dev/null
+++ b/spec/tasks/login.spec.js
@@ -0,0 +1,183 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var prompt = require('prompt');
+var rewire = require('rewire');
+var login = rewire('../../lib/ionic/login');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+var appLibLogin = IonicAppLib.login;
+
+describe('login command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(login.title).toBeDefined();
+      expect(login.title).not.toBeNull();
+      expect(login.title.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('run function', function() {
+    it('should call the login function', function() {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var loginSpy = jasmine.createSpy('loginSpy');
+      var revertLoginSpy = login.__set__('login', loginSpy);
+
+      // Expect failure
+      login.run(null, argv);
+      expect(loginSpy).toHaveBeenCalledWith(argv);
+      revertLoginSpy();
+    });
+  });
+
+  describe('login function', function() {
+    it('should use argv email and password first.', function(done) {
+      var processArguments = ['node', 'ionic', 'login', '--email', 'josh@ionic.io', '--password', 'asdf1234'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var jar = { jar: 'contents' };
+      spyOn(log, 'info');
+      spyOn(login, 'promptForLogin');
+      spyOn(appLibLogin, 'requestLogIn').andReturn(Q(jar));
+
+      login.login(argv).then(function(results) {
+        expect(results).toEqual(jar);
+        expect(login.promptForLogin).not.toHaveBeenCalled();
+        expect(appLibLogin.requestLogIn).toHaveBeenCalledWith('josh@ionic.io', 'asdf1234', true);
+        done();
+      });
+    });
+
+    it('should use argv e and p second.', function(done) {
+      var processArguments = ['node', 'ionic', 'login', '--e', 'josh@ionic.io', '--p', 'asdf1234'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var jar = { jar: 'contents' };
+      spyOn(log, 'info');
+      spyOn(login, 'promptForLogin');
+      spyOn(appLibLogin, 'requestLogIn').andReturn(Q(jar));
+
+      login.login(argv).then(function(results) {
+        expect(results).toEqual(jar);
+        expect(login.promptForLogin).not.toHaveBeenCalled();
+        expect(appLibLogin.requestLogIn).toHaveBeenCalledWith('josh@ionic.io', 'asdf1234', true);
+        done();
+      });
+    });
+
+    it('should use environment variables last.', function(done) {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      process.env.IONIC_EMAIL = 'josh@ionic.io';
+      process.env.IONIC_PASSWORD = 'asdf1234';
+      var jar = { jar: 'contents' };
+      spyOn(log, 'info');
+      spyOn(login, 'promptForLogin');
+      spyOn(appLibLogin, 'requestLogIn').andReturn(Q(jar));
+
+      login.login(argv).then(function(results) {
+        expect(results).toEqual(jar);
+        expect(login.promptForLogin).not.toHaveBeenCalled();
+        expect(appLibLogin.requestLogIn).toHaveBeenCalledWith('josh@ionic.io', 'asdf1234', true);
+        done();
+      });
+      delete process.env.IONIC_EMAIL;
+      delete process.env.IONIC_PASSWORD;
+    });
+
+    it('should prompt to ask for email and password when not available', function(done) {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var jar = { jar: 'contents' };
+      spyOn(log, 'info');
+
+      var promptForLoginSpy = jasmine.createSpy('promptForLoginSpy');
+      promptForLoginSpy.andReturn(Q({
+        email: 'josh@ionic.io',
+        password: 'asdf1234'
+      }));
+      var revertPromptForLoginSpy = login.__set__('promptForLogin', promptForLoginSpy);
+      spyOn(appLibLogin, 'requestLogIn').andReturn(Q(jar));
+
+      login.login(argv).then(function(results) {
+        expect(results).toEqual(jar);
+        expect(promptForLoginSpy).toHaveBeenCalledWith(argv);
+        expect(appLibLogin.requestLogIn).toHaveBeenCalledWith('josh@ionic.io', 'asdf1234', true);
+        revertPromptForLoginSpy();
+        done();
+      });
+    });
+
+    it('should throw an error on a failed log in', function(done) {
+      var processArguments = ['node', 'ionic', 'login', '--email', 'josh@ionic.io', '--password', 'asdf1234'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('error occurred');
+      spyOn(log, 'error');
+      spyOn(login, 'promptForLogin');
+      spyOn(appLibLogin, 'requestLogIn').andCallFake(function() {
+        throw error;
+      });
+
+      login.login(argv).catch(function(err) {
+        expect(log.error).toHaveBeenCalledWith('Error logging in');
+        expect(err).toEqual(error);
+        done();
+      });
+    });
+  });
+
+  describe('promptForLogin function', function() {
+    it('should ask for email and password and return a promise', function(done) {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'info');
+      spyOn(prompt, 'start');
+      spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+        callback(null, { email: 'josh@ionic.io', password: 'asdf1234' });
+      });
+
+      var promptForLogin = login.__get__('promptForLogin');
+
+      promptForLogin(argv).then(function(results) {
+        expect(prompt.get).toHaveBeenCalled();
+        expect(results.email).toEqual('josh@ionic.io');
+        expect(results.password).toEqual('asdf1234');
+        done();
+      });
+    });
+
+    it('should return a rejected promise on failure', function(done) {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'info');
+      spyOn(prompt, 'start');
+      spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+        callback('an error occurred', null);
+      });
+
+      var promptForLogin = login.__get__('promptForLogin');
+
+      promptForLogin(argv).catch(function(results) {
+        expect(prompt.get).toHaveBeenCalled();
+        expect(results).toEqual('Error logging in: an error occurred');
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/package.spec.js b/spec/tasks/package.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/platform.spec.js b/spec/tasks/platform.spec.js
new file mode 100644
index 0000000000..0a2540dd10
--- /dev/null
+++ b/spec/tasks/platform.spec.js
@@ -0,0 +1,105 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var IonicResources = IonicAppLib.resources;
+var State = IonicAppLib.state;
+var log = IonicAppLib.logging.logger;
+var platform = require('../../lib/ionic/platform');
+
+describe('platform command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(platform.title).toBeDefined();
+      expect(platform.title).not.toBeNull();
+      expect(platform.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(platform.summary).toBeDefined();
+      expect(platform.summary).not.toBeNull();
+      expect(platform.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(platform.args).toEqual(jasmine.any(Object));
+      expect(platform.args['[options]']).toEqual(jasmine.any(String));
+      expect(platform.args['<PLATFORM>']).toEqual(jasmine.any(String));
+    });
+
+    it('should have options', function() {
+      expect(platform.options).toEqual(jasmine.any(Object));
+      expect(platform.options['--noresources|-r']).toEqual(jasmine.any(Object));
+      expect(platform.options['--nosave|-e']).toEqual(jasmine.any(Object));
+    });
+  });
+
+  describe('cordova command', function() {
+    var appDirectory = '/ionic/app/path';
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+    });
+
+    it('should use commands provided', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      platform.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['platform', '-n']);
+        done();
+      });
+    });
+
+    it('should execute cordova using commands provided', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', 'add', 'ios'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicResources, 'copyIconFilesIntoResources').andReturn(Q(true));
+      spyOn(IonicResources, 'addIonicIcons').andReturn(Q(true));
+      spyOn(State, 'savePlatform');
+      spyOn(State, 'removePlatform');
+
+      platform.run(null, argv, rawCliArguments).then(function() {
+        expect(IonicResources.copyIconFilesIntoResources).toHaveBeenCalledWith(appDirectory);
+        expect(IonicResources.addIonicIcons).toHaveBeenCalledWith(appDirectory, 'ios');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['platform', 'add', 'ios']);
+        expect(State.savePlatform).toHaveBeenCalledWith(appDirectory, 'ios');
+        expect(State.removePlatform).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should execute cordova using commands provided', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', 'remove', 'ios'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicResources, 'copyIconFilesIntoResources').andReturn(Q(true));
+      spyOn(IonicResources, 'addIonicIcons').andReturn(Q(true));
+      spyOn(State, 'savePlatform');
+      spyOn(State, 'removePlatform');
+
+      platform.run(null, argv, rawCliArguments).then(function() {
+        expect(IonicResources.copyIconFilesIntoResources).not.toHaveBeenCalled();
+        expect(IonicResources.addIonicIcons).not.toHaveBeenCalled();
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['platform', 'remove', 'ios']);
+        expect(State.savePlatform).not.toHaveBeenCalled();
+        expect(State.removePlatform).toHaveBeenCalledWith(appDirectory, 'ios');
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/plugin.spec.js b/spec/tasks/plugin.spec.js
new file mode 100644
index 0000000000..89c034f738
--- /dev/null
+++ b/spec/tasks/plugin.spec.js
@@ -0,0 +1,102 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var IonicAppLib = require('ionic-app-lib');
+var State = IonicAppLib.state;
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var plugin = require('../../lib/ionic/plugin');
+
+describe('plugin command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(plugin.title).toBeDefined();
+      expect(plugin.title).not.toBeNull();
+      expect(plugin.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(plugin.summary).toBeDefined();
+      expect(plugin.summary).not.toBeNull();
+      expect(plugin.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(plugin.args).toEqual(jasmine.any(Object));
+      expect(plugin.args['[options]']).toEqual(jasmine.any(String));
+      expect(plugin.args['<SPEC>']).toEqual(jasmine.any(String));
+    });
+
+    it('should have a boolean option of --nohooks or -n that defaults to true', function() {
+      expect(plugin.options).toEqual(jasmine.any(Object));
+      expect(plugin.options['--searchpath <directory>']).toEqual(jasmine.any(String));
+      expect(plugin.options['--nosave|-e']).toEqual(jasmine.any(Object));
+    });
+  });
+
+
+  describe('cordova platform checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(log, 'info');
+    });
+
+    it('should pass args on to cordovaUtils', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      plugin.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['plugin', '-n']);
+        done();
+      });
+    });
+
+    it('should add plugins', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(State, 'savePlugin');
+      spyOn(State, 'removePlugin');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      plugin.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['plugin', 'add', 'thing', '--variable', 'hello']);
+        expect(State.savePlugin).toHaveBeenCalledWith(appDirectory, 'thing', ['hello']);
+        expect(State.removePlugin).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should remove plugins', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'remove', 'thing'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(State, 'savePlugin');
+      spyOn(State, 'removePlugin');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      plugin.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['plugin', 'remove', 'thing']);
+        expect(State.removePlugin).toHaveBeenCalledWith(appDirectory, 'thing');
+        expect(State.savePlugin).not.toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/prepare.spec.js b/spec/tasks/prepare.spec.js
new file mode 100644
index 0000000000..1cf646b07b
--- /dev/null
+++ b/spec/tasks/prepare.spec.js
@@ -0,0 +1,45 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var prepare = require('../../lib/ionic/prepare');
+
+describe('prepare command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(prepare.title).toBeDefined();
+      expect(prepare.title).not.toBeNull();
+      expect(prepare.title.length).toBeGreaterThan(0);
+    });
+  });
+
+  describe('cordova platform and plugin checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'prepare'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+    });
+
+    it('should try to install the cordova platform if it is not installed', function(done) {
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
+      prepare.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['prepare']);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/push.spec.js b/spec/tasks/push.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/remove.spec.js b/spec/tasks/remove.spec.js
new file mode 100644
index 0000000000..cad7420485
--- /dev/null
+++ b/spec/tasks/remove.spec.js
@@ -0,0 +1,135 @@
+'use strict';
+
+var optimist = require('optimist');
+var childProcess = require('child_process');
+var rewire = require('rewire');
+var remove = rewire('../../lib/ionic/remove');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var ioLib = IonicAppLib.ioConfig;
+var log = IonicAppLib.logging.logger;
+var bower = require('../../lib/utils/bower');
+
+describe('remove command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(remove.title).toBeDefined();
+      expect(remove.title).not.toBeNull();
+      expect(remove.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(remove.summary).toBeDefined();
+      expect(remove.summary).not.toBeNull();
+      expect(remove.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a args', function() {
+      expect(remove.args).toEqual(jasmine.any(Object));
+      expect(remove.args['[name]']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    var processArguments = ['node', 'ionic', 'remove', 'thing'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(childProcess, 'exec');
+    });
+
+    it('should fail if bower is not installed', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(false);
+
+      // Expect failure
+      remove.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(bower.installMessage, 'remove');
+    });
+
+    it('should fail if uninstall throws an error obj message if the error has a message value', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(true);
+
+      var uninstallBowerSpy = jasmine.createSpy('uninstallBowerSpy');
+      uninstallBowerSpy.andCallFake(function() {
+        throw new Error('something failed');
+      });
+      var revertUninstallBowerSpy = remove.__set__('uninstallBowerComponent', uninstallBowerSpy);
+
+      // Expect failure
+      remove.run(null, argv, rawCliArguments);
+      expect(uninstallBowerSpy).toHaveBeenCalledWith('thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something failed', 'service');
+
+      // TODO: things seems incorrect
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(false, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertUninstallBowerSpy();
+    });
+
+    it('should fail if uninstallBowerComponent throws an error if the error has a message value', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(appLibUtils, 'fail');
+      spyOn(bower, 'checkForBower').andReturn(true);
+      var uninstallBowerSpy = jasmine.createSpy('uninstallBowerSpy');
+      uninstallBowerSpy.andCallFake(function() {
+        throw 'something';
+      });
+      var revertInstallBowerSpy = remove.__set__('uninstallBowerComponent', uninstallBowerSpy);
+
+      // Expect failure
+      remove.run(null, argv, rawCliArguments);
+      expect(uninstallBowerSpy).toHaveBeenCalledWith('thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith('something', 'service');
+
+      // TODO: things seems incorrect
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(false, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertInstallBowerSpy();
+    });
+
+    it('should call injectIoComponent and warnMissingData on install success.', function() {
+      spyOn(ioLib, 'injectIoComponent');
+      spyOn(ioLib, 'warnMissingData');
+      spyOn(bower, 'checkForBower').andReturn(true);
+
+      var uninstallBowerSpy = jasmine.createSpy('uninstallBowerSpy');
+      var revertInstallBowerSpy = remove.__set__('uninstallBowerComponent', uninstallBowerSpy);
+
+      remove.run(null, argv, rawCliArguments);
+      expect(bower.checkForBower).toHaveBeenCalled();
+      expect(uninstallBowerSpy).toHaveBeenCalledWith('thing');
+      expect(ioLib.injectIoComponent).toHaveBeenCalledWith(false, 'thing');
+      expect(ioLib.warnMissingData).toHaveBeenCalled();
+      revertInstallBowerSpy();
+    });
+  });
+
+  describe('uninstallBowerComponent function', function() {
+
+    it('should call childProcess exec to install the bower component', function() {
+      spyOn(log, 'info');
+      spyOn(childProcess, 'exec').andReturn({ code: 0 });
+
+      var uninstallBowerComponent = remove.__get__('uninstallBowerComponent');
+      uninstallBowerComponent('thing');
+      expect(childProcess.exec).toHaveBeenCalledWith('bower uninstall --save-dev thing');
+      expect(log.info).toHaveBeenCalledWith(jasmine.any(String));
+    });
+
+    it('should call childProcess exec and call util fail if result.code is not equal to 0', function() {
+      spyOn(appLibUtils, 'fail');
+      spyOn(childProcess, 'exec').andReturn({ code: 1 });
+
+      var uninstallBowerComponent = remove.__get__('uninstallBowerComponent');
+      uninstallBowerComponent('thing');
+      expect(childProcess.exec).toHaveBeenCalledWith('bower uninstall --save-dev thing');
+      expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String), 'remove');
+    });
+  });
+});
diff --git a/spec/tasks/resources.spec.js b/spec/tasks/resources.spec.js
new file mode 100644
index 0000000000..0103984c4e
--- /dev/null
+++ b/spec/tasks/resources.spec.js
@@ -0,0 +1,86 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var resources = require('../../lib/ionic/resources');
+var IonicAppLib = require('ionic-app-lib');
+var Project = IonicAppLib.project;
+var appLibUtils = IonicAppLib.utils;
+var IonicResources = IonicAppLib.resources;
+
+describe('resources command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(resources.title).toBeDefined();
+      expect(resources.title).not.toBeNull();
+      expect(resources.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(resources.summary).toBeDefined();
+      expect(resources.summary).not.toBeNull();
+      expect(resources.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have options', function() {
+      expect(resources.options).toEqual(jasmine.any(Object));
+      expect(resources.options['--icon|-i']).toEqual(jasmine.any(Object));
+      expect(resources.options['--splash|-s']).toEqual(jasmine.any(Object));
+    });
+  });
+
+  describe('run function', function() {
+    it('should fail if project cannot be loaded', function() {
+      var processArguments = ['node', 'ionic', 'resources'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('an error occurred');
+      spyOn(process, 'cwd').andReturn('/current/directory');
+      spyOn(Project, 'load').andCallFake(function() {
+        throw error;
+      });
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      resources.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(error, 'resources');
+    });
+
+    it('should fail if applib generate fails', function(done) {
+      var processArguments = ['node', 'ionic', 'resources'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('an error occurred');
+      spyOn(process, 'cwd').andReturn('/current/directory');
+      spyOn(Project, 'load');
+      spyOn(IonicResources, 'generate').andReturn(Q.reject(error));
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      resources.run(null, argv, rawCliArguments).then(function() {
+        expect(appLibUtils.fail).toHaveBeenCalledWith(error, 'resources');
+        done();
+      });
+    });
+
+    it('should pass platforms on to the applib generate', function(done) {
+      var processArguments = ['node', 'ionic', 'resources', '--icon'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(process, 'cwd').andReturn('/current/directory');
+      spyOn(Project, 'load');
+      spyOn(IonicResources, 'generate').andReturn(Q(true));
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      resources.run(null, argv, rawCliArguments).then(function() {
+        expect(IonicResources.generate).toHaveBeenCalledWith('/current/directory', jasmine.any(Object));
+        expect(appLibUtils.fail).not.toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
new file mode 100644
index 0000000000..4935c8dc47
--- /dev/null
+++ b/spec/tasks/run.spec.js
@@ -0,0 +1,190 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var cordovaUtils = require('../../lib/utils/cordova');
+var os = require('os');
+var childProcess = require('child_process');
+var IonicAppLib = require('ionic-app-lib');
+var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
+var run = require('../../lib/ionic/run');
+
+describe('run command', function() {
+  beforeEach(function() {
+    spyOn(log, 'error');
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+  });
+
+  describe('command settings', function() {
+
+    it('should have a title', function() {
+      expect(run.title).toBeDefined();
+      expect(run.title).not.toBeNull();
+      expect(run.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(run.summary).toBeDefined();
+      expect(run.summary).not.toBeNull();
+      expect(run.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a boolean option of --nohooks or -n that defaults to true', function() {
+      expect(run.options).toEqual(jasmine.any(Object));
+      expect(run.options['--consolelogs|-c']).toEqual(jasmine.any(Object));
+      expect(run.options['--consolelogs|-c'].boolean).toEqual(true);
+      expect(run.options['--serverlogs|-s']).toEqual(jasmine.any(Object));
+      expect(run.options['--serverlogs|-s'].boolean).toEqual(true);
+      expect(run.options['--debug|--release']).toEqual(jasmine.any(Object));
+      expect(run.options['--debug|--release'].boolean).toEqual(true);
+    });
+  });
+
+
+  describe('cordova platform checks', function() {
+
+    // This argv should model after optimist objects
+    // $ ionic run -n
+    var processArguments = ['node', 'ionic', 'run', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var appDirectory = '/ionic/app/path';
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should default to iOS for the platform', function(done) {
+      spyOn(os, 'platform').andReturn('darwin');
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.isPlatformInstalled).toHaveBeenCalledWith('ios', appDirectory);
+        done();
+      });
+    });
+
+    it('should fail if the system is not Mac and the platform is iOS', function(done) {
+      spyOn(os, 'platform').andReturn('windows');
+
+      run.run(null, argv, rawCliArguments).catch(function(error) {
+        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+        done();
+      });
+    });
+  });
+
+
+  describe('cordova platform and plugin checks', function() {
+
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'run', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(os, 'platform').andReturn('darwin');
+
+      spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
+      spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should try to install the cordova platform if it is not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(false);
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).toHaveBeenCalledWith('ios');
+        done();
+      });
+    });
+
+    it('should not try to install the cordova platform if it is installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.installPlatform).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should install plugins if they are not installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(false);
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).toHaveBeenCalledWith();
+        done();
+      });
+    });
+
+    it('should not install plugins if they are installed', function(done) {
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
+        expect(cordovaUtils.installPlugins).not.toHaveBeenCalledWith();
+        done();
+      });
+    });
+  });
+
+  describe('execute cordova command', function() {
+    var appDirectory = '/ionic/app/path';
+
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(os, 'platform').andReturn('darwin');
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should execute the command against the cordova util', function(done) {
+      var processArguments = ['node', 'ionic', 'run', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', '-n', 'ios'], false, true);
+        done();
+      });
+    });
+
+
+    it('should execute the command against the cordova util using the platform provided', function(done) {
+      var processArguments = ['node', 'ionic', 'run', 'android'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        done();
+      });
+    });
+
+    it('should execute the command against the cordova util using the platform provided', function(done) {
+      var processArguments = ['node', 'ionic', 'run', 'android', '--livereload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(cordovaUtils, 'setupLiveReload').andReturn(Q({
+        blah: 'blah'
+      }));
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
+          ['run', 'android'], true, { blah: 'blah' });
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/security.spec.js b/spec/tasks/security.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/serve.spec.js b/spec/tasks/serve.spec.js
new file mode 100644
index 0000000000..ebbb91a980
--- /dev/null
+++ b/spec/tasks/serve.spec.js
@@ -0,0 +1,254 @@
+'use strict';
+
+var optimist = require('optimist');
+var rewire = require('rewire');
+var Q = require('q');
+var serveTask = rewire('../../lib/ionic/serve');
+var IonicAppLib = require('ionic-app-lib');
+var IonicProject = IonicAppLib.project;
+var Serve = IonicAppLib.serve;
+var log = IonicAppLib.logging.logger;
+var appLibUtils = IonicAppLib.utils;
+
+describe('Serve', function() {
+
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(serveTask.title).toBeDefined();
+      expect(serveTask.title).not.toBeNull();
+      expect(serveTask.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(serveTask.summary).toBeDefined();
+      expect(serveTask.summary).not.toBeNull();
+      expect(serveTask.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(serveTask.args).toEqual(jasmine.any(Object));
+      expect(serveTask.args['[options]']).toEqual(jasmine.any(String));
+    });
+
+    it('should have options', function() {
+      expect(serveTask.options).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--consolelogs|-c']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--serverlogs|-s']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--port|-p']).toEqual(jasmine.any(String));
+      expect(serveTask.options['--livereload-port|-r']).toEqual(jasmine.any(String));
+      expect(serveTask.options['--nobrowser|-b']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--nolivereload|-d']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--noproxy|-x']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--address']).toEqual(jasmine.any(String));
+      expect(serveTask.options['--all|-a']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--browser|-w']).toEqual(jasmine.any(String));
+      expect(serveTask.options['--browseroption|-o']).toEqual(jasmine.any(String));
+      expect(serveTask.options['--lab|-l']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--nogulp']).toEqual(jasmine.any(Object));
+      expect(serveTask.options['--platform|-t']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run command', function() {
+    beforeEach(function() {
+      spyOn(process, 'cwd').andReturn('/some/project/dir');
+      spyOn(log, 'error');
+    });
+
+    it('should fail if loading the ionic project fails', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--livereload', '--nogulp'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('some error');
+
+      spyOn(IonicProject, 'load').andCallFake(function() {
+        throw error;
+      });
+      spyOn(appLibUtils, 'fail');
+
+      serveTask.run({}, argv);
+      expect(log.error).toHaveBeenCalledWith(jasmine.any(String), error);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(error.message);
+      done();
+    });
+
+    it('should fail if loading the ionic project fails', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--livereload', '--nogulp'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('some error');
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andCallFake(function() {
+        throw error;
+      });
+
+      spyOn(appLibUtils, 'fail');
+
+      serveTask.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('Error with serve- ' + error);
+      done();
+    });
+
+    it('should return a rejected promise when chain fails', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '-a'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('some error');
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andReturn(Q());
+      spyOn(Serve, 'checkPorts').andReturn(Q.reject(error));
+
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      serveTask.run({}, argv).catch(function(errCaught) {
+        expect(Serve.checkPorts).toHaveBeenCalled();
+        expect(Serve.start).not.toHaveBeenCalled();
+        expect(Serve.showFinishedServeMessage).not.toHaveBeenCalled();
+
+        expect(log.info).toHaveBeenCalledWith('There was an error serving your Ionic application:', error);
+        expect(errCaught).toEqual(error);
+        done();
+      });
+    });
+
+    it('should use IP of 0.0.0.0 if -a is supplied', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '-a'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andReturn(Q());
+
+      spyOn(Serve, 'checkPorts');
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      serveTask.run({}, argv).then(function() {
+        expect(Serve.getAddress).not.toHaveBeenCalled();
+        expect(Serve.start.calls[0].args[0].address).toBe('0.0.0.0');
+        done();
+      });
+    });
+
+    it('should use IP of 0.0.0.0 if --all is supplied', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--all'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andReturn(Q());
+
+      spyOn(Serve, 'checkPorts');
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      serveTask.run({}, argv).then(function() {
+        expect(Serve.getAddress).not.toHaveBeenCalled();
+        expect(Serve.start.calls[0].args[0].address).toBe('0.0.0.0');
+        done();
+      });
+    });
+
+    it('should use IP of --address if supplied', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--address', '192.168.1.10'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andReturn(Q());
+
+      spyOn(Serve, 'checkPorts');
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      serveTask.run({}, argv).then(function() {
+        expect(Serve.getAddress).not.toHaveBeenCalled();
+        expect(Serve.start.calls[0].args[0].address).toBe('192.168.1.10');
+        done();
+      });
+    });
+
+    it('should use connect live reload port from env var', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--livereload', '--nogulp'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andReturn({});
+      spyOn(Serve, 'loadSettings').andReturn({});
+      spyOn(Serve, 'getAddress').andReturn(Q());
+
+      spyOn(Serve, 'checkPorts');
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      process.env = { CONNECT_LIVE_RELOAD_PORT: 5000 };
+
+      var options = {
+        appDirectory: '/some/project/dir',
+        liveReloadPort: 5000,
+        nogulp: true
+      };
+
+      serveTask.run({}, argv).then(function() {
+        expect(Serve.start).toHaveBeenCalledWith(options);
+        done();
+      });
+    });
+
+    it('should use connect live reload port from default', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--livereload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load').andReturn({
+        get: function() {
+          return false;
+        }
+      });
+      process.env = {};
+      spyOn(Serve, 'getAddress').andReturn(Q());
+
+      spyOn(Serve, 'checkPorts');
+      spyOn(Serve, 'start');
+      spyOn(Serve, 'showFinishedServeMessage');
+
+      serveTask.run({}, argv).then(function() {
+        expect(Serve.start.calls[0].args[0].liveReloadPort).toBe(35729);
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/service.spec.js b/spec/tasks/service.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/setup.spec.js b/spec/tasks/setup.spec.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spec/tasks/share.spec.js b/spec/tasks/share.spec.js
new file mode 100644
index 0000000000..56bb37fcc3
--- /dev/null
+++ b/spec/tasks/share.spec.js
@@ -0,0 +1,161 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var share = require('../../lib/ionic/share');
+var IonicAppLib = require('ionic-app-lib');
+var Project = IonicAppLib.project;
+var Share = IonicAppLib.share;
+var log = IonicAppLib.logging.logger;
+var Login = IonicAppLib.login;
+var appLibUtils = IonicAppLib.utils;
+
+var LoginTask = require('../../lib/ionic/login');
+
+describe('share command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(share.title).toBeDefined();
+      expect(share.title).not.toBeNull();
+      expect(share.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(share.summary).toBeDefined();
+      expect(share.summary).not.toBeNull();
+      expect(share.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(share.args).toEqual(jasmine.any(Object));
+      expect(share.args['<EMAIL>']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    it('should fail email is missing', function() {
+      var processArguments = ['node', 'ionic', 'share'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('Invalid command', 'share');
+    });
+
+    it('should fail if project.load fails', function() {
+      var processArguments = ['node', 'ionic', 'share', 'josh@ionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('an error occurred');
+      spyOn(Project, 'load').andCallFake(function() {
+        throw error;
+      });
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith(error.message);
+    });
+
+    it('should fail if the project does not have an app_id', function() {
+      var processArguments = ['node', 'ionic', 'share', 'josh@ionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var projectSpy = jasmine.createSpyObj('promiseExec', ['get']);
+      spyOn(Project, 'load').andReturn(projectSpy);
+      projectSpy.get.andReturn('');
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('You must first upload the app to share it');
+    });
+
+    it('should fail if the email provided does not have an @ sign within it', function() {
+      var processArguments = ['node', 'ionic', 'share', 'joshionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var projectSpy = jasmine.createSpyObj('promiseExec', ['get']);
+      spyOn(Project, 'load').andReturn(projectSpy);
+      projectSpy.get.andReturn('123');
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('Invalid email address', 'share');
+    });
+
+    it('should fail if the login.retrieveLogin returns a rejected promise', function(done) {
+      var processArguments = ['node', 'ionic', 'share', 'josh@ionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'info');
+      var projectSpy = jasmine.createSpyObj('promiseExec', ['get']);
+      spyOn(Project, 'load').andReturn(projectSpy);
+      projectSpy.get.andReturn('123');
+      spyOn(Login, 'retrieveLogin').andReturn(Q.reject('error occurred'));
+      spyOn(appLibUtils, 'fail').andReturn(Q(true)); // TODO: hack for now
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments).then(function() {
+        expect(appLibUtils.fail).toHaveBeenCalledWith('error occurred');
+        done();
+      });
+    });
+
+    it('should not ask a user to login if a previous session is found', function(done) {
+      var processArguments = ['node', 'ionic', 'share', 'josh@ionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'info');
+      spyOn(process, 'cwd').andReturn('/stuff/things');
+      var projectSpy = jasmine.createSpyObj('promiseExec', ['get']);
+      spyOn(Project, 'load').andReturn(projectSpy);
+      projectSpy.get.andReturn('123');
+      spyOn(Login, 'retrieveLogin').andReturn(Q({ jar: 'contents' }));
+      spyOn(LoginTask, 'login');
+      spyOn(Share, 'shareApp').andReturn(Q(true));
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments).then(function() {
+        expect(LoginTask.login).not.toHaveBeenCalled();
+        expect(Share.shareApp).toHaveBeenCalledWith(
+          '/stuff/things', { jar: 'contents' }, 'josh@ionic.io'
+        );
+        done();
+      });
+    });
+
+    it('should ask a user to login if a previous session is not found', function(done) {
+      var processArguments = ['node', 'ionic', 'share', 'josh@ionic.io'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'info');
+      spyOn(process, 'cwd').andReturn('/stuff/things');
+      var projectSpy = jasmine.createSpyObj('promiseExec', ['get']);
+      spyOn(Project, 'load').andReturn(projectSpy);
+      projectSpy.get.andReturn('123');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(false));
+      spyOn(LoginTask, 'login').andReturn(Q({ jar: 'contents' }));
+      spyOn(Share, 'shareApp').andReturn(Q(true));
+
+      // Expect failure
+      share.run(null, argv, rawCliArguments).then(function() {
+        expect(LoginTask.login).toHaveBeenCalledWith(argv);
+        expect(Share.shareApp).toHaveBeenCalledWith(
+          '/stuff/things', { jar: 'contents' }, 'josh@ionic.io'
+        );
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
new file mode 100644
index 0000000000..b87f0cbbc6
--- /dev/null
+++ b/spec/tasks/start.spec.js
@@ -0,0 +1,179 @@
+'use strict';
+
+var fs = require('fs');
+var Q = require('q');
+var optimist = require('optimist');
+var rewire = require('rewire');
+var start = rewire('../../lib/ionic/start');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var Start = IonicAppLib.start;
+var log = IonicAppLib.logging.logger;
+var templateUtils = require('../../lib/utils/templates');
+
+describe('start command', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(start.title).toBeDefined();
+      expect(start.title).not.toBeNull();
+      expect(start.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(start.summary).toBeDefined();
+      expect(start.summary).not.toBeNull();
+      expect(start.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(start.args).toEqual(jasmine.any(Object));
+      expect(start.args['[options]']).toEqual(jasmine.any(String));
+      expect(start.args['<PATH>']).toEqual(jasmine.any(String));
+      expect(start.args['[template]']).toEqual(jasmine.any(String));
+    });
+
+    it('should have options', function() {
+      expect(start.options).toEqual(jasmine.any(Object));
+      expect(start.options['--appname|-a']).toEqual(jasmine.any(String));
+      expect(start.options['--id|-i']).toEqual(jasmine.any(String));
+      expect(start.options['--skip-npm']).toEqual(jasmine.any(Object));
+      expect(start.options['--no-cordova|-w']).toEqual(jasmine.any(Object));
+      expect(start.options['--sass|-s']).toEqual(jasmine.any(Object));
+      expect(start.options['--list|-l']).toEqual(jasmine.any(Object));
+      expect(start.options['--io-app-id']).toEqual(jasmine.any(String));
+      expect(start.options['--template|-t']).toEqual(jasmine.any(String));
+      expect(start.options['--v2|-v']).toEqual(jasmine.any(Object));
+      expect(start.options['--typescript|--ts']).toEqual(jasmine.any(Object));
+      expect(start.options['--zip-file|-z']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+
+    it('should call list and return templates when list is passed as a command', function() {
+      var processArguments = ['node', 'ionic', 'start', '--list'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(templateUtils, 'listTemplates');
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+
+      start.run({}, argv);
+      expect(templateUtils.listTemplates).toHaveBeenCalled();
+      expect(appLibUtils.preprocessCliOptions).not.toHaveBeenCalled();
+    });
+
+    it('should fail if a dir is not supplied to start', function() {
+      var processArguments = ['node', 'ionic', 'start'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(appLibUtils, 'fail');
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+
+      start.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalled();
+      expect(appLibUtils.preprocessCliOptions).not.toHaveBeenCalled();
+    });
+
+    it('should fail if a the dir is equal to "."', function() {
+      var processArguments = ['node', 'ionic', 'start', '.'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'error');
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+
+      start.run({}, argv);
+      expect(log.error).toHaveBeenCalled();
+      expect(appLibUtils.preprocessCliOptions).not.toHaveBeenCalled();
+    });
+
+    it('should prompt for overwrite if the dir already exists, and cancel if user says no', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'existingDir'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite').andReturn(Q(false));
+      spyOn(Start, 'startApp');
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions).toHaveBeenCalled();
+        expect(Start.promptForOverwrite).toHaveBeenCalled();
+        expect(log.info).toHaveBeenCalled();
+        expect(Start.startApp).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should not prompt for overwrite if the dir does not exist', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions).toHaveBeenCalled();
+        expect(Start.promptForOverwrite).not.toHaveBeenCalled();
+        expect(Start.startApp).toHaveBeenCalled();
+        expect(Start.printQuickHelp).toHaveBeenCalled();
+        expect(Start.promptLogin).toHaveBeenCalled();
+        done();
+      });
+    });
+    it('should provide extra content if starting a v2 project', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(log.info).toHaveBeenCalledWith(
+          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
+        );
+        done();
+      });
+    });
+
+    it('should catch error if any process throws', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(log, 'error');
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q.reject(false));
+      spyOn(Start, 'printQuickHelp');
+      spyOn(Start, 'promptLogin');
+
+      start.run({}, argv).catch(function() {
+        expect(appLibUtils.preprocessCliOptions).toHaveBeenCalled();
+        expect(Start.promptForOverwrite).not.toHaveBeenCalled();
+        expect(Start.startApp).toHaveBeenCalled();
+        expect(Start.printQuickHelp).not.toHaveBeenCalled();
+        expect(Start.promptLogin).not.toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/tasks/state.spec.js b/spec/tasks/state.spec.js
new file mode 100644
index 0000000000..e0db32f2a8
--- /dev/null
+++ b/spec/tasks/state.spec.js
@@ -0,0 +1,154 @@
+'use strict';
+
+var optimist = require('optimist');
+var rewire = require('rewire');
+var state = rewire('../../lib/ionic/state');
+var IonicAppLib = require('ionic-app-lib');
+var State = IonicAppLib.state;
+var IonicProject = IonicAppLib.project;
+var appLibUtils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
+
+describe('state command', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(state.title).toBeDefined();
+      expect(state.title).not.toBeNull();
+      expect(state.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(state.summary).toBeDefined();
+      expect(state.summary).not.toBeNull();
+      expect(state.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have args', function() {
+      expect(state.args).toEqual(jasmine.any(Object));
+      expect(state.args['<COMMAND>']).toEqual(jasmine.any(String));
+    });
+
+    it('should have options', function() {
+      expect(state.options).toEqual(jasmine.any(Object));
+      expect(state.options.save).toEqual(jasmine.any(String));
+      expect(state.options.restore).toEqual(jasmine.any(String));
+      expect(state.options.clear).toEqual(jasmine.any(String));
+      expect(state.options.reset).toEqual(jasmine.any(String));
+      expect(state.options['--plugins']).toEqual(jasmine.any(Object));
+      expect(state.options['--platforms']).toEqual(jasmine.any(Object));
+    });
+  });
+
+  describe('run function', function() {
+
+    it('should fail if ionic project fails to laod', function() {
+      var processArguments = ['node', 'ionic', 'state', 'other'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(appLibUtils, 'fail');
+      spyOn(IonicProject, 'load').andCallFake(function() {
+        throw new Error('oh broken');
+      });
+
+      state.run({}, argv);
+      expect(appLibUtils.fail).toHaveBeenCalledWith('oh broken');
+    });
+
+    it('should fail if command is not identified', function() {
+      var processArguments = ['node', 'ionic', 'state', 'other'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(log, 'error');
+      spyOn(IonicProject, 'load');
+
+      state.run({}, argv);
+      expect(log.error).toHaveBeenCalledWith(jasmine.any(String));
+    });
+
+    it('should call State.saveState if command is save', function() {
+      var processArguments = ['node', 'ionic', 'state', 'save'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(process, 'cwd').andReturn('/blah/dir');
+      spyOn(State, 'saveState');
+
+      state.run({}, argv);
+      expect(State.saveState).toHaveBeenCalledWith('/blah/dir', {
+        platforms: true,
+        plugins: true
+      });
+    });
+
+    it('should call State.restoreState if command is restore', function() {
+      var processArguments = ['node', 'ionic', 'state', 'restore'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(process, 'cwd').andReturn('/blah/dir');
+      spyOn(State, 'restoreState');
+
+      state.run({}, argv);
+      expect(State.restoreState).toHaveBeenCalledWith('/blah/dir', {
+        platforms: true,
+        plugins: true
+      });
+    });
+
+    it('should call State.resetState if command is reset', function() {
+      var processArguments = ['node', 'ionic', 'state', 'reset'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(process, 'cwd').andReturn('/blah/dir');
+      spyOn(State, 'resetState');
+
+      state.run({}, argv);
+      expect(State.resetState).toHaveBeenCalledWith('/blah/dir', {
+        platforms: true,
+        plugins: true
+      });
+    });
+
+    it('should call State.clearState if command is clear', function() {
+      var processArguments = ['node', 'ionic', 'state', 'clear'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(process, 'cwd').andReturn('/blah/dir');
+      spyOn(State, 'clearState');
+
+      state.run({}, argv);
+      expect(State.clearState).toHaveBeenCalledWith('/blah/dir', {
+        platforms: true,
+        plugins: true
+      });
+    });
+
+    it('should update options for platforms and plugins values if they are passed', function() {
+      var processArguments = ['node', 'ionic', 'state', 'clear', '--platforms', '--plugins'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicProject, 'load');
+      spyOn(process, 'cwd').andReturn('/blah/dir');
+      spyOn(State, 'clearState');
+
+      state.run({}, argv);
+      expect(State.clearState).toHaveBeenCalledWith('/blah/dir', {
+        platforms: true,
+        plugins: true
+      });
+    });
+  });
+});
diff --git a/spec/tasks/upload.spec.js b/spec/tasks/upload.spec.js
new file mode 100644
index 0000000000..e79ec7fde0
--- /dev/null
+++ b/spec/tasks/upload.spec.js
@@ -0,0 +1,99 @@
+'use strict';
+
+var Q = require('q');
+var optimist = require('optimist');
+var rewire = require('rewire');
+var upload = rewire('../../lib/ionic/upload');
+var IonicAppLib = require('ionic-app-lib');
+var Login = IonicAppLib.login;
+var Upload = IonicAppLib.upload;
+var appLibUtils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
+
+// TODO: lets not do this
+var LoginTask = require('../../lib/ionic/login');
+
+describe('upload command', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(upload.title).toBeDefined();
+      expect(upload.title).not.toBeNull();
+      expect(upload.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(upload.summary).toBeDefined();
+      expect(upload.summary).not.toBeNull();
+      expect(upload.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have options', function() {
+      expect(upload.options).toEqual(jasmine.any(Object));
+      expect(upload.options['--email|-e']).toEqual(jasmine.any(String));
+      expect(upload.options['--password|-p']).toEqual(jasmine.any(String));
+      expect(upload.options['--note']).toEqual(jasmine.any(String));
+      expect(upload.options['--deploy <channel_tag>']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    it('should fail if ionic project fails to laod', function(done) {
+      var processArguments = ['node', 'ionic', 'upload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('oh broken');
+      spyOn(appLibUtils, 'fail');
+      spyOn(Login, 'retrieveLogin').andReturn(Q.reject(error));
+
+      upload.run({}, argv).then(function() {
+        expect(appLibUtils.fail).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should ask the user to login if we cannot retrieve a saved session', function(done) {
+      var processArguments = ['node', 'ionic', 'upload', '--note', 'note text', '--deploy', 'dev'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var jar = {
+        my: 'jar'
+      };
+      spyOn(process, 'cwd').andReturn('/my/pwd');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(false));
+      spyOn(LoginTask, 'login').andReturn(Q(jar));
+      spyOn(Upload, 'doUpload').andReturn(Q(true));
+
+      upload.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(LoginTask.login).toHaveBeenCalledWith(argv);
+        expect(Upload.doUpload).toHaveBeenCalledWith('/my/pwd', jar, 'note text', 'dev');
+        done();
+      });
+    });
+
+    it('should retrieve a saved session and use it', function(done) {
+      var processArguments = ['node', 'ionic', 'upload', '--note', 'note text', '--deploy', 'dev'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var jar = {
+        my: 'jar'
+      };
+      spyOn(process, 'cwd').andReturn('/my/pwd');
+      spyOn(Login, 'retrieveLogin').andReturn(Q(jar));
+      spyOn(Upload, 'doUpload').andReturn(Q(true));
+
+      upload.run({}, argv).then(function() {
+        expect(Login.retrieveLogin).toHaveBeenCalled();
+        expect(Upload.doUpload).toHaveBeenCalledWith('/my/pwd', jar, 'note text', 'dev');
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/utils/bower.spec.js b/spec/utils/bower.spec.js
new file mode 100644
index 0000000000..c9c2e117e3
--- /dev/null
+++ b/spec/utils/bower.spec.js
@@ -0,0 +1,174 @@
+'use strict';
+
+var rewire = require('rewire');
+var childProcess = require('child_process');
+var bowerUtils = rewire('../../lib/utils/bower');
+var fs = require('fs');
+var path = require('path');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+describe('setIonicVersion function', function() {
+  it('should get bower file data, and add devDependencies if they dont exist and write back', function() {
+    spyOn(bowerUtils, 'getData').andReturn({
+      name: 'HelloIonic',
+      stuff: 'things',
+      private: 'true'
+    });
+    spyOn(bowerUtils, 'saveData');
+
+    bowerUtils.setIonicVersion('2.0.0');
+
+    expect(bowerUtils.getData).toHaveBeenCalled();
+    expect(bowerUtils.saveData).toHaveBeenCalledWith({
+      name: 'HelloIonic',
+      stuff: 'things',
+      private: 'true',
+      devDependencies: {
+        ionic: 'driftyco/ionic-bower#2.0.0'
+      }
+    });
+  });
+
+  it('should get bower file data, and update devDependencies if they do exist and write back', function() {
+    spyOn(bowerUtils, 'getData').andReturn({
+      name: 'HelloIonic',
+      stuff: 'things',
+      private: 'true',
+      devDependencies: {
+        ionic: 'driftyco/ionic-bower#2.0.0',
+        bootstrap: 'twbs/bootstrap#3.3.6'
+      }
+    });
+    spyOn(bowerUtils, 'saveData');
+
+    bowerUtils.setIonicVersion('2.1.0');
+
+    expect(bowerUtils.getData).toHaveBeenCalled();
+    expect(bowerUtils.saveData).toHaveBeenCalledWith({
+      name: 'HelloIonic',
+      stuff: 'things',
+      private: 'true',
+      devDependencies: {
+        ionic: 'driftyco/ionic-bower#2.1.0',
+        bootstrap: 'twbs/bootstrap#3.3.6'
+      }
+    });
+  });
+});
+
+describe('setAppName function', function() {
+  it('should get bower file and then write name back to bower file', function() {
+    var newName = 'New Name';
+
+    spyOn(bowerUtils, 'getData').andReturn({
+      name: 'HelloIonic',
+      stuff: 'things',
+      private: 'true'
+    });
+    spyOn(bowerUtils, 'saveData');
+
+    bowerUtils.setAppName(newName);
+
+    expect(bowerUtils.getData).toHaveBeenCalled();
+    expect(bowerUtils.saveData).toHaveBeenCalledWith({
+      name: newName,
+      stuff: 'things',
+      private: 'true'
+    });
+  });
+});
+
+describe('getData function', function() {
+  it('should return default values if the bower file is not found', function() {
+    var defaults = {
+      name: 'HelloIonic',
+      private: 'true'
+    };
+
+    var result = bowerUtils.getData();
+    expect(result).toEqual(defaults);
+  });
+
+  it('should throw an error if the bower file is found but malformed', function() {
+
+    spyOn(fs, 'existsSync').andReturn(true);
+    spyOn(bowerUtils, 'getData').andCallThrough();
+    spyOn(fs, 'readFileSync').andReturn('{ "hi": "I am broken}');
+    try {
+      bowerUtils.getData();
+    } catch (e) {} // eslint-disable-line no-empty
+
+    expect(bowerUtils.getData).toThrow();
+  });
+
+  it('should return contents of the project bower.json file', function() {
+    var json = {
+      name: 'bowerFile',
+      private: 'true'
+    };
+    spyOn(fs, 'existsSync').andReturn(true);
+    spyOn(bowerUtils, 'getData').andCallThrough();
+    spyOn(fs, 'readFileSync').andReturn(JSON.stringify(json));
+    var results = bowerUtils.getData();
+
+    expect(results).toEqual(json);
+  });
+});
+
+describe('saveData function', function() {
+  it('should save bower data to file', function() {
+    var bowerFilePath = '/path/to/bower/bower.json';
+    var json = {
+      name: 'bowerFile',
+      private: 'true'
+    };
+    spyOn(path, 'resolve').andReturn(bowerFilePath);
+    spyOn(fs, 'writeFileSync');
+
+    bowerUtils.saveData(json);
+    expect(fs.writeFileSync).toHaveBeenCalledWith(bowerFilePath, JSON.stringify(json, null, 2));
+  });
+
+  it('should write an error to console if error occurs during write', function() {
+    var bowerFilePath = '/path/to/bower/bower.json';
+    var json = {
+      name: 'bowerFile',
+      private: 'true'
+    };
+    spyOn(path, 'resolve').andReturn(bowerFilePath);
+    spyOn(log, 'error');
+    spyOn(fs, 'writeFileSync').andCallFake(function() {
+      throw new Error('error occurred');
+    });
+
+    bowerUtils.saveData(json);
+    expect(log.error).toHaveBeenCalled();
+  });
+});
+
+describe('checkForBower function', function() {
+  it('should return true if bower is installed', function() {
+    spyOn(childProcess, 'exec').andReturn({
+      output: '0'
+    });
+    var result = bowerUtils.checkForBower();
+    expect(result).toEqual(true);
+  });
+
+  it('should return false if bower exec returns "command not found"', function() {
+    spyOn(childProcess, 'exec').andReturn({
+      output: 'command not found'
+    });
+    var result = bowerUtils.checkForBower();
+    expect(result).toEqual(false);
+  });
+
+  it('should return false if bower exec returns "not recognized"', function() {
+    spyOn(childProcess, 'exec').andReturn({
+      output: 'not recognized'
+    });
+    var result = bowerUtils.checkForBower();
+    expect(result).toEqual(false);
+  });
+});
diff --git a/spec/utils/cordova.spec.js b/spec/utils/cordova.spec.js
new file mode 100644
index 0000000000..f3641e51a7
--- /dev/null
+++ b/spec/utils/cordova.spec.js
@@ -0,0 +1,415 @@
+'use strict';
+
+var fs = require('fs');
+var Q = require('q');
+var rewire = require('rewire');
+var childProcess = require('child_process');
+var cordovaUtils = rewire('../../lib/utils/cordova');
+var optimist = require('optimist');
+var IonicAppLib = require('ionic-app-lib');
+var Project = require('ionic-app-lib').project;
+var Serve = require('ionic-app-lib').serve;
+var ConfigXml = require('ionic-app-lib').configXml;
+var log = IonicAppLib.logging.logger;
+
+describe('isPlatformInstalled', function() {
+  it('should return true if the platform directory does exist', function() {
+    spyOn(fs, 'statSync').andCallFake(function() {
+      return;
+    });
+
+    var result = cordovaUtils.isPlatformInstalled('ios', '/tmp');
+
+    expect(result).toEqual(true);
+    expect(fs.statSync).toHaveBeenCalledWith('/tmp/platforms/ios');
+  });
+
+  it('should return false if the platform directory does not exist', function() {
+    spyOn(fs, 'statSync').andCallFake(function() {
+      throw new Error('Dir does not exist');
+    });
+
+    var result = cordovaUtils.isPlatformInstalled('ios', '/tmp');
+
+    expect(result).toEqual(false);
+    expect(fs.statSync).toHaveBeenCalledWith('/tmp/platforms/ios');
+  });
+});
+
+describe('arePluginsInstalled', function() {
+  it('should return true if the plugins directory does exist', function() {
+    spyOn(fs, 'statSync').andCallFake(function() {
+      return;
+    });
+
+    var result = cordovaUtils.arePluginsInstalled('/tmp');
+
+    expect(result).toEqual(true);
+    expect(fs.statSync).toHaveBeenCalledWith('/tmp/plugins');
+  });
+
+  it('should return false if the plugins directory does not exist', function() {
+    spyOn(fs, 'statSync').andCallFake(function() {
+      throw new Error('Dir does not exist');
+    });
+
+    var result = cordovaUtils.arePluginsInstalled('/tmp');
+
+    expect(result).toEqual(false);
+    expect(fs.statSync).toHaveBeenCalledWith('/tmp/plugins');
+  });
+});
+
+describe('installPlatform', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  it('should call promiseExec', function(done) {
+    var installPlatform = cordovaUtils.__get__('installPlatform');
+    var promiseExecSpy = jasmine.createSpy('promiseExec');
+    promiseExecSpy.andReturn(Q(true));
+    var revertPromiseExecSpy = cordovaUtils.__set__('promiseExec', promiseExecSpy);
+
+
+    installPlatform('ios').then(function() {
+      expect(promiseExecSpy).toHaveBeenCalledWith('cordova platform add ios');
+      revertPromiseExecSpy();
+      done();
+    });
+  });
+});
+
+describe('installPlugins', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  it('should call promiseExec', function(done) {
+    var installPlugins = cordovaUtils.__get__('installPlugins');
+    var promiseExecSpy = jasmine.createSpy('promiseExec');
+    promiseExecSpy.andReturn(Q(true));
+    var revertPromiseExecSpy = cordovaUtils.__set__('promiseExec', promiseExecSpy);
+
+    installPlugins().then(function() {
+      expect(promiseExecSpy.calls[0].args[0]).toEqual('cordova plugin add --save cordova-plugin-device');
+      expect(promiseExecSpy.calls[1].args[0]).toEqual('cordova plugin add --save cordova-plugin-console');
+      expect(promiseExecSpy.calls[2].args[0]).toEqual('cordova plugin add --save cordova-plugin-whitelist');
+      expect(promiseExecSpy.calls[3].args[0]).toEqual('cordova plugin add --save cordova-plugin-splashscreen');
+      expect(promiseExecSpy.calls[4].args[0]).toEqual('cordova plugin add --save cordova-plugin-statusbar');
+      expect(promiseExecSpy.calls[5].args[0]).toEqual('cordova plugin add --save ionic-plugin-keyboard');
+      revertPromiseExecSpy();
+      done();
+    });
+  });
+});
+
+
+describe('setupLiveReload', function() {
+  var argv;
+  var baseDir;
+
+  beforeEach(function() {
+    spyOn(log, 'info');
+    argv = {};
+    baseDir = '/some/base/dir';
+  });
+  afterEach(function() {
+    argv = {};
+    baseDir = '';
+  });
+
+  it('should return options on success', function(done) {
+    argv.all = true;
+    var processCwd = '/process/current/pwd';
+    var project = { name: 'something' };
+    var loadSettings = { address: '127.0.0.1', port: 80 };
+    var serveHostValue = 'devServer value';
+    var finalOptions = {
+      port: 80,
+      address: '0.0.0.0',
+      appDirectory: baseDir,
+      runLivereload: true,
+      launchBrowser: false,
+      launchLab: false,
+      isPlatformServe: true,
+      devServer: serveHostValue
+    };
+
+    spyOn(process, 'cwd').andReturn(processCwd);
+    spyOn(Project, 'load').andReturn(project);
+    spyOn(Serve, 'loadSettings').andReturn(loadSettings);
+    spyOn(Serve, 'getAddress');
+    spyOn(Serve, 'host').andReturn(serveHostValue);
+    spyOn(Serve, 'checkPorts').andReturn(Q(true));
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    var setupLiveReload = cordovaUtils.__get__('setupLiveReload');
+
+    setupLiveReload(argv, baseDir).then(function(options) {
+      expect(Project.load).toHaveBeenCalledWith(baseDir);
+      expect(Serve.loadSettings).toHaveBeenCalledWith(argv, project);
+      expect(Serve.getAddress).not.toHaveBeenCalled();
+      expect(Serve.host.calls[0].args).toEqual(['0.0.0.0', 80]);
+      expect(Serve.checkPorts).toHaveBeenCalledWith(true, 80, '0.0.0.0', finalOptions);
+      expect(ConfigXml.setConfigXml).toHaveBeenCalledWith(processCwd, { devServer: serveHostValue });
+      expect(Serve.host.calls[1].args).toEqual(['0.0.0.0', 80]);
+      expect(Serve.start).toHaveBeenCalledWith(finalOptions);
+      expect(options).toEqual(finalOptions);
+      done();
+    });
+  });
+  it('should use address if it is supplied', function(done) {
+    argv.address = '127.0.0.1';
+    var processCwd = '/process/current/pwd';
+    var project = { name: 'something' };
+    var loadSettings = { address: '127.0.0.1', port: 80 };
+    var serveHostValue = 'devServer value';
+    var finalOptions = {
+      port: 80,
+      address: '127.0.0.1',
+      appDirectory: baseDir,
+      runLivereload: true,
+      launchBrowser: false,
+      launchLab: false,
+      isPlatformServe: true,
+      devServer: serveHostValue
+    };
+
+    spyOn(process, 'cwd').andReturn(processCwd);
+    spyOn(Project, 'load').andReturn(project);
+    spyOn(Serve, 'loadSettings').andReturn(loadSettings);
+    spyOn(Serve, 'getAddress');
+    spyOn(Serve, 'host').andReturn(serveHostValue);
+    spyOn(Serve, 'checkPorts').andReturn(Q(true));
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    var setupLiveReload = cordovaUtils.__get__('setupLiveReload');
+
+    setupLiveReload(argv, baseDir).then(function(options) {
+      expect(Project.load).toHaveBeenCalledWith(baseDir);
+      expect(Serve.loadSettings).toHaveBeenCalledWith(argv, project);
+      expect(Serve.getAddress).not.toHaveBeenCalled();
+      expect(Serve.host.calls[0].args).toEqual(['127.0.0.1', 80]);
+      expect(Serve.checkPorts).toHaveBeenCalledWith(true, 80, '127.0.0.1', finalOptions);
+      expect(ConfigXml.setConfigXml).toHaveBeenCalledWith(processCwd, { devServer: serveHostValue });
+      expect(Serve.host.calls[1].args).toEqual(['127.0.0.1', 80]);
+      expect(Serve.start).toHaveBeenCalledWith(finalOptions);
+      expect(options).toEqual(finalOptions);
+      done();
+    });
+  });
+  it('should return options on success and gather address if not supplied', function(done) {
+    var processCwd = '/process/current/pwd';
+    var project = { name: 'something' };
+    var loadSettings = { address: '127.0.0.1', port: 80 };
+    var serveHostValue = 'devServer value';
+    var finalOptions = {
+      port: 80,
+      address: '80.80.80.80',
+      appDirectory: baseDir,
+      runLivereload: true,
+      launchBrowser: false,
+      launchLab: false,
+      isPlatformServe: true,
+      devServer: serveHostValue
+    };
+
+    spyOn(process, 'cwd').andReturn(processCwd);
+    spyOn(Project, 'load').andReturn(project);
+    spyOn(Serve, 'loadSettings').andReturn(loadSettings);
+    spyOn(Serve, 'getAddress').andCallFake(function(options) {
+      options.address = '80.80.80.80';
+      return Q(true);
+    });
+    spyOn(Serve, 'host').andReturn(serveHostValue);
+    spyOn(Serve, 'checkPorts').andReturn(Q(true));
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    var setupLiveReload = cordovaUtils.__get__('setupLiveReload');
+
+    setupLiveReload(argv, baseDir).then(function(options) {
+      expect(Project.load).toHaveBeenCalledWith(baseDir);
+      expect(Serve.loadSettings).toHaveBeenCalledWith(argv, project);
+      expect(Serve.getAddress).toHaveBeenCalled();
+      expect(Serve.host.calls[0].args).toEqual(['80.80.80.80', 80]);
+      expect(Serve.checkPorts).toHaveBeenCalledWith(true, 80, '80.80.80.80', finalOptions);
+      expect(ConfigXml.setConfigXml).toHaveBeenCalledWith(processCwd, { devServer: serveHostValue });
+      expect(Serve.host.calls[1].args).toEqual(['80.80.80.80', 80]);
+      expect(Serve.start).toHaveBeenCalledWith(finalOptions);
+      expect(options).toEqual(finalOptions);
+      done();
+    });
+  });
+
+  it('should throw an error if the an error occurs within the promise chain', function(done) {
+    var processCwd = '/process/current/pwd';
+    var project = { name: 'something' };
+    var loadSettings = { address: '127.0.0.1', port: 80 };
+    var serveHostValue = 'devServer value';
+
+    spyOn(process, 'cwd').andReturn(processCwd);
+    spyOn(Project, 'load').andReturn(project);
+    spyOn(Serve, 'loadSettings').andReturn(loadSettings);
+    spyOn(Serve, 'getAddress').andCallFake(function(options) {
+      options.address = '80.80.80.80';
+      return Q(true);
+    });
+    spyOn(Serve, 'host').andReturn(serveHostValue);
+    spyOn(Serve, 'checkPorts').andReturn(Q.reject('AN ERROR OCCURRED'));
+    spyOn(ConfigXml, 'setConfigXml').andReturn(Q(true));
+    spyOn(Serve, 'start');
+    spyOn(Serve, 'showFinishedServeMessage');
+    var setupLiveReload = cordovaUtils.__get__('setupLiveReload');
+
+    setupLiveReload(argv, baseDir).catch(function() {
+      expect(Project.load).toHaveBeenCalledWith(baseDir);
+      expect(Serve.loadSettings).toHaveBeenCalledWith(argv, project);
+      expect(Serve.getAddress).toHaveBeenCalled();
+      expect(Serve.host.calls[0].args).toEqual(['80.80.80.80', 80]);
+      done();
+    });
+  });
+});
+
+describe('execCordovaCommand', function() {
+  beforeEach(function() {
+    spyOn(childProcess, 'exec').andCallThrough();
+  });
+
+  it('should execute the command against the cordova util', function(done) {
+    var optionList = [
+      'build',
+      '-n',
+      'ios'
+    ];
+    var isLiveReload = false;
+    var serveOptions = {};
+
+    cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions).catch(function() {
+      expect(childProcess.exec).toHaveBeenCalledWith('cordova build -n ios');
+      done();
+    });
+  });
+
+  it('should execute the command against the cordova util using the platform provided', function(done) {
+    var optionList = [
+      'build',
+      'android'
+    ];
+    var isLiveReload = false;
+    var serveOptions = {};
+
+    cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions).catch(function() {
+      expect(childProcess.exec).toHaveBeenCalledWith('cordova build android');
+      done();
+    });
+  });
+});
+
+describe('filterArgumentsForCordova', function() {
+
+  it('should always leave the ionic command in the cordova command list', function() {
+    var processArguments = ['node', 'ionic', 'build'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build']);
+  });
+
+  it('should remove all commands from the ignore list', function() {
+    var processArguments = ['node', 'ionic', 'build',
+
+      // Start - Ignore command list
+      '--livereload', '-l',
+      '--consolelogs', '-c',
+      '--serverlogs', '-s',
+      '--port', '-p',
+      '--livereload-port',
+      '-i', '-r',
+
+      // End - Ignore command list
+      'ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', 'ios']);
+  });
+
+  it('should remove the address parameter and the parameter that follows it', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '--address', '0.0.0.0',
+      '--blah', 'ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--blah', 'ios']);
+  });
+
+  it('should remove the port parameter and the parameter that follows it', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '--port', '80',
+      '--blah', 'ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--blah', 'ios']);
+  });
+
+  it('should remove the shorthand port parameter and the parameter that follows it', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '-p', '80',
+      '--blah', 'ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--blah', 'ios']);
+  });
+
+  it('should remove the livereload-port parameter and the parameter that follows it', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '--livereload-port', '80',
+      '--blah', 'ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--blah', 'ios']);
+  });
+
+  it('should ensure that the --target= parameter contains double quotes when quotes are removed', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '--target=ios'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--target="ios"']);
+  });
+  it('should ensure that the --target= parameter contains double quotes when quotes are not removed', function() {
+    var processArguments = ['node', 'ionic', 'build',
+      '--target="ios"'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var cmdName = argv._[0];
+
+    var resultArgs = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawCliArguments);
+    expect(resultArgs).toEqual(['build', '--target="ios"']);
+  });
+});
+
diff --git a/spec/utils/help.spec.js b/spec/utils/help.spec.js
new file mode 100644
index 0000000000..a3fa4a62cd
--- /dev/null
+++ b/spec/utils/help.spec.js
@@ -0,0 +1,162 @@
+'use strict';
+
+var rewire = require('rewire');
+var helpUtils = rewire('../../lib/utils/help');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+describe('printIonic function', function() {
+  it('should return an array of strings', function() {
+    var printIonic = helpUtils.__get__('printIonic');
+    var results = printIonic();
+
+    expect(results).toEqual(jasmine.any(Array));
+    expect(results.length).toBeGreaterThan(0);
+    expect(results[0]).toEqual(jasmine.any(String));
+  });
+});
+
+describe('printTemplate function', function() {
+  it('should log an array as a new line seperated string', function() {
+    spyOn(log, 'info');
+    var printTemplate = helpUtils.__get__('printTemplate');
+    printTemplate(['red', 'green', '', null]);
+
+    expect(log.info).toHaveBeenCalledWith('red\ngreen\n\n');
+  });
+});
+
+describe('printTaskListUsage method', function() {
+  it('should call printTaskDetails for all tasks with a summary', function() {
+    spyOn(log, 'info');
+    spyOn(log, 'error');
+    var printTaskRevert = helpUtils.__set__('printTaskDetails', function(param) {
+      log.error(param);
+    });
+
+    var taskList = [
+      {
+        name: 'one',
+        summary: 'one summary'
+      },
+      {
+        name: 'two',
+        summary: 'two summary'
+      },
+      {
+        name: 'three'
+      }
+    ];
+    helpUtils.printTaskListUsage(taskList, 'v2.0.0');
+    expect(log.error.calls.length).toEqual(2);
+    printTaskRevert();
+  });
+});
+
+describe('printTaskListShortUsage method', function() {
+  it('should print ionic logo, a header and the each task details', function() {
+    var printIonicSpy = jasmine.createSpy('printIonicSpy');
+    printIonicSpy.andReturn('ionic logo');
+    var revertPrintIonic = helpUtils.__set__('printIonic', printIonicSpy);
+
+    var printTemplateSpy = jasmine.createSpy('printTemplateSpy');
+    var revertPrintTemplate = helpUtils.__set__('printTemplate', printTemplateSpy);
+
+    spyOn(log, 'info');
+    var taskList = [
+      {
+        name: 'one',
+        summary: 'one summary'
+      },
+      {
+        name: 'two',
+        summary: 'two summary'
+      },
+      {
+        name: 'three'
+      }
+    ];
+    helpUtils.printTaskListShortUsage(taskList, null, 'v2.0.0');
+    var arrayArgs = printTemplateSpy.calls[0].args[0];
+    expect(arrayArgs[0]).toEqual('ionic logo');
+    expect(arrayArgs[1]).toEqual('');
+    expect(arrayArgs[2]).toEqual('Usage: ionic task args');
+    expect(arrayArgs[3]).toEqual('');
+    expect(arrayArgs[4]).toEqual('');
+    expect(arrayArgs[5]).toEqual('=======================');
+    expect(arrayArgs[6]).toEqual(null);
+    revertPrintIonic();
+    revertPrintTemplate();
+  });
+
+  it('should identify the task does not exist if taskname is provided', function() {
+    var printIonicSpy = jasmine.createSpy('printIonicSpy');
+    printIonicSpy.andReturn('ionic logo');
+    var revertPrintIonic = helpUtils.__set__('printIonic', printIonicSpy);
+
+    var printTemplateSpy = jasmine.createSpy('printTemplateSpy');
+    var revertPrintTemplate = helpUtils.__set__('printTemplate', printTemplateSpy);
+
+    spyOn(log, 'info');
+    var taskList = [
+      {
+        name: 'one',
+        summary: 'one summary'
+      },
+      {
+        name: 'two',
+        summary: 'two summary'
+      },
+      {
+        name: 'three'
+      }
+    ];
+    helpUtils.printTaskListShortUsage(taskList, 'fudge', 'v2.0.0');
+    var arrayArgs = printTemplateSpy.calls[0].args[0];
+    expect(arrayArgs[6]).toMatch('fudge is not a valid task');
+    revertPrintIonic();
+    revertPrintTemplate();
+  });
+});
+
+describe('printTaskUsage method', function() {
+  it('should log info', function() {
+    spyOn(log, 'info');
+    spyOn(log, 'error');
+    var printTaskRevert = helpUtils.__set__('printTaskDetails', function(param) {
+      log.error(param);
+    });
+
+    helpUtils.printTaskUsage({}, 'v2.0.0');
+    expect(log.error.calls.length).toEqual(1);
+    printTaskRevert();
+  });
+});
+
+describe('printTaskDetails function', function() {
+  it('should write to process log', function() {
+    var settings = {
+      title: 'platform',
+      name: 'platform',
+      summary: 'Add platform target for building an Ionic app',
+      args: {
+        '[options]': '',
+        '<PLATFORM>': ''
+      },
+      options: {
+        '--noresources|-r': {
+          title: 'Do not add default Ionic icons and splash screen resources',
+          boolean: true
+        },
+        '--nosave|-e': {
+          title: 'Do not save the platform to the package.json file',
+          boolean: true
+        }
+      }
+    };
+    spyOn(process.stdout, 'write');
+    var printTaskDetails = helpUtils.__get__('printTaskDetails');
+    printTaskDetails(settings);
+    expect(process.stdout.write).toHaveBeenCalled();
+  });
+});
diff --git a/spec/utils/ionitron.spec.js b/spec/utils/ionitron.spec.js
new file mode 100644
index 0000000000..bb6576fbc2
--- /dev/null
+++ b/spec/utils/ionitron.spec.js
@@ -0,0 +1,31 @@
+'use strict';
+
+var rewire = require('rewire');
+var ionitron = rewire('../../lib/utils/ionitron');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+describe('print function', function() {
+  it('should return an array of strings', function() {
+    spyOn(log, 'info');
+    ionitron.print();
+
+    expect(log.info).toHaveBeenCalled();
+    var printedLines = log.info.calls[0].args[0];
+    expect(log.info).toHaveBeenCalled();
+    expect(printedLines).not.toMatch(
+      '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
+    );
+  });
+
+  it('should return an array of strings', function() {
+    spyOn(log, 'info');
+    ionitron.print('es');
+
+    var printedLines = log.info.calls[0].args[0];
+    expect(log.info).toHaveBeenCalled();
+    expect(printedLines).not.toMatch(
+      '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
+    );
+  });
+});
diff --git a/spec/utils/prompt.spec.js b/spec/utils/prompt.spec.js
new file mode 100644
index 0000000000..f0a1275b40
--- /dev/null
+++ b/spec/utils/prompt.spec.js
@@ -0,0 +1,36 @@
+'use strict';
+
+var prompt = require('prompt');
+var promptUtil = require('../../lib/utils/prompt');
+
+describe('prompt function', function() {
+  it('should pass the prompt callback value to the resolved promise', function(done) {
+    spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+      callback(null, 1000);
+    });
+    promptUtil.prompt({}, {}).then(function(value) {
+      expect(value).toEqual(1000);
+      done();
+    });
+  });
+
+  it('should reject the promise with the error if an error occurs with a msg not equal to "cancelled"', function(done) {
+    spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+      callback({ message: 'error happened' }, 1000);
+    });
+    promptUtil.prompt({}, {}).catch(function(value) {
+      expect(value).toEqual({ message: 'error happened' });
+      done();
+    });
+  });
+
+  it('should reject the promise with false if an error occurs with msg canceled', function(done) {
+    spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+      callback({ message: 'canceled' }, 1000);
+    });
+    promptUtil.prompt({}, {}).catch(function(value) {
+      expect(value).toEqual(false);
+      done();
+    });
+  });
+});
diff --git a/spec/utils/stats.spec.js b/spec/utils/stats.spec.js
new file mode 100644
index 0000000000..7e28429770
--- /dev/null
+++ b/spec/utils/stats.spec.js
@@ -0,0 +1,297 @@
+'use strict';
+
+var fs = require('fs');
+var rewire = require('rewire');
+var IonicStats = rewire('../../lib/utils/stats');
+var IonicInfoModule = rewire('ionic-app-lib').info;
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+describe('Stats', function() {
+
+  it('should have stats t method defined', function() {
+    expect(IonicStats.t).toBeDefined();
+  });
+
+  describe('#t', function() {
+    var oldprocessargv;
+
+    beforeEach(function() {
+      oldprocessargv = process.argv;
+    });
+
+    afterEach(function() {
+      process.argv = oldprocessargv;
+    });
+
+    it('should not track if process.argv is less than 3', function() {
+      process.argv = ['node', 'bin/ionic'];
+
+      var mpSpy = jasmine.createSpy('mpSpy');
+      var revertMpSpy = IonicStats.__set__('mp', mpSpy);
+
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(true);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(configSpy.get).not.toHaveBeenCalled();
+      expect(mpSpy).not.toHaveBeenCalled();
+      revertMpSpy();
+      revertConfig();
+    });
+
+    it('should not track stats if opted out', function() {
+      process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
+
+      var mpSpy = jasmine.createSpy('mpSpy');
+      var revertMpSpy = IonicStats.__set__('mp', mpSpy);
+
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(true);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(configSpy.get).toHaveBeenCalled();
+      expect(mpSpy).not.toHaveBeenCalled();
+      revertMpSpy();
+      revertConfig();
+    });
+
+    it('should catch errors thrown mp', function() {
+      process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
+
+      spyOn(log, 'error');
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
+
+      configSpy.get.andCallFake(function() {
+        throw new Error('Fake Error');
+      });
+
+      var mpSpy = jasmine.createSpy('mpSpy');
+      var revertMpSpy = IonicStats.__set__('mp', mpSpy);
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(configSpy.get).toHaveBeenCalled();
+      expect(mpSpy).not.toHaveBeenCalled();
+      expect(log.error).toHaveBeenCalled();
+      revertMpSpy();
+      revertConfig();
+    });
+
+    it('should track the correct command', function() {
+      process.argv = ['node', 'bin/ionic', 'update', 'foldername', '-w', 'android', 'ios'];
+
+      spyOn(fs, 'readFileSync').andReturn('{ "version": "2.0.0-beta.25" }');
+
+      var mpSpy = jasmine.createSpy('mpSpy');
+      var revertMpSpy = IonicStats.__set__('mp', mpSpy);
+
+      spyOn(IonicInfoModule, 'getNodeVersion');
+      spyOn(IonicInfoModule, 'getOsEnvironment');
+      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
+        info.os = 'Mac OS X El Capitan';
+        info.node = 'v5.10.1';
+        info.gulp = 'v3.0.0';
+      });
+
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(false);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(mpSpy).toHaveBeenCalledWith('update', {
+        ionic_version: '2.0.0-beta.25', // eslint-disable-line camelcase
+        cli_version: '2.0.0-beta.25', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        /*
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        */
+        cli_release_tag: 'beta', // eslint-disable-line camelcase
+        '--no-cordova': true,
+        android: true,
+        ios: true,
+        platform: 'android,ios'
+      });
+      revertMpSpy();
+      revertConfig();
+    });
+
+    it('should track the correct command with no platforms or releaseTags', function() {
+      process.argv = ['node', 'bin/ionic', 'update', 'foldername', '-w'];
+
+      spyOn(fs, 'readFileSync').andReturn('{ "version": "2.0.0" }');
+
+      var mpSpy = jasmine.createSpy('mpSpy');
+      var revertMpSpy = IonicStats.__set__('mp', mpSpy);
+
+      spyOn(IonicInfoModule, 'getNodeVersion');
+      spyOn(IonicInfoModule, 'getOsEnvironment');
+      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
+        info.os = 'Mac OS X El Capitan';
+        info.node = 'v5.10.1';
+        info.gulp = 'v3.0.0';
+      });
+
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
+      configSpy.get.andReturn(false);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+
+      IonicStats.t();
+
+      expect(mpSpy).toHaveBeenCalledWith('update', {
+        ionic_version: '2.0.0', // eslint-disable-line camelcase
+        cli_version: '2.0.0', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        /*
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        */
+        '--no-cordova': true
+      });
+      revertMpSpy();
+      revertConfig();
+    });
+  });
+
+  describe('mp function', function() {
+    it('should call track after getting unique Id from ionicConfig', function() {
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get', 'set']);
+      configSpy.get.andReturn('uniq121');
+
+      var trackSpy = jasmine.createSpy('trackSpy');
+      var revertTrackSpy = IonicStats.__set__('track', trackSpy);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+      var mp = IonicStats.__get__('mp');
+
+      mp('update', {
+        ionic_version: '2.0.0', // eslint-disable-line camelcase
+        cli_version: '2.0.0', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        '--no-cordova': true
+      });
+
+      expect(configSpy.get).toHaveBeenCalled();
+      expect(configSpy.set).not.toHaveBeenCalled();
+      expect(trackSpy).toHaveBeenCalledWith('update', 'uniq121', {
+        ionic_version: '2.0.0', // eslint-disable-line camelcase
+        cli_version: '2.0.0', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        '--no-cordova': true
+      }, jasmine.any(Function));
+      revertTrackSpy();
+      revertConfig();
+    });
+
+    it('should call track after getting unique Id from createId', function() {
+      var configSpy = jasmine.createSpyObj('ionicConfig', ['get', 'set']);
+      configSpy.get.andReturn(null);
+
+      var createIdSpy = jasmine.createSpy('createIdSpy');
+      createIdSpy.andReturn('uniq454');
+      var revertCreateIdSpy = IonicStats.__set__('createId', createIdSpy);
+
+      var trackSpy = jasmine.createSpy('trackSpy');
+      var revertTrackSpy = IonicStats.__set__('track', trackSpy);
+
+      var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
+      var mp = IonicStats.__get__('mp');
+
+      mp('update', {
+        ionic_version: '2.0.0', // eslint-disable-line camelcase
+        cli_version: '2.0.0', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        '--no-cordova': true
+      });
+
+      expect(configSpy.get).toHaveBeenCalled();
+      expect(configSpy.set).toHaveBeenCalled();
+      expect(trackSpy).toHaveBeenCalledWith('update', 'uniq454', {
+        ionic_version: '2.0.0', // eslint-disable-line camelcase
+        cli_version: '2.0.0', // eslint-disable-line camelcase
+        email: false,
+        account_id: false, // eslint-disable-line camelcase
+        os: 'Mac OS X El Capitan',
+        gulp: 'v3.0.0',
+        node: 'v5.10.1',
+        '--no-cordova': true
+      }, jasmine.any(Function));
+
+      revertCreateIdSpy();
+      revertTrackSpy();
+      revertConfig();
+    });
+  });
+
+  describe('track function', function() {
+    it('should return a unique id', function() {
+      var track = IonicStats.__get__('track');
+      var requestSpy = jasmine.createSpy('requestSpy');
+      requestSpy.andCallFake(function(options, callback) {
+        callback(null, { code: 200 }, 'thumbs up');
+      });
+      var revertRequestSpy = IonicStats.__set__('request', requestSpy);
+
+
+      track('update', 'uniq676', {
+        ionic_version: '2.0.0' // eslint-disable-line camelcase
+      }, function(err, res, body) {
+        expect(requestSpy).toHaveBeenCalledWith({
+          url: 'https://t.ionic.io/event/cli',
+          method: 'POST',
+          json: {
+            _event: 'update',
+            _uuid: 'uniq676',
+            data: {
+              ionic_version: '2.0.0' // eslint-disable-line camelcase
+            }
+          },
+          proxy: null
+        }, jasmine.any(Function));
+
+        expect(err).toEqual(null);
+        expect(res.code).toEqual(200);
+        expect(body).toEqual('thumbs up');
+
+        revertRequestSpy();
+      });
+    });
+  });
+
+  describe('createId function', function() {
+    it('should return a unique id', function() {
+      var createId = IonicStats.__get__('createId');
+      var uniqueId = createId();
+      var uniqueId2 = createId();
+
+      expect(uniqueId).not.toEqual(uniqueId2);
+    });
+  });
+});
diff --git a/spec/utils/store.spec.js b/spec/utils/store.spec.js
new file mode 100644
index 0000000000..cc354cd501
--- /dev/null
+++ b/spec/utils/store.spec.js
@@ -0,0 +1,211 @@
+'use strict';
+
+var fs = require('fs');
+var IonicStore = require('../../lib/utils/store');
+
+describe('IonicStore', function() {
+
+  describe('IonicStore Constructor homedir', function() {
+    it('IonicStore should use HOME env variable first', function() {
+      process.env.HOME = '/home/ionicuser';
+      process.env.USERPROFILE = '/home/ionicuser1';
+      process.env.HOMEPATH = '/home/ionicuser2';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename');
+
+      expect(store.homeDir).toEqual('/home/ionicuser');
+    });
+
+    it('IonicStore should use HOME env variable second', function() {
+      delete process.env.HOME;
+      process.env.USERPROFILE = '/home/ionicuser1';
+      process.env.HOMEPATH = '/home/ionicuser2';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename');
+
+      expect(store.homeDir).toEqual('/home/ionicuser1');
+    });
+
+    it('IonicStore should use HOME env variable third', function() {
+      delete process.env.HOME;
+      delete process.env.USERPROFILE;
+      process.env.HOMEPATH = '/home/ionicuser2';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename');
+
+      expect(store.homeDir).toEqual('/home/ionicuser2');
+    });
+  });
+
+  describe('constructor values', function() {
+    it('should load file provided to constructor', function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename');
+
+      expect(fs.mkdirSync).not.toHaveBeenCalled();
+      expect(store.fileName).toEqual('myfilename.data');
+      expect(store.homeDir).toEqual('/home/ionicuser');
+      expect(store.privateDir).toEqual('/home/ionicuser/.ionic');
+      expect(store.filePath).toEqual('/home/ionicuser/.ionic/myfilename.data');
+      expect(store.data).toEqual({
+        file: 'store'
+      });
+    });
+
+    it('should create the privateDir if it does not exist', function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename.json');
+
+      expect(fs.mkdirSync).toHaveBeenCalledWith('/home/ionicuser/.ionic');
+      expect(store.fileName).toEqual('myfilename.json');
+      expect(store.homeDir).toEqual('/home/ionicuser');
+      expect(store.privateDir).toEqual('/home/ionicuser/.ionic');
+      expect(store.filePath).toEqual('/home/ionicuser/.ionic/myfilename.json');
+      expect(store.data).toEqual({
+        file: 'store'
+      });
+    });
+
+    it('should keep filename intact if it contains a dot', function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore('myfilename.json');
+
+      expect(store.fileName).toEqual('myfilename.json');
+      expect(store.homeDir).toEqual('/home/ionicuser');
+      expect(store.privateDir).toEqual('/home/ionicuser/.ionic');
+      expect(store.filePath).toEqual('/home/ionicuser/.ionic/myfilename.json');
+      expect(store.data).toEqual({
+        file: 'store'
+      });
+    });
+
+    it('should end early if no filename provided', function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+
+      var store = new IonicStore();
+
+      expect(store.fileName).toBeUndefined();
+      expect(store.homeDir).toBeUndefined();
+      expect(store.privateDir).toBeUndefined();
+      expect(store.filePath).toBeUndefined();
+      expect(store.data).toEqual({});
+    });
+  });
+
+  describe('get function', function() {
+    var store;
+    beforeEach(function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+      store = new IonicStore('myfilename');
+    });
+
+    it('should return the stored value if it exists', function() {
+      var result = store.get('file');
+      expect(result).toEqual('store');
+    });
+
+    it('should return undefined if the value does not exists', function() {
+      var result = store.get('file2');
+      expect(result).toBeUndefined();
+    });
+    it('should return the entire store if no value is passed', function() {
+      var result = store.get();
+      expect(result).toEqual({ file: 'store' });
+    });
+  });
+
+  describe('set function', function() {
+    var store;
+    beforeEach(function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+      store = new IonicStore('myfilename');
+    });
+
+    it('should update the keys value if the key exists', function() {
+      store.set('file', 'newval');
+      expect(store.get('file')).toEqual('newval');
+    });
+
+    it('should create the keys value if the key does not exist', function() {
+      store.set('newfile', 'newval');
+      expect(store.get('newfile')).toEqual('newval');
+    });
+  });
+
+  describe('save function', function() {
+    var store;
+    beforeEach(function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+      store = new IonicStore('myfilename');
+    });
+
+    it('should return the stored value if it exists', function() {
+      spyOn(fs, 'writeFileSync');
+      store.save();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        '/home/ionicuser/.ionic/myfilename.data',
+        '{\n  "file": "store"\n}'
+      );
+    });
+    it('should return the stored value if it exists', function() {
+      spyOn(console, 'error');
+      spyOn(fs, 'writeFileSync').andCallFake(function() {
+        throw new Error('error');
+      });
+      store.save();
+
+      expect(console.error).toHaveBeenCalled();
+    });
+  });
+
+  describe('remove function', function() {
+    var store;
+    beforeEach(function() {
+      process.env.HOME = '/home/ionicuser';
+      spyOn(fs, 'existsSync').andReturn(true);
+      spyOn(fs, 'mkdirSync');
+      spyOn(fs, 'readFileSync').andReturn('{ "file": "store" }');
+      store = new IonicStore('myfilename');
+    });
+
+    it('should key and value if the key exists', function() {
+      store.remove('file');
+      expect(store.get('file')).toBeUndefined();
+    });
+    it('should not throw an error if the key/value being removed does not exist', function() {
+      store.remove('file2');
+      expect(store.get('file2')).toBeUndefined();
+    });
+  });
+});
diff --git a/spec/utils/table.spec.js b/spec/utils/table.spec.js
new file mode 100644
index 0000000000..495af59d7f
--- /dev/null
+++ b/spec/utils/table.spec.js
@@ -0,0 +1,63 @@
+'use strict';
+
+var cliTable = require('cli-table');
+var Table = require('../../lib/utils/table');
+
+describe('Table prototype', function() {
+  it('should call through to cliTable with defaulted options', function() {
+    spyOn(cliTable, 'call').andCallThrough();
+
+    var t = new Table();
+
+    expect(cliTable.call).toHaveBeenCalledWith(t, {
+      chars: {
+        top: '',
+        'top-mid': '',
+        'top-left': '',
+        'top-right': '',
+        bottom: '',
+        'bottom-mid': '',
+        'bottom-left': '',
+        'bottom-right': '',
+        left: ' ',
+        'left-mid': '',
+        right: '',
+        'right-mid': ''
+      },
+      style: {
+        compact: true,
+        head: ['yellow']
+      }
+    });
+  });
+
+  it('should call through to cliTable with extended options', function() {
+    spyOn(cliTable, 'call').andCallThrough();
+
+    var t = new Table({
+      other: 'red'
+    });
+
+    expect(cliTable.call).toHaveBeenCalledWith(t, {
+      chars: {
+        top: '',
+        'top-mid': '',
+        'top-left': '',
+        'top-right': '',
+        bottom: '',
+        'bottom-mid': '',
+        'bottom-left': '',
+        'bottom-right': '',
+        left: ' ',
+        'left-mid': '',
+        right: '',
+        'right-mid': ''
+      },
+      style: {
+        compact: true,
+        head: ['yellow']
+      },
+      other: 'red'
+    });
+  });
+});
diff --git a/spec/utils/templates.spec.js b/spec/utils/templates.spec.js
new file mode 100644
index 0000000000..0e75efd953
--- /dev/null
+++ b/spec/utils/templates.spec.js
@@ -0,0 +1,162 @@
+'use strict';
+
+var Q = require('q');
+var rewire = require('rewire');
+var templateUtils = rewire('../../lib/utils/templates');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+describe('listTemplates method', function() {
+  it('should should call fetchStarterTemplates pull out templates/sort and send to list', function(done) {
+    var fetchStarterTemplatesRevert = templateUtils.__set__('fetchStarterTemplates', function() {
+      return Q({
+        items: [
+          {
+            name: 'A Template',
+            description: 'A Description'
+          },
+          {
+            name: 'C Template',
+            description: 'C Description'
+          },
+          {
+            name: 'B Template',
+            description: 'B Description'
+          }
+        ]
+      });
+    });
+    var listRevert = templateUtils.__set__('list', function(list) {
+      return list;
+    });
+    templateUtils.listTemplates().then(function(list) {
+      expect(list).toEqual([
+        {
+          name: 'A Template',
+          description: 'A Description'
+        },
+        {
+          name: 'B Template',
+          description: 'B Description'
+        },
+        {
+          name: 'C Template',
+          description: 'C Description'
+        }
+      ]);
+      fetchStarterTemplatesRevert();
+      listRevert();
+      done();
+    });
+  });
+
+  it('should call fail fetchStarterTemplate throws', function(done) {
+    var error = 'Something failed';
+    var fetchStarterTemplatesRevert = templateUtils.__set__('fetchStarterTemplates', function() {
+      return Q.reject(error);
+    });
+    templateUtils.listTemplates().catch(function(err) {
+      expect(err).toEqual(error);
+      fetchStarterTemplatesRevert();
+      done();
+    });
+  });
+});
+
+describe('fetchStarterTemplates function', function() {
+  beforeEach(function() {
+    spyOn(log, 'info');
+  });
+
+  it('use request to gather templates and return a promise', function(done) {
+    var templatesJson = {
+      items: [
+        {
+          name: 'A Template',
+          description: 'A Description'
+        },
+        {
+          name: 'C Template',
+          description: 'C Description'
+        },
+        {
+          name: 'B Template',
+          description: 'B Description'
+        }
+      ]
+    };
+    var templatesString = JSON.stringify(templatesJson);
+    var revertRequest = templateUtils.__set__('request', function(options, callback) {
+      callback(null, { statusCode: '200' }, templatesString);
+    });
+    var fetchStarterTemplates = templateUtils.__get__('fetchStarterTemplates');
+
+    fetchStarterTemplates().then(function(templatesReturned) {
+      expect(templatesReturned).toEqual(templatesJson);
+      revertRequest();
+      done();
+    });
+  });
+
+  it('use request to gather templates and fail on invalid json', function(done) {
+    var revertRequest = templateUtils.__set__('request', function(options, callback) {
+      callback(null, { statusCode: '200' }, '{');
+    });
+    spyOn(log, 'error');
+    var fetchStarterTemplates = templateUtils.__get__('fetchStarterTemplates');
+
+    fetchStarterTemplates().catch(function() {
+      expect(log.error).toHaveBeenCalled();
+      revertRequest();
+      done();
+    });
+  });
+
+  it('use request to gather templates and fail on an response not equal to 200', function(done) {
+    var revertRequest = templateUtils.__set__('request', function(options, callback) {
+      callback(null, { statusCode: '400' }, null);
+    });
+    spyOn(log, 'error');
+    var fetchStarterTemplates = templateUtils.__get__('fetchStarterTemplates');
+
+    fetchStarterTemplates().catch(function() {
+      expect(log.error).toHaveBeenCalled();
+      revertRequest();
+      done();
+    });
+  });
+});
+
+describe('list function', function() {
+
+  it('on an response not equal to 200', function() {
+    var templates = [
+      {
+        name: 'ionic-starter-a-template',
+        description: 'A Description'
+      },
+      {
+        name: 'ionic-starter-b-template',
+        description: 'B Description'
+      },
+      {
+        name: 'c-template',
+        description: 'C Description'
+      }
+    ];
+    spyOn(log, 'info');
+    var list = templateUtils.__get__('list');
+
+    list(templates);
+    expect(log.info.calls[0].args).toEqual(['\n']);
+    expect(log.info.calls[1].args[0]).toMatch('a-template'); // Use match because of colors
+    expect(log.info.calls[1].args[1]).toEqual('...........');
+    expect(log.info.calls[1].args[2]).toEqual(templates[0].description);
+    expect(log.info.calls[2].args[0]).toMatch('b-template'); // Use match because of colors
+    expect(log.info.calls[2].args[1]).toEqual('...........');
+    expect(log.info.calls[2].args[2]).toEqual(templates[1].description);
+    expect(log.info.calls[3].args[0]).toMatch('c-template'); // Use match because of colors
+    expect(log.info.calls[3].args[1]).toEqual('...........');
+    expect(log.info.calls[3].args[2]).toEqual(templates[2].description);
+  });
+});

From 3505ce82c798803ee52d772bfb2a9e194e471db2 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 1 Jun 2016 16:32:20 -0500
Subject: [PATCH 0981/1100] Corrected an issue with the help command related to
 run configuration.

---
 CHANGELOG.md         | 13 +++++++++++++
 lib/ionic/browser.js |  1 -
 lib/ionic/run.js     |  6 +++---
 package.json         |  4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1202c010b..aba3dd67e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+<a name="2.0.0-beta.26"></a>
+# [2.0.0-beta.26](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.26) (2016-06-01)
+
+
+### Bug Fixes
+* **tests:** add tests to cover cli tasks and utilities. ([6c7a040](https://github.com/driftyco/ionic-cli/commit/6c7a040))
+* **eslint:** add parseInt to all request response checks because type coersion was removed. ([5e283ce](https://github.com/driftyco/ionic-cli/commit/5e283ce))
+* **login:** correct email regex that was split to change decrease line length. ([2dbd92c](https://github.com/driftyco/ionic-cli/commit/2dbd92c))
+* **serve:** remove unused lab preview template ([a100e8b](https://github.com/driftyco/ionic-cli/commit/a100e8b))
+* **share:** use app-lib project utility ([6317e76](https://github.com/driftyco/ionic-cli/commit/6317e76))
+* **store:** don't error if config isn't found ([cd72553](https://github.com/driftyco/ionic-cli/commit/cd72553))
+
+
 <a name="2.0.0-beta.25"></a>
 # [2.0.0-beta.25](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.24...v2.0.0-beta.25) (2016-04-20)
 
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
index bb9249dbb5..91f0d8b2de 100644
--- a/lib/ionic/browser.js
+++ b/lib/ionic/browser.js
@@ -17,7 +17,6 @@ var settings = {
       boolean: true
     }
   },
-  module: './ionic/browser',
   isProjectTask: true
 };
 
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index c0b2cc01d5..c03f6708ff 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -24,8 +24,7 @@ var cordovaRunEmulateOptions = {
     title: '',
     boolean: true
   },
-  '--device|--emulator|--target=FOO': '',
-  isProjectTask: true
+  '--device|--emulator|--target=FOO': ''
 };
 
 var settings = {
@@ -36,7 +35,8 @@ var settings = {
     '[options]': '',
     '<PLATFORM>': ''
   },
-  options: cordovaRunEmulateOptions
+  options: cordovaRunEmulateOptions,
+  isProjectTask: true
 };
 
 function run(ionic, argv, rawCliArguments) {
diff --git a/package.json b/package.json
index 7c5af1585c..919dc95b4f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.26",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.15",
+    "ionic-app-lib": "2.0.0-beta.16",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 3f801038b80c8c1ff3b9b9bbc83ab11a37cf1fb4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 1 Jun 2016 20:09:02 -0500
Subject: [PATCH 0982/1100] enhancement(start): change start task to default to
 typescript if project is started as v2.

---
 lib/ionic/start.js       |  5 +++++
 spec/tasks/start.spec.js | 27 ++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 72d540c10b..eb67ab8e57 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -62,6 +62,11 @@ function run(ionic, argv) {
     return templateUtils.listTemplates();
   }
 
+  // If we are starting a version 2 project then typescript should be set by default
+  if ((argv.v2 || argv.v) && !argv.ts && !argv.typescript) {
+    argv.ts = true;
+  }
+
   if (argv._.length < 2) {
     return appLibUtils.fail('Invalid command', 'start');
   }
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
index b87f0cbbc6..ebf6c6c807 100644
--- a/spec/tasks/start.spec.js
+++ b/spec/tasks/start.spec.js
@@ -133,7 +133,30 @@ describe('start command', function() {
         done();
       });
     });
-    it('should provide extra content if starting a v2 project', function(done) {
+
+    it('should default to typescript if starting a v2 project with -v', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir', '-v'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v).toEqual(true);
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(true);
+        expect(log.info).toHaveBeenCalledWith(
+          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
+        );
+        done();
+      });
+    });
+
+    it('should default to typescript if starting a v2 project with --v2', function(done) {
       var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
@@ -146,6 +169,8 @@ describe('start command', function() {
       spyOn(Start, 'promptLogin').andReturn(Q(true));
 
       start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(true);
         expect(log.info).toHaveBeenCalledWith(
           '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
         );

From c655cce1763d4a9ea4c6fc1905b21db791a89c45 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 1 Jun 2016 20:14:59 -0500
Subject: [PATCH 0983/1100] chore(changelog): Updated changelog for beta26.w

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aba3dd67e5..9d2c3d55ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 <a name="2.0.0-beta.26"></a>
 # [2.0.0-beta.26](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.26) (2016-06-01)
 
+### Features
+
+* **start:** default all version 2 projects that are started to use typescript.
+
 
 ### Bug Fixes
 * **tests:** add tests to cover cli tasks and utilities. ([6c7a040](https://github.com/driftyco/ionic-cli/commit/6c7a040))

From 56a9bec2bb65ffc4c3b0991435d2a1ed762d7851 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 1 Jun 2016 20:17:32 -0500
Subject: [PATCH 0984/1100] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d2c3d55ba..0908449a36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ### Features
 
-* **start:** default all version 2 projects that are started to use typescript.
+* **start:** default all v2 projects that are started to use typescript. ([3f80103](https://github.com/driftyco/ionic-cli/commit/3f80103))
 
 
 ### Bug Fixes

From 5549b828c87b2ea5cf29ccb1c562d519bb6ee1b5 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 09:05:43 -0500
Subject: [PATCH 0985/1100] fix(commands): ensure that rawCliArguments are
 passed to all tasks that are ran from cli.js.

---
 lib/cli.js       | 12 +++----
 spec/cli.spec.js | 82 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index b39089bb65..d975e472f3 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -141,7 +141,7 @@ Cli.run = function run(processArgv) {
 
     // No need to do project specific actions, cd to root, etc.
     if (!task.isProjectTask) {
-      return Q.fcall(task.run.bind(task), Cli, argv);
+      return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
     var root = Utils.cdIonicRoot();
@@ -157,7 +157,7 @@ Cli.run = function run(processArgv) {
       }
       log.debug('node_modules directory not found, not running gulp hooks');
 
-      return Q.fcall(task.run.bind(task), Cli, argv);
+      return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
     try {
@@ -184,17 +184,17 @@ Cli.run = function run(processArgv) {
       }
       log.debug('No gulpfile found, not running gulp hooks');
 
-      return Q.fcall(task.run.bind(task), Cli, argv);
+      return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
-    return Cli.runWithGulp(argv, task);
+    return Cli.runWithGulp(argv, task, rawCliArguments);
 
   } catch (ex) {
     return Utils.fail(ex);
   }
 };
 
-Cli.runWithGulp = function runWithGulp(argv, taskInstance) {
+Cli.runWithGulp = function runWithGulp(argv, taskInstance, rawCliArguments) {
   var cmdName = argv._[0];
   var beforeHook = cmdName + ':before';
   var afterHook = cmdName + ':after';
@@ -229,7 +229,7 @@ Cli.runWithGulp = function runWithGulp(argv, taskInstance) {
 
   // run cmd
     .then(function() {
-      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv);
+      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv, rawCliArguments);
     })
 
   // run afterHook
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 14e249227d..b3758d3bb6 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -2,6 +2,7 @@
 
 var IonicAppLib = require('ionic-app-lib');
 var semver = require('semver');
+var optimist = require('optimist');
 var Ionitron = require('../lib/utils/ionitron');
 var Q = require('q');
 var helpUtils = require('../lib/utils/help');
@@ -162,6 +163,10 @@ describe('Cli', function() {
       });
 
       it('should change cwd to project root for project tasks', function(done) {
+        var processArguments = ['node', 'bin/ionic', 'fake'];
+        var rawCliArguments = processArguments.slice(2);
+        var argv = optimist(rawCliArguments).argv;
+
         var FakeTask = {
           name: 'fake',
           title: 'fake',
@@ -171,15 +176,77 @@ describe('Cli', function() {
           isProjectTask: true
         };
         spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(FakeTask, 'run').andReturn(Q(true));
 
-        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        IonicCli.run(processArguments)
         .then(function() {
           expect(Utils.cdIonicRoot).toHaveBeenCalled();
+          expect(FakeTask.run).toHaveBeenCalledWith(IonicCli, argv, rawCliArguments);
+          done();
+        });
+      });
+
+      it('should skip loading gulpfile if node_modules does not exist', function(done) {
+        var processArguments = ['node', 'bin/ionic', 'fake'];
+        var rawCliArguments = processArguments.slice(2);
+        var argv = optimist(rawCliArguments).argv;
+
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {
+            return Q(true);
+          },
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(fs, 'existsSync').andReturn(false);
+        spyOn(FakeTask, 'run').andReturn(Q(true));
+        spyOn(IonicCli, 'loadGulpfile');
+        spyOn(IonicCli, 'runWithGulp');
+
+        IonicCli.run(processArguments)
+        .then(function() {
+          expect(IonicCli.loadGulpfile).not.toHaveBeenCalled();
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          expect(FakeTask.run).toHaveBeenCalledWith(IonicCli, argv, rawCliArguments);
+          done();
+        });
+      });
+
+      it('should skip runWithGulp if a gulpfile does not exist', function(done) {
+        var processArguments = ['node', 'bin/ionic', 'fake'];
+        var rawCliArguments = processArguments.slice(2);
+        var argv = optimist(rawCliArguments).argv;
+
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {
+            return Q(true);
+          },
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(FakeTask, 'run').andReturn(Q(true));
+        spyOn(IonicCli, 'runWithGulp');
+
+        IonicCli.run(processArguments)
+        .then(function() {
+          expect(IonicCli.loadGulpfile).toHaveBeenCalled();
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          expect(FakeTask.run).toHaveBeenCalledWith(IonicCli, argv, rawCliArguments);
           done();
         });
       });
 
       it('should not change cwd to project root for non project tasks', function(done) {
+        var processArguments = ['node', 'bin/ionic', 'fake'];
+        var rawCliArguments = processArguments.slice(2);
+        var argv = optimist(rawCliArguments).argv;
+
         var FakeTask = {
           name: 'fake',
           title: 'fake',
@@ -189,10 +256,12 @@ describe('Cli', function() {
           isProjectTask: false
         };
         spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(FakeTask, 'run').andReturn(Q(true));
 
-        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        IonicCli.run(processArguments)
         .then(function() {
           expect(Utils.cdIonicRoot).not.toHaveBeenCalled();
+          expect(FakeTask.run).toHaveBeenCalledWith(IonicCli, argv, rawCliArguments);
           done();
         });
       });
@@ -267,7 +336,6 @@ describe('Cli', function() {
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
           expect(IonicCli.loadGulpfile).toHaveBeenCalled();
-          expect(FakeTask.run).toHaveBeenCalled();
           expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
           done();
         });
@@ -557,6 +625,7 @@ describe('Cli', function() {
   describe('runWithGulp function', function() {
     var fakeTask;
     var argv;
+    var rawCliArguments;
     var qCallbacks;
 
     beforeEach(function() {
@@ -572,6 +641,7 @@ describe('Cli', function() {
         _: ['fake'],
         v2: true
       };
+      rawCliArguments = ['fake', '--v2'];
       gulp.tasks = {
         'fake:before': function() {},
         'fake:after': function() {}
@@ -598,7 +668,7 @@ describe('Cli', function() {
     it('should try to load gulp, exit if it fails', function() {
       spyOn(path, 'resolve').andReturn('./wrong_path');
 
-      IonicCli.runWithGulp(argv, fakeTask);
+      IonicCli.runWithGulp(argv, fakeTask, rawCliArguments);
 
       expect(log.error).toHaveBeenCalledWith('\nGulpfile detected, but gulp is not installed'.red);
       expect(log.error).toHaveBeenCalledWith('Do you need to run `npm install`?\n'.red);
@@ -611,12 +681,12 @@ describe('Cli', function() {
 
 
     it('should run logEvents, the command and the gulp hooks', function(done) {
-      IonicCli.runWithGulp(argv, fakeTask).then(function() {
+      IonicCli.runWithGulp(argv, fakeTask, rawCliArguments).then(function() {
 
         expect(IonicCli.logEvents).toHaveBeenCalled();
         expect(gulp.start).toHaveBeenCalledWith('fake:before', qCallbacks[0]);
         expect(gulp.start).toHaveBeenCalledWith('fake:after', qCallbacks[1]);
-        expect(fakeTask.run).toHaveBeenCalledWith(IonicCli, argv);
+        expect(fakeTask.run).toHaveBeenCalledWith(IonicCli, argv, rawCliArguments);
 
         expect(log.error).not.toHaveBeenCalled();
         expect(process.exit).not.toHaveBeenCalled();

From df20815abe63879f89bffcb13bf4aa8d0ba028a3 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 09:15:31 -0500
Subject: [PATCH 0986/1100] chore(): update package.json and changelog for
 beta.27 release.

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0908449a36..5f700b3afa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="2.0.0-beta.27"></a>
+# [2.0.0-beta.27](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.27) (2016-06-02)
+
+
+### Bug Fixes
+
+* **commands:** ensure that rawCliArguments are passed to all tasks that are ran from cli.js. ([5549b82](https://github.com/driftyco/ionic-cli/commit/5549b82))
+
+
 <a name="2.0.0-beta.26"></a>
 # [2.0.0-beta.26](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.26) (2016-06-01)
 
diff --git a/package.json b/package.json
index 919dc95b4f..9b22176f5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.26",
+  "version": "2.0.0-beta.27",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From c30f9d8467f1cae0f46137dbb17836e8d8333a36 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 10:03:45 -0500
Subject: [PATCH 0987/1100] fix(start): ensure that --no-ts flag provided to
 --v2 project start pulls the javascript version.

---
 lib/ionic/start.js       |  2 +-
 spec/tasks/start.spec.js | 44 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index eb67ab8e57..8c1f934189 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -63,7 +63,7 @@ function run(ionic, argv) {
   }
 
   // If we are starting a version 2 project then typescript should be set by default
-  if ((argv.v2 || argv.v) && !argv.ts && !argv.typescript) {
+  if ((argv.v2 || argv.v) && !argv.hasOwnProperty('ts') && !argv.hasOwnProperty('typescript')) {
     argv.ts = true;
   }
 
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
index ebf6c6c807..c8cd698c5e 100644
--- a/spec/tasks/start.spec.js
+++ b/spec/tasks/start.spec.js
@@ -178,6 +178,50 @@ describe('start command', function() {
       });
     });
 
+    it('should use javascript if starting a v2 project with --v2 and --no-ts', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2', '--no-ts'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(false);
+        expect(log.info).toHaveBeenCalledWith(
+          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
+        );
+        done();
+      });
+    });
+
+    it('should use javascript if starting a v2 project with --v2 and --no-typescript', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2', '--no-typescript'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].typescript).toEqual(false);
+        expect(log.info).toHaveBeenCalledWith(
+          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
+        );
+        done();
+      });
+    });
+
     it('should catch error if any process throws', function(done) {
       var processArguments = ['node', 'ionic', 'start', 'newDir'];
       var rawCliArguments = processArguments.slice(2);

From 05536494179a9cd04e26c28be9e6496ad453a221 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 10:05:41 -0500
Subject: [PATCH 0988/1100] Publish beta.28 and update changelog.

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f700b3afa..8aaa68a5e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="2.0.0-beta.28"></a>
+# [2.0.0-beta.28](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.28) (2016-06-02)
+
+
+### Bug Fixes
+
+* **start:** ensure that --no-ts flag provided to --v2 project start pulls the javascript version. ([c30f9d8](https://github.com/driftyco/ionic-cli/commit/c30f9d8))
+
+
 <a name="2.0.0-beta.27"></a>
 # [2.0.0-beta.27](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.27) (2016-06-02)
 
diff --git a/package.json b/package.json
index 9b22176f5e..55b40b596a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.27",
+  "version": "2.0.0-beta.28",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 7ddd42e5536d915ef412db93c8d1a7c375d7a7e4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 12:10:35 -0500
Subject: [PATCH 0989/1100] fix(commands): add generate, prepare, address,
 compile to the available command list.

---
 lib/config/commands.js       |  4 ++++
 spec/config/commands.spec.js | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 spec/config/commands.spec.js

diff --git a/lib/config/commands.js b/lib/config/commands.js
index 203b4eff41..1320a11937 100644
--- a/lib/config/commands.js
+++ b/lib/config/commands.js
@@ -32,7 +32,9 @@ var affordances = {
 var orderedListOfCommands = [
   'start',
   'serve',
+  'generate',
   'platform',
+  'prepare',
   'run',
   'emulate',
   'build',
@@ -58,6 +60,8 @@ var orderedListOfCommands = [
   'link',
   'hooks',
   'state',
+  'address',
+  'compile',
   'docs'
 ];
 
diff --git a/spec/config/commands.spec.js b/spec/config/commands.spec.js
new file mode 100644
index 0000000000..27418821f3
--- /dev/null
+++ b/spec/config/commands.spec.js
@@ -0,0 +1,23 @@
+'use strict';
+
+var fs = require('fs');
+var path = require('path');
+var commands = require('../../lib/config/commands');
+
+describe('orderedListOfCommands', function() {
+  var listOfCommands = commands.orderedListOfCommands.slice(0);
+
+  it('should have a corresponding command every task in ionic folder', function() {
+    var taskFileList = fs
+      .readdirSync(path.join(__dirname, '../../lib/ionic'))
+      .filter(function(file) {
+        var stat = fs.statSync(path.join(__dirname, '../../lib/ionic', file));
+        return !stat.isDirectory();
+      })
+      .map(function(file) {
+        return file.replace('.js', '');
+      })
+      .sort();
+    expect(taskFileList).toEqual(listOfCommands.sort());
+  });
+});

From 31add44eee2ca5d8fdd0aa0c8af4089c072684c7 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 2 Jun 2016 12:32:06 -0500
Subject: [PATCH 0990/1100] chore(): update package.json version and changelog.

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aaa68a5e8..6d57fcd27b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="2.0.0-beta.29"></a>
+# [2.0.0-beta.29](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.29) (2016-06-02)
+
+
+### Bug Fixes
+
+* **commands:** add generate, prepare, address, compile to the available command list. ([7ddd42e](https://github.com/driftyco/ionic-cli/commit/7ddd42e))
+
+
 <a name="2.0.0-beta.28"></a>
 # [2.0.0-beta.28](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.28) (2016-06-02)
 
diff --git a/package.json b/package.json
index 55b40b596a..57ef2b7f23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.28",
+  "version": "2.0.0-beta.29",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 53bcbbbdb902616121bacafd08396b8245dd2f60 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 6 Jun 2016 11:23:45 -0500
Subject: [PATCH 0991/1100] fix(): ensure when bower exec throws an error it is
 caught. fixes #1037.

---
 lib/utils/bower.js       | 12 ++++++++----
 spec/utils/bower.spec.js |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/utils/bower.js b/lib/utils/bower.js
index 66c88e967d..b103e6b70a 100644
--- a/lib/utils/bower.js
+++ b/lib/utils/bower.js
@@ -48,10 +48,14 @@ function saveData(bowerData) {
 }
 
 function checkForBower() {
-  var result = childProcess.exec('bower -v', { silent: true });
-  if (result.output.indexOf('command not found') === -1 && result.output.indexOf('not recognized') === -1) {
-    return true;
-  }
+  try {
+    var result = childProcess.exec('bower -v', { silent: true });
+    if (result.hasOwnProperty('output') &&
+        result.output.indexOf('command not found') === -1 &&
+        result.output.indexOf('not recognized') === -1) {
+      return true;
+    }
+  } catch (ex) {} // eslint-disable-line no-empty
   return false;
 }
 
diff --git a/spec/utils/bower.spec.js b/spec/utils/bower.spec.js
index c9c2e117e3..d28abed897 100644
--- a/spec/utils/bower.spec.js
+++ b/spec/utils/bower.spec.js
@@ -171,4 +171,12 @@ describe('checkForBower function', function() {
     var result = bowerUtils.checkForBower();
     expect(result).toEqual(false);
   });
+
+  it('should return false if bower exec throws an error', function() {
+    spyOn(childProcess, 'exec').andCallFake(function() {
+      throw new Error('something happened');
+    });
+    var result = bowerUtils.checkForBower();
+    expect(result).toEqual(false);
+  });
 });

From f36acef1cfe744ea4cf5dfdc9bac7d6089a43ce6 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 6 Jun 2016 11:34:48 -0500
Subject: [PATCH 0992/1100] fix(): ensure that the project base directory is
 passed to setupLiveReload. fixes #1034

---
 lib/ionic/emulate.js       | 4 ++--
 lib/ionic/run.js           | 4 ++--
 spec/tasks/emulate.spec.js | 2 +-
 spec/tasks/run.spec.js     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index c54e0f6981..54319e32c4 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -67,11 +67,11 @@ function run(ionic, argv, rawCliArguments) {
 
   return Q.all(promiseList).then(function() {
     if (isLiveReload) {
-      return cordovaUtils.setupLiveReload(argv);
+      return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
 
     // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(process.cwd(), {
+    return ConfigXml.setConfigXml(appDirectory, {
       resetContent: true,
       errorWhenNotFound: false
     });
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index c03f6708ff..3897812818 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -67,11 +67,11 @@ function run(ionic, argv, rawCliArguments) {
 
   return Q.all(promiseList).then(function() {
     if (isLiveReload) {
-      return cordovaUtils.setupLiveReload(argv);
+      return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
 
     // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(process.cwd(), {
+    return ConfigXml.setConfigXml(appDirectory, {
       resetContent: true,
       errorWhenNotFound: false
     });
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index b0dc4bee9d..a4f3c71070 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -183,7 +183,7 @@ describe('emulate command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv. appDirectory);
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
           ['emulate', 'android'], true, { blah: 'blah' });
         done();
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
index 4935c8dc47..d57b3d0f4e 100644
--- a/spec/tasks/run.spec.js
+++ b/spec/tasks/run.spec.js
@@ -180,7 +180,7 @@ describe('run command', function() {
       }));
 
       run.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv);
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv, appDirectory);
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
           ['run', 'android'], true, { blah: 'blah' });
         done();

From 1728ae0afccbed7e7f1043deed52dfec8150bc19 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 6 Jun 2016 11:53:22 -0500
Subject: [PATCH 0993/1100] chore(): fix test that had a syntax error for
 emulate task.

---
 spec/tasks/emulate.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index a4f3c71070..f3487234a5 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -183,7 +183,7 @@ describe('emulate command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv. appDirectory);
+        expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv, appDirectory);
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
           ['emulate', 'android'], true, { blah: 'blah' });
         done();

From 7a282dbc1a26fbba45014177eb947a99c86ffe25 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 6 Jun 2016 13:20:22 -0500
Subject: [PATCH 0994/1100] chore(): CHANGELOG and package update for release
 beta30.

---
 CHANGELOG.md       | 15 ++++++++++++---
 package.json       |  2 +-
 scripts/release.js | 16 +++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d57fcd27b..ca0c32ff4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
+<a name="2.0.0-beta.30"></a>
+# [2.0.0-beta.30](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.29...v2.0.0-beta.30) (2016-06-06)
+
+
+### Bug Fixes
+* ensure that the project base directory is passed to setupLiveReload. fixes [#1034](https://github.com/driftyco/ionic-cli/issues/1034) ([f36acef](https://github.com/driftyco/ionic-cli/commit/f36acef)), closes [#1034](https://github.com/driftyco/ionic-cli/issues/1034)
+* ensure when bower exec throws an error it is caught. fixes [#1037](https://github.com/driftyco/ionic-cli/issues/1037). ([53bcbbb](https://github.com/driftyco/ionic-cli/commit/53bcbbb)), closes [#1037](https://github.com/driftyco/ionic-cli/issues/1037)
+
+
 <a name="2.0.0-beta.29"></a>
-# [2.0.0-beta.29](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.29) (2016-06-02)
+# [2.0.0-beta.29](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.28...v2.0.0-beta.29) (2016-06-02)
 
 
 ### Bug Fixes
@@ -8,7 +17,7 @@
 
 
 <a name="2.0.0-beta.28"></a>
-# [2.0.0-beta.28](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.28) (2016-06-02)
+# [2.0.0-beta.28](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.27...v2.0.0-beta.28) (2016-06-02)
 
 
 ### Bug Fixes
@@ -17,7 +26,7 @@
 
 
 <a name="2.0.0-beta.27"></a>
-# [2.0.0-beta.27](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.25...v2.0.0-beta.27) (2016-06-02)
+# [2.0.0-beta.27](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.26...v2.0.0-beta.27) (2016-06-02)
 
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 57ef2b7f23..1fed23fd9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
diff --git a/scripts/release.js b/scripts/release.js
index 9ffa999755..cf772c600f 100644
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -1,3 +1,9 @@
+/*
+ * This script will create a new github release using the verion
+ * specified from within the package.json file. The output from
+ * the changelog command will be the body of the tag. The name
+ * is the package.JSON.version
+ */
 var changelog = require('conventional-changelog');
 var GithubApi = require('github');
 var packageJSON = require('../package.json');
@@ -15,16 +21,16 @@ github.authenticate({
 return changelog({
   preset: 'angular'
 })
-.pipe(through.obj(function(file, enc, cb){
+.pipe(through.obj(function(file) {
   github.releases.createRelease({
     owner: 'driftyco',
     repo: 'ionic-cli',
-    target_commitish: 'v2',
-    tag_name: 'v' + packageJSON.version,
+    target_commitish: 'v2', // eslint-disable-line camelcase
+    tag_name: 'v' + packageJSON.version, // eslint-disable-line camelcase
     name: packageJSON.version,
     body: file.toString(),
-    prerelease: true,
-  }, function(err, data){
+    prerelease: true
+  }, function(err, data) {
     if (err) console.log('error: ' + err);
     console.log(data);
   });

From 78f0cb14d773b19d4969357bcb7d1629608df4c0 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 10 Jun 2016 11:29:57 -0500
Subject: [PATCH 0995/1100] chore(): ensured all variations of ionic-app-lib
 usage were the same

---
 lib/ionic/docs.js    | 5 +++--
 lib/ionic/lib.js     | 2 +-
 lib/ionic/service.js | 2 +-
 lib/utils/stats.js   | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index d2cb860ea3..6aa8b0a4a1 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -4,7 +4,8 @@ var prompt = require('prompt');
 var _ = require('underscore');
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicDocs = require('./resources/docs.json');
-var log = require('ionic-app-lib').logging.logger;
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
 var COLUMN_LIMIT = 3;
 
 var settings = {
@@ -53,7 +54,7 @@ function list() {
 }
 
 function openDefault() {
-  var Info = require('ionic-app-lib').info;
+  var Info = IonicAppLib.info;
 
   var envInfo = Info.gatherInfo();
   var ionicVersion = envInfo.ionic;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 8e9c015c7e..fd0047abb7 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -12,9 +12,9 @@ var argv = require('optimist').argv;
 var prompt = require('prompt');
 var IonicAppLib = require('ionic-app-lib');
 var utils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
 var exec = require('child_process').exec;
 var Q = require('q');
-var log = require('ionic-app-lib').logging.logger;
 
 var settings =  {
   title: 'lib',
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 3feeb7e0f3..4ed0c6a831 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -6,8 +6,8 @@ var exec = require('child_process').exec;
 var _ = require('underscore');
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var bower = require('../utils/bower');
-var log = require('ionic-app-lib').logging.logger;
 var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
 var fail = IonicAppLib.utils.fail;
 
 var settings = {
diff --git a/lib/utils/stats.js b/lib/utils/stats.js
index 2f3f42aeca..c8ae31190e 100644
--- a/lib/utils/stats.js
+++ b/lib/utils/stats.js
@@ -2,9 +2,10 @@
 'use strict';
 
 var request = require('request');
-var IonicConfig = require('ionic-app-lib').config;
-var IonicInfo = require('ionic-app-lib').info;
-var log = require('ionic-app-lib').logging.logger;
+var IonicAppLib = require('ionic-app-lib');
+var IonicConfig = IonicAppLib.config;
+var IonicInfo = IonicAppLib.info;
+var log = IonicAppLib.logging.logger;
 var path = require('path');
 var fs = require('fs');
 

From c4ee8eb52da54e68b672480c6351131188ec9a53 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 13 Jun 2016 09:58:22 -0500
Subject: [PATCH 0996/1100] chore(): rename variables to create a consistent
 usage of IonicAppLib across the codebase.

---
 lib/cli.js           | 18 +++++++++---------
 lib/ionic/address.js |  7 ++++---
 lib/ionic/lib.js     |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index d975e472f3..1cc1b13e53 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -13,7 +13,7 @@ var fs = require('fs');
 var settings = require('../package.json');
 var Tasks = require('./config/commands').allCommands;
 var orderedListOfTasks = require('./config/commands').orderedListOfCommands;
-var Utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var Logging = IonicAppLib.logging;
 var log = Logging.logger;
 var Q = require('q');
@@ -144,7 +144,7 @@ Cli.run = function run(processArgv) {
       return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
-    var root = Utils.cdIonicRoot();
+    var root = appLibUtils.cdIonicRoot();
     var project = IonicProject.load(root);
     argv.v2 = project && project.get('v2');
 
@@ -190,7 +190,7 @@ Cli.run = function run(processArgv) {
     return Cli.runWithGulp(argv, task, rawCliArguments);
 
   } catch (ex) {
-    return Utils.fail(ex);
+    return appLibUtils.fail(ex);
   }
 };
 
@@ -521,7 +521,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
         log.info('+---------------------------------------------------------+\n'.green);
       } catch (ex) {
         q.reject('Error occurred in downloading the CLI messages:', ex);
-        Utils.fail(ex);
+        appLibUtils.fail(ex);
       }
       q.resolve(messagesJson);
     } else {
@@ -542,14 +542,14 @@ Cli.gatherInfo = function gatherInfo() {
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
   log.error('An uncaught exception occurred and has been reported to Ionic'.red.bold);
   var errorMessage = typeof err === 'string' ? err : err.message;
-  Utils.errorHandler(errorMessage);
+  appLibUtils.errorHandler(errorMessage);
   process.exit(1);
 };
 
 Cli.attachErrorHandling = function attachErrorHandling() {
-  Utils.errorHandler = function errorHandler(msg) {
+  appLibUtils.errorHandler = function errorHandler(msg) {
     try {
-      log.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
+      log.debug('Cli.appLibUtils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       if (msg) {
@@ -578,11 +578,11 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 // Backwards compatability for those commands that havent been
 // converted yet.
 Cli.fail = function fail(err, taskHelp) {
-  Utils.fail(err, taskHelp);
+  appLibUtils.fail(err, taskHelp);
 };
 
 Cli.getContentSrc = function getContentSrc() {
-  return Utils.getContentSrc(process.cwd());
+  return appLibUtils.getContentSrc(process.cwd());
 };
 
 Cli.doRuntimeCheck = function doRuntimeCheck(version) {
diff --git a/lib/ionic/address.js b/lib/ionic/address.js
index 035049cc78..880932f1b6 100644
--- a/lib/ionic/address.js
+++ b/lib/ionic/address.js
@@ -2,6 +2,7 @@
 
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
+var IonicConfig = IonicAppLib.config;
 var Serve = IonicAppLib.serve;
 
 var settings =  {
@@ -13,9 +14,9 @@ var settings =  {
 function run(ionic, argv) { // eslint-disable-line no-unused-vars
 
   // reset any address configs
-  var ionicConfig = IonicAppLib.config.load();
-  ionicConfig.set('ionicServeAddress', null);
-  ionicConfig.set('platformServeAddress', null);
+  var ionConfig = IonicConfig.load();
+  ionConfig.set('ionicServeAddress', null);
+  ionConfig.set('platformServeAddress', null);
   return Serve.getAddress({ isAddressCmd: true });
 }
 
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index fd0047abb7..0bc8559596 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -11,7 +11,7 @@ var unzip = require('unzip');
 var argv = require('optimist').argv;
 var prompt = require('prompt');
 var IonicAppLib = require('ionic-app-lib');
-var utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var log = IonicAppLib.logging.logger;
 var exec = require('child_process').exec;
 var Q = require('q');
@@ -33,7 +33,7 @@ var settings =  {
 function run(ionic, argv) {
 
   if (!fs.existsSync(path.resolve('www'))) {
-    return utils.fail('"www" directory cannot be found. Make sure the working directory ' +
+    return appLibUtils.fail('"www" directory cannot be found. Make sure the working directory ' +
                       'is at the top level of an Ionic project.', 'lib');
   }
 

From 9de215758874c856d3220c924e908c10b94e322e Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 13 Jun 2016 10:55:19 -0500
Subject: [PATCH 0997/1100] fix(bower): change check for bower to use execSync.

---
 lib/utils/bower.js       |  7 +++----
 spec/utils/bower.spec.js | 19 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/utils/bower.js b/lib/utils/bower.js
index b103e6b70a..9e24f66a71 100644
--- a/lib/utils/bower.js
+++ b/lib/utils/bower.js
@@ -49,10 +49,9 @@ function saveData(bowerData) {
 
 function checkForBower() {
   try {
-    var result = childProcess.exec('bower -v', { silent: true });
-    if (result.hasOwnProperty('output') &&
-        result.output.indexOf('command not found') === -1 &&
-        result.output.indexOf('not recognized') === -1) {
+    var result = childProcess.execSync('bower -v', { silent: true, encoding: 'utf8' });
+    if (result.indexOf('command not found') === -1 &&
+        result.indexOf('not recognized') === -1) {
       return true;
     }
   } catch (ex) {} // eslint-disable-line no-empty
diff --git a/spec/utils/bower.spec.js b/spec/utils/bower.spec.js
index d28abed897..3c523a2239 100644
--- a/spec/utils/bower.spec.js
+++ b/spec/utils/bower.spec.js
@@ -149,31 +149,30 @@ describe('saveData function', function() {
 
 describe('checkForBower function', function() {
   it('should return true if bower is installed', function() {
-    spyOn(childProcess, 'exec').andReturn({
-      output: '0'
-    });
+    spyOn(childProcess, 'execSync').andReturn('1.7.9\n');
+    var result = bowerUtils.checkForBower();
+    expect(result).toEqual(true);
+  });
+  it('should return true if bower is installed', function() {
+    spyOn(childProcess, 'execSync').andReturn('0');
     var result = bowerUtils.checkForBower();
     expect(result).toEqual(true);
   });
 
   it('should return false if bower exec returns "command not found"', function() {
-    spyOn(childProcess, 'exec').andReturn({
-      output: 'command not found'
-    });
+    spyOn(childProcess, 'execSync').andReturn('command not found');
     var result = bowerUtils.checkForBower();
     expect(result).toEqual(false);
   });
 
   it('should return false if bower exec returns "not recognized"', function() {
-    spyOn(childProcess, 'exec').andReturn({
-      output: 'not recognized'
-    });
+    spyOn(childProcess, 'execSync').andReturn('not recognized');
     var result = bowerUtils.checkForBower();
     expect(result).toEqual(false);
   });
 
   it('should return false if bower exec throws an error', function() {
-    spyOn(childProcess, 'exec').andCallFake(function() {
+    spyOn(childProcess, 'execSync').andCallFake(function() {
       throw new Error('something happened');
     });
     var result = bowerUtils.checkForBower();

From 2379b41cd93dd43441364ac88e587e9552924a0c Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 13 Jun 2016 12:05:03 -0500
Subject: [PATCH 0998/1100] fix(login): show error message from login results
 on login failure.

---
 lib/ionic/login.js       |  6 +-----
 spec/tasks/login.spec.js | 33 +++++----------------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index a4cf977eb0..0883e9201b 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -45,11 +45,7 @@ function login(argv) {
     return cookieJar;
   })
   .catch(function(ex) {
-    log.error('Error logging in');
-    throw ex;
-
-    // log.info(ex);
-    // log.info(ex.stack);
+    log.error(ex);
   });
 }
 
diff --git a/spec/tasks/login.spec.js b/spec/tasks/login.spec.js
index 1bad90f05c..3608518d35 100644
--- a/spec/tasks/login.spec.js
+++ b/spec/tasks/login.spec.js
@@ -118,21 +118,18 @@ describe('login command', function() {
       });
     });
 
-    it('should throw an error on a failed log in', function(done) {
+    it('should display the error on a failed log in attempt', function(done) {
       var processArguments = ['node', 'ionic', 'login', '--email', 'josh@ionic.io', '--password', 'asdf1234'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
-      var error = new Error('error occurred');
+      var error = 'Email or Password incorrect. Please visit';
       spyOn(log, 'error');
       spyOn(login, 'promptForLogin');
-      spyOn(appLibLogin, 'requestLogIn').andCallFake(function() {
-        throw error;
-      });
+      spyOn(appLibLogin, 'requestLogIn').andReturn(Q.reject(error));
 
-      login.login(argv).catch(function(err) {
-        expect(log.error).toHaveBeenCalledWith('Error logging in');
-        expect(err).toEqual(error);
+      login.login(argv).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
         done();
       });
     });
@@ -159,25 +156,5 @@ describe('login command', function() {
         done();
       });
     });
-
-    it('should return a rejected promise on failure', function(done) {
-      var processArguments = ['node', 'ionic', 'login'];
-      var rawCliArguments = processArguments.slice(2);
-      var argv = optimist(rawCliArguments).argv;
-
-      spyOn(log, 'info');
-      spyOn(prompt, 'start');
-      spyOn(prompt, 'get').andCallFake(function(schema, callback) {
-        callback('an error occurred', null);
-      });
-
-      var promptForLogin = login.__get__('promptForLogin');
-
-      promptForLogin(argv).catch(function(results) {
-        expect(prompt.get).toHaveBeenCalled();
-        expect(results).toEqual('Error logging in: an error occurred');
-        done();
-      });
-    });
   });
 });

From 3f87bfb09e37214301c27863c53bb7a9cabdf555 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 13 Jun 2016 16:00:19 -0500
Subject: [PATCH 0999/1100] feat(start): remove javascript as an option for v2
 projects because they should all be typescript.

---
 lib/ionic/start.js       |  9 ----
 spec/cli.spec.js         |  2 +-
 spec/tasks/start.spec.js | 95 ++++++----------------------------------
 3 files changed, 15 insertions(+), 91 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 8c1f934189..48b74a6bd1 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -48,10 +48,6 @@ var settings = {
       boolean: true,
       title: 'Start a Ionic v2 project'
     },
-    '--typescript|--ts': {
-      boolean: true,
-      title: '(with --v2 only) Use TypeScript in starter'
-    },
     '--zip-file|-z': 'URL to download zipfile for starter template'
   },
   isProjectTask: false
@@ -62,11 +58,6 @@ function run(ionic, argv) {
     return templateUtils.listTemplates();
   }
 
-  // If we are starting a version 2 project then typescript should be set by default
-  if ((argv.v2 || argv.v) && !argv.hasOwnProperty('ts') && !argv.hasOwnProperty('typescript')) {
-    argv.ts = true;
-  }
-
   if (argv._.length < 2) {
     return appLibUtils.fail('Invalid command', 'start');
   }
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index b3758d3bb6..7c49e3a4d9 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -150,7 +150,7 @@ describe('Cli', function() {
         var booleanOptions = IonicCli.getListOfBooleanOptions(task.options);
 
         // We expect 6 total = 3 options, each with short hand notation.
-        expect(booleanOptions.length).toBe(11);
+        expect(booleanOptions.length).toBe(9);
       });
 
       it('should track stats for cli', function(done) {
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
index c8cd698c5e..e6d6c13448 100644
--- a/spec/tasks/start.spec.js
+++ b/spec/tasks/start.spec.js
@@ -47,7 +47,6 @@ describe('start command', function() {
       expect(start.options['--io-app-id']).toEqual(jasmine.any(String));
       expect(start.options['--template|-t']).toEqual(jasmine.any(String));
       expect(start.options['--v2|-v']).toEqual(jasmine.any(Object));
-      expect(start.options['--typescript|--ts']).toEqual(jasmine.any(Object));
       expect(start.options['--zip-file|-z']).toEqual(jasmine.any(String));
     });
   });
@@ -134,74 +133,32 @@ describe('start command', function() {
       });
     });
 
-    it('should default to typescript if starting a v2 project with -v', function(done) {
-      var processArguments = ['node', 'ionic', 'start', 'newDir', '-v'];
-      var rawCliArguments = processArguments.slice(2);
-      var argv = optimist(rawCliArguments).argv;
-
-      spyOn(fs, 'existsSync').andReturn(false);
-      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
-      spyOn(Start, 'promptForOverwrite');
-      spyOn(Start, 'startApp').andReturn(Q(true));
-      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
-      spyOn(Start, 'promptLogin').andReturn(Q(true));
-
-      start.run({}, argv).then(function() {
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v).toEqual(true);
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(true);
-        expect(log.info).toHaveBeenCalledWith(
-          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
-        );
-        done();
-      });
-    });
-
-    it('should default to typescript if starting a v2 project with --v2', function(done) {
-      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2'];
+    it('should catch error if any process throws', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
       spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(log, 'error');
       spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
       spyOn(Start, 'promptForOverwrite');
-      spyOn(Start, 'startApp').andReturn(Q(true));
-      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
-      spyOn(Start, 'promptLogin').andReturn(Q(true));
+      spyOn(Start, 'startApp').andReturn(Q.reject(false));
+      spyOn(Start, 'printQuickHelp');
+      spyOn(Start, 'promptLogin');
 
-      start.run({}, argv).then(function() {
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(true);
-        expect(log.info).toHaveBeenCalledWith(
-          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
-        );
+      start.run({}, argv).catch(function() {
+        expect(appLibUtils.preprocessCliOptions).toHaveBeenCalled();
+        expect(Start.promptForOverwrite).not.toHaveBeenCalled();
+        expect(Start.startApp).toHaveBeenCalled();
+        expect(Start.printQuickHelp).not.toHaveBeenCalled();
+        expect(Start.promptLogin).not.toHaveBeenCalled();
         done();
       });
     });
 
-    it('should use javascript if starting a v2 project with --v2 and --no-ts', function(done) {
-      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2', '--no-ts'];
-      var rawCliArguments = processArguments.slice(2);
-      var argv = optimist(rawCliArguments).argv;
 
-      spyOn(fs, 'existsSync').andReturn(false);
-      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
-      spyOn(Start, 'promptForOverwrite');
-      spyOn(Start, 'startApp').andReturn(Q(true));
-      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
-      spyOn(Start, 'promptLogin').andReturn(Q(true));
-
-      start.run({}, argv).then(function() {
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].ts).toEqual(false);
-        expect(log.info).toHaveBeenCalledWith(
-          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
-        );
-        done();
-      });
-    });
-
-    it('should use javascript if starting a v2 project with --v2 and --no-typescript', function(done) {
-      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2', '--no-typescript'];
+    it('should print a getting started message with v2 projects', function(done) {
+      var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
@@ -214,35 +171,11 @@ describe('start command', function() {
 
       start.run({}, argv).then(function() {
         expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
-        expect(appLibUtils.preprocessCliOptions.calls[0].args[0].typescript).toEqual(false);
         expect(log.info).toHaveBeenCalledWith(
           '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
         );
         done();
       });
     });
-
-    it('should catch error if any process throws', function(done) {
-      var processArguments = ['node', 'ionic', 'start', 'newDir'];
-      var rawCliArguments = processArguments.slice(2);
-      var argv = optimist(rawCliArguments).argv;
-
-      spyOn(fs, 'existsSync').andReturn(false);
-      spyOn(log, 'error');
-      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
-      spyOn(Start, 'promptForOverwrite');
-      spyOn(Start, 'startApp').andReturn(Q.reject(false));
-      spyOn(Start, 'printQuickHelp');
-      spyOn(Start, 'promptLogin');
-
-      start.run({}, argv).catch(function() {
-        expect(appLibUtils.preprocessCliOptions).toHaveBeenCalled();
-        expect(Start.promptForOverwrite).not.toHaveBeenCalled();
-        expect(Start.startApp).toHaveBeenCalled();
-        expect(Start.printQuickHelp).not.toHaveBeenCalled();
-        expect(Start.promptLogin).not.toHaveBeenCalled();
-        done();
-      });
-    });
   });
 });

From 632237619b840ef07169a17ce81e3b589d4dd627 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 13 Jun 2016 16:53:23 -0500
Subject: [PATCH 1000/1100] fix(start): ensure that folders can be created even
 if they are numeric.

---
 lib/ionic/start.js       |  4 ++++
 spec/tasks/start.spec.js | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 48b74a6bd1..37eeaf2464 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -66,6 +66,10 @@ function run(ionic, argv) {
     return log.error('Please name your Ionic project something meaningful other than \'.\''.red);
   }
 
+  // Ensure that the folder name provided is a String
+  // ie 5 becomes '5' AND '5' stays as '5'
+  argv._[1] = argv._[1].toString();
+
   var promptPromise;
   var options = appLibUtils.preprocessCliOptions(argv);
   var startingApp = true;
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
index e6d6c13448..109f476bc0 100644
--- a/spec/tasks/start.spec.js
+++ b/spec/tasks/start.spec.js
@@ -157,6 +157,24 @@ describe('start command', function() {
     });
 
 
+    it('should treat all numerically named folders and strings not integers', function(done) {
+      var processArguments = ['node', 'ionic', 'start', '5887'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(fs, 'existsSync').andReturn(false);
+      spyOn(appLibUtils, 'preprocessCliOptions').andCallThrough();
+      spyOn(Start, 'promptForOverwrite');
+      spyOn(Start, 'startApp').andReturn(Q(true));
+      spyOn(Start, 'printQuickHelp').andReturn(Q(true));
+      spyOn(Start, 'promptLogin').andReturn(Q(true));
+
+      start.run({}, argv).then(function() {
+        expect(appLibUtils.preprocessCliOptions.calls[0].args[0]._[1]).toEqual('5887');
+        done();
+      });
+    });
+
     it('should print a getting started message with v2 projects', function(done) {
       var processArguments = ['node', 'ionic', 'start', 'newDir', '--v2'];
       var rawCliArguments = processArguments.slice(2);

From c0b7b537a739515408934d5f54ff809dc42aa2bd Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 14 Jun 2016 13:30:45 -0500
Subject: [PATCH 1001/1100] chore(): remove deprecated commands browser and
 setup.

---
 lib/config/commands.js   |  2 --
 lib/ionic/browser.js     | 34 ----------------------------------
 lib/ionic/setup.js       | 23 -----------------------
 spec/tasks/setup.spec.js |  0
 4 files changed, 59 deletions(-)
 delete mode 100644 lib/ionic/browser.js
 delete mode 100644 lib/ionic/setup.js
 delete mode 100644 spec/tasks/setup.spec.js

diff --git a/lib/config/commands.js b/lib/config/commands.js
index 1320a11937..bb25a20529 100644
--- a/lib/config/commands.js
+++ b/lib/config/commands.js
@@ -43,14 +43,12 @@ var orderedListOfCommands = [
   'upload',
   'share',
   'lib',
-  'setup',
   'login',
   'io',
   'security',
   'push',
   'package',
   'config',
-  'browser',
   'service',
   'add',
   'remove',
diff --git a/lib/ionic/browser.js b/lib/ionic/browser.js
deleted file mode 100644
index 91f0d8b2de..0000000000
--- a/lib/ionic/browser.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Deprecated
-'use strict';
-
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
-
-var settings = {
-  title: 'browser',
-  name: 'browser',
-  summary: 'Add another browser for a platform ' + '(beta)'.yellow,
-  args: {
-    '<command>': '"add remove rm info versions upgrade list ls revert"',
-    '[browser]': 'The browser you wish to add or remove (Crosswalk)'
-  },
-  options: {
-    '--nosave|-n': {
-      title: 'Do not save the platforms and plugins to the package.json file',
-      boolean: true
-    }
-  },
-  isProjectTask: true
-};
-
-function run() {
-  console.log(
-    'The browser task has been deprecated.\n' +
-    'Please use the Cordova Crosswalk plugin instead:\n\n' +
-    'ionic platform add android\n' +
-    'ionic plugin add cordova-plugin-crosswalk-webview\n'
-  );
-}
-
-module.exports = extend(settings, {
-  run: run
-});
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
deleted file mode 100644
index e27ce3d4ff..0000000000
--- a/lib/ionic/setup.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
-
-var settings =  {
-  title: 'setup',
-  name: 'setup',
-  summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
-  args: {
-    '[sass]': 'Setup the project to use Sass CSS precompiling'
-  },
-  isProjectTask: true
-};
-
-function run() {
-
-  // TODO link to gulp hook docs
-  console.log('The setup task has been deprecated.\n');
-}
-
-module.exports = extend(settings, {
-  run: run
-});
diff --git a/spec/tasks/setup.spec.js b/spec/tasks/setup.spec.js
deleted file mode 100644
index e69de29bb2..0000000000

From 2a3269ba231e165b8454a39924d0c72095e17df3 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 14 Jun 2016 15:51:40 -0500
Subject: [PATCH 1002/1100] Updated help documentation of cordova commands to
 ensure that <PLATFORM> is the first option.

---
 lib/ionic/build.js    | 4 ++--
 lib/ionic/emulate.js  | 4 ++--
 lib/ionic/platform.js | 4 ++--
 lib/ionic/run.js      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 85eb723527..4f9f613f0e 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -12,8 +12,8 @@ var settings = {
   name: 'build',
   summary: 'Build (prepare + compile) an Ionic project for a given platform.\n',
   args: {
-    '[options]': '',
-    '<PLATFORM>': ''
+    '<PLATFORM>': '',
+    '[options]': ''
   },
   options: {
     '--nohooks|-n': {
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 54319e32c4..18693ddc0d 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -32,8 +32,8 @@ var settings = {
   name: 'emulate',
   summary: 'Emulate an Ionic project on a simulator or emulator',
   args: {
-    '[options]': '',
-    '<PLATFORM>': ''
+    '<PLATFORM>': '',
+    '[options]': ''
   },
   options: cordovaRunEmulateOptions,
   isProjectTask: true
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index 5f4a4d17d2..a1696b08b4 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -13,8 +13,8 @@ var settings = {
   name: 'platform',
   summary: 'Add platform target for building an Ionic app',
   args: {
-    '[options]': '',
-    '<PLATFORM>': ''
+    '<PLATFORM>': '',
+    '[options]': ''
   },
   options: {
     '--noresources|-r': {
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 3897812818..b4387818c8 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -32,8 +32,8 @@ var settings = {
   name: 'run',
   summary: 'Run an Ionic project on a connected device',
   args: {
-    '[options]': '',
-    '<PLATFORM>': ''
+    '<PLATFORM>': '',
+    '[options]': ''
   },
   options: cordovaRunEmulateOptions,
   isProjectTask: true

From b3608f36923816eb4c091cb8bd555aa76448a0d4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 14 Jun 2016 16:04:04 -0500
Subject: [PATCH 1003/1100] chore(): add deprecation messages to all bower
 commands.

---
 lib/ionic/add.js     |  6 ++++++
 lib/ionic/lib.js     |  6 ++++++
 lib/ionic/list.js    |  6 ++++++
 lib/ionic/remove.js  |  6 ++++++
 lib/ionic/service.js | 10 ++++++++--
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 5073376ce2..b8892afe01 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -45,6 +45,12 @@ function installBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+   'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
+   'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
+  log.info(deprecationMsg.bold);
+
   if (!bower.checkForBower()) {
     appLibUtils.fail(bower.installMessage, 'add');
     return;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 0bc8559596..783b7c24e3 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -32,6 +32,12 @@ var settings =  {
 
 function run(ionic, argv) {
 
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+   'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
+   'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
+  log.info(deprecationMsg.bold);
+
   if (!fs.existsSync(path.resolve('www'))) {
     return appLibUtils.fail('"www" directory cannot be found. Make sure the working directory ' +
                       'is at the top level of an Ionic project.', 'lib');
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
index dd84ccc511..e4019c9108 100644
--- a/lib/ionic/list.js
+++ b/lib/ionic/list.js
@@ -37,6 +37,12 @@ function listComponents() {
  */
 function run() {
 
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+   'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
+   'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
+  log.info(deprecationMsg.bold);
+
   try {
     listComponents();
   } catch (error) {
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index 17f429b5b7..b4f96fd4b0 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -42,6 +42,12 @@ function uninstallBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+   'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
+   'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
+  log.info(deprecationMsg.bold);
+
   if (!bower.checkForBower()) {
     appLibUtils.fail(bower.installMessage, 'remove');
     return;
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 4ed0c6a831..bdf430c6bc 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -166,8 +166,14 @@ function removeService(serviceName) {
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
 function run(ionic, argv) {
 
-  if (!bower.IonicBower.checkForBower()) {
-    fail(bower.IonicBower.installMessage, 'service');
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+   'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
+   'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
+  log.info(deprecationMsg.bold);
+
+  if (!bower.checkForBower()) {
+    fail(bower.installMessage, 'service');
     return;
   }
 

From d04ca786946742126b0011704f03eeff034e5cdd Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 17 Jun 2016 11:30:27 -0500
Subject: [PATCH 1004/1100] Commit changes to package.json and Changelog for
 beta.31

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca0c32ff4b..05ac3798dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="2.0.0-beta.31"></a>
+# [2.0.0-beta.31](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.30...v2.0.0-beta.31) (2016-06-13)
+
+
+### Bug Fixes
+
+* **bower:** change check for bower to use execSync. ([9de2157](https://github.com/driftyco/ionic-cli/commit/9de2157))
+* **login:** show error message from login results on login failure. ([2379b41](https://github.com/driftyco/ionic-cli/commit/2379b41))
+* **start:** ensure that folders can be created even if they are numeric. ([6322376](https://github.com/driftyco/ionic-cli/commit/6322376))
+
+
+### Features
+
+* **start:** remove javascript as an option for v2 projects because they should all be typescript. ([3f87bfb](https://github.com/driftyco/ionic-cli/commit/3f87bfb))
+
+
 <a name="2.0.0-beta.30"></a>
 # [2.0.0-beta.30](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.29...v2.0.0-beta.30) (2016-06-06)
 
diff --git a/package.json b/package.json
index 1fed23fd9d..a7fdd5e3ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.30",
+  "version": "2.0.0-beta.31",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.16",
+    "ionic-app-lib": "2.0.0-beta.17",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 18c567549d82beaa921c2afcd4abbd6c2c2ff402 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 23 Jun 2016 17:00:18 -0500
Subject: [PATCH 1005/1100] chore(): update to 1.7.16

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8c0e844ea3..f6c46bf475 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.7.15",
+  "version": "1.7.16",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -68,7 +68,7 @@
     "finalhandler": "0.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
-    "ionic-app-lib": "0.7.2",
+    "ionic-app-lib": "0.7.3",
     "moment": "^2.10.6",
     "ncp": "0.4.2",
     "npm": "2.1.3",

From f64121f5fa24def0deb17d8179758a29ef464a40 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 23 Jun 2016 17:44:55 -0500
Subject: [PATCH 1006/1100] chore(): update to beta.32

---
 CHANGELOG.md | 6 ++++++
 package.json | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05ac3798dd..af4a1a2efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+<a name="2.0.0-beta.32"></a>
+# [2.0.0-beta.32](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.31...v2.0.0-beta.32) (2016-06-23)
+
+### Bug Fixes
+* **upload** Update ionic-app-lib dependency to fix HTML entities being created in index.html on upload. Closes [#562](https://github.com/driftyco/ionic-cli/issues/562), [#600](https://github.com/driftyco/ionic-cli/issues/600), [#640](https://github.com/driftyco/ionic-cli/issues/642)
+
 <a name="2.0.0-beta.31"></a>
 # [2.0.0-beta.31](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.30...v2.0.0-beta.31) (2016-06-13)
 
diff --git a/package.json b/package.json
index a7fdd5e3ad..c1f3982b55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.32",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.17",
+    "ionic-app-lib": "2.0.0-beta.18",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From b006e3f50d0fd5740f1ad45278c0855ad81d8ffd Mon Sep 17 00:00:00 2001
From: Tim Lancina <tlancina@users.noreply.github.com>
Date: Thu, 23 Jun 2016 17:58:09 -0500
Subject: [PATCH 1007/1100] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af4a1a2efc..88619bcad8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 # [2.0.0-beta.32](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.31...v2.0.0-beta.32) (2016-06-23)
 
 ### Bug Fixes
-* **upload** Update ionic-app-lib dependency to fix HTML entities being created in index.html on upload. Closes [#562](https://github.com/driftyco/ionic-cli/issues/562), [#600](https://github.com/driftyco/ionic-cli/issues/600), [#640](https://github.com/driftyco/ionic-cli/issues/642)
+* **upload** Update ionic-app-lib dependency to fix HTML entities being created in index.html on upload. Closes [#562](https://github.com/driftyco/ionic-cli/issues/562), [#600](https://github.com/driftyco/ionic-cli/issues/600), [#640](https://github.com/driftyco/ionic-cli/issues/640)
 
 <a name="2.0.0-beta.31"></a>
 # [2.0.0-beta.31](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.30...v2.0.0-beta.31) (2016-06-13)

From 5b400e712947ec1dff4e92d8fa53668cdd297568 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 7 Jul 2016 14:22:22 -0500
Subject: [PATCH 1008/1100] fix(cordova): correct issue where node 6 shows
 numbers when printing from stdout. fixes #1078

---
 lib/utils/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 3e1b02378e..c6b71e2968 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -59,7 +59,7 @@ function arePluginsInstalled(baseDir) {
  * @return {Promise} Promise upon completion
  */
 function installPlatform(platform) {
-  log.info(('• You\'re trying to build for ' + platform + 'but don\'t have the platform installed yet.').yellow);
+  log.info(('• You\'re trying to build for ' + platform + ' but don\'t have the platform installed yet.').yellow);
   log.info('∆ Installing ' + platform + ' for you.');
 
   return promiseExec('cordova platform add ' + platform).then(function() {
@@ -75,7 +75,7 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
   var cordovaProcess = childProcess.exec('cordova ' + optionList.join(' '));
 
   cordovaProcess.stdout.on('data', function(data) {
-    log.info(data);
+    log.info(data.toString());
   });
 
   cordovaProcess.stderr.on('data', function(data) {

From 142128ab81bb33d44fe2494845a9d7eea6bc3b3c Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Thu, 7 Jul 2016 15:48:54 -0500
Subject: [PATCH 1009/1100] =?UTF-8?q?fix(cordova):=20ensure=20that=20each?=
 =?UTF-8?q?=20cordova=20command=20will=20properly=20catch=20wh=E2=80=A6=20?=
 =?UTF-8?q?(#1154)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(cordova): ensure that each cordova command will properly catch when cordova throws an error.

* fix(cordova): show error message to user when iOS is only available on an OSX machine.
---
 lib/ionic/build.js          |  9 ++++++-
 lib/ionic/compile.js        |  6 +++++
 lib/ionic/emulate.js        |  9 ++++++-
 lib/ionic/platform.js       |  5 ++++
 lib/ionic/plugin.js         |  5 ++++
 lib/ionic/prepare.js        |  6 +++++
 lib/ionic/run.js            |  9 ++++++-
 spec/tasks/build.spec.js    | 34 +++++++++++++++++++++---
 spec/tasks/compile.spec.js  | 14 ++++++++--
 spec/tasks/emulate.spec.js  | 38 +++++++++++++++++++++++---
 spec/tasks/platform.spec.js | 53 ++++++++++++++++++++++++++++++++++++-
 spec/tasks/plugin.spec.js   | 46 ++++++++++++++++++++++++++++++++
 spec/tasks/prepare.spec.js  | 22 +++++++++++++++
 spec/tasks/run.spec.js      | 38 +++++++++++++++++++++++---
 14 files changed, 277 insertions(+), 17 deletions(-)

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index 4f9f613f0e..a2ff942961 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -5,6 +5,7 @@ var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var settings = {
@@ -37,7 +38,8 @@ function run(ionic, argv, rawCliArguments) {
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
-    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+    log.error('✗ You cannot run iOS unless you are on Mac OSX.');
+    return Q();
   }
 
   var promiseList = []
@@ -59,6 +61,11 @@ function run(ionic, argv, rawCliArguments) {
   .then(function() {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList);
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/compile.js b/lib/ionic/compile.js
index b368179e0d..f66ab97162 100644
--- a/lib/ionic/compile.js
+++ b/lib/ionic/compile.js
@@ -3,6 +3,7 @@
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var settings = {
@@ -23,6 +24,11 @@ function run(ionic, argv, rawCliArguments) {
   }).then(function() {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList);
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 18693ddc0d..696b4fbea9 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -5,6 +5,7 @@ var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var cordovaRunEmulateOptions = {
@@ -54,7 +55,8 @@ function run(ionic, argv, rawCliArguments) {
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
-    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+    log.error('✗ You cannot run iOS unless you are on Mac OSX.');
+    return Q();
   }
 
   var promiseList = []
@@ -79,6 +81,11 @@ function run(ionic, argv, rawCliArguments) {
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index a1696b08b4..fd2103022f 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -71,6 +71,11 @@ function run(ionic, argv, rawCliArguments) {
       log.info('Removing platform from package.json file');
       return State.removePlatform(appDirectory, argumentName);
     }
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/plugin.js b/lib/ionic/plugin.js
index f5493e0735..5139387046 100644
--- a/lib/ionic/plugin.js
+++ b/lib/ionic/plugin.js
@@ -70,6 +70,11 @@ function run(ionic, argv, rawCliArguments) {
       log.info('Removing plugin from package.json file');
       return State.removePlugin(appDirectory, argumentName);
     }
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/prepare.js b/lib/ionic/prepare.js
index f780130e66..0270fd2f3c 100644
--- a/lib/ionic/prepare.js
+++ b/lib/ionic/prepare.js
@@ -3,6 +3,7 @@
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var settings = {
@@ -24,6 +25,11 @@ function run(ionic, argv, rawCliArguments) {
   .then(function() {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList);
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index b4387818c8..6f54c6f086 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -5,6 +5,7 @@ var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
+var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var cordovaRunEmulateOptions = {
@@ -54,7 +55,8 @@ function run(ionic, argv, rawCliArguments) {
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
-    return Q.reject('✗ You cannot run iOS unless you are on Mac OSX.');
+    log.error('✗ You cannot run iOS unless you are on Mac OSX.');
+    return Q();
   }
 
   var promiseList = []
@@ -79,6 +81,11 @@ function run(ionic, argv, rawCliArguments) {
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
+  })
+  .catch(function(ex) {
+    if (ex instanceof Error) {
+      log.error(ex);
+    }
   });
 }
 
diff --git a/spec/tasks/build.spec.js b/spec/tasks/build.spec.js
index 4fdf6a5d9c..1a563782b0 100644
--- a/spec/tasks/build.spec.js
+++ b/spec/tasks/build.spec.js
@@ -70,14 +70,13 @@ describe('build command', function() {
     it('should fail if the system is not Mac and the platform is iOS', function(done) {
       spyOn(os, 'platform').andReturn('windows');
 
-      build.run(null, argv, rawCliArguments).catch(function(error) {
-        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith('✗ You cannot run iOS unless you are on Mac OSX.');
         done();
       });
     });
   });
 
-
   describe('cordova platform and plugin checks', function() {
 
     var appDirectory = '/ionic/app/path';
@@ -91,11 +90,11 @@ describe('build command', function() {
 
       spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
       spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
-      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
     });
 
     it('should try to install the cordova platform if it is not installed', function(done) {
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(false);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       build.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.installPlatform).toHaveBeenCalledWith('ios');
@@ -106,6 +105,7 @@ describe('build command', function() {
 
     it('should not try to install the cordova platform if it is installed', function(done) {
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       build.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.installPlatform).not.toHaveBeenCalledWith();
@@ -116,6 +116,7 @@ describe('build command', function() {
     it('should install plugins if they are not installed', function(done) {
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(false);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       build.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
@@ -127,6 +128,7 @@ describe('build command', function() {
     it('should not install plugins if they are installed', function(done) {
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       build.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.arePluginsInstalled).toHaveBeenCalledWith(appDirectory);
@@ -134,5 +136,29 @@ describe('build command', function() {
         done();
       });
     });
+
+    it('should fail if any functions throw', function(done) {
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      build.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var error = 1;
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      build.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
+    });
   });
 });
diff --git a/spec/tasks/compile.spec.js b/spec/tasks/compile.spec.js
index eaeae971e1..5a8de1c475 100644
--- a/spec/tasks/compile.spec.js
+++ b/spec/tasks/compile.spec.js
@@ -31,8 +31,18 @@ describe('compile command', function() {
       var error = new Error('error occurred');
       spyOn(ConfigXml, 'setConfigXml').andReturn(Q.reject(error));
 
-      compile.run({}, argv, rawCliArguments).catch(function(ex) {
-        expect(ex).toEqual(error);
+      compile.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if error is not instanceof Error', function(done) {
+      var error = 1;
+      spyOn(ConfigXml, 'setConfigXml').andReturn(Q.reject(error));
+
+      compile.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
         done();
       });
     });
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index f3487234a5..9529948092 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -57,7 +57,7 @@ describe('emulate command', function() {
     it('should default to iOS for the platform', function(done) {
       spyOn(os, 'platform').andReturn('darwin');
 
-      emulate.run(null, argv, rawCliArguments).catch(function() {
+      emulate.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.isPlatformInstalled).toHaveBeenCalledWith('ios', appDirectory);
         done();
       });
@@ -66,8 +66,8 @@ describe('emulate command', function() {
     it('should fail if the system is not Mac and the platform is iOS', function(done) {
       spyOn(os, 'platform').andReturn('windows');
 
-      emulate.run(null, argv, rawCliArguments).catch(function(error) {
-        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith('✗ You cannot run iOS unless you are on Mac OSX.');
         done();
       });
     });
@@ -140,6 +140,38 @@ describe('emulate command', function() {
       spyOn(os, 'platform').andReturn('darwin');
     });
 
+    it('should fail if any functions throw', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      emulate.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 1;
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      emulate.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it('should execute the command against the cordova util', function(done) {
       var processArguments = ['node', 'ionic', 'emulate', '-n'];
       var rawCliArguments = processArguments.slice(2);
diff --git a/spec/tasks/platform.spec.js b/spec/tasks/platform.spec.js
index 0a2540dd10..f177afc452 100644
--- a/spec/tasks/platform.spec.js
+++ b/spec/tasks/platform.spec.js
@@ -48,13 +48,41 @@ describe('platform command', function() {
 
     beforeEach(function() {
       spyOn(process, 'cwd').andReturn(appDirectory);
-      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+    });
+
+    it('should fail if any functions throw', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      platform.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 1;
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      platform.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
     });
 
     it('should use commands provided', function(done) {
       var processArguments = ['node', 'ionic', 'platform', '-n'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       platform.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['platform', '-n']);
@@ -62,6 +90,27 @@ describe('platform command', function() {
       });
     });
 
+    it('should not save if no-save flag is provided', function(done) {
+      var processArguments = ['node', 'ionic', 'platform', 'add', 'ios', '--nosave'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(IonicResources, 'copyIconFilesIntoResources').andReturn(Q(true));
+      spyOn(IonicResources, 'addIonicIcons').andReturn(Q(true));
+      spyOn(State, 'savePlatform');
+      spyOn(State, 'removePlatform');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      platform.run(null, argv, rawCliArguments).then(function() {
+        expect(IonicResources.copyIconFilesIntoResources).toHaveBeenCalledWith(appDirectory);
+        expect(IonicResources.addIonicIcons).toHaveBeenCalledWith(appDirectory, 'ios');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['platform', 'add', 'ios', '--nosave']);
+        expect(State.savePlatform).not.toHaveBeenCalled();
+        expect(State.removePlatform).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it('should execute cordova using commands provided', function(done) {
       var processArguments = ['node', 'ionic', 'platform', 'add', 'ios'];
       var rawCliArguments = processArguments.slice(2);
@@ -71,6 +120,7 @@ describe('platform command', function() {
       spyOn(IonicResources, 'addIonicIcons').andReturn(Q(true));
       spyOn(State, 'savePlatform');
       spyOn(State, 'removePlatform');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       platform.run(null, argv, rawCliArguments).then(function() {
         expect(IonicResources.copyIconFilesIntoResources).toHaveBeenCalledWith(appDirectory);
@@ -91,6 +141,7 @@ describe('platform command', function() {
       spyOn(IonicResources, 'addIonicIcons').andReturn(Q(true));
       spyOn(State, 'savePlatform');
       spyOn(State, 'removePlatform');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
 
       platform.run(null, argv, rawCliArguments).then(function() {
         expect(IonicResources.copyIconFilesIntoResources).not.toHaveBeenCalled();
diff --git a/spec/tasks/plugin.spec.js b/spec/tasks/plugin.spec.js
index 89c034f738..352576efb0 100644
--- a/spec/tasks/plugin.spec.js
+++ b/spec/tasks/plugin.spec.js
@@ -65,6 +65,52 @@ describe('plugin command', function() {
       });
     });
 
+    it('should fail if any functions throw', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      plugin.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 1;
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      plugin.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should not save if nosave flag is passed', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello', '--nosave'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(State, 'savePlugin');
+      spyOn(State, 'removePlugin');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      plugin.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
+          ['plugin', 'add', 'thing', '--variable', 'hello', '--nosave']);
+        expect(State.savePlugin).not.toHaveBeenCalled();
+        expect(State.removePlugin).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it('should add plugins', function(done) {
       var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello'];
       var rawCliArguments = processArguments.slice(2);
diff --git a/spec/tasks/prepare.spec.js b/spec/tasks/prepare.spec.js
index 1cf646b07b..0330dfca60 100644
--- a/spec/tasks/prepare.spec.js
+++ b/spec/tasks/prepare.spec.js
@@ -41,5 +41,27 @@ describe('prepare command', function() {
         done();
       });
     });
+
+    it('should fail if any functions throw', function(done) {
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      prepare.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 1;
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      prepare.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
+    });
   });
 });
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
index d57b3d0f4e..a2ee1c1190 100644
--- a/spec/tasks/run.spec.js
+++ b/spec/tasks/run.spec.js
@@ -4,7 +4,6 @@ var Q = require('q');
 var optimist = require('optimist');
 var cordovaUtils = require('../../lib/utils/cordova');
 var os = require('os');
-var childProcess = require('child_process');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
@@ -70,8 +69,8 @@ describe('run command', function() {
     it('should fail if the system is not Mac and the platform is iOS', function(done) {
       spyOn(os, 'platform').andReturn('windows');
 
-      run.run(null, argv, rawCliArguments).catch(function(error) {
-        expect(error).toEqual('✗ You cannot run iOS unless you are on Mac OSX.');
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith('✗ You cannot run iOS unless you are on Mac OSX.');
         done();
       });
     });
@@ -144,7 +143,6 @@ describe('run command', function() {
 
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
-      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
     it('should execute the command against the cordova util', function(done) {
@@ -152,18 +150,49 @@ describe('run command', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
       run.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', '-n', 'ios'], false, true);
         done();
       });
     });
 
+    it('should fail if any functions throw', function(done) {
+      var processArguments = ['node', 'ionic', 'run', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = new Error('error occurred');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      run.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).toHaveBeenCalledWith(error);
+        done();
+      });
+    });
+
+    it('should fail if any functions throw and not log if not an instance of an Error', function(done) {
+      var processArguments = ['node', 'ionic', 'run', '-n'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 1;
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q.reject(error));
+
+      run.run({}, argv, rawCliArguments).then(function() {
+        expect(log.error).not.toHaveBeenCalled();
+        done();
+      });
+    });
 
     it('should execute the command against the cordova util using the platform provided', function(done) {
       var processArguments = ['node', 'ionic', 'run', 'android'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+
       run.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
         done();
@@ -178,6 +207,7 @@ describe('run command', function() {
       spyOn(cordovaUtils, 'setupLiveReload').andReturn(Q({
         blah: 'blah'
       }));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       run.run(null, argv, rawCliArguments).then(function() {
         expect(cordovaUtils.setupLiveReload).toHaveBeenCalledWith(argv, appDirectory);

From 1b461af79666a2966aaa459ea594e833ddedc268 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 7 Jul 2016 16:00:51 -0500
Subject: [PATCH 1010/1100] chore(): move all extend references to a single
 util file.

---
 lib/config/commands.js | 2 +-
 lib/ionic/add.js       | 2 +-
 lib/ionic/address.js   | 2 +-
 lib/ionic/build.js     | 2 +-
 lib/ionic/compile.js   | 2 +-
 lib/ionic/config.js    | 2 +-
 lib/ionic/docs.js      | 2 +-
 lib/ionic/emulate.js   | 2 +-
 lib/ionic/generate.js  | 2 +-
 lib/ionic/help.js      | 2 +-
 lib/ionic/hooks.js     | 2 +-
 lib/ionic/info.js      | 2 +-
 lib/ionic/io.js        | 2 +-
 lib/ionic/lib.js       | 2 +-
 lib/ionic/link.js      | 2 +-
 lib/ionic/list.js      | 2 +-
 lib/ionic/login.js     | 2 +-
 lib/ionic/package.js   | 2 +-
 lib/ionic/platform.js  | 2 +-
 lib/ionic/plugin.js    | 2 +-
 lib/ionic/prepare.js   | 2 +-
 lib/ionic/push.js      | 2 +-
 lib/ionic/remove.js    | 2 +-
 lib/ionic/resources.js | 2 +-
 lib/ionic/run.js       | 2 +-
 lib/ionic/security.js  | 2 +-
 lib/ionic/serve.js     | 2 +-
 lib/ionic/service.js   | 2 +-
 lib/ionic/share.js     | 2 +-
 lib/ionic/start.js     | 2 +-
 lib/ionic/state.js     | 2 +-
 lib/ionic/upload.js    | 2 +-
 lib/utils/extend.js    | 4 ++++
 33 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 lib/utils/extend.js

diff --git a/lib/config/commands.js b/lib/config/commands.js
index bb25a20529..b0e132aa35 100644
--- a/lib/config/commands.js
+++ b/lib/config/commands.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var path = require('path');
 
 var COMMAND_DIRECTORY = 'ionic';
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index b8892afe01..c78bc8ff6a 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -2,7 +2,7 @@
 
 require('colors');
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var childProcess = require('child_process');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
diff --git a/lib/ionic/address.js b/lib/ionic/address.js
index 880932f1b6..c9a31022c7 100644
--- a/lib/ionic/address.js
+++ b/lib/ionic/address.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var IonicConfig = IonicAppLib.config;
 var Serve = IonicAppLib.serve;
diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index a2ff942961..cade8f6daa 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
diff --git a/lib/ionic/compile.js b/lib/ionic/compile.js
index f66ab97162..bde2e8b27d 100644
--- a/lib/ionic/compile.js
+++ b/lib/ionic/compile.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index c06c35eeab..0b46b1d9d6 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ioLib = IonicAppLib.ioConfig;
 var IonicProject = IonicAppLib.project;
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 6aa8b0a4a1..374401ed02 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -2,7 +2,7 @@
 
 var prompt = require('prompt');
 var _ = require('underscore');
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicDocs = require('./resources/docs.json');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 696b4fbea9..22b7472a69 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index f98d760daa..7d3c7906e2 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var path = require('path');
 var ionicAppLib = require('ionic-app-lib');
 var log = ionicAppLib.logging.logger;
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 9aa180dccd..1005ed78cd 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var helpUtil = require('../utils/help');
 
 var settings = {
diff --git a/lib/ionic/hooks.js b/lib/ionic/hooks.js
index 0b5b9f67d1..122a965058 100644
--- a/lib/ionic/hooks.js
+++ b/lib/ionic/hooks.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var shelljs = require('shelljs');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index db3692644f..3953c0a003 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var path = require('path');
 var IonicAppLib = require('ionic-app-lib');
 var Info = IonicAppLib.info;
diff --git a/lib/ionic/io.js b/lib/ionic/io.js
index 32510d3fc7..13d18453f5 100644
--- a/lib/ionic/io.js
+++ b/lib/ionic/io.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ioLib = IonicAppLib.ioConfig;
 var IonicProject = IonicAppLib.project;
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 783b7c24e3..bb3791659c 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -2,7 +2,7 @@
 
 require('colors');
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
 var shell = require('shelljs');
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index 31f92016b0..debf0637ef 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
 var IonicAppLib = require('ionic-app-lib');
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
index e4019c9108..ab264cbb2e 100644
--- a/lib/ionic/list.js
+++ b/lib/ionic/list.js
@@ -2,7 +2,7 @@
 
 require('colors');
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var path = require('path');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 0883e9201b..3a42709af4 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var Login = IonicAppLib.login;
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 3cb921a6ea..7283be0d7b 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -2,7 +2,7 @@
 
 var path = require('path');
 var _ = require('underscore');
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var Q = require('q');
 var moment = require('moment');
 var expandTilde = require('expand-tilde');
diff --git a/lib/ionic/platform.js b/lib/ionic/platform.js
index fd2103022f..153be064e1 100644
--- a/lib/ionic/platform.js
+++ b/lib/ionic/platform.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var IonicResources = IonicAppLib.resources;
 var ConfigXml = IonicAppLib.configXml;
diff --git a/lib/ionic/plugin.js b/lib/ionic/plugin.js
index 5139387046..4bb3c57796 100644
--- a/lib/ionic/plugin.js
+++ b/lib/ionic/plugin.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var State = IonicAppLib.state;
diff --git a/lib/ionic/prepare.js b/lib/ionic/prepare.js
index 0270fd2f3c..77cfda0613 100644
--- a/lib/ionic/prepare.js
+++ b/lib/ionic/prepare.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 5f93b4bcbe..c9e927c7d4 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
 var parseUrl = require('url').parse;
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index b4f96fd4b0..e90bd3200e 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var childProcess = require('child_process');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 9f02faad48..6497d161cb 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var IonicResources = IonicAppLib.resources;
 var appLibUtils = IonicAppLib.utils;
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 6f54c6f086..dc47b13b9b 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 42b7fdbfa3..728b08e416 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -5,7 +5,7 @@ var path = require('path');
 var Q = require('q');
 var expandTilde = require('expand-tilde');
 var _ = require('underscore');
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var fail = IonicAppLib.utils.fail;
 var Login = IonicAppLib.login;
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 147ba75488..ba9e68b973 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
 var events = IonicAppLib.events;
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index bdf430c6bc..9a10490101 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -4,7 +4,7 @@ var fs = require('fs');
 var path = require('path');
 var exec = require('child_process').exec;
 var _ = require('underscore');
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var bower = require('../utils/bower');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index cbdb8c909e..f61be09fee 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var LoginTask = require('./login');
 var IonicAppLib = require('ionic-app-lib');
 var IonicProject = IonicAppLib.project;
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index 37eeaf2464..bc891fd7b2 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,7 +1,7 @@
 require('shelljs/global');
 require('colors');
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var fs = require('fs');
 var Q = require('q');
 var templateUtils = require('../utils/templates');
diff --git a/lib/ionic/state.js b/lib/ionic/state.js
index c5bbf2072e..daa4d8cfb9 100644
--- a/lib/ionic/state.js
+++ b/lib/ionic/state.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var shelljs = require('shelljs');
 var IonicAppLib = require('ionic-app-lib');
 var IonicProject = IonicAppLib.project;
diff --git a/lib/ionic/upload.js b/lib/ionic/upload.js
index 5ac346937d..ee47ffa96b 100644
--- a/lib/ionic/upload.js
+++ b/lib/ionic/upload.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
+var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var Login = IonicAppLib.login;
 var LoginTask = require('./login');
diff --git a/lib/utils/extend.js b/lib/utils/extend.js
new file mode 100644
index 0000000000..e150c391d7
--- /dev/null
+++ b/lib/utils/extend.js
@@ -0,0 +1,4 @@
+'use strict';
+
+// This module is used to allow use of the extend command
+module.exports = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle

From 92dfc6c3b9ce847fdd2eae8639636a0a75d4c730 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 7 Jul 2016 16:18:29 -0500
Subject: [PATCH 1011/1100] chore(tests): add tests to increase coverage on
 login, plugin and resources.

---
 spec/tasks/login.spec.js     | 21 +++++++++++++++++++++
 spec/tasks/plugin.spec.js    | 18 ++++++++++++++++++
 spec/tasks/resources.spec.js | 18 ++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/spec/tasks/login.spec.js b/spec/tasks/login.spec.js
index 3608518d35..aec4cd21c6 100644
--- a/spec/tasks/login.spec.js
+++ b/spec/tasks/login.spec.js
@@ -156,5 +156,26 @@ describe('login command', function() {
         done();
       });
     });
+
+    it('should ask for email and password and eject an error if error', function(done) {
+      var processArguments = ['node', 'ionic', 'login'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+      var error = 'error logging in';
+
+      spyOn(log, 'info');
+      spyOn(prompt, 'start');
+      spyOn(prompt, 'get').andCallFake(function(schema, callback) {
+        callback(error);
+      });
+
+      var promptForLogin = login.__get__('promptForLogin');
+
+      promptForLogin(argv).catch(function(error) {
+        expect(prompt.get).toHaveBeenCalled();
+        expect(error).toEqual(error);
+        done();
+      });
+    });
   });
 });
diff --git a/spec/tasks/plugin.spec.js b/spec/tasks/plugin.spec.js
index 352576efb0..4160aed14d 100644
--- a/spec/tasks/plugin.spec.js
+++ b/spec/tasks/plugin.spec.js
@@ -111,6 +111,24 @@ describe('plugin command', function() {
       });
     });
 
+    it('should add array of variables', function(done) {
+      var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello', '--variable', 'man'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(State, 'savePlugin');
+      spyOn(State, 'removePlugin');
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+
+      plugin.run(null, argv, rawCliArguments).then(function() {
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(
+          ['plugin', 'add', 'thing', '--variable', 'hello', '--variable', 'man']);
+        expect(State.savePlugin).toHaveBeenCalledWith(appDirectory, 'thing', ['hello', 'man']);
+        expect(State.removePlugin).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it('should add plugins', function(done) {
       var processArguments = ['node', 'ionic', 'plugin', 'add', 'thing', '--variable', 'hello'];
       var rawCliArguments = processArguments.slice(2);
diff --git a/spec/tasks/resources.spec.js b/spec/tasks/resources.spec.js
index 0103984c4e..1be3c72e73 100644
--- a/spec/tasks/resources.spec.js
+++ b/spec/tasks/resources.spec.js
@@ -65,6 +65,24 @@ describe('resources command', function() {
       });
     });
 
+    it('should fail if applib generate fails and not log error if not instanceof Error', function(done) {
+      var processArguments = ['node', 'ionic', 'resources'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      var error = 'an error occurred';
+      spyOn(process, 'cwd').andReturn('/current/directory');
+      spyOn(Project, 'load');
+      spyOn(IonicResources, 'generate').andReturn(Q.reject(error));
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      resources.run(null, argv, rawCliArguments).then(function() {
+        expect(appLibUtils.fail).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
     it('should pass platforms on to the applib generate', function(done) {
       var processArguments = ['node', 'ionic', 'resources', '--icon'];
       var rawCliArguments = processArguments.slice(2);

From 1d5d3ad1da06fc23a47db19f4562b7f66b65b0f1 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 11 Jul 2016 10:35:55 -0500
Subject: [PATCH 1012/1100] chore(): add eslintignore file and fix eslint
 errors.

---
 .eslintignore           | 1 +
 spec/tasks/info.spec.js | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .eslintignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000..4ebc8aea50
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+coverage
diff --git a/spec/tasks/info.spec.js b/spec/tasks/info.spec.js
index 3d532fd2c7..0c95995d97 100644
--- a/spec/tasks/info.spec.js
+++ b/spec/tasks/info.spec.js
@@ -5,7 +5,6 @@ var info = require('../../lib/ionic/info');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
 var appLibInfo = IonicAppLib.info;
-var log = IonicAppLib.logging.logger;
 
 describe('info command', function() {
   describe('command settings', function() {

From e673f1378d41e9472d2cf9506d6f768c094d74e2 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 11 Jul 2016 14:18:00 -0500
Subject: [PATCH 1013/1100] chore(): update eslint and istanbul versions.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c1f3982b55..7481fb3f2f 100644
--- a/package.json
+++ b/package.json
@@ -85,9 +85,9 @@
   "devDependencies": {
     "conventional-changelog-cli": "1.1.1",
     "coveralls": "^2.2.0",
-    "eslint": "^2.8.0",
+    "eslint": "^3.0.1",
     "github": "0.2.4",
-    "istanbul": "^0.4.3",
+    "istanbul": "^0.4.4",
     "jasmine-node": "1.14.5",
     "mock-require": "1.3.0",
     "rewire": "2.5.1"

From eeba919de63598cda03bb14a0ee63c7b4bc5ef47 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 25 Jul 2016 15:42:37 -0500
Subject: [PATCH 1014/1100] chore(): update package.json and CHANGELOG.

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88619bcad8..483626d7ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.0.0-beta.33"></a>
+# [2.0.0-beta.33](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.32...v2.0.0-beta.33) (2016-07-25)
+
+
+### Bug Fixes
+
+* **cordova:** ensure that each cordova command will properly catch wh… ([#1154](https://github.com/driftyco/ionic-cli/issues/1154)) ([142128a](https://github.com/driftyco/ionic-cli/commit/142128a))
+
+
+
 <a name="2.0.0-beta.32"></a>
 # [2.0.0-beta.32](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.31...v2.0.0-beta.32) (2016-06-23)
 
diff --git a/package.json b/package.json
index 7481fb3f2f..88abedcaa0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.32",
+  "version": "2.0.0-beta.33",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.18",
+    "ionic-app-lib": "2.0.0-beta.19",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 3b7c4c08a704252de48d9453b8ecc5d5ecb3d109 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 27 Jul 2016 10:41:18 -0500
Subject: [PATCH 1015/1100] Updated to beta 34 because of issues with bundling
 dependencies in npm 3.

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 483626d7ca..a8805113fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="2.0.0-beta.34"></a>
+# [2.0.0-beta.34](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.33...v2.0.0-beta.34) (2016-07-27)
+
+
+### Bug Fixes
+
+* **npm:** republish with npm 2 to fix bundled dependencies
+
 <a name="2.0.0-beta.33"></a>
 # [2.0.0-beta.33](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.32...v2.0.0-beta.33) (2016-07-25)
 
diff --git a/package.json b/package.json
index 88abedcaa0..8478c8cbfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.33",
+  "version": "2.0.0-beta.34",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From cc4ee640338ac90040dd9f54e6b74a272be2e7f1 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 27 Jul 2016 10:54:43 -0500
Subject: [PATCH 1016/1100] Updated to fix npm bundled dependencies.

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8805113fb..8d5557d55b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="2.0.0-beta.35"></a>
+# [2.0.0-beta.35](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.34...v2.0.0-beta.35) (2016-07-27)
+
+
+### Bug Fixes
+
+* **npm:** republish with npm 2 to fix bundled dependencies (again)
+
 <a name="2.0.0-beta.34"></a>
 # [2.0.0-beta.34](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.33...v2.0.0-beta.34) (2016-07-27)
 
diff --git a/package.json b/package.json
index 8478c8cbfb..8a09e2868e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.34",
+  "version": "2.0.0-beta.35",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 930857718d7cd8a09316d26f1689e5ac822e4271 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 2 Aug 2016 15:50:19 -0500
Subject: [PATCH 1017/1100] fix(stats): Updated cli to only track on valid
 commands.

---
 lib/cli.js       | 6 +++---
 spec/cli.spec.js | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 1cc1b13e53..ca1461b0f1 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -119,9 +119,6 @@ Cli.run = function run(processArgv) {
       });
     }
 
-    // Gather stats on the current command execution
-    IonicStats.t();
-
     var taskName = argv._[0];
     var task = Cli.getTaskSettingsByName(taskName);
     log.debug('Task:', task);
@@ -134,6 +131,9 @@ Cli.run = function run(processArgv) {
 
     var booleanOptions = Cli.getListOfBooleanOptions(task.options);
 
+    // Gather stats on the current command execution
+    IonicStats.t();
+
     // Remove all possible task boolean options from the args
     argv = optimist(rawCliArguments)
       .boolean(booleanOptions)
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 7c49e3a4d9..e430a477ec 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -162,6 +162,15 @@ describe('Cli', function() {
         });
       });
 
+      it('should not track stats for cli for a bogus command', function(done) {
+
+        IonicCli.run(['node', 'bin/ionic', 'helper'])
+        .then(function() {
+          expect(IonicStats.t).not.toHaveBeenCalled();
+          done();
+        });
+      });
+
       it('should change cwd to project root for project tasks', function(done) {
         var processArguments = ['node', 'bin/ionic', 'fake'];
         var rawCliArguments = processArguments.slice(2);

From cb01e1d92711ca61d6d3a9443284d9c2d61676a3 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 3 Aug 2016 11:54:44 -0500
Subject: [PATCH 1018/1100] fix(): change all exec commands within add, remove,
 and service to use sync.

---
 lib/ionic/add.js          | 21 ++++++------
 lib/ionic/remove.js       | 20 ++++++------
 lib/ionic/service.js      | 68 ++++++++++++++++++++++++---------------
 spec/tasks/add.spec.js    | 14 ++++----
 spec/tasks/remove.spec.js | 14 ++++----
 5 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index c78bc8ff6a..50f81105b5 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -23,18 +23,17 @@ var settings = {
 function installBowerComponent(componentName) {
   var bowerInstallCommand = 'bower install --save-dev ' + componentName;
 
-  var result = childProcess.exec(bowerInstallCommand);
-
-  if (result.code !== 0) {
-
-    // Error happened, report it.
-    var errorMessage = 'Bower error, check that "'.red.bold + componentName.verbose + '"'.red.bold +
-      ' exists,'.red.bold + '\nor try running "'.red.bold + bowerInstallCommand.verbose + '" for more info.'.red.bold;
+  try {
+    var result = childProcess.execSync(bowerInstallCommand);
+    if (result.code === 0) {
+      return log.info('Bower component installed - ' + componentName);
+    }
+  } catch (e) {} // eslint-disable-line no-empty
 
-    appLibUtils.fail(errorMessage, 'add');
-  } else {
-    log.info('Bower component installed - ' + componentName);
-  }
+  // Error happened, report it.
+  var errorMessage = 'Bower error, check that "'.red.bold + componentName + '"'.red.bold +
+    ' exists,'.red.bold + '\nor try running "'.red.bold + bowerInstallCommand + '" for more info.'.red.bold;
+  appLibUtils.fail(errorMessage, 'add');
 }
 
 /**
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index e90bd3200e..2feccf90a3 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -21,17 +21,19 @@ var settings = {
 function uninstallBowerComponent(componentName) {
   var bowerUninstallCommand = 'bower uninstall --save-dev ' + componentName;
 
-  var result = childProcess.exec(bowerUninstallCommand);
+  try {
+    var result = childProcess.execSync(bowerUninstallCommand);
 
-  if (result.code !== 0) {
-    var errorMessage = 'Failed to find the bower component "'.red.bold + componentName.verbose +
-      '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
+    if (result.code === 0) {
+      var message = 'Bower component removed - ' + componentName;
+      return log.info(message.red);
+    }
+  } catch (e) {} // eslint-disable-line no-empty
 
-    appLibUtils.fail(errorMessage, 'remove');
-  } else {
-    var message = 'Bower component removed - ' + componentName;
-    log.info(message.red);
-  }
+  var errorMessage = 'Failed to find the bower component "'.red.bold + componentName +
+    '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
+
+  appLibUtils.fail(errorMessage, 'remove');
 }
 
 /**
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 9a10490101..0cdc5878f0 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -2,7 +2,7 @@
 
 var fs = require('fs');
 var path = require('path');
-var exec = require('child_process').exec;
+var execSync = require('child_process').execSync;
 var _ = require('underscore');
 var extend = require('../utils/extend');
 var bower = require('../utils/bower');
@@ -59,29 +59,35 @@ function addServiceToIonicJson(serviceName) {
 
 function installBowerComponent(serviceName) {
   var bowerInstallCommand = 'bower link ionic-service-' + serviceName;
-  var result = exec(bowerInstallCommand);
 
-  if (result.code !== 0) {
+  try {
+    var result = execSync(bowerInstallCommand);
 
-    // Error happened, report it.
-    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
-      '"'.bold + '.\nAre you sure it exists?'.bold;
-    fail(errorMessage, 'service');
-  } else {
-    addServiceToIonicJson(serviceName);
-  }
+    if (result.code !== 0) {
+      return addServiceToIonicJson(serviceName);
+    }
+  } catch (e) {} // eslint-disable-line no-empty
+
+  // Error happened, report it.
+  var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
+    '"'.bold + '.\nAre you sure it exists?'.bold;
+  fail(errorMessage, 'service');
 }
 
 function uninstallBowerComponent(serviceName) {
   var bowerUninstallCommand = 'bower unlink ionic-service-' + serviceName;
 
-  var result = exec(bowerUninstallCommand);
+  try {
+    var result = execSync(bowerUninstallCommand);
 
-  if (result.code !== 0) {
-    var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
-      '"'.bold + '.\nAre you sure it exists?'.bold;
-    fail(errorMessage, 'service');
-  }
+    if (result.code !== 0) {
+      return;
+    }
+  } catch (e) {} // eslint-disable-line no-empty
+
+  var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
+    '"'.bold + '.\nAre you sure it exists?'.bold;
+  fail(errorMessage, 'service');
 }
 
 function getBowerComponentsLocation() {
@@ -117,12 +123,17 @@ function installBowerPlugins(directory, serviceName) {
     log.info('Installing cordova plugin - ' + plugin.name + ' (' + plugin.id + ')');
     var installPluginCmd = 'ionic plugin add ' + plugin.uri;
     log.info(installPluginCmd);
-    var pluginInstallResult = exec(installPluginCmd);
 
-    if (pluginInstallResult.code !== 0) {
-      var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
-      fail(errorMessage, 'service');
-    }
+    try {
+      var pluginInstallResult = execSync(installPluginCmd);
+
+      if (pluginInstallResult.code === 0) {
+        return;
+      }
+    } catch (e) {} // eslint-disable-line no-empty
+
+    var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
+    fail(errorMessage, 'service');
   });
 }
 
@@ -131,12 +142,17 @@ function uninstallBowerPlugins(bowerJson) {
     log.info('Uninstalling cordova plugin -  ' + plugin.name);
     var uninstallPluginCmd = 'ionic plugin rm ' + plugin.id;
     log.info(uninstallPluginCmd);
-    var pluginRemoveResult = exec(uninstallPluginCmd);
 
-    if (pluginRemoveResult.code !== 0) {
-      var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
-      fail(errorMessage, 'service');
-    }
+    try {
+      var pluginRemoveResult = execSync(uninstallPluginCmd);
+
+      if (pluginRemoveResult.code === 0) {
+        return;
+      }
+    } catch (e) {} // eslint-disable-line no-empty
+
+    var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
+    fail(errorMessage, 'service');
   });
 }
 
diff --git a/spec/tasks/add.spec.js b/spec/tasks/add.spec.js
index 4cf2811309..80a7324ac2 100644
--- a/spec/tasks/add.spec.js
+++ b/spec/tasks/add.spec.js
@@ -36,7 +36,7 @@ describe('add command', function() {
     var argv = optimist(rawCliArguments).argv;
 
     beforeEach(function() {
-      spyOn(childProcess, 'exec');
+      spyOn(childProcess, 'execSync');
     });
 
     it('should fail if bower is not installed', function() {
@@ -111,23 +111,23 @@ describe('add command', function() {
 
   describe('installBowerComponent function', function() {
 
-    it('should call childProcess exec to install the bower component', function() {
+    it('should call childProcess execSync to install the bower component', function() {
       spyOn(log, 'info');
-      spyOn(childProcess, 'exec').andReturn({ code: 0 });
+      spyOn(childProcess, 'execSync').andReturn({ code: 0 });
 
       var installBowerComponent = add.__get__('installBowerComponent');
       installBowerComponent('thing');
-      expect(childProcess.exec).toHaveBeenCalledWith('bower install --save-dev thing');
+      expect(childProcess.execSync).toHaveBeenCalledWith('bower install --save-dev thing');
       expect(log.info).toHaveBeenCalledWith('Bower component installed - thing');
     });
 
-    it('should call childProcess exec and call util fail if result.code is not equal to 0', function() {
+    it('should call childProcess execSync and call util fail if result.code is not equal to 0', function() {
       spyOn(appLibUtils, 'fail');
-      spyOn(childProcess, 'exec').andReturn({ code: 1 });
+      spyOn(childProcess, 'execSync').andReturn({ code: 1 });
 
       var installBowerComponent = add.__get__('installBowerComponent');
       installBowerComponent('thing');
-      expect(childProcess.exec).toHaveBeenCalledWith('bower install --save-dev thing');
+      expect(childProcess.execSync).toHaveBeenCalledWith('bower install --save-dev thing');
       expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String), 'add');
     });
   });
diff --git a/spec/tasks/remove.spec.js b/spec/tasks/remove.spec.js
index cad7420485..58aef91f3d 100644
--- a/spec/tasks/remove.spec.js
+++ b/spec/tasks/remove.spec.js
@@ -36,7 +36,7 @@ describe('remove command', function() {
     var argv = optimist(rawCliArguments).argv;
 
     beforeEach(function() {
-      spyOn(childProcess, 'exec');
+      spyOn(childProcess, 'execSync');
     });
 
     it('should fail if bower is not installed', function() {
@@ -112,23 +112,23 @@ describe('remove command', function() {
 
   describe('uninstallBowerComponent function', function() {
 
-    it('should call childProcess exec to install the bower component', function() {
+    it('should call childProcess execSync to install the bower component', function() {
       spyOn(log, 'info');
-      spyOn(childProcess, 'exec').andReturn({ code: 0 });
+      spyOn(childProcess, 'execSync').andReturn({ code: 0 });
 
       var uninstallBowerComponent = remove.__get__('uninstallBowerComponent');
       uninstallBowerComponent('thing');
-      expect(childProcess.exec).toHaveBeenCalledWith('bower uninstall --save-dev thing');
+      expect(childProcess.execSync).toHaveBeenCalledWith('bower uninstall --save-dev thing');
       expect(log.info).toHaveBeenCalledWith(jasmine.any(String));
     });
 
-    it('should call childProcess exec and call util fail if result.code is not equal to 0', function() {
+    it('should call childProcess execSync and call util fail if result.code is not equal to 0', function() {
       spyOn(appLibUtils, 'fail');
-      spyOn(childProcess, 'exec').andReturn({ code: 1 });
+      spyOn(childProcess, 'execSync').andReturn({ code: 1 });
 
       var uninstallBowerComponent = remove.__get__('uninstallBowerComponent');
       uninstallBowerComponent('thing');
-      expect(childProcess.exec).toHaveBeenCalledWith('bower uninstall --save-dev thing');
+      expect(childProcess.execSync).toHaveBeenCalledWith('bower uninstall --save-dev thing');
       expect(appLibUtils.fail).toHaveBeenCalledWith(jasmine.any(String), 'remove');
     });
   });

From afc2a21f86b99aec572aca78622ce232885b4a4d Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 3 Aug 2016 12:22:16 -0500
Subject: [PATCH 1019/1100] chore(): Updated changelog and package.json
 versioning.

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d5557d55b..ae94bf6050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="2.0.0-beta.36"></a>
+# [2.0.0-beta.36](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.35...v2.0.0-beta.36) (2016-08-03)
+
+
+### Bug Fixes
+
+* **stats:** Updated cli to only track on valid commands. ([9308577](https://github.com/driftyco/ionic-cli/commit/9308577))
+* change all exec commands within add, remove, and service to use sync. ([cb01e1d](https://github.com/driftyco/ionic-cli/commit/cb01e1d))
+
+
+
 <a name="2.0.0-beta.35"></a>
 # [2.0.0-beta.35](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.34...v2.0.0-beta.35) (2016-07-27)
 
diff --git a/package.json b/package.json
index 8a09e2868e..00feddd0fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 2bd7aeea83fe86eafe69e5f83e1ac766c58bbb39 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 11 Aug 2016 09:59:40 -0500
Subject: [PATCH 1020/1100] fix(setup): add setup sass back as a command for v1
 projects.

---
 lib/config/commands.js   |   1 +
 lib/ionic/setup.js       |  44 +++++++++++++++++
 spec/tasks/setup.spec.js | 103 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+)
 create mode 100644 lib/ionic/setup.js
 create mode 100644 spec/tasks/setup.spec.js

diff --git a/lib/config/commands.js b/lib/config/commands.js
index b0e132aa35..e63c4ee280 100644
--- a/lib/config/commands.js
+++ b/lib/config/commands.js
@@ -32,6 +32,7 @@ var affordances = {
 var orderedListOfCommands = [
   'start',
   'serve',
+  'setup',
   'generate',
   'platform',
   'prepare',
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
new file mode 100644
index 0000000000..484db3daca
--- /dev/null
+++ b/lib/ionic/setup.js
@@ -0,0 +1,44 @@
+'use strict';
+
+require('colors');
+
+var extend = require('../utils/extend');
+var Q = require('q');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var log = IonicAppLib.logging.logger;
+var appLibSetup = IonicAppLib.setup;
+
+var settings = {
+  title: 'setup',
+  name: 'setup',
+  summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
+  args: {
+    '[sass]': 'Setup the project to use Sass CSS precompiling'
+  },
+  isProjectTask: true
+}
+
+function run(ionic, argv) {
+  var taskName = argv._[1];
+  if(!taskName) {
+    appLibUtils.fail('Missing setup task command.', 'setup');
+    return Q();
+  }
+  if (taskName !== 'sass') {
+    appLibUtils.fail('Invalid setup task command: ' + taskName, 'setup');
+    return Q();
+  }
+
+ return appLibSetup.sassSetup(process.cwd())
+    .then(function() {
+      log.info('Ionic setup complete'.green);
+    })
+    .catch(function(error) {
+      log.error('Error from setup - ' + error);
+    })
+};
+
+module.exports = extend(settings, {
+  run: run
+});
diff --git a/spec/tasks/setup.spec.js b/spec/tasks/setup.spec.js
new file mode 100644
index 0000000000..8fe940ff54
--- /dev/null
+++ b/spec/tasks/setup.spec.js
@@ -0,0 +1,103 @@
+'use strict';
+
+var optimist = require('optimist');
+var setup = require('../../lib/ionic/setup');
+var IonicAppLib = require('ionic-app-lib');
+var appLibUtils = IonicAppLib.utils;
+var appLibSetup = IonicAppLib.setup;
+var log = IonicAppLib.logging.logger;
+var Q = require('q');
+
+describe('setup command', function() {
+  describe('command settings', function() {
+    it('should have a title', function() {
+      expect(setup.title).toBeDefined();
+      expect(setup.title).not.toBeNull();
+      expect(setup.title.length).toBeGreaterThan(0);
+    });
+
+    it('should have a summary', function() {
+      expect(setup.summary).toBeDefined();
+      expect(setup.summary).not.toBeNull();
+      expect(setup.summary.length).toBeGreaterThan(0);
+    });
+
+    it('should have a an option of sass', function() {
+      expect(setup.args).toEqual(jasmine.any(Object));
+      expect(setup.args['[sass]']).toEqual(jasmine.any(String));
+    });
+  });
+
+  describe('run function', function() {
+    it('should fail if a command is not passed', function(done) {
+      var processArguments = ['node', 'ionic', 'setup'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      setup.run(null, argv, rawCliArguments).then(function() {
+        expect(appLibUtils.fail).toHaveBeenCalledWith('Missing setup task command.', 'setup');
+				done();
+			});
+    });
+
+    it('should fail if a an invalid command passed', function(done) {
+      var processArguments = ['node', 'ionic', 'setup', 'stuff'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(appLibUtils, 'fail');
+
+      // Expect failure
+      setup.run(null, argv, rawCliArguments).then(function() {
+				expect(appLibUtils.fail).toHaveBeenCalledWith('Invalid setup task command: stuff', 'setup');
+				done();
+			});
+    });
+
+    it('should succeed if sass was passed and sassSetup returns success', function(done) {
+      var processArguments = ['node', 'ionic', 'setup', 'sass'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+      var dir = '/project/dir/path';
+
+      spyOn(appLibUtils, 'fail');
+      spyOn(log, 'info');
+      spyOn(log, 'error');
+      spyOn(process, 'cwd').andReturn(dir);
+      spyOn(appLibSetup, 'sassSetup').andReturn(Q(true));
+
+      // Expect success
+      setup.run(null, argv, rawCliArguments).then(function() {
+				expect(appLibSetup.sassSetup).toHaveBeenCalledWith(dir);
+				expect(log.info).toHaveBeenCalled();
+				expect(log.error).not.toHaveBeenCalled();
+				done();
+			});
+
+    });
+
+    it('should fail if sass was passed and sassSetup returns an error', function(done) {
+      var processArguments = ['node', 'ionic', 'setup', 'sass'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+      var dir = '/project/dir/path';
+
+      spyOn(appLibUtils, 'fail');
+      spyOn(log, 'info');
+      spyOn(log, 'error');
+      spyOn(process, 'cwd').andReturn(dir);
+      spyOn(appLibSetup, 'sassSetup').andReturn(Q.reject('error occurred'));
+
+      // Expect success
+      setup.run(null, argv, rawCliArguments).then(function() {
+				expect(appLibSetup.sassSetup).toHaveBeenCalledWith(dir);
+				expect(log.info).not.toHaveBeenCalled();
+				expect(log.error).toHaveBeenCalled();
+				done();
+			});
+    });
+  });
+});

From cf9b2700de557c7e54649af87cd0c692471ac363 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 11 Aug 2016 10:11:16 -0500
Subject: [PATCH 1021/1100] chore(): update changelog and increment
 package.json

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae94bf6050..d9b569932b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.0.0-beta.37"></a>
+# [2.0.0-beta.37](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.36...v2.0.0-beta.37) (2016-08-11)
+
+
+### Bug Fixes
+
+* **setup:** add setup sass back as a command for v1 projects. ([2bd7aee](https://github.com/driftyco/ionic-cli/commit/2bd7aee))
+
+
+
 <a name="2.0.0-beta.36"></a>
 # [2.0.0-beta.36](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.35...v2.0.0-beta.36) (2016-08-03)
 
diff --git a/package.json b/package.json
index 00feddd0fb..6b61cbd28b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.36",
+  "version": "2.0.0-beta.37",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 83288696a2a46bcc28fce338ebc84e7307526021 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 11 Aug 2016 10:13:00 -0500
Subject: [PATCH 1022/1100] chore(): increment ionic-app-lib because it was
 missed.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6b61cbd28b..27a824b35f 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.19",
+    "ionic-app-lib": "2.0.0-beta.20",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 9185bb5828b2ecd85edd4dbce9ab165a6288641e Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 15 Aug 2016 08:37:12 -0500
Subject: [PATCH 1023/1100] Create 2.0 release.

---
 CHANGELOG.md | 5 +++++
 package.json | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9b569932b..ca123cb459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+<a name="2.0.0"></a>
+# [2.0.0](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.37...v2.0.0) (2016-08-15)
+
+* create 2.0 release using beta.37 source.
+
 <a name="2.0.0-beta.37"></a>
 # [2.0.0-beta.37](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.36...v2.0.0-beta.37) (2016-08-11)
 
diff --git a/package.json b/package.json
index 27a824b35f..99600f4426 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0-beta.37",
+  "version": "2.0.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -67,7 +67,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0-beta.20",
+    "ionic-app-lib": "2.0.0",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 7db1850e7e340a95eebec1c95279686c37f95120 Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Tue, 13 Sep 2016 23:27:17 -0500
Subject: [PATCH 1024/1100] added in generators using @ionic/app-generators

---
 lib/ionic/generate.js | 47 +++++++++++++++++++++++++++----------------
 package.json          |  1 +
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 7d3c7906e2..6aa1095877 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -3,6 +3,7 @@
 var extend = require('../utils/extend');
 var path = require('path');
 var ionicAppLib = require('ionic-app-lib');
+var appGenerator = require('@ionic/app-generators');
 var log = ionicAppLib.logging.logger;
 var Project =  ionicAppLib.project;
 var fail = ionicAppLib.utils.fail;
@@ -16,10 +17,6 @@ var settings = {
     '--list': {
       title: 'List available generators',
       boolean: true
-    },
-    '--typescript|--ts': {
-      boolean: true,
-      title: '(with --v2 only) Use TypeScript in generation'
     }
   },
   isProjectTask: true
@@ -48,28 +45,44 @@ function run(ionic, argv) {
     var name = argv._[2]; // TODO support multiple names
     var isTS = project.get('typescript') || argv.ts;
 
-    var ionicModule = loadToolingModule();
-
     if (argv.list) {
-      ionicModule.Generate.printAvailableGenerators();
+      appGenerator.printAvailableGenerators();
       return;
     }
 
-    var promise;
-    try {
-      promise = ionicModule.generate({ appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS });
-    } catch (err) {
-      if (err.message.indexOf('no generator available') !== -1) {
+    let includeSpec = argv.includeSpec ? true : false;
+    let includeSass = argv.skipScss ? false : true;
+
+    var generatorOptions = {
+      generatorType: generator,
+      suppliedName: name,
+      includeSpec: includeSpec,
+      includeSass: includeSass
+    };
+
+    var projectStructureOptions = {
+      absoluteComponentDirPath: process.cwd() + '/src/components',
+      absoluteDirectiveDirPath: process.cwd() + '/src/components',
+      absolutePagesDirPath: process.cwd() + '/src/pages',
+      absolutePipeDirPath: process.cwd() + '/src/pipes',
+      absoluteProviderDirPath: process.cwd() + '/src/providers',
+      absolutePagesDirPath: process.cwd() + '/src/pages',
+      absolutePathTemplateBaseDir: process.cwd() + '/node_modules/ionic-angular/templates'
+    };
+
+    return appGenerator.generate(generatorOptions, projectStructureOptions).catch(function(err) {
+      if (err.message === 'Unknown Generator Type') {
         log.error(err.message);
-        ionicModule.Generate.printAvailableGenerators();
+        appGenerator.printAvailableGenerators();
         return;
+      } else {
+        return fail(err);
       }
-      return fail(err);
-    }
-    return promise;
+    });
+
 
   } catch (err) {
-    fail('There was an error generating your item:', err);
+    return fail('There was an error generating your item:', err);
   }
 }
 
diff --git a/package.json b/package.json
index 99600f4426..87e2b14e88 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@ionic/app-generators": "0.0.3",
     "cli-table": "0.3.1",
     "colors": "0.6.2",
     "expand-tilde": "1.2.0",

From 2c6822d911864936aefb5d25774d1bdbd4bd6384 Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Tue, 13 Sep 2016 23:36:53 -0500
Subject: [PATCH 1025/1100] remove duplicate pages path

---
 lib/ionic/generate.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 6aa1095877..764e6faec3 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -66,7 +66,6 @@ function run(ionic, argv) {
       absolutePagesDirPath: process.cwd() + '/src/pages',
       absolutePipeDirPath: process.cwd() + '/src/pipes',
       absoluteProviderDirPath: process.cwd() + '/src/providers',
-      absolutePagesDirPath: process.cwd() + '/src/pages',
       absolutePathTemplateBaseDir: process.cwd() + '/node_modules/ionic-angular/templates'
     };
 

From 9a49df9ae419683d08d75d65c29dde55c94c9b11 Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Tue, 13 Sep 2016 23:42:04 -0500
Subject: [PATCH 1026/1100] let to var

---
 lib/ionic/generate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 764e6faec3..8a1f28be46 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -50,8 +50,8 @@ function run(ionic, argv) {
       return;
     }
 
-    let includeSpec = argv.includeSpec ? true : false;
-    let includeSass = argv.skipScss ? false : true;
+    var includeSpec = argv.includeSpec ? true : false;
+    var includeSass = argv.skipScss ? false : true;
 
     var generatorOptions = {
       generatorType: generator,

From 2bc79bf728ef64a9bf66dbbd1224929e1523c1d4 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 14 Sep 2016 21:03:15 -0400
Subject: [PATCH 1027/1100] feat(): add build step for npm scripts if they
 exists

---
 lib/cli.js | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 93 insertions(+), 8 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index ca1461b0f1..2ace110d78 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -160,6 +160,9 @@ Cli.run = function run(processArgv) {
       return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
+    // Check if there are npm scripts in the package.json
+    var npmScripts = Cli.loadNpmScripts();
+
     try {
       var gulpLoaded = Cli.loadGulpfile();
     } catch (e) {
@@ -174,20 +177,28 @@ Cli.run = function run(processArgv) {
       process.exit(1);
     }
 
-    if (!gulpLoaded) {
+    log.debug('\nNpm scripts:', npmScripts);
+    log.debug('Gulpfile found:', gulpLoaded, '\n');
+
+    if (npmScripts) {
+      return Cli.runWithNpmScripts(argv, task, rawCliArguments);
+    } else if (gulpLoaded) {
+      return Cli.runWithGulp(argv, task, rawCliArguments);
+    }
 
-      // warn if no gulpfile and it's a command that requires a build step
+    if (!gulpLoaded) {
+      // warn if no build file and it's a command that requires a build step
       // but still run the command with no hooks
-      if (Cli.isBuildCommand(taskName) && argv.v2) {
-        log.warn('WARN: No gulpfile found!');
+      if (Cli.isBuildCommand(taskName) && argv.v2 && !npmScripts) {
+        log.warn('WARN: No build file found!');
         log.warn('If your app requires a build step, you may want to ensure it runs before ' + taskName + '.\n');
       }
-      log.debug('No gulpfile found, not running gulp hooks');
-
-      return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
+      if (!npmScripts) {
+        log.debug('No gulpfile found, not running gulp hooks');
+      }
     }
 
-    return Cli.runWithGulp(argv, task, rawCliArguments);
+    return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
 
   } catch (ex) {
     return appLibUtils.fail(ex);
@@ -272,6 +283,80 @@ Cli.loadGulpfile = function loadGulpfile() {
   return false;
 };
 
+Cli.runWithNpmScripts = function runWithNpmScripts(argv, taskInstance, rawCliArguments) {
+  var cmdName = argv._[0];
+  var beforeHook = cmdName + ':before';
+  var afterHook = cmdName + ':after';
+
+  var packageFile = require(path.resolve(process.cwd() + '/package.json'));
+  var scripts = packageFile.scripts;
+
+  var beforeHookPromise = Q(true);
+  if (scripts[beforeHook]) {
+    log.info('\nRunning \'' + beforeHook + '\' npm script before ' + cmdName);
+    beforeHookPromise = Cli.runNpmHook(scripts[beforeHook]);
+  }
+
+  // run beforeHook
+  return beforeHookPromise
+
+    // run cmd
+    .then(function() {
+      return Q.fcall(taskInstance.run.bind(taskInstance), Cli, argv, rawCliArguments);
+    })
+
+    // run afterHook
+    .then(function() {
+      if (scripts[afterHook]) {
+        log.info('\nRunning \'' + afterHook + '\' npm script before ' + cmdName);
+        return Cli.runNpmHook(scripts[afterHook]);
+      }
+    });
+}
+
+Cli.runNpmHook = function runNpmHook(hook) {
+  var cmd = 'npm';
+  var args = ['run', hook];
+  var command = cmd + ' ' + args;
+
+  var q = Q.defer();
+  var spawn = require('cross-spawn-async');
+
+  var spawned = spawn('npm', args);
+  spawned.on('error', function(err) {
+    log.error('Unable to run spawn command ' + err);
+  });
+  spawned.stdout.on('data', function(data) {
+    log.info(data.toString());
+  });
+  spawned.stderr.on('data', function(data) {
+    log.info(data.toString());
+  });
+  spawned.on('exit', function(code) {
+    log.debug('Spawn command', command, 'completed');
+    if (code !== 0) {
+      return q.reject('There was an error with the spawned command: ' + command);
+    }
+    return q.resolve();
+  });
+
+  return q.promise;
+}
+
+Cli.loadNpmScripts = function loadNpmScripts() {
+  var fileName = 'package.json';
+
+  try {
+    var packageFile = require(path.resolve(process.cwd() + '/' + fileName));
+    log.verbose('Package.json found scripts:', packageFile.scripts);
+    return packageFile.scripts;
+  } catch (e) {
+    throw e;
+  }
+
+  return undefined;
+};
+
 Cli.logEvents = function logEvents(gulpInst, finalTaskNames) {
   var prettyTime = require('pretty-hrtime');
   var gutil = require('gulp-util');

From fac1c4d7b49e7c102269f3d5e0acef660d762bf5 Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Thu, 15 Sep 2016 16:41:46 -0500
Subject: [PATCH 1028/1100] =?UTF-8?q?=E2=80=9CThis=20command=20has=20been?=
 =?UTF-8?q?=20deprecate=E2=80=9D=20typo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ionic/add.js     | 4 ++--
 lib/ionic/lib.js     | 4 ++--
 lib/ionic/list.js    | 4 ++--
 lib/ionic/remove.js  | 4 ++--
 lib/ionic/service.js | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 50f81105b5..8fffd7ecef 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -44,8 +44,8 @@ function installBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
-  // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+  // This command will be depreciated in the future.
+  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index bb3791659c..74fe976384 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -32,8 +32,8 @@ var settings =  {
 
 function run(ionic, argv) {
 
-  // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+  // This command will be depreciated in the future.
+  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
index ab264cbb2e..6874b96bd5 100644
--- a/lib/ionic/list.js
+++ b/lib/ionic/list.js
@@ -37,8 +37,8 @@ function listComponents() {
  */
 function run() {
 
-  // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+  // This command will be depreciated in the future.
+  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index 2feccf90a3..e64ea6d2c0 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -44,8 +44,8 @@ function uninstallBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
-  // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+  // This command will be depreciated in the future.
+  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index 0cdc5878f0..aa00615429 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -182,8 +182,8 @@ function removeService(serviceName) {
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
 function run(ionic, argv) {
 
-  // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecate'.red + '.  All ' +
+  // This command will be depreciated in the future.
+  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);

From f41a26409f68825c2b052ed968284161f1eff03e Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 16 Sep 2016 13:48:45 -0400
Subject: [PATCH 1029/1100] chore: update changelog for 2.1.0 release

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca123cb459..7f39283fbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+<a name="2.1.0"></a>
+# [2.1.0](https://github.com/driftyco/ionic-cli/compare/v2.0.0...v2.1.0) (2016-09-16)
+
+* **refactor:** updated generate functionality to call @ionic/app-generators instead of ionic. ([45e9959](https://github.com/driftyco/ionic-cli/commit/45e99597b0f0afa81b992f4fb60388675679b595))
+* **feat:** add build step for npm scripts if they exist. ([2bc79bf](https://github.com/driftyco/ionic-cli/commit/2bc79bf728ef64a9bf66dbbd1224929e1523c1d4))
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/driftyco/ionic-cli/compare/v2.0.0-beta.37...v2.0.0) (2016-08-15)
 

From a6df88c7aa047468af9cae25e3c45eee627ac252 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:05:40 -0500
Subject: [PATCH 1030/1100] Update io.js

---
 lib/ionic/io.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/io.js b/lib/ionic/io.js
index 13d18453f5..7070392feb 100644
--- a/lib/ionic/io.js
+++ b/lib/ionic/io.js
@@ -12,7 +12,7 @@ var LoginTask = require('./login');
 var settings = {
   title: 'io',
   name: 'io',
-  summary: 'Integrate your app with the ionic.io platform services ' + '(alpha)'.red,
+  summary: 'Integrate your app with the ionic.io platform services',
   args: {
     '<command>': 'init'.yellow
   },

From 9476e3fb672f5f8a156b9171c8910e8bd0bafba9 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:06:11 -0500
Subject: [PATCH 1031/1100] Update config.js

---
 lib/ionic/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 0b46b1d9d6..18efd17be4 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -9,7 +9,7 @@ var appLibUtils = IonicAppLib.utils;
 var settings = {
   title: 'config',
   name: 'config',
-  summary: 'Set configuration variables for your ionic app ' + '(alpha)'.red,
+  summary: 'Set configuration variables for your ionic app',
   args: {
     '<command>': 'set'.yellow + ', ' + 'unset'.yellow + ', ' + 'build'.yellow + ', or ' + 'info'.yellow,
     '[key]': 'The key to set',

From c1b12062a7158eb8257730e6ea44e9aa334031bb Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:06:42 -0500
Subject: [PATCH 1032/1100] Update package.js

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 7283be0d7b..96510e3a45 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -20,7 +20,7 @@ var Project = IonicAppLib.project;
 var settings = {
   title: 'package',
   name: 'package',
-  summary: 'Use Ionic Package to build your app ' + '(alpha)'.red,
+  summary: 'Use Ionic Package to build your app',
   args: {
     '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow +
       ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,

From a6e17628f5ed92861a327ccb43f3a8529e49023d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:07:01 -0500
Subject: [PATCH 1033/1100] Update security.js

---
 lib/ionic/security.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index 728b08e416..d97ec68113 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -20,7 +20,7 @@ var Project = IonicAppLib.project;
 var settings = {
   title: 'security',
   name: 'security',
-  summary: 'Store your app\'s credentials for the Ionic Platform ' + '(alpha)'.red,
+  summary: 'Store your app\'s credentials for the Ionic Cloud',
   args: {
     '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' +
       'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,

From 72b9fff6701727f619cc28619917a4e898388740 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:08:22 -0500
Subject: [PATCH 1034/1100] Update io.js

---
 lib/ionic/io.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/io.js b/lib/ionic/io.js
index 7070392feb..b5f51613fb 100644
--- a/lib/ionic/io.js
+++ b/lib/ionic/io.js
@@ -12,7 +12,7 @@ var LoginTask = require('./login');
 var settings = {
   title: 'io',
   name: 'io',
-  summary: 'Integrate your app with the ionic.io platform services',
+  summary: 'Integrate your app with Ionic Cloud services',
   args: {
     '<command>': 'init'.yellow
   },

From c3307fa41bb81b0923de2276e58050a7dccbe4a6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:10:34 -0500
Subject: [PATCH 1035/1100] Update push.js

---
 lib/ionic/push.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index c9e927c7d4..2382a4c4f3 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -18,7 +18,7 @@ var LoginTask = require('./login');
 var settings =  {
   title: 'push',
   name: 'push',
-  summary: 'Upload APNS and GCM credentials to Ionic Push ' + '(alpha)'.red,
+  summary: 'Upload APNS and GCM credentials to Ionic Push',
   options: {
     '--ios-dev-cert': 'Upload your development .p12 file to Ionic Push',
     '--ios-prod-cert': 'Upload your production .p12 file to Ionic Push',

From 4c844540fdd8ed001e0cd90a1b25fe8048140ed6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:10:59 -0500
Subject: [PATCH 1036/1100] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c922812ee6..160c55a729 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 Ionic-Cli
 =========
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!)  integration with the [Ionic Platform](http://ionic.io/), a set of mobile services perfect for Ionic apps.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!)  integration with the [Ionic Cloud](http://ionic.io/), a set of mobile backend services perfect for Ionic apps.
 
 Use the `ionic --help` command for more detailed task information.
 

From 6b35a9818c02cde5c92e107381b500ddc8a8d821 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:13:41 -0500
Subject: [PATCH 1037/1100] chore(docs): readme ionic cloud

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 160c55a729..b2b55908e9 100644
--- a/README.md
+++ b/README.md
@@ -426,9 +426,9 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 5. In the `ionic.project` file, add the JavaScript property `"gulpStartupTasks": ["sass", "watch"]` (this can also be customized to whatever gulp tasks you'd like).
 
 
-# Ionic.io services
+# Ionic Cloud services
 
-The CLI supports operations to use backend services for your Ionic app. To get started, [visit the ionic.io homepage](http://ionic.io) and [sign up there](https://apps.ionic.io/signup).
+The CLI integrates with Ionic Cloud, a set of backend services that integrate perfectly with Ionic apps. To get started, [visit the Ionic Cloud homepage](http://ionic.io) and [sign up](https://apps.ionic.io/signup).
 
 There are a few things you can utilize the CLI for to support ease of development.
 
@@ -465,7 +465,7 @@ Successfully uploaded (f23j9fjs)
 
 This indicates you uploaded the application correctly, and the App ID is set to `f23j9fjs`.
 
-You can then view that App ID from the View app or the application listing on ionic.io.
+You can then view that App ID from the View app or the application listing on your [Ionic Cloud dashboard](http://apps.ionic.io/).
 
 ### Adding a note with your upload
 
@@ -479,7 +479,7 @@ Use the `ionic link <appId>` command to set your Ionic App ID to continue workin
 
 ## Share the application with another user
 
-Use the `ionic share <email>` command to have an email sent to another person to have them view the Ionic application you are using. Note: You must have an ionic.io account as well as the user you are sharing with.
+Use the `ionic share <email>` command to have an email sent to another person to have them view the Ionic application you are using. Note: You must have an [Ionic Cloud](http://ionic.io/) account as well as the user you are sharing with.
 
 # Ionic Docs
 

From 5f2be6fc44dd5ef10936099b388264c0d41be5ab Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Fri, 16 Sep 2016 13:18:09 -0500
Subject: [PATCH 1038/1100] error message grammar: deprecated not depreciated

http://english.stackexchange.com/questions/45295/why-is-there-confusion-between-depreciated-and-deprecated
---
 lib/ionic/add.js     | 4 ++--
 lib/ionic/lib.js     | 4 ++--
 lib/ionic/list.js    | 4 ++--
 lib/ionic/remove.js  | 4 ++--
 lib/ionic/service.js | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index 8fffd7ecef..a447f5f952 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -44,8 +44,8 @@ function installBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
-  // This command will be depreciated in the future.
-  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index 74fe976384..a85cc8128c 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -32,8 +32,8 @@ var settings =  {
 
 function run(ionic, argv) {
 
-  // This command will be depreciated in the future.
-  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
index 6874b96bd5..75a57f59af 100644
--- a/lib/ionic/list.js
+++ b/lib/ionic/list.js
@@ -37,8 +37,8 @@ function listComponents() {
  */
 function run() {
 
-  // This command will be depreciated in the future.
-  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index e64ea6d2c0..248ab3038e 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -44,8 +44,8 @@ function uninstallBowerComponent(componentName) {
  */
 function run(ionic, argv) {
 
-  // This command will be depreciated in the future.
-  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index aa00615429..ae489ce24d 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -182,8 +182,8 @@ function removeService(serviceName) {
 // For each plugins - call 'ionic add plugin <current-required-plugin>'
 function run(ionic, argv) {
 
-  // This command will be depreciated in the future.
-  var deprecationMsg = 'This command has been ' + 'depreciated'.red + '.  All ' +
+  // This command will be deprecated in the future.
+  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
   log.info(deprecationMsg.bold);

From 0c3ceb5dc5f6aa3e6ab7fff2e01cc1f8f7f6324d Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:31:55 -0500
Subject: [PATCH 1039/1100] chore(error): friendly package error message

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 96510e3a45..39b808e8a7 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -59,7 +59,7 @@ function run(ionic, argv) {
     appId = project.get('app_id');
 
     if (!appId) {
-      throw new Error('Missing Ionic App ID.');
+      throw new Error('Missing Ionic App ID. Please make sure to upload your app or set your app_id in the ionic.config.json file.');
     }
   } catch (ex) {
     return fail(ex, 'package');

From 271f2f984861d4faf17c9d5a91e382f061f60697 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 16 Sep 2016 13:35:46 -0500
Subject: [PATCH 1040/1100] chore(error): friendly(-er) package error message

---
 lib/ionic/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 39b808e8a7..0dbdd74da3 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -59,7 +59,7 @@ function run(ionic, argv) {
     appId = project.get('app_id');
 
     if (!appId) {
-      throw new Error('Missing Ionic App ID. Please make sure to upload your app or set your app_id in the ionic.config.json file.');
+      throw new Error('Missing Ionic App ID. Make sure to run "ionic upload" first or set your app_id in the ionic.config.json file.');
     }
   } catch (ex) {
     return fail(ex, 'package');

From 4c8cdc65c252c19c78d0ebd9e42e283991a52c82 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 16 Sep 2016 14:07:46 -0500
Subject: [PATCH 1041/1100] fix(): add missing cross-spawn-async dependency

Looks like cross-spawn-async prints a warning on install, we should
look into using cross-spawn instead.
---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 87e2b14e88..e6036fac5b 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "@ionic/app-generators": "0.0.3",
     "cli-table": "0.3.1",
     "colors": "0.6.2",
+    "cross-spawn-async": "2.1.9",
     "expand-tilde": "1.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
@@ -96,6 +97,7 @@
   "bundledDependencies": [
     "cli-table",
     "colors",
+    "cross-spawn-async",
     "expand-tilde",
     "form-data",
     "gulp",

From bf52436a9d447856e87acb283949d947ee0dda2d Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Wed, 14 Sep 2016 10:09:12 -0500
Subject: [PATCH 1042/1100] tests passing

---
 spec/config/commands.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/config/commands.spec.js b/spec/config/commands.spec.js
index 27418821f3..bdfb901a80 100644
--- a/spec/config/commands.spec.js
+++ b/spec/config/commands.spec.js
@@ -14,10 +14,15 @@ describe('orderedListOfCommands', function() {
         var stat = fs.statSync(path.join(__dirname, '../../lib/ionic', file));
         return !stat.isDirectory();
       })
+      .filter(function(file) {
+        // stats is private to us, so ignore it
+        return file !== 'stats.js';
+      })
       .map(function(file) {
         return file.replace('.js', '');
       })
       .sort();
+
     expect(taskFileList).toEqual(listOfCommands.sort());
   });
 });

From c1c55eff2add94d1bf8c4c73eceaca992ed52855 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 16 Sep 2016 16:10:20 -0400
Subject: [PATCH 1043/1100] test(cli): fix tests with gulpfile, add tests for
 npm scripts

---
 spec/cli.spec.js | 69 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index e430a477ec..6b247ff47f 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -320,11 +320,12 @@ describe('Cli', function() {
         spyOn(FakeTask, 'run').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(false);
         spyOn(log, 'warn');
 
         IonicCli.run(['node', 'bin/ionic', 'build'])
         .then(function() {
-          expect(log.warn).toHaveBeenCalledWith('WARN: No gulpfile found!');
+          expect(log.warn).toHaveBeenCalledWith('WARN: No build file found!');
           done();
         });
       });
@@ -341,6 +342,29 @@ describe('Cli', function() {
         spyOn(FakeTask, 'run').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(false);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(IonicCli.loadGulpfile).toHaveBeenCalled();
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should not runWithGulp if npmScripts exist', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          title: 'fake',
+          run: function() {},
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp');
+        spyOn(FakeTask, 'run').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(true);
 
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
@@ -357,12 +381,55 @@ describe('Cli', function() {
         };
         spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
         spyOn(IonicCli, 'runWithGulp').andReturn(Q(true));
+        spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(true);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(false);
 
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
           expect(IonicCli.runWithGulp).toHaveBeenCalled();
+          expect(IonicCli.runWithNpmScripts).not.toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should runWithNpmScripts without Gulpfile', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp').andReturn(Q(true));
+        spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(false);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(true);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          expect(IonicCli.runWithNpmScripts).toHaveBeenCalled();
+          done();
+        });
+      });
+
+      it('should runWithNpmScripts even with Gulpfile', function(done) {
+        var FakeTask = {
+          name: 'fake',
+          isProjectTask: true
+        };
+        spyOn(IonicCli, 'getTaskSettingsByName').andReturn(FakeTask);
+        spyOn(IonicCli, 'runWithGulp').andReturn(Q(true));
+        spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
+        spyOn(fs, 'existsSync').andReturn(true);
+        spyOn(IonicCli, 'loadGulpfile').andReturn(true);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn(true);
+
+        IonicCli.run(['node', 'bin/ionic', 'fake'])
+        .then(function() {
+          expect(IonicCli.runWithGulp).not.toHaveBeenCalled();
+          expect(IonicCli.runWithNpmScripts).toHaveBeenCalled();
           done();
         });
       });

From 2772a4c18f7e36038b35b913471fc1c7ed5cce9e Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 20 Sep 2016 10:43:16 -0500
Subject: [PATCH 1044/1100] chore(): bump version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e6036fac5b..09bf471cd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.0.0",
+  "version": "2.1.0-beta.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.0.0",
+    "ionic-app-lib": "2.1.0-beta.0",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 734639caa37f0947fe27142ec3dde39606088fa8 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 20 Sep 2016 11:46:06 -0500
Subject: [PATCH 1045/1100] chore(serve): continue command after watch ready
 hook

---
 lib/cli.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 2ace110d78..c4fb1e8106 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -327,7 +327,15 @@ Cli.runNpmHook = function runNpmHook(hook) {
     log.error('Unable to run spawn command ' + err);
   });
   spawned.stdout.on('data', function(data) {
-    log.info(data.toString());
+    var dataLines = data.toString().split('\n');
+    for (var i = 0; i < dataLines.length; i++) {
+      if (dataLines[i].length) {
+        log.info(dataLines[i]);
+        if (dataLines[i].indexOf('watch ready') > -1) {
+          return q.resolve();
+        }
+      }
+    }
   });
   spawned.stderr.on('data', function(data) {
     log.info(data.toString());

From 3b7dd96fd1cf655d185bcdf89883ec49802f466c Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Tue, 20 Sep 2016 20:01:22 -0400
Subject: [PATCH 1046/1100] chore: bump version and release

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 09bf471cd3..8b53dd0263 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.0-beta.1",
+  "version": "2.1.0-beta.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.0-beta.0",
+    "ionic-app-lib": "2.1.0-beta.1",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 74ad1ea30f75ecddc1bf8c4dfbeaa48460f33602 Mon Sep 17 00:00:00 2001
From: Dan Bucholtz <dan.bucholtz@gmail.com>
Date: Sun, 25 Sep 2016 11:49:08 -0500
Subject: [PATCH 1047/1100] fix(generators): allow configurable directory to be
 passed in

---
 lib/ionic/generate.js | 44 +++++++++++++++++++++++++++++++++++++------
 package.json          |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index 8a1f28be46..dc288d8789 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -60,13 +60,45 @@ function run(ionic, argv) {
       includeSass: includeSass
     };
 
+    var componentsDir = path.join(process.cwd(), 'src', 'components');
+    var directivesDir = path.join(process.cwd(), 'src', 'components');
+    var pagesDir = path.join(process.cwd(), 'src', 'pages');
+    var pipesDir = path.join(process.cwd(), 'src', 'pipes');
+    var providersDir = path.join(process.cwd(), 'src', 'providers');
+    var templateDir = path.join(process.cwd(), 'node_modules', 'ionic-angular', 'templates');
+
+    if (argv.componentsDir && argv.componentsDir.length > 0) {
+      componentsDir = path.resolve(argv.componentsDir);
+    }
+
+    if (argv.directivesDir && argv.directivesDir.length > 0) {
+      directivesDir = path.resolve(argv.directivesDir);
+    }
+
+    if (argv.pagesDir && argv.pagesDir.length > 0) {
+      pagesDir = path.resolve(argv.pagesDir);
+    }
+
+    if (argv.pipesDir && argv.pipesDir.length > 0) {
+      pipesDir = path.resolve(argv.pipesDir);
+    }
+
+    if (argv.providersDir && argv.providersDir.length > 0) {
+      providersDir = path.resolve(argv.providersDir);
+    }
+
+    if (argv.templateDir && argv.templateDir.length > 0) {
+      templateDir = path.resolve(argv.templateDir);
+    }
+
+
     var projectStructureOptions = {
-      absoluteComponentDirPath: process.cwd() + '/src/components',
-      absoluteDirectiveDirPath: process.cwd() + '/src/components',
-      absolutePagesDirPath: process.cwd() + '/src/pages',
-      absolutePipeDirPath: process.cwd() + '/src/pipes',
-      absoluteProviderDirPath: process.cwd() + '/src/providers',
-      absolutePathTemplateBaseDir: process.cwd() + '/node_modules/ionic-angular/templates'
+      absoluteComponentDirPath: componentsDir,
+      absoluteDirectiveDirPath: directivesDir,
+      absolutePagesDirPath: pagesDir,
+      absolutePipeDirPath: pipesDir,
+      absoluteProviderDirPath: providersDir,
+      absolutePathTemplateBaseDir: templateDir
     };
 
     return appGenerator.generate(generatorOptions, projectStructureOptions).catch(function(err) {
diff --git a/package.json b/package.json
index 8b53dd0263..bcb1b39a98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From d61763458f5c9b903bc03e42ad1353396c86cf25 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 27 Sep 2016 10:29:17 -0500
Subject: [PATCH 1048/1100] chore(): updated package.json version to 2.1.0.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bcb1b39a98..02fa111ce2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.0-beta.3",
+  "version": "2.1.0",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 184aa593c100b69ea7ef33ec4e1a178cfa904326 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 28 Sep 2016 14:52:00 -0500
Subject: [PATCH 1049/1100] Update circle.yml

Ensure node 4 is used when running coveralls on CI server.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index a0d097163d..5717fb5c42 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,4 +3,4 @@ test:
     - nvm use 0.12 && npm test
     - nvm use 4.0 && npm test
   post:
-    - npm run coveralls
+    - nvm use 4.0 && npm run coveralls

From 59e2d795834ed340f2423bf1f8db7d6a29819975 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Thu, 29 Sep 2016 16:01:21 -0500
Subject: [PATCH 1050/1100] Update README.md

Added disclaimer about using npm 2.7 because of our dependency now on a name spaced module.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b2b55908e9..0bae1517b6 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@ $ npm install -g ionic
 
 *Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo` or can setup [proper file permissions on OSX for npm](http://www.johnpapa.net/how-to-use-npm-global-without-sudo-on-osx/) to install without `sudo`. *
 
+*Please ensure that you have npm 2.7+ installed. We are now depending on scoped npm packages which where not introduced until this version. This occurred around the time of NodeJS 0.12.2*
+
 
 ## Starting an Ionic App
 

From 8df45a29018474843ec46265dcf006615eb29de9 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Mon, 3 Oct 2016 10:53:03 -0500
Subject: [PATCH 1051/1100] Update README.md

Fixed a typo.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0bae1517b6..55f6beaaaf 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ $ npm install -g ionic
 
 *Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo` or can setup [proper file permissions on OSX for npm](http://www.johnpapa.net/how-to-use-npm-global-without-sudo-on-osx/) to install without `sudo`. *
 
-*Please ensure that you have npm 2.7+ installed. We are now depending on scoped npm packages which where not introduced until this version. This occurred around the time of NodeJS 0.12.2*
+*Please ensure that you have npm 2.7+ installed. We are now depending on scoped npm packages which were not introduced until this version. This occurred around the time of NodeJS 0.12.2*
 
 
 ## Starting an Ionic App

From d22c78ed258b76361eb4ec67f1dd42eee9031bf5 Mon Sep 17 00:00:00 2001
From: Matt Lewis <mattlewis92@users.noreply.github.com>
Date: Tue, 4 Oct 2016 19:11:34 +0200
Subject: [PATCH 1052/1100] docs(readme): update docs to reflect CLI 2.0
 (#1366)

Looks good. Thank you!
---
 README.md | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 55f6beaaaf..790fc060d1 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,7 @@ __LiveReload__
 
 By default, LiveReload will watch for changes in your `www/` directory,
 excluding `www/lib/`.  To change this, you can specify a `watchPatterns`
-property in the `ionic.project` file located in your project root to watch
+property in the `ionic.config.json` file located in your project root to watch
 (or not watch) for specific changes.
 
 ```json
@@ -237,30 +237,26 @@ the Grunt website.
 
 __Gulp Integration__
 
-When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by putting them into your `ionic.project` as a `gulpStartupTasks` property as follows:
-
-```json
-{
-  "name": "SmoothRiders",
-   "gulpStartupTasks": [
-    "watch"
-  ]
-}
+When running `ionic serve`, you can have Ionic run any Gulp tasks you specify by putting them into a gulp task called `serve:before`:
 
+```js
+gulp.task('serve:before', ['sass', 'watch']);
 ```
 
 Now, when you run `ionic serve`, it will run the `watch` task while starting the Ionic server.
 
 If you would like to disable gulp from running during serve, pass the `--nogulp` option.
 
+Your gulpfile must be named gulpfile.js or Gulpfile.js, there is currently no support for typescript, babel or coffeescript gulp files in the 2.0 CLI
+
 NOTE:
 
 ```bash
 $ ionic setup sass
 ```
 
-will add a `watchPatterns` propery with the default values to your `ionic.project`
-file that you can then edit, in addition to the `gulpStartupTasks` property
+will add a `watchPatterns` propery with the default values to your `ionic.config.json`
+file that you can then edit, in addition to the `serve:before` gulp task
 described in the [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) section.
 
 
@@ -268,7 +264,7 @@ __Service Proxies:__
 
 The `serve` command can add some proxies to the http server. These proxies are useful if you are developing in the browser and you need to make calls to an external API. With this feature you can proxy request to the external api through the ionic http server preventing the `No 'Access-Control-Allow-Origin' header is present on the requested resource` error.
 
-In the `ionic.project` file you can add a property with an array of proxies you want to add. The proxies are object with the following properties:
+In the `ionic.config.json` file you can add a property with an array of proxies you want to add. The proxies are object with the following properties:
 
 * `path`: string that will be matched against the beginning of the incoming request URL.
 * `proxyUrl`: a string with the url of where the proxied request should go.
@@ -341,7 +337,7 @@ And of course, it supports Live Reload and all the other goodies we've added ove
 
 ## Serving an alternate document root
 
-If you'd like to test your app in the browser and you use a folder other than the default of `www`, you can specify this folder in your `ionic.project` file.
+If you'd like to test your app in the browser and you use a folder other than the default of `www`, you can specify this folder in your `ionic.config.json` file.
 
 You might also want to have the document root be created if you use some sort of build system, we suggest using `createDocumentRoot` for that so that `ionic serve` will create that folder for you.
 
@@ -350,9 +346,6 @@ It is also advised you specify the watch patterns for this document root as well
 ```json
 {
   "name": "SmoothRiders",
-   "gulpStartupTasks": [
-    "watch"
-  ],
   "documentRoot": "app",
   "createDocumentRoot": "app",
   "watchPatterns": [
@@ -425,7 +418,7 @@ By default, starter projects are hooked up to Ionic's precompiled CSS file, whic
 2. Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 3. Remove `<link href="css/style.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
 4. Add `<link href="css/ionic.app.css" rel="stylesheet">` to the `<head>` of the root `index.html` file.
-5. In the `ionic.project` file, add the JavaScript property `"gulpStartupTasks": ["sass", "watch"]` (this can also be customized to whatever gulp tasks you'd like).
+5. In your `serve:before` gulp task, add the `sass` task `gulp.task('serve:before', ['sass', 'watch']);` (this can also be customized to whatever gulp tasks you'd like).
 
 
 # Ionic Cloud services

From 0b458e4a7f4e4b681376957493ec770611b988e3 Mon Sep 17 00:00:00 2001
From: Mike Hartington <mhartington@users.noreply.github.com>
Date: Fri, 7 Oct 2016 21:01:39 -0400
Subject: [PATCH 1053/1100] docs(): update readme (#1481)

Update readme with more accurate information for recent Ionic V1 and V2
projects
---
 README.md | 195 +++++++++++++-----------------------------------------
 1 file changed, 47 insertions(+), 148 deletions(-)

diff --git a/README.md b/README.md
index 790fc060d1..1b362459e3 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,9 @@
 [![Build status][appveyor-badge]][appveyor-badge-url]
 [![npm][npm-badge]][npm-badge-url]
 
-Ionic-Cli
-=========
+# Ionic-Cli
 
-The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!)  integration with the [Ionic Cloud](http://ionic.io/), a set of mobile backend services perfect for Ionic apps.
+The Ionic Framework command line utility makes it easy to start, build, run, and emulate [Ionic](http://ionicframework.com/) apps. In addition, it comes with (optional!) integration with the [Ionic Cloud](http://ionic.io/), a set of mobile backend services perfect for Ionic apps.
 
 Use the `ionic --help` command for more detailed task information.
 
@@ -15,28 +14,47 @@ Use the `ionic --help` command for more detailed task information.
 $ npm install -g ionic
 ```
 
-*Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo` or can setup [proper file permissions on OSX for npm](http://www.johnpapa.net/how-to-use-npm-global-without-sudo-on-osx/) to install without `sudo`. *
+*Note: For a global install of `-g ionic`, OSX/Linux users may need to prefix the command with `sudo` or can setup [proper file permissions on OSX for npm](http://www.johnpapa.net/how-to-use-npm-global-without-sudo-on-osx/) to install without `sudo`.*
+
+
+Minimal node requirements:
+
+- NodeLTS or greater
+- NPM 3x
 
-*Please ensure that you have npm 2.7+ installed. We are now depending on scoped npm packages which were not introduced until this version. This occurred around the time of NodeJS 0.12.2*
 
 
 ## Starting an Ionic App
 
+To start a Ionic 1x app, run:
+
 ```bash
 $ ionic start myapp [template]
 ```
 
-Starter templates can either come from a named template, a Github repo, a Codepen, or a local directory. A starter template is what becomes the `www` directory within the Cordova project.
+To start a Ionic 2 app, run:
+
+```bash
+$ ionic start myapp [template] --v2
+```
+
+Starter templates can either come from a named template, a Github repo, a Codepen, or a local directory. A starter template is what becomes the `www` directory for a V1 project, and a `src` directory for a V2 project
 
-__Named template starters:__
+__Named V1 template starters:__
 
 * [tabs](https://github.com/driftyco/ionic-starter-tabs) (Default)
 * [sidemenu](https://github.com/driftyco/ionic-starter-sidemenu)
 * [maps](https://github.com/driftyco/ionic-starter-maps)
 * [salesforce](https://github.com/driftyco/ionic-starter-salesforce)
-* [complex-list](https://github.com/driftyco/ionic-starter-complex-list)
 * [blank](https://github.com/driftyco/ionic-starter-blank)
 
+__Named V2 template starters:__
+
+* [tabs](https://github.com/driftyco/ionic2-starter-tabs) (Default)
+* [sidemenu](https://github.com/driftyco/ionic2-starter-sidemenu)
+* [blank](https://github.com/driftyco/ionic2-starter-blank)
+
+
 __Github Repo starters:__
 
 * Any Github repo url, ex: [https://github.com/driftyco/ionic-starter-tabs](https://github.com/driftyco/ionic-starter-tabs)
@@ -62,7 +80,7 @@ __Command-line flags/options:__
     [--id|-i]  ............  Package name set in the <widget id> config
                              ex: com.mycompany.myapp
     [--no-cordova|-w]  ....  Do not create an app targeted for Cordova
-    [--sass|-s] ...........  Setup the project to use Sass CSS precompiling
+    [--sass|-s] ...........  Setup the project to use Sass CSS precompiling (V1 only)
     [--list|-l]  ..........  List starter templates available
 
     [--io-app-id] .........  The Ionic.io app ID to use
@@ -75,7 +93,7 @@ $ ionic platform ios android
 
 ## Testing in a Browser
 
-Use `ionic serve` to start a local development server for app dev and testing. This is useful for both desktop browser testing, and to test within a device browser which is connected to the same network. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
+Use `ionic serve` to start a local development server for app dev and testing. Additionally, this command starts LiveReload which is used to monitor changes in the file system. As soon as you save a file the browser is refreshed automatically. View [Using Sass](https://github.com/driftyco/ionic-cli/blob/master/README.md#using-sass) if you would also like to have `ionic serve` watch the project's Sass files.
 
 ```bash
 $ ionic serve [options]
@@ -87,33 +105,6 @@ $ ionic serve [options]
 $ ionic build ios
 ```
 
-## Live Reload App During Development (beta)
-
-The `run` or `emulate` command will deploy the app to the specified platform devices/emulators. You can also run __live reload__ on the specified platform device by adding the `--livereload` option. The live reload functionality is similar to `ionic serve`, but instead of developing and debugging an app using a standard browser, the compiled hybrid app itself is watching for any changes to its files and reloading the app when needed. This reduces the requirement to constantly rebuild the app for small changes. However, any changes to plugins will still require a full rebuild. For live reload to work, the dev machine and device must be on the same local network, and the device must support [web sockets](http://caniuse.com/websockets).
-
-With live reload enabled, an app's console logs can also be printed to the terminal/command prompt by including the `--consolelogs` or `-c` option. Additionally, the development server's request logs can be printed out using `--serverlogs` or `-s` options.
-
-__Command-line flags/options for `run` and `emulate`:__
-
-    [--livereload|-l] .......  Live Reload app dev files from the device (beta)
-    [--consolelogs|-c] ......  Print app console logs to Ionic CLI (live reload req.)
-    [--serverlogs|-s] .......  Print dev server logs to Ionic CLI (live reload req.)
-    [--port|-p] .............  Dev server HTTP port (8100 default, live reload req.)
-    [--livereload-port|-i] ..  Live Reload port (35729 default, live reload req.)
-    [--all|-a] ..............  Specify to run on all addresses, 0.0.0.0, so you can view externally
-    [--browser|-w] ..........  Specifies the browser to use (safari, firefox, chrome)
-    [--browseroption|-o] ....  Specifies a path to open to (/#/tab/dash)
-    [--debug|--release]
-
-While the server is running for live reload, you can use the following commands within the CLI:
-
-    restart or r to restart the client app from the root
-    goto or g and a url to have the app navigate to the given url
-    consolelogs or c to enable/disable console log output
-    serverlogs or s to enable/disable server log output
-    quit or q to shutdown the server and exit
-
-
 ## Emulating your app
 
 Deploys the Ionic app on specified platform emulator. This is simply an alias for `run --emulator`.
@@ -196,26 +187,19 @@ When starting a new app and adding a platform `ionic platform add ios` - the def
 
 ## Crosswalk for Android
 
-In v1.3.0 and later, you can now specify which browser to use in your Cordova Android projects. Currently we only support [Crosswalk](https://crosswalk-project.org/) and have plans to support more browsers later.
-
-Execute `ionic browser add crosswalk` to add the Crosswalk browser to your Android project. By default, this will install the `12.41.296.5` version of Crosswalk.
+To install [Crosswalk](https://crosswalk-project.org/) for Android run:
 
-If you'd like to specify a different version of Crosswalk, run `ionic browser list` to see which browsers are available and what versions. Then run `ionic browser add crosswalk@10.39.235.15`.
+```bash
+ionic plugin add cordova-plugin-crosswalk-webview --save
+```
 
 All that is left is to run the project as normal - `ionic run android`.
 
-If you'd like to build without Crosswalk for Android SDK 21 or later, do the following:
-
-```
-ionic browser revert android
-ionic build android --release -- --minSdkVersion 21
-```
-
 ## Advanced serve options
 
 __LiveReload__
 
-By default, LiveReload will watch for changes in your `www/` directory,
+By default, for Ionic 1 projects, LiveReload will watch for changes in your `www/` directory,
 excluding `www/lib/`.  To change this, you can specify a `watchPatterns`
 property in the `ionic.config.json` file located in your project root to watch
 (or not watch) for specific changes.
@@ -249,7 +233,7 @@ If you would like to disable gulp from running during serve, pass the `--nogulp`
 
 Your gulpfile must be named gulpfile.js or Gulpfile.js, there is currently no support for typescript, babel or coffeescript gulp files in the 2.0 CLI
 
-NOTE:
+NOTE For V1:
 
 ```bash
 $ ionic setup sass
@@ -325,16 +309,18 @@ __Command-line flags/options:__
 
 ## Using Ionic Labs
 
-We've extended the serve command to open the new Lab UI that features iOS and Android side-by-side.
+We've extended the serve command to open the new Lab UI that features iOS, Android, and Windows side-by-side.
 
 ```bash
 $ ionic serve --lab
 ```
 
-If you've used the serve command before, you'll feel right at home with this one. Just like serve, it opens your app in a browser, but now it shows you what your app will look like on a phone, with both iOS and Android side by side.
+If you've used the serve command before, you'll feel right at home with this one. Just like serve, it opens your app in a browser, but now it shows you what your app will look like on a phone, with both iOS, Android, Windows side by side.
 
 And of course, it supports Live Reload and all the other goodies we've added over the last couple of months.
 
+NOTE: This does **not** emulate cordova or cordova plugins. So while the UI may feel like a native app, you'll still want to deploy to a device to test plugins.
+
 ## Serving an alternate document root
 
 If you'd like to test your app in the browser and you use a folder other than the default of `www`, you can specify this folder in your `ionic.config.json` file.
@@ -356,17 +342,6 @@ It is also advised you specify the watch patterns for this document root as well
 
 ```
 
-## Update Ionic lib
-
-Update Ionic library files, which are found in the `www/lib/ionic` directory. If bower is being used
-by the project, this command will automatically run `bower update ionic`, otherwise this command updates
-the local static files from Ionic's CDN.
-
-```bash
-$ ionic lib update
-```
-*Note: Using bower? This command does not update Ionic's dependencies. Run `bower update` to update Ionic and all of it's dependencies defined in `bower.json`.*
-
 ## Packaging an app (beta)
 
 Using Ionic's service, you can compile and package your project into an app-store ready app without
@@ -403,16 +378,18 @@ PROXY=internal.proxy.com ionic start my_app
 ```
 
 
-## Using Sass
+## Using Sass (V1 Only)
 
-By default, starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, Ionic projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Below are two ways to setup Sass for your Ionic project (the `ionic setup sass` command simply does the manual steps for you). Once Sass has been setup for your Ionic project, then the `ionic serve` command will also watch for Sass changes.
+By default, V1 starter projects are hooked up to Ionic's precompiled CSS file, which is found in the project's `www/lib/ionic/css` directory, and is linked to the app in the head of the root `index.html` file. However, projects can also be customized using [Sass](http://sass-lang.com/), which gives developers and designers "superpowers" in terms of creating and maintaining CSS. Below are two ways to setup Sass for your Ionic project (the `ionic setup sass` command simply does the manual steps for you). Once Sass has been setup for your Ionic project, then the `ionic serve` command will also watch for Sass changes.
 
-#### Setup Sass Automatically
+For V2 projects, there's nothing you need to do! Ionic 2 projects by default are setup with sass and come with all the build process enabled.
+
+#### Setup Sass Automatically (V1)
 
     ionic setup sass
 
 
-#### Setup Sass Manually
+#### Setup Sass Manually (V1)
 
 1. Run `npm install` from the working directory of an Ionic project. This will install [gulp.js](http://gulpjs.com/) and a few handy tasks, such as [gulp-sass](https://www.npmjs.org/package/gulp-sass) and [gulp-minify-css](https://www.npmjs.org/package/gulp-minify-css).
 2. Remove `<link href="lib/ionic/css/ionic.css" rel="stylesheet">` from the `<head>` of the root `index.html` file.
@@ -476,16 +453,7 @@ Use the `ionic link <appId>` command to set your Ionic App ID to continue workin
 
 Use the `ionic share <email>` command to have an email sent to another person to have them view the Ionic application you are using. Note: You must have an [Ionic Cloud](http://ionic.io/) account as well as the user you are sharing with.
 
-# Ionic Docs
-
-To get Ionic documentation from the Ionic CLI, try using the `ionic docs` command. The command will look up your currently used Ionic version and open the docs specific for that version. Ex: RC0, RC1, etc.
-
-To view all docs, `ionic docs ls`.
-
-To get help with a doc you may not remember, just type the name close enough: `ionic docs list` and you will be prompted for suggestions that may match.
-
-
-# Ionic Hooks
+# Ionic Hooks (V1)
 
 Ionic provides some default hooks for you to use in your Cordova application. In versions prior to 1.3.18, these hooks were automatically installed via the `ionic platform` command.
 
@@ -496,82 +464,13 @@ If you were a user who would still like to use those hooks, you can re-install t
 If you would like to remove these hooks yourself, use `ionic hooks remove` to get rid of them.
 
 
-# Ionic State
-
-Ionic now provides a command to help you manage the state of your Ionic application. Previously Cordova hooks were used to save platforms and plugins to your `package.json` file.
-
-Now when using `ionic platform add`, `ionic platform rm`, `ionic plugin add`, or `ionic plugin rm`, the state command will automatically be used to save the platform or plugin state to the `package.json` file.
-
-If you would like to avoid saving plugins or platforms to the `package.json` file - pass in the `--nosave` option. (`ionic plugin add org.apache.cordova.file --nosave`).
-
-Your package.json file might look something like the following:
-
-```json
-"cordovaPlatforms": [
-  "ios",
-  {
-    "android": {
-      "id": "android",
-      "locator": "https://github.com/apache/cordova-android.git"
-    }
-  }
-],
-"cordovaPlugins": [
-  "org.apache.cordova.device",
-  "org.apache.cordova.console",
-  "com.ionic.keyboard",
-  "org.apache.cordova.splashscreen",
-  {
-    "locator": "https://github.com/MobileChromeApps/cordova-crosswalk-engine.git",
-    "id": "org.cordova.croswalk"
-  },
-  {
-    "locator": "/path/to/cloned/phonegap-facebook-plugin",
-    "id": "",
-    "variables": {
-        "APP_ID": "some_id",
-        "APP_NAME": "some_name"
-    }
-  }
-]
-```
-
-## ionic state save
-
-The `ionic state save` command does some lookup in your platforms and plugins to save the current state of your cordova application.
-
-First it looks in your platforms folder to see which platforms are installed, and saves the name and version in your `package.json` file under the `cordovaPlatforms` attribute.
-
-Second it looks at your plugins `fetch.json` file to save the plugins installed both from the Cordova registry, locally installed plugins, as well as remote plugins from github or a remote HTTP url.
-
-## ionic state restore
-
-The `ionic state restore` command looks at the `cordovaPlugins` and `cordovaPlatforms` attributes in your `package.json` file to restore your application with those platforms and plugins.
-
-In the package.json file, `cordovaPlugins` will be stored as just their `ID` if they are installed from the Cordova registry. However, if they are local or remote, they will be stored as an object with those properties. Also to note, variables are stored for plugins with variables like the Facebook connect plugin.
-
-The `cordovaPlatforms` follow the same convention of either an `ID` for the platform name, if they are local or remote, they will be stored as an object with those properties.
-
-If you'd like, you can populate the `cordovaPlugins` and `cordovaPlatforms` by hand, then use the `ionic state restore` command to get your app ready to go.
-
-## ionic state clear
-
-The `ionic state clear` method will clear out your platforms and plugins directories, as well as removing the `cordovaPlugins` and `cordovaPlaforms` attributes in your `package.json` file.
-
-## ionic state reset
-
-The `ionic state reset` method will first remove your platforms and plugins folders. Then it will look at your `package.json` file to re-install the platforms and plugins as specified there.
-
-This command can be helpful for you to reinstall your plugins and platforms to get a fresh start.
-
-
 # Ionic CLI 2.0
 
 ## Ionic Generators
 
-First class support has come to the Ionic CLI to scaffold and generate Ionic and Angular 2 components. To use this feature, first install the V2 Ionic CLI: `npm install ionic@alpha` and start an app.
+First class support has come to the Ionic CLI to scaffold and generate Ionic and Angular 2 components.
 
-Once in the app folder, use the `generate` command (alias: `g`).
+From your app directory, use the `generate` command (alias: `g`).
 
 Usage:
 * `ionic generate page About` - Generate a page named About with HTML, JavaScript, and Sass named `about`.

From 951fbc867503fc420cda53d0df3f9595f67b4997 Mon Sep 17 00:00:00 2001
From: Justin Willis <jgw9617@gmail.com>
Date: Wed, 12 Oct 2016 13:52:25 -0500
Subject: [PATCH 1054/1100] chore(): add issue template (#1525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

👍
---
 .github/ISSUE_TEMPLATE.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..3887def3a2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,29 @@
+**Note: for support questions, please use one of these channels:**
+
+https://forum.ionicframework.com/
+http://ionicworldwide.herokuapp.com/
+
+**Note: for build related issues you can open up an issue on the ionic-app-scripts repo**
+
+https://github.com/driftyco/ionic-app-scripts
+
+
+#### Short description of the problem:
+
+
+#### What behavior are you expecting?
+
+
+**Steps to reproduce:**
+1.
+2.
+3.
+
+```
+insert any relevant code between the above and below backticks
+```
+
+**Post the output of `ionic info` below please**
+
+
+**Other information:** (e.g. stacktraces, related issues, suggestions how to fix, stackoverflow links, forum links, etc)
\ No newline at end of file

From 157aefd98d096f1dc6d26f195ed0cf6ea50d55e4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 14 Oct 2016 12:48:55 -0500
Subject: [PATCH 1055/1100] fix(): ensure all child spawned npm process exit
 when the parent process ends. fixes #1544

---
 lib/cli.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index c4fb1e8106..e40b686d12 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -312,7 +312,7 @@ Cli.runWithNpmScripts = function runWithNpmScripts(argv, taskInstance, rawCliArg
         return Cli.runNpmHook(scripts[afterHook]);
       }
     });
-}
+};
 
 Cli.runNpmHook = function runNpmHook(hook) {
   var cmd = 'npm';
@@ -347,9 +347,14 @@ Cli.runNpmHook = function runNpmHook(hook) {
     }
     return q.resolve();
   });
+  
+  // If this process ends ensure that we killed the spawned child
+  process.on('exit', function() {
+    spawned.kill();
+  });
 
   return q.promise;
-}
+};
 
 Cli.loadNpmScripts = function loadNpmScripts() {
   var fileName = 'package.json';

From f74e3c3754af204b272a3bc5a7811bc09462760f Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 14 Oct 2016 14:22:47 -0500
Subject: [PATCH 1056/1100] feat(): ensure child spawned processes for npm run
 print colors.

---
 lib/cli.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index e40b686d12..83a173e863 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -316,30 +316,27 @@ Cli.runWithNpmScripts = function runWithNpmScripts(argv, taskInstance, rawCliArg
 
 Cli.runNpmHook = function runNpmHook(hook) {
   var cmd = 'npm';
-  var args = ['run', hook];
+  var args = ['run', hook, '--color'];
   var command = cmd + ' ' + args;
 
   var q = Q.defer();
   var spawn = require('cross-spawn-async');
 
-  var spawned = spawn('npm', args);
+  var spawned = spawn('npm', args, { stdio: ['pipe', 'pipe', process.stderr] });
   spawned.on('error', function(err) {
     log.error('Unable to run spawn command ' + err);
   });
+  spawned.stdout.pipe(process.stdout);
   spawned.stdout.on('data', function(data) {
     var dataLines = data.toString().split('\n');
     for (var i = 0; i < dataLines.length; i++) {
       if (dataLines[i].length) {
-        log.info(dataLines[i]);
         if (dataLines[i].indexOf('watch ready') > -1) {
           return q.resolve();
         }
       }
     }
   });
-  spawned.stderr.on('data', function(data) {
-    log.info(data.toString());
-  });
   spawned.on('exit', function(code) {
     log.debug('Spawn command', command, 'completed');
     if (code !== 0) {

From 7e2dd6c6b627b1e3a16c5f0bd3290dd73658df17 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 14 Oct 2016 15:05:14 -0500
Subject: [PATCH 1057/1100] feat(): update  to print ionic app-scripts version.

---
 lib/ionic/info.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 3953c0a003..8827b22b5e 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -20,6 +20,7 @@ function run() {
 
     Info.getIonicVersion(info, process.cwd());
     Info.getIonicCliVersion(info, path.join(__dirname, '../../'));
+    Info.getIonicAppScriptsVersion(info, process.cwd());
 
     Info.printInfo(info);
 

From b8e9023022eab85b06e317e6f04a3bd26a7071c9 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 14 Oct 2016 15:10:17 -0500
Subject: [PATCH 1058/1100] chore(): increment package.json and update
 changelog.

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f39283fbd..04c31f108f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="2.1.1"></a>
+## [2.1.1](https://github.com/driftyco/ionic-cli/compare/v2.1.0...v2.1.1) (2016-10-14)
+
+
+### Bug Fixes
+
+* ensure all child spawned npm process exit when the parent process ends. fixes [#1544](https://github.com/driftyco/ionic-cli/issues/1544) ([157aefd](https://github.com/driftyco/ionic-cli/commit/157aefd))
+
+
+### Features
+
+* ensure child spawned processes for npm run print colors. ([f74e3c3](https://github.com/driftyco/ionic-cli/commit/f74e3c3))
+* update `ionic info` to print ionic app-scripts version. ([7e2dd6c](https://github.com/driftyco/ionic-cli/commit/7e2dd6c))
+
+
+
 <a name="2.1.0"></a>
 # [2.1.0](https://github.com/driftyco/ionic-cli/compare/v2.0.0...v2.1.0) (2016-09-16)
 
diff --git a/package.json b/package.json
index 02fa111ce2..4459402861 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.0-beta.1",
+    "ionic-app-lib": "2.1.1",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 5ee6657a5878c3c292793780c67dca268e98985a Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 18 Oct 2016 09:49:15 -0500
Subject: [PATCH 1059/1100] chore(): update info test to also spyOn
 getIonicAppScriptsVersion.

---
 spec/tasks/info.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/tasks/info.spec.js b/spec/tasks/info.spec.js
index 0c95995d97..5246bfbf2e 100644
--- a/spec/tasks/info.spec.js
+++ b/spec/tasks/info.spec.js
@@ -47,13 +47,14 @@ describe('info command', function() {
       expect(appLibInfo.checkRuntime).not.toHaveBeenCalled();
     });
 
-    it('should fail if any Info task throws', function() {
+    it('should gather info', function() {
       var gatheredInfo = { info: 'hi' };
       spyOn(appLibUtils, 'fail');
       spyOn(process, 'cwd').andReturn('/hello/how/areyou');
       spyOn(appLibInfo, 'gatherInfo').andReturn(gatheredInfo);
       spyOn(appLibInfo, 'getIonicVersion');
       spyOn(appLibInfo, 'getIonicCliVersion');
+      spyOn(appLibInfo, 'getIonicAppScriptsVersion');
       spyOn(appLibInfo, 'printInfo');
       spyOn(appLibInfo, 'checkRuntime');
 
@@ -62,6 +63,7 @@ describe('info command', function() {
       expect(appLibInfo.gatherInfo).toHaveBeenCalled();
       expect(appLibInfo.getIonicVersion).toHaveBeenCalledWith(gatheredInfo, '/hello/how/areyou');
       expect(appLibInfo.getIonicCliVersion).toHaveBeenCalledWith(gatheredInfo, jasmine.any(String));
+      expect(appLibInfo.getIonicAppScriptsVersion).toHaveBeenCalledWith(gatheredInfo, '/hello/how/areyou');
       expect(appLibInfo.printInfo).toHaveBeenCalledWith(gatheredInfo);
       expect(appLibInfo.checkRuntime).toHaveBeenCalled();
 

From cdbeef6ee4702b6ac8790342b54d6bdb8688bbca Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Tue, 18 Oct 2016 10:17:47 -0500
Subject: [PATCH 1060/1100] fix(): use an environment variable to force colors
 instead of using the --colors flag. (#1557)

---
 lib/cli.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index 83a173e863..93d97c3241 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -316,9 +316,12 @@ Cli.runWithNpmScripts = function runWithNpmScripts(argv, taskInstance, rawCliArg
 
 Cli.runNpmHook = function runNpmHook(hook) {
   var cmd = 'npm';
-  var args = ['run', hook, '--color'];
+  var args = ['run', hook];
   var command = cmd + ' ' + args;
 
+  // Force colors for all spawned child processes
+  process.env['FORCE_COLOR'] = true;
+
   var q = Q.defer();
   var spawn = require('cross-spawn-async');
 

From 7285d5198cec81bbfcd4d6e6afc10b37d4548b32 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Tue, 18 Oct 2016 10:41:18 -0500
Subject: [PATCH 1061/1100]  feat(): introduce new api for build and watch
 tasks for app-scripts.

---
 lib/ionic/build.js         | 10 ++++
 lib/ionic/emulate.js       | 10 ++++
 lib/ionic/run.js           | 10 ++++
 lib/ionic/serve.js         | 96 ++++++++++++++++++++------------------
 lib/utils/npmScripts.js    | 73 +++++++++++++++++++++++++++++
 spec/tasks/build.spec.js   | 47 +++++++++++++++++++
 spec/tasks/emulate.spec.js | 48 +++++++++++++++++++
 spec/tasks/run.spec.js     | 48 +++++++++++++++++++
 spec/tasks/serve.spec.js   | 67 ++++++++++++++++++++------
 9 files changed, 349 insertions(+), 60 deletions(-)
 create mode 100644 lib/utils/npmScripts.js

diff --git a/lib/ionic/build.js b/lib/ionic/build.js
index cade8f6daa..723ff7f47d 100644
--- a/lib/ionic/build.js
+++ b/lib/ionic/build.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var extend = require('../utils/extend');
+var npmScripts = require('../utils/npmScripts');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
@@ -51,6 +52,15 @@ function run(ionic, argv, rawCliArguments) {
       []);
 
   return Q.all(promiseList).then(function() {
+    return npmScripts.hasIonicScript('build');
+  })
+  .then(function(hasBuildCommand) {
+    if (hasBuildCommand) {
+      return npmScripts.runIonicScript('build');
+    }
+    return Q.resolve();
+  })
+  .then(function() {
 
     // ensure the content node was set back to its original
     return ConfigXml.setConfigXml(appDirectory, {
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 22b7472a69..6c11474fce 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var extend = require('../utils/extend');
+var npmScripts = require('../utils/npmScripts');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
@@ -68,6 +69,15 @@ function run(ionic, argv, rawCliArguments) {
       []);
 
   return Q.all(promiseList).then(function() {
+    return npmScripts.hasIonicScript('build');
+  })
+  .then(function(hasBuildCommand) {
+    if (hasBuildCommand) {
+      return npmScripts.runIonicScript('build');
+    }
+    return Q.resolve();
+  })
+  .then(function() {
     if (isLiveReload) {
       return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index dc47b13b9b..9188e3b844 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var extend = require('../utils/extend');
+var npmScripts = require('../utils/npmScripts');
 var os = require('os');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
@@ -68,6 +69,15 @@ function run(ionic, argv, rawCliArguments) {
       []);
 
   return Q.all(promiseList).then(function() {
+    return npmScripts.hasIonicScript('build');
+  })
+  .then(function(hasBuildCommand) {
+    if (hasBuildCommand) {
+      return npmScripts.runIonicScript('build');
+    }
+    return Q.resolve();
+  })  
+  .then(function() {
     if (isLiveReload) {
       return cordovaUtils.setupLiveReload(argv, appDirectory);
     }
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index cfd6cef21f..636e019b8e 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var extend = require('../utils/extend');
+var npmScripts = require('../utils/npmScripts');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
 var events = IonicAppLib.events;
@@ -60,65 +61,68 @@ var settings =  {
 };
 
 function run(ionic, argv) {
+
+  /**
+   * Before running the internal server check to see if npmscripts has 
+   * a ionic specific serve command.  If so then run it instead.
+   */
+  return npmScripts.hasIonicScript('serve')
+    .then(function(hasServeCommand) {
+      if (hasServeCommand) {
+        return npmScripts.runIonicScript('serve', argv);
+      } else {
+        return runServer(argv);
+      }
+    })
+    .catch(function(error) {
+      log.error('There was an error serving your Ionic application:', error);
+    });
+}
+
+function runServer(argv) {
   var project = null;
   var cwd = process.cwd();
+  var options = {};
+  var promise = Q();
 
-  try {
-    project = IonicProject.load(cwd);
-  } catch (ex) {
-    log.error('Error occured', ex);
-    return appLibUtils.fail(ex.message);
-  }
-
-  var options = Serve.loadSettings(argv, project);
+  project = IonicProject.load(cwd);
 
+  options = Serve.loadSettings(argv, project);
   options.appDirectory = cwd; // called from cli - ionic serve - cwd is this
-
   options.nogulp = argv.nogulp;
 
   // check if CONNECT_LIVE_RELOAD_PORT is defined and use that instead
   if (process.env.CONNECT_LIVE_RELOAD_PORT) {
     options.liveReloadPort = process.env.CONNECT_LIVE_RELOAD_PORT;
   }
-  var promise;
-
-  try {
-    if (argv.all || argv.a) {
-      options.address = '0.0.0.0';
-      promise = Q();
-    } else if (argv.address) {
-      options.address = argv.address;
-      promise = Q();
-    } else {
-      promise = Serve.getAddress(options);
-    }
 
-    return promise
-    .then(function() {
-      return Serve.checkPorts(true, options.port, options.address, options);
-    })
-    .then(function() {
-      if (options.runLivereload) {
-        return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
-      }
-    })
-    .then(function() {
-      return Serve.start(options);
-    })
-    .then(function() {
-      return Serve.showFinishedServeMessage(options);
-    })
-    .then(function() {
-      events.on('serverlog', log.info);
-      events.on('consolelog', log.info);
-    })
-    .catch(function(error) {
-      log.info('There was an error serving your Ionic application:', error);
-      throw error;
-    });
-  } catch (ex) {
-    appLibUtils.fail('Error with serve- ' + ex);
+  if (argv.all || argv.a) {
+    options.address = '0.0.0.0';
+  } else if (argv.address) {
+    options.address = argv.address;
+  } else {
+    promise = Serve.getAddress(options);
   }
+
+  return promise
+  .then(function() {
+    return Serve.checkPorts(true, options.port, options.address, options);
+  })
+  .then(function() {
+    if (options.runLivereload) {
+      return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
+    }
+  })
+  .then(function() {
+    return Serve.start(options);
+  })
+  .then(function() {
+    return Serve.showFinishedServeMessage(options);
+  })
+  .then(function() {
+    events.on('serverlog', log.info);
+    events.on('consolelog', log.info);
+  });
 }
 
 module.exports = extend(settings, {
diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
new file mode 100644
index 0000000000..4315c673fe
--- /dev/null
+++ b/lib/utils/npmScripts.js
@@ -0,0 +1,73 @@
+'use strict';
+
+var Q = require('q');
+var path = require('path');
+var fs = require('fs');
+var IonicAppLib = require('ionic-app-lib');
+var log = IonicAppLib.logging.logger;
+
+
+function hasIonicScript(name) {
+  return getPackageJsonContents().then(function(packageJsonContents) {
+    return packageJsonContents.hasOwnProperty('scripts') && 
+           packageJsonContents.scripts.hasOwnProperty('ionic:' + name);
+  });
+}
+
+function runIonicScript(name, argv) {
+  var spawn = require('cross-spawn-async');
+  var scriptName = 'ionic:' + name;
+  var q = Q.defer();
+
+  var scriptSpawn = spawn('npm', ['run', scriptName].concat(argv || []), { stdio: 'inherit' })
+    .on('error', function(err) {
+      log.debug('Spawn command', scriptName, 'failed');
+      q.reject('Unable to run spawn command ' + err);
+    });
+  
+  scriptSpawn.on('exit', function(code) {
+    log.debug('Spawn command', scriptName, 'completed');
+    if (code !== 0) {
+      return q.reject('There was an error with the spawned command: ' + name);
+    }
+    return q.resolve();
+  });
+  
+  return q.promise;
+}
+
+/**
+ * Function is memoized so that it should only access the filesystem one time.
+ * Everytime after that it just returns the saved packageJson wrapped in a resolved promise.
+ */
+var getPackageJsonContents = (function() {
+  var packageJson;
+
+  return function f() {
+    var packageJsonPath = path.resolve(process.cwd() + '/package.json');
+    var q = Q.defer();
+
+    if (packageJson) {
+      Q.resolve(packageJson);
+    }
+
+    try {
+      fs.readFile(packageJsonPath, 'utf8', function(err, dataString) {
+        if (!err) {
+          packageJson = JSON.parse(dataString);
+        }
+        q.resolve(packageJson);
+      });
+    } catch (e) {
+      q.resolve(packageJson);
+    }
+
+    return q.promise;
+  };
+})();
+
+module.exports = {
+  getPackageJsonContents: getPackageJsonContents,
+  hasIonicScript: hasIonicScript,
+  runIonicScript: runIonicScript
+};
diff --git a/spec/tasks/build.spec.js b/spec/tasks/build.spec.js
index 1a563782b0..add186aa2a 100644
--- a/spec/tasks/build.spec.js
+++ b/spec/tasks/build.spec.js
@@ -8,6 +8,7 @@ var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
 var build = require('../../lib/ionic/build');
+var npmScripts = require('../../lib/utils/npmScripts');
 
 describe('build command', function() {
   beforeEach(function() {
@@ -54,6 +55,7 @@ describe('build command', function() {
 
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
@@ -90,6 +92,7 @@ describe('build command', function() {
 
       spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
       spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
     });
 
     it('should try to install the cordova platform if it is not installed', function(done) {
@@ -161,4 +164,48 @@ describe('build command', function() {
       });
     });
   });
+
+  describe('npmScripts check', function() {
+    var appDirectory = '/ionic/app/path';
+    var processArguments = ['node', 'ionic', 'build', 'ios', '-n'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      spyOn(os, 'platform').andReturn('darwin');
+      spyOn(process, 'cwd').andReturn(appDirectory);
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+    });
+
+    it('should not call runIonicScript if hasIonicScript is false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['build', 'ios', '-n']);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+
+    it('should call runIonicScript if hasIonicScript is true', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      build.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['build', 'ios', '-n']);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+  });
 });
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index 9529948092..46ea4fefc5 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -8,6 +8,7 @@ var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
 var emulate = require('../../lib/ionic/emulate');
+var npmScripts = require('../../lib/utils/npmScripts');
 
 describe('emulate command', function() {
   beforeEach(function() {
@@ -52,6 +53,7 @@ describe('emulate command', function() {
       spyOn(process, 'cwd').andReturn(appDirectory);
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
     });
 
     it('should default to iOS for the platform', function(done) {
@@ -86,6 +88,7 @@ describe('emulate command', function() {
       spyOn(process, 'cwd').andReturn(appDirectory);
       spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
       spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
@@ -138,6 +141,7 @@ describe('emulate command', function() {
     beforeEach(function() {
       spyOn(process, 'cwd').andReturn(appDirectory);
       spyOn(os, 'platform').andReturn('darwin');
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
     });
 
     it('should fail if any functions throw', function(done) {
@@ -222,4 +226,48 @@ describe('emulate command', function() {
       });
     });
   });
+
+  describe('npmScripts check', function() {
+    var processArguments = ['node', 'ionic', 'emulate', 'android'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      var appDirectory = '/ionic/app/path';
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(os, 'platform').andReturn('darwin');
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
+    });
+
+    it('should not call runIonicScript if hasIonicScript is false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+
+    it('should call runIonicScript if hasIonicScript is true', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+  });
 });
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
index a2ee1c1190..08240aa99a 100644
--- a/spec/tasks/run.spec.js
+++ b/spec/tasks/run.spec.js
@@ -8,6 +8,7 @@ var IonicAppLib = require('ionic-app-lib');
 var ConfigXml = IonicAppLib.configXml;
 var log = IonicAppLib.logging.logger;
 var run = require('../../lib/ionic/run');
+var npmScripts = require('../../lib/utils/npmScripts');
 
 describe('run command', function() {
   beforeEach(function() {
@@ -54,6 +55,7 @@ describe('run command', function() {
       spyOn(process, 'cwd').andReturn(appDirectory);
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
@@ -90,6 +92,7 @@ describe('run command', function() {
 
       spyOn(cordovaUtils, 'installPlatform').andReturn(Q(true));
       spyOn(cordovaUtils, 'installPlugins').andReturn(Q(true));
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
@@ -143,6 +146,7 @@ describe('run command', function() {
 
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
     });
 
     it('should execute the command against the cordova util', function(done) {
@@ -217,4 +221,48 @@ describe('run command', function() {
       });
     });
   });
+
+  describe('npmScripts check', function() {
+    var processArguments = ['node', 'ionic', 'run', 'android'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+
+    beforeEach(function() {
+      var appDirectory = '/ionic/app/path';
+      spyOn(process, 'cwd').andReturn(appDirectory);
+      spyOn(os, 'platform').andReturn('darwin');
+
+      spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+    });
+
+    it('should not call runIonicScript if hasIonicScript is false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+
+    it('should call runIonicScript if hasIonicScript is true', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+  });
 });
diff --git a/spec/tasks/serve.spec.js b/spec/tasks/serve.spec.js
index ebbb91a980..e3f53220eb 100644
--- a/spec/tasks/serve.spec.js
+++ b/spec/tasks/serve.spec.js
@@ -9,6 +9,7 @@ var IonicProject = IonicAppLib.project;
 var Serve = IonicAppLib.serve;
 var log = IonicAppLib.logging.logger;
 var appLibUtils = IonicAppLib.utils;
+var npmScripts = require('../../lib/utils/npmScripts');
 
 describe('Serve', function() {
 
@@ -66,15 +67,17 @@ describe('Serve', function() {
 
       var error = new Error('some error');
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andCallFake(function() {
         throw error;
       });
-      spyOn(appLibUtils, 'fail');
 
-      serveTask.run({}, argv);
-      expect(log.error).toHaveBeenCalledWith(jasmine.any(String), error);
-      expect(appLibUtils.fail).toHaveBeenCalledWith(error.message);
-      done();
+      serveTask.run({}, argv).then(function() {
+        expect(log.error).toHaveBeenCalledWith(jasmine.any(String), error);
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
+        done();
+      });
     });
 
     it('should fail if loading the ionic project fails', function(done) {
@@ -83,6 +86,9 @@ describe('Serve', function() {
       var argv = optimist(rawCliArguments).argv;
 
       var error = new Error('some error');
+
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -93,19 +99,22 @@ describe('Serve', function() {
         throw error;
       });
 
-      spyOn(appLibUtils, 'fail');
-
-      serveTask.run({}, argv);
-      expect(appLibUtils.fail).toHaveBeenCalledWith('Error with serve- ' + error);
-      done();
+      serveTask.run({}, argv).then(function() {
+        expect(log.error).toHaveBeenCalledWith(jasmine.any(String), error);
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
+        done();
+      });
     });
 
-    it('should return a rejected promise when chain fails', function(done) {
+    it('should call appLibUtils when chain fails', function(done) {
       var processArguments = ['node', 'ionic', 'serve', '-a'];
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
       var error = new Error('some error');
+
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -118,13 +127,13 @@ describe('Serve', function() {
       spyOn(Serve, 'start');
       spyOn(Serve, 'showFinishedServeMessage');
 
-      serveTask.run({}, argv).catch(function(errCaught) {
+      serveTask.run({}, argv).then(function() {
         expect(Serve.checkPorts).toHaveBeenCalled();
         expect(Serve.start).not.toHaveBeenCalled();
         expect(Serve.showFinishedServeMessage).not.toHaveBeenCalled();
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
 
-        expect(log.info).toHaveBeenCalledWith('There was an error serving your Ionic application:', error);
-        expect(errCaught).toEqual(error);
+        expect(log.error).toHaveBeenCalledWith(jasmine.any(String), error);
         done();
       });
     });
@@ -134,6 +143,8 @@ describe('Serve', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -147,6 +158,7 @@ describe('Serve', function() {
       spyOn(Serve, 'showFinishedServeMessage');
 
       serveTask.run({}, argv).then(function() {
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(Serve.getAddress).not.toHaveBeenCalled();
         expect(Serve.start.calls[0].args[0].address).toBe('0.0.0.0');
         done();
@@ -158,6 +170,8 @@ describe('Serve', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -171,6 +185,7 @@ describe('Serve', function() {
       spyOn(Serve, 'showFinishedServeMessage');
 
       serveTask.run({}, argv).then(function() {
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(Serve.getAddress).not.toHaveBeenCalled();
         expect(Serve.start.calls[0].args[0].address).toBe('0.0.0.0');
         done();
@@ -182,6 +197,8 @@ describe('Serve', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -195,6 +212,7 @@ describe('Serve', function() {
       spyOn(Serve, 'showFinishedServeMessage');
 
       serveTask.run({}, argv).then(function() {
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(Serve.getAddress).not.toHaveBeenCalled();
         expect(Serve.start.calls[0].args[0].address).toBe('192.168.1.10');
         done();
@@ -206,6 +224,8 @@ describe('Serve', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({});
       spyOn(Serve, 'loadSettings').andReturn({});
       spyOn(Serve, 'getAddress').andReturn(Q());
@@ -223,6 +243,7 @@ describe('Serve', function() {
       };
 
       serveTask.run({}, argv).then(function() {
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(Serve.start).toHaveBeenCalledWith(options);
         done();
       });
@@ -233,6 +254,8 @@ describe('Serve', function() {
       var rawCliArguments = processArguments.slice(2);
       var argv = optimist(rawCliArguments).argv;
 
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+      spyOn(npmScripts, 'runIonicScript');
       spyOn(IonicProject, 'load').andReturn({
         get: function() {
           return false;
@@ -246,9 +269,25 @@ describe('Serve', function() {
       spyOn(Serve, 'showFinishedServeMessage');
 
       serveTask.run({}, argv).then(function() {
+        expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(Serve.start.calls[0].args[0].liveReloadPort).toBe(35729);
         done();
       });
     });
+
+    it('should call runIonicScript if hasIonicScript is true', function(done) {
+      var processArguments = ['node', 'ionic', 'serve', '--livereload', '--nogulp'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      serveTask.run({}, argv).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('serve');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', argv);
+        done();
+      });
+    });
   });
 });

From 5544cc8f286a9331f4440eee0b5aff73e5ed4a78 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 18 Oct 2016 10:50:19 -0500
Subject: [PATCH 1062/1100] chore(): increment package.json version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4459402861..e48a39b347 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 9c128e0b49261969e6881d9146cfaaeab2c0c305 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Fri, 21 Oct 2016 08:33:24 -0500
Subject: [PATCH 1063/1100] chore(): create tests for npmscripts util.

---
 lib/utils/npmScripts.js       | 10 +++--
 spec/fixtures/package.json    | 53 +++++++++++++++++++++++++
 spec/utils/npmScripts.spec.js | 73 +++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/package.json
 create mode 100644 spec/utils/npmScripts.spec.js

diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index 4315c673fe..e538e5dd7c 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -6,17 +6,21 @@ var fs = require('fs');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
 
+function getScriptName(name) {
+  return 'ionic:' + name;
+}
+
 
 function hasIonicScript(name) {
   return getPackageJsonContents().then(function(packageJsonContents) {
     return packageJsonContents.hasOwnProperty('scripts') && 
-           packageJsonContents.scripts.hasOwnProperty('ionic:' + name);
+           packageJsonContents.scripts.hasOwnProperty(getScriptName(name));
   });
 }
 
 function runIonicScript(name, argv) {
   var spawn = require('cross-spawn-async');
-  var scriptName = 'ionic:' + name;
+  var scriptName = getScriptName(name);
   var q = Q.defer();
 
   var scriptSpawn = spawn('npm', ['run', scriptName].concat(argv || []), { stdio: 'inherit' })
@@ -48,7 +52,7 @@ var getPackageJsonContents = (function() {
     var q = Q.defer();
 
     if (packageJson) {
-      Q.resolve(packageJson);
+      return Q.resolve(packageJson);
     }
 
     try {
diff --git a/spec/fixtures/package.json b/spec/fixtures/package.json
new file mode 100644
index 0000000000..6ddf931184
--- /dev/null
+++ b/spec/fixtures/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "ionic-hello-world",
+  "author": "Ionic Framework",
+  "homepage": "http://ionicframework.com/",
+  "scripts": {
+    "ionic:build": "ionic-app-scripts build",
+    "watch": "ionic-app-scripts watch",
+    "ionic:test": "dir",
+    "serve:before": "watch",
+    "emulate:before": "build",
+    "deploy:before": "build",
+    "build:before": "build",
+    "run:before": "build"
+  },
+  "dependencies": {
+    "@angular/common": "^2.0.0",
+    "@angular/compiler": "^2.0.0",
+    "@angular/compiler-cli": "0.6.2",
+    "@angular/core": "^2.0.0",
+    "@angular/forms": "^2.0.0",
+    "@angular/http": "^2.0.0",
+    "@angular/platform-browser": "^2.0.0",
+    "@angular/platform-browser-dynamic": "^2.0.0",
+    "@angular/platform-server": "^2.0.0",
+    "@ionic/storage": "^1.0.3",
+    "ionic-angular": "^2.0.0-rc.1",
+    "ionic-native": "^2.2.3",
+    "ionicons": "^3.0.0",
+    "rxjs": "5.0.0-beta.12",
+    "zone.js": "^0.6.21"
+  },
+  "devDependencies": {
+    "@ionic/app-scripts": "^0.0.36",
+    "typescript": "^2.0.3"
+  },
+  "cordovaPlugins": [
+    "cordova-plugin-whitelist",
+    "cordova-plugin-statusbar",
+    "cordova-plugin-console",
+    "cordova-plugin-device",
+    "cordova-plugin-splashscreen",
+    "ionic-plugin-keyboard"
+  ],
+  "cordovaPlatforms": [
+    "ios",
+    {
+      "platform": "ios",
+      "version": "",
+      "locator": "ios"
+    }
+  ],
+  "description": "hi: An Ionic project"
+}
\ No newline at end of file
diff --git a/spec/utils/npmScripts.spec.js b/spec/utils/npmScripts.spec.js
new file mode 100644
index 0000000000..ca1a84fec0
--- /dev/null
+++ b/spec/utils/npmScripts.spec.js
@@ -0,0 +1,73 @@
+'use strict';
+
+var rewire = require('rewire');
+var path = require('path');
+var fs = require('fs');
+var npmScripts = rewire('../../lib/utils/npmScripts');
+var EventEmitter = require('events');
+var Q = require('q');
+var spawn = require('cross-spawn-async');
+
+describe('hasIonicScript function', function() {
+  
+  it('should return false if script does not exist', function(done) {
+    var jsonContent = require(path.join(__dirname, '../', 'fixtures/', 'package.json'));
+    var getPackageJsonContentsSpy = jasmine.createSpy('getPackageJsonContentsSpy').andReturn(Q(jsonContent));
+    var revert = npmScripts.__set__('getPackageJsonContents', getPackageJsonContentsSpy);
+    spyOn(npmScripts, 'getPackageJsonContents').andReturn(Q(jsonContent));
+
+    npmScripts.hasIonicScript('stuff').then(function(results) {
+      expect(results).toEqual(false);
+      done();
+      revert();
+    });
+  });
+  it('should return true if script does not exist', function(done) {
+    var jsonContent = require(path.join(__dirname, '../', 'fixtures/', 'package.json'));
+    var getPackageJsonContentsSpy = jasmine.createSpy('getPackageJsonContentsSpy').andReturn(Q(jsonContent));
+    var revert = npmScripts.__set__('getPackageJsonContents', getPackageJsonContentsSpy);
+    spyOn(npmScripts, 'getPackageJsonContents').andReturn(Q(jsonContent));
+
+    npmScripts.hasIonicScript('build').then(function(results) {
+      expect(results).toEqual(true);
+      done();
+      revert();
+    });
+  });
+});
+/*
+describe('runIonicScript function', function() {
+  it('should call spawn', function(done) {
+    //'npm', ['run', scriptName].concat(argv || []), { stdio: 'inherit' }
+    var emitter = new EventEmitter();
+    var error = new Error();
+
+    spawn = jasmine.createSpy('spawnSpy', spawn).andCallFake(function() {
+      return emitter;
+    });
+
+    npmScripts.runIonicScript('test').catch(function(err) {
+      expect(err).toEqual(error);
+      done();
+    });
+    emitter.emit('error', error);
+  });
+});
+*/
+describe('getPackageJsonContents method', function() {
+  it('getPackageJsonContents should return json contents of package.json file and should memoize', function(done) {
+    var dapath = path.join(__dirname, '../', 'fixtures/package.json');
+    spyOn(path, 'resolve').andReturn(dapath);
+    spyOn(fs, 'readFile').andCallThrough();
+
+    npmScripts.getPackageJsonContents().then(function(contents) {
+      expect(contents).toEqual(require(dapath));
+
+      npmScripts.getPackageJsonContents().then(function(secondContents) {
+        expect(secondContents).toEqual(require(dapath));
+        expect(fs.readFile.calls.length).toEqual(1);
+        done();
+      });
+    });
+  });
+});
\ No newline at end of file

From 5565e5dc2bf20f90e5be128f347a0ef285e9ee84 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 21 Oct 2016 10:35:04 -0500
Subject: [PATCH 1064/1100] chore(): increment ionic-app-lib dependency to
 2.1.2 to get latests fixes.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e48a39b347..83cb61a550 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.1",
+    "ionic-app-lib": "2.1.2",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From a1f7bb55442ca1402d5901de45eb737aea7aa726 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 21 Oct 2016 10:37:16 -0500
Subject: [PATCH 1065/1100] chore(): update changelog.

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c31f108f..8f42663408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="2.1.2"></a>
+## [2.1.2](https://github.com/driftyco/ionic-cli/compare/v2.1.1...v2.1.2) (2016-10-21)
+
+### Bug Fixes
+
+chore(): increment ionic-app-lib dependency to 2.1.2 to get latests fixes. ([5565e5d](https://github.com/driftyco/ionic-cli/commit/5565e5d))
+
+
 <a name="2.1.1"></a>
 ## [2.1.1](https://github.com/driftyco/ionic-cli/compare/v2.1.0...v2.1.1) (2016-10-14)
 

From a56d792d797e8d73d9e3646d91c35a4473bdf2f5 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Fri, 21 Oct 2016 10:39:15 -0500
Subject: [PATCH 1066/1100] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f42663408..6117fd04ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ### Bug Fixes
 
-chore(): increment ionic-app-lib dependency to 2.1.2 to get latests fixes. ([5565e5d](https://github.com/driftyco/ionic-cli/commit/5565e5d))
+* increment ionic-app-lib dependency to 2.1.2 to get latests fixes. ([5565e5d](https://github.com/driftyco/ionic-cli/commit/5565e5d))
 
 
 <a name="2.1.1"></a>

From 4b4b77f8ffe6b8e6ffb315e09f9d8590f61cfbae Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 21 Oct 2016 11:11:00 -0500
Subject: [PATCH 1067/1100] chore(): update changelog for 2.1.2 and 2.1.3.

---
 CHANGELOG.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6117fd04ba..31bec396d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,21 @@
-<a name="2.1.2"></a>
-## [2.1.2](https://github.com/driftyco/ionic-cli/compare/v2.1.1...v2.1.2) (2016-10-21)
+<a name="2.1.3"></a>
+## [2.1.3](https://github.com/driftyco/ionic-cli/compare/v2.1.2...v2.1.3) (2016-10-21)
+
 
 ### Bug Fixes
 
 * increment ionic-app-lib dependency to 2.1.2 to get latests fixes. ([5565e5d](https://github.com/driftyco/ionic-cli/commit/5565e5d))
 
 
+<a name="2.1.2"></a>
+## [2.1.2](https://github.com/driftyco/ionic-cli/compare/v2.1.1...v2.1.2) (2016-10-18)
+
+
+### Bug Fixes
+
+* use an environment variable to force colors instead of using the --colors flag. ([#1557](https://github.com/driftyco/ionic-cli/issues/1557)) ([cdbeef6](https://github.com/driftyco/ionic-cli/commit/cdbeef6))
+
+
 <a name="2.1.1"></a>
 ## [2.1.1](https://github.com/driftyco/ionic-cli/compare/v2.1.0...v2.1.1) (2016-10-14)
 

From 2a50608ada56fab24cfe611ca50a4b6b0ac71f5e Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Fri, 21 Oct 2016 11:26:07 -0500
Subject: [PATCH 1068/1100] fix(): rerelease to npm because ionic-app-lib
 bundled dependency was not updated.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83cb61a550..3eeda02abb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 58cfd8a5c091665be51fcdc5d4b0c8a5acbb39f6 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Tue, 25 Oct 2016 13:39:20 -0500
Subject: [PATCH 1069/1100] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31bec396d5..1eb17d536f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-<a name="2.1.3"></a>
-## [2.1.3](https://github.com/driftyco/ionic-cli/compare/v2.1.2...v2.1.3) (2016-10-21)
+<a name="2.1.4"></a>
+## [2.1.4](https://github.com/driftyco/ionic-cli/compare/v2.1.2...v2.1.4) (2016-10-21)
 
 
 ### Bug Fixes

From 26486d2449740aa4d6083f74b1ae364290c72fd6 Mon Sep 17 00:00:00 2001
From: Vyacheslav Chub <buchslava@users.noreply.github.com>
Date: Fri, 28 Oct 2016 04:23:44 +0300
Subject: [PATCH 1070/1100] fix(cli): npm install under windows (#1539)

Closes #1445
---
 lib/cli.js                   | 7 ++++---
 lib/utils/help.js            | 7 ++++---
 spec/utils/templates.spec.js | 3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index 93d97c3241..10873abdca 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -18,6 +18,7 @@ var Logging = IonicAppLib.logging;
 var log = Logging.logger;
 var Q = require('q');
 var helpUtil = require('./utils/help');
+var EOL = require('os').EOL;
 
 Cli.ALL_TASKS = Tasks;
 Cli.IONIC_DASH = 'https://apps.ionic.io';
@@ -268,7 +269,7 @@ Cli.loadGulpfile = function loadGulpfile() {
   var names = ['gulpfile.js', 'Gulpfile.js'];
   for (var i = 0, ii = names.length; i < ii; i += 1) {
     try {
-      require(path.resolve(process.cwd() + '/' + names[i]));
+      require(path.resolve(process.cwd(), names[i]));
       log.verbose('Gulpfile found');
       return true;
     } catch (e) {
@@ -331,7 +332,7 @@ Cli.runNpmHook = function runNpmHook(hook) {
   });
   spawned.stdout.pipe(process.stdout);
   spawned.stdout.on('data', function(data) {
-    var dataLines = data.toString().split('\n');
+    var dataLines = data.toString().split(EOL);
     for (var i = 0; i < dataLines.length; i++) {
       if (dataLines[i].length) {
         if (dataLines[i].indexOf('watch ready') > -1) {
@@ -360,7 +361,7 @@ Cli.loadNpmScripts = function loadNpmScripts() {
   var fileName = 'package.json';
 
   try {
-    var packageFile = require(path.resolve(process.cwd() + '/' + fileName));
+    var packageFile = require(path.resolve(process.cwd(), fileName));
     log.verbose('Package.json found scripts:', packageFile.scripts);
     return packageFile.scripts;
   } catch (e) {
diff --git a/lib/utils/help.js b/lib/utils/help.js
index 144adbdbc2..2aebb576f7 100644
--- a/lib/utils/help.js
+++ b/lib/utils/help.js
@@ -2,6 +2,7 @@
 
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
+var EOL = require('os').EOL;
 require('colors');
 
 /**
@@ -173,7 +174,7 @@ function printTaskDetails(d) {
     }
     w((indent + '    ' + arg + ' ').bold);
 
-    var argDescs = d.args[arg].split('\n');
+    var argDescs = d.args[arg].split(EOL);
     var argIndent = indent + '    ';
 
     for (x = 0; x < arg.length + 1; x += 1) {
@@ -218,9 +219,9 @@ function printTaskDetails(d) {
         var optDescs;
 
         if (typeof taskOpt == 'string') {
-          optDescs = taskOpt.split('\n');
+          optDescs = taskOpt.split(EOL);
         } else {
-          optDescs = taskOpt.title.split('\n');
+          optDescs = taskOpt.title.split(EOL);
         }
         for (x = 0; x < optDescs.length; x += 1) {
           if (x === 0) {
diff --git a/spec/utils/templates.spec.js b/spec/utils/templates.spec.js
index 0e75efd953..ae37dbb929 100644
--- a/spec/utils/templates.spec.js
+++ b/spec/utils/templates.spec.js
@@ -5,6 +5,7 @@ var rewire = require('rewire');
 var templateUtils = rewire('../../lib/utils/templates');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
+var EOL = require('os').EOL;
 
 describe('listTemplates method', function() {
   it('should should call fetchStarterTemplates pull out templates/sort and send to list', function(done) {
@@ -148,7 +149,7 @@ describe('list function', function() {
     var list = templateUtils.__get__('list');
 
     list(templates);
-    expect(log.info.calls[0].args).toEqual(['\n']);
+    expect(log.info.calls[0].args).toEqual([EOL]);
     expect(log.info.calls[1].args[0]).toMatch('a-template'); // Use match because of colors
     expect(log.info.calls[1].args[1]).toEqual('...........');
     expect(log.info.calls[1].args[2]).toEqual(templates[0].description);

From 690a447fbf87a592cae53551c25f23e2d9dd21c9 Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Fri, 28 Oct 2016 13:42:10 -0500
Subject: [PATCH 1071/1100] chore(): replace colors module with chalk and
 update all usages. (#1605)

---
 .eslintrc.js           |  4 +++
 lib/cli.js             | 70 ++++++++++++++++++------------------------
 lib/ionic/add.js       | 11 +++----
 lib/ionic/config.js    |  4 ++-
 lib/ionic/docs.js      |  7 +++--
 lib/ionic/emulate.js   |  3 +-
 lib/ionic/generate.js  | 48 -----------------------------
 lib/ionic/help.js      |  3 +-
 lib/ionic/io.js        |  3 +-
 lib/ionic/lib.js       | 33 ++++++++++----------
 lib/ionic/link.js      |  3 +-
 lib/ionic/list.js      | 11 +++----
 lib/ionic/login.js     | 11 ++++---
 lib/ionic/package.js   | 40 ++++++++++++------------
 lib/ionic/push.js      | 37 +++++++++++-----------
 lib/ionic/remove.js    | 11 ++++---
 lib/ionic/resources.js |  3 +-
 lib/ionic/run.js       |  3 +-
 lib/ionic/security.js  | 27 ++++++++--------
 lib/ionic/serve.js     |  1 -
 lib/ionic/service.js   | 17 +++++-----
 lib/ionic/setup.js     | 17 +++++-----
 lib/ionic/share.js     |  4 ++-
 lib/ionic/start.js     |  4 +--
 lib/utils/bower.js     |  5 ++-
 lib/utils/cordova.js   |  9 +++---
 lib/utils/help.js      | 28 ++++++++---------
 lib/utils/ionitron.js  |  4 +--
 lib/utils/templates.js | 10 +++---
 package.json           |  7 +++--
 30 files changed, 197 insertions(+), 241 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0905e44435..ffa1706b6f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,8 +3,12 @@ module.exports = {
     node: true,
     commonjs: true
   },
+  plugins: [
+    'no-use-extend-native'
+  ],
   extends: 'eslint:recommended',
   rules: {
+    'no-use-extend-native/no-use-extend-native': 2,
     eqeqeq: [
       "error",
       "smart"
diff --git a/lib/cli.js b/lib/cli.js
index 10873abdca..1dbf2dcfea 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -1,5 +1,3 @@
-require('colors');
-
 var Cli = {};
 var IonicAppLib = require('ionic-app-lib');
 var IonicStats = require('./utils/stats');
@@ -19,6 +17,7 @@ var log = Logging.logger;
 var Q = require('q');
 var helpUtil = require('./utils/help');
 var EOL = require('os').EOL;
+var chalk = require('chalk');
 
 Cli.ALL_TASKS = Tasks;
 Cli.IONIC_DASH = 'https://apps.ionic.io';
@@ -154,7 +153,7 @@ Cli.run = function run(processArgv) {
     // For v2, print a warning as this is most likely not what they want
     if (!fs.existsSync('node_modules')) {
       if (argv.v2) {
-        log.warn('WARN: No node_modules directory found, do you need to run npm install?'.yellow);
+        log.warn(chalk.yellow('WARN: No node_modules directory found, do you need to run npm install?'));
       }
       log.debug('node_modules directory not found, not running gulp hooks');
 
@@ -173,7 +172,7 @@ Cli.run = function run(processArgv) {
         log.info('\nDo you need to run `npm install`?\n');
         process.exit(1);
       }
-      log.error('\nThere is an error in your gulpfile: '.red);
+      log.error(chalk.red('\nThere is an error in your gulpfile: '));
       log.error(e.stack + '\n');
       process.exit(1);
     }
@@ -188,6 +187,7 @@ Cli.run = function run(processArgv) {
     }
 
     if (!gulpLoaded) {
+
       // warn if no build file and it's a command that requires a build step
       // but still run the command with no hooks
       if (Cli.isBuildCommand(taskName) && argv.v2 && !npmScripts) {
@@ -216,8 +216,8 @@ Cli.runWithGulp = function runWithGulp(argv, taskInstance, rawCliArguments) {
   } catch (e) {
 
     // Empty gulpfile (or one that doesn't require gulp?), and no gulp
-    log.error('\nGulpfile detected, but gulp is not installed'.red);
-    log.error('Do you need to run `npm install`?\n'.red);
+    log.error(chalk.red('\nGulpfile detected, but gulp is not installed'));
+    log.error(chalk.red('Do you need to run `npm install`?\n'));
     return process.exit(1);
   }
 
@@ -231,9 +231,9 @@ Cli.runWithGulp = function runWithGulp(argv, taskInstance, rawCliArguments) {
     beforeHookPromise = Cli.runGulpHook(gulp, beforeHook);
 
   } else if (Cli.isBuildCommand(cmdName) && argv.v2) {
-    log.warn(('WARN: No \'' + beforeHook + '\' gulp task found!').yellow);
-    log.warn(('If your app requires a build step, you may want to ensure it runs before ' +
-              cmdName + '.\n').yellow);
+    log.warn(chalk.yellow('WARN: No \'' + beforeHook + '\' gulp task found!'));
+    log.warn(chalk.yellow('If your app requires a build step, you may want to ensure it runs before ' +
+              cmdName + '.\n'));
   }
 
   // run beforeHook
@@ -333,7 +333,7 @@ Cli.runNpmHook = function runNpmHook(hook) {
   spawned.stdout.pipe(process.stdout);
   spawned.stdout.on('data', function(data) {
     var dataLines = data.toString().split(EOL);
-    for (var i = 0; i < dataLines.length; i++) {
+    for (var i = 0; i < dataLines.length; i += 1) {
       if (dataLines[i].length) {
         if (dataLines[i].indexOf('watch ready') > -1) {
           return q.resolve();
@@ -348,7 +348,7 @@ Cli.runNpmHook = function runNpmHook(hook) {
     }
     return q.resolve();
   });
-  
+
   // If this process ends ensure that we killed the spawned child
   process.on('exit', function() {
     spawned.kill();
@@ -367,8 +367,6 @@ Cli.loadNpmScripts = function loadNpmScripts() {
   } catch (e) {
     throw e;
   }
-
-  return undefined;
 };
 
 Cli.logEvents = function logEvents(gulpInst, finalTaskNames) {
@@ -379,14 +377,14 @@ Cli.logEvents = function logEvents(gulpInst, finalTaskNames) {
 
     // TODO: batch these
     // so when 5 tasks start at once it only logs one time with all 5
-    gutil.log('Starting', '\'' + e.task.cyan + '\'...');
+    gutil.log('Starting', '\'' + chalk.cyan(e.task) + '\'...');
   });
 
   gulpInst.on('task_stop', function(e) {
     var time = prettyTime(e.hrDuration);
     gutil.log(
-      'Finished', '\'' + e.task.cyan + '\'',
-      'after', time.magenta
+      'Finished', '\'' + chalk.cyan(e.task) + '\'',
+      'after', chalk.magenta(time)
     );
     if (finalTaskNames.indexOf(e.task) > -1) {
       log.info();
@@ -397,20 +395,12 @@ Cli.logEvents = function logEvents(gulpInst, finalTaskNames) {
     var msg = Cli.formatGulpError(e);
     var time = prettyTime(e.hrDuration);
     gutil.log(
-      '\'' + e.task.cyan + '\'',
-      'errored after'.red,
-      time.magenta
+      '\'' + chalk.cyan(e.task) + '\'',
+      chalk.red('errored after'),
+      chalk.magenta(time)
     );
     gutil.log(msg);
   });
-
-  // gulpInst.on('task_not_found', function(err) {
-  //   gutil.log(
-  //     ('Task \'' + err.task + '\' is not in your gulpfile').red
-  //   );
-  //   gutil.log('Please check the documentation for proper gulpfile formatting');
-  //   process.exit(1);
-  // });
 };
 
 // Format orchestrator errors
@@ -472,13 +462,13 @@ Cli.printVersionWarning = function printVersionWarning(version, npmVersion) {
   }
 
   if (npmVersion && npmVersion !== version.trim()) {
-    log.warn('\n------------------------------------\n'.red);
-    log.warn('Ionic CLI is out of date:\n'.bold.yellow);
-    log.warn((' * Locally installed version: ' + version + '\n').yellow);
-    log.warn((' * Latest version: ' + npmVersion + '\n').yellow);
-    log.warn((' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n').yellow);
-    log.warn(' * Run '.yellow + 'npm install -g ionic'.bold + ' to update\n'.yellow);
-    log.warn('------------------------------------\n\n'.red);
+    log.warn(chalk.red('\n------------------------------------\n'));
+    log.warn(chalk.yellow.bold('Ionic CLI is out of date:\n'));
+    log.warn(chalk.yellow(' * Locally installed version: ' + version + '\n'));
+    log.warn(chalk.yellow(' * Latest version: ' + npmVersion + '\n'));
+    log.warn(chalk.yellow(' * https://github.com/driftyco/ionic-cli/blob/master/CHANGELOG.md\n'));
+    log.warn(chalk.yellow(' * Run ') + chalk.bold('npm install -g ionic') + chalk.yellow(' to update\n'));
+    log.warn(chalk.red('------------------------------------\n\n'));
   }
 };
 
@@ -614,10 +604,10 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
 
         for (var i = 0, j = messagesJson.list.length; i < j; i += 1) {
           var entry = messagesJson.list[i];
-          var entryMessage = ['+ ', entry.name, '\n', '+ ', entry.action.blue.bold, '\n+\n'].join('');
+          var entryMessage = ['+ ', entry.name, '\n', '+ ', chalk.blue.bold(entry.action), '\n+\n'].join('');
           log.info(entryMessage);
         }
-        log.info('+---------------------------------------------------------+\n'.green);
+        log.info(chalk.green('+---------------------------------------------------------+\n'));
       } catch (ex) {
         q.reject('Error occurred in downloading the CLI messages:', ex);
         appLibUtils.fail(ex);
@@ -639,7 +629,7 @@ Cli.gatherInfo = function gatherInfo() {
 };
 
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
-  log.error('An uncaught exception occurred and has been reported to Ionic'.red.bold);
+  log.error(chalk.red.bold('An uncaught exception occurred and has been reported to Ionic'));
   var errorMessage = typeof err === 'string' ? err : err.message;
   appLibUtils.errorHandler(errorMessage);
   process.exit(1);
@@ -655,10 +645,10 @@ Cli.attachErrorHandling = function attachErrorHandling() {
         var info = Cli.gatherInfo();
         var ionicCliVersion = info.ionic_cli;
         if (stack && stack.length > 0) {
-          process.stderr.write('\n' + stack.bold + '\n\n');
+          process.stderr.write('\n' + chalk.bold(stack) + '\n\n');
         }
-        process.stderr.write('\n' + errorMessage.bold);
-        process.stderr.write((' (CLI v' + ionicCliVersion + ')').bold + '\n');
+        process.stderr.write('\n' + chalk.bold(errorMessage));
+        process.stderr.write(chalk.bold(' (CLI v' + ionicCliVersion + ')') + '\n');
 
         Info.printInfo(info);
       }
diff --git a/lib/ionic/add.js b/lib/ionic/add.js
index a447f5f952..d05168a978 100644
--- a/lib/ionic/add.js
+++ b/lib/ionic/add.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var childProcess = require('child_process');
 var IonicAppLib = require('ionic-app-lib');
@@ -31,8 +30,8 @@ function installBowerComponent(componentName) {
   } catch (e) {} // eslint-disable-line no-empty
 
   // Error happened, report it.
-  var errorMessage = 'Bower error, check that "'.red.bold + componentName + '"'.red.bold +
-    ' exists,'.red.bold + '\nor try running "'.red.bold + bowerInstallCommand + '" for more info.'.red.bold;
+  var errorMessage = chalk.red.bold('Bower error, check that "') + componentName + 
+    chalk.red.bold('" exists,\nor try running "') + bowerInstallCommand + chalk.red.bold('" for more info.');
   appLibUtils.fail(errorMessage, 'add');
 }
 
@@ -45,10 +44,10 @@ function installBowerComponent(componentName) {
 function run(ionic, argv) {
 
   // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
+  var deprecationMsg = 'This command has been ' + chalk.red('deprecated') + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
-  log.info(deprecationMsg.bold);
+  log.info(chalk.bold(deprecationMsg));
 
   if (!bower.checkForBower()) {
     appLibUtils.fail(bower.installMessage, 'add');
diff --git a/lib/ionic/config.js b/lib/ionic/config.js
index 18efd17be4..a39d750b67 100644
--- a/lib/ionic/config.js
+++ b/lib/ionic/config.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ioLib = IonicAppLib.ioConfig;
@@ -11,7 +12,8 @@ var settings = {
   name: 'config',
   summary: 'Set configuration variables for your ionic app',
   args: {
-    '<command>': 'set'.yellow + ', ' + 'unset'.yellow + ', ' + 'build'.yellow + ', or ' + 'info'.yellow,
+    '<command>': chalk.yellow('set') + ', ' +
+      chalk.yellow('unset') + ', ' + chalk.yellow('build') + ', or ' + chalk.yellow('info'),
     '[key]': 'The key to set',
     '[value]': 'The value to set'
   },
diff --git a/lib/ionic/docs.js b/lib/ionic/docs.js
index 374401ed02..4885020cf0 100644
--- a/lib/ionic/docs.js
+++ b/lib/ionic/docs.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var prompt = require('prompt');
 var _ = require('underscore');
 var extend = require('../utils/extend');
@@ -28,7 +29,7 @@ function list() {
     var docsList = IonicDocs.api;
 
     // var i = 0;
-    log.info('Help Topics'.yellow);
+    log.info(chalk.yellow('Help Topics'));
     _.each(docsList, function(doc) {
       var table = new Table({ head: [doc.id] });
       var count = 0;
@@ -50,7 +51,7 @@ function list() {
   } catch (ex) {
     log.error('Error listing docs:', ex);
   }
-  log.info('Type "ionic docs <docname>" to open the help document for that doc.'.blue.bold);
+  log.info(chalk.blue.bold('Type "ionic docs <docname>" to open the help document for that doc.'));
 }
 
 function openDefault() {
@@ -150,7 +151,7 @@ function lookUpCommand(helpDoc) {
 
   function openDoc(topic, doc) {
     var url = sanitizeUrl('http://ionicframework.com/docs/api/' + topic + '/' + doc);
-    log.info('Opening Ionic document:'.green.bold, url.green.bold);
+    log.info(chalk.green.bold('Opening Ionic document:'), chalk.green.bold(url));
     return require('open')(url);
   }
 }
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 6c11474fce..714a824854 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -10,7 +11,7 @@ var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var cordovaRunEmulateOptions = {
-  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--livereload|-l': 'Live reload app dev files from the device' + chalk.yellow(' (beta)'),
   '--address': 'Use specific address (livereload req.)',
   '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
   '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index dc288d8789..f7e616b671 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -5,7 +5,6 @@ var path = require('path');
 var ionicAppLib = require('ionic-app-lib');
 var appGenerator = require('@ionic/app-generators');
 var log = ionicAppLib.logging.logger;
-var Project =  ionicAppLib.project;
 var fail = ionicAppLib.utils.fail;
 
 var settings = {
@@ -34,16 +33,8 @@ function run(ionic, argv) {
       return fail('Generators are only available for Ionic 2 projects');
     }
 
-    var project;
-    try {
-      project = Project.load(process.cwd());
-    } catch (err) {
-      return fail(err);
-    }
-
     var generator = argv._[1];
     var name = argv._[2]; // TODO support multiple names
-    var isTS = project.get('typescript') || argv.ts;
 
     if (argv.list) {
       appGenerator.printAvailableGenerators();
@@ -117,45 +108,6 @@ function run(ionic, argv) {
   }
 }
 
-function loadToolingModule() {
-
-  // First try node_modules/ionic-angular/tooling
-  var toolingPath;
-  var ionicModule;
-
-  try {
-    toolingPath = path.join(process.cwd(), 'node_modules', 'ionic-angular', 'tooling');
-    ionicModule = require(toolingPath);
-  } catch (err) {
-
-    // if this isn't found, that's fine, check for ionic-framework
-    if (err.code !== 'MODULE_NOT_FOUND') {
-      fail('Error when requiring ' + toolingPath + ':\n  ' + err);
-    }
-  }
-
-  // Then try node_modules/ionic-framework/tooling
-  if (!ionicModule) {
-    try {
-      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework', 'tooling'));
-    } catch (err) {
-      if (err.code === 'MODULE_NOT_FOUND') {
-        fail('No ionic-angular package found, do you have Ionic installed?');
-      }
-    }
-  }
-
-  // Last, try node_modules/ionic-framework (beta.1 and below)
-  if (!ionicModule) {
-    try {
-      ionicModule = require(path.join(process.cwd(), 'node_modules', 'ionic-framework'));
-    } catch (err) {
-      fail(err);
-    }
-  }
-  return ionicModule;
-}
-
 module.exports = extend(settings, {
   run: run
 });
diff --git a/lib/ionic/help.js b/lib/ionic/help.js
index 1005ed78cd..d714a011d0 100644
--- a/lib/ionic/help.js
+++ b/lib/ionic/help.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var helpUtil = require('../utils/help');
 
@@ -28,7 +29,7 @@ function run(ionic, argv) {
     return helpUtil.printTaskUsage(task, ionic.VERSION);
   }
 
-  return console.log('Command not found.'.red.bold);
+  return console.log(chalk.red.bold('Command not found.'));
 }
 
 module.exports = extend(settings, {
diff --git a/lib/ionic/io.js b/lib/ionic/io.js
index b5f51613fb..f5714b024c 100644
--- a/lib/ionic/io.js
+++ b/lib/ionic/io.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var ioLib = IonicAppLib.ioConfig;
@@ -14,7 +15,7 @@ var settings = {
   name: 'io',
   summary: 'Integrate your app with Ionic Cloud services',
   args: {
-    '<command>': 'init'.yellow
+    '<command>': chalk.yellow('init')
   },
   isProjectTask: true
 };
diff --git a/lib/ionic/lib.js b/lib/ionic/lib.js
index a85cc8128c..1a4cdb0ffd 100644
--- a/lib/ionic/lib.js
+++ b/lib/ionic/lib.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
@@ -33,10 +32,10 @@ var settings =  {
 function run(ionic, argv) {
 
   // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
+  var deprecationMsg = 'This command has been ' + chalk.red('deprecated') + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
-  log.info(deprecationMsg.bold);
+  log.info(chalk.bold(deprecationMsg));
 
   if (!fs.existsSync(path.resolve('www'))) {
     return appLibUtils.fail('"www" directory cannot be found. Make sure the working directory ' +
@@ -84,16 +83,16 @@ function loadVersionData() {
 
 function printLibVersions(data) {
 
-  log.info('Local Ionic version: '.bold.green + data.local.version + '  (' + data.versionFilePath + ')');
+  log.info(chalk.bold.green('Local Ionic version: ') + data.local.version + '  (' + data.versionFilePath + ')');
 
   getVersionData('latest').then(function(versionData) {
-    log.info('Latest Ionic version: '.bold.green + versionData.version_number +
+    log.info(chalk.bold.green('Latest Ionic version: ') + versionData.version_number +
              '  (released ' + versionData.release_date + ')');
 
     if (data.local.version !== versionData.version_number) {
-      log.info(' * Local version is out of date'.yellow);
+      log.info(chalk.yellow(' * Local version is out of date'));
     } else {
-      log.info(' * Local version up to date'.green);
+      log.info(chalk.green(' * Local version up to date'));
     }
   });
 }
@@ -134,7 +133,7 @@ function getVersionData(data, version) {
 
       q.resolve(versionData);
     } catch (e) {
-      log.error('Error loading ' + version.bold + ' version information');
+      log.error('Error loading ' + chalk.bold(version) + ' version information');
       q.reject();
     }
   });
@@ -154,7 +153,7 @@ function updateLibVersion(data) {
 
     bowerCmd.stderr.on('data', function(data) {
       if (data) {
-        process.stderr.write(data.toString().red.bold);
+        process.stderr.write(chalk.red.bold(data.toString()));
       }
     });
 
@@ -167,13 +166,13 @@ function updateLibVersion(data) {
 
   var libPath = path.resolve('www/lib/ionic/');
 
-  log.info('Are you sure you want to replace '.green.bold + libPath.bold +
-           ' with an updated version of Ionic?'.green.bold);
+  log.info(chalk.green.bold('Are you sure you want to replace ') + chalk.bold(libPath) +
+           chalk.green.bold(' with an updated version of Ionic?'));
 
   var promptProperties = {
     areYouSure: {
       name: 'areYouSure',
-      description: '(yes/no):'.yellow.bold,
+      description: chalk.yellow.bold('(yes/no):'),
       required: true
     }
   };
@@ -209,10 +208,10 @@ function getLatest() {
 
   getVersionData(version).then(function(versionData) {
     if (version === 'latest') {
-      log.info('Latest version: '.bold.green + versionData.version_number +
+      log.info(chalk.bold.green('Latest version: ') + versionData.version_number +
                '  (released ' + versionData.release_date + ')');
     } else {
-      log.info('Version: '.bold.green + versionData.version_number +
+      log.info(chalk.bold.green('Version: ') + versionData.version_number +
                '  (released ' + versionData.release_date + ')');
     }
     downloadZip(versionData.version_number);
@@ -230,7 +229,7 @@ function downloadZip(data, version) {
     fs.mkdirSync(data.tmpExtractPath);
   }
 
-  log.info('Downloading: '.green.bold + archivePath);
+  log.info(chalk.bold.green('Downloading: ') + archivePath);
 
   var proxy = process.env.PROXY || null;
   request({ url: archivePath, rejectUnauthorized: false, encoding: null, proxy: proxy }, function(err, res, body) {
@@ -331,7 +330,7 @@ function updateFiles(data, tmpZipPath, tmpExtractPath) {
           log.error(e);
         }
 
-        log.info('Ionic version updated to: '.bold.green + data.versionData.version_number.bold);
+        log.info(chalk.bold.green('Ionic version updated to: ') + chalk.bold(data.versionData.version_number));
 
         writeVersionData(data);
 
diff --git a/lib/ionic/link.js b/lib/ionic/link.js
index debf0637ef..fcfa7302e2 100644
--- a/lib/ionic/link.js
+++ b/lib/ionic/link.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
@@ -43,7 +44,7 @@ function run(ionic, argv) {
     setAppId(ionic, argv._[1]);
   }
 
-  log.info('Your Ionic App ID was set'.green);
+  log.info(chalk.green('Your Ionic App ID was set'));
 }
 
 function setAppId(ionic, appId) {
diff --git a/lib/ionic/list.js b/lib/ionic/list.js
index 75a57f59af..a8d686491f 100644
--- a/lib/ionic/list.js
+++ b/lib/ionic/list.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var path = require('path');
 var IonicAppLib = require('ionic-app-lib');
@@ -22,10 +21,10 @@ function listComponents() {
     log.info('Ions, bower components, or addons installed:');
 
     Object.keys(bowerJson.devDependencies).forEach(function(bowerComponentName) {
-      log.info(bowerComponentName.green);
+      log.info(chalk.green(bowerComponentName));
     });
   } catch (ex) {
-    log.error('This command can only be used when in an Ionic project directory'.red.bold);
+    log.error(chalk.red.bold('This command can only be used when in an Ionic project directory'));
   }
 }
 
@@ -38,10 +37,10 @@ function listComponents() {
 function run() {
 
   // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
+  var deprecationMsg = 'This command has been ' + chalk.red('deprecated') + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
-  log.info(deprecationMsg.bold);
+  log.info(chalk.bold(deprecationMsg));
 
   try {
     listComponents();
diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 3a42709af4..2ee35a5e95 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var Login = IonicAppLib.login;
@@ -41,7 +42,7 @@ function login(argv) {
     return Login.requestLogIn(loginInfo.email, loginInfo.password, true);
   })
   .then(function(cookieJar) {
-    log.info('Logged in! :)'.green);
+    log.info(chalk.green('Logged in! :)'));
     return cookieJar;
   })
   .catch(function(ex) {
@@ -55,18 +56,18 @@ function promptForLogin(argv) {
   var schema = [{
     name: 'email',
     pattern: /^[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+(?:\.[A-z0-9!#$%&'*+\/=?\^_{|}~\-]+)*@(?:[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?\.)+[A-z0-9](?:[A-z0-9\-]*[A-z0-9])?$/, // eslint-disable-line max-len
-    description: 'Email:'.yellow.bold,
+    description: chalk.yellow.bold('Email:'),
     required: true
   }, {
     name: 'password',
-    description: 'Password:'.yellow.bold,
+    description: chalk.yellow.bold('Password:'),
     hidden: true,
     required: true
   }];
 
   // prompt for log
-  log.info('\nTo continue, please login to your Ionic account.'.bold.green);
-  log.info('Don\'t have one? Create one at: '.bold + (appLibSettings.IONIC_DASH + '/signup').bold + '\n');
+  log.info(chalk.bold.green('\nTo continue, please login to your Ionic account.'));
+  log.info(chalk.bold('Don\'t have one? Create one at: ') + chalk.bold(appLibSettings.IONIC_DASH + '/signup') + '\n');
 
   prompt.override = argv;
   prompt.message = '';
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
index 0dbdd74da3..25d126f962 100644
--- a/lib/ionic/package.js
+++ b/lib/ionic/package.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var path = require('path');
 var _ = require('underscore');
 var extend = require('../utils/extend');
@@ -22,18 +23,18 @@ var settings = {
   name: 'package',
   summary: 'Use Ionic Package to build your app',
   args: {
-    '<command>': 'build android'.yellow + ', ' + 'build ios'.yellow +
-      ', ' + 'list'.yellow + ', ' + 'info'.yellow + ', or ' + 'download'.yellow,
+    '<command>': chalk.yellow('build android') + ', ' + chalk.yellow('build ios') +
+      ', ' + chalk.yellow('list') + ', ' + chalk.yellow('info') + ', or ' + chalk.yellow('download'),
     '[options]': ''
   },
   options: {
-    '--release': '(' + 'build <platform>'.yellow +
+    '--release': '(' + chalk.yellow('build <platform>') +
       ') Mark this build as a release',
-    '--profile|-p <tag>': '(' + 'build <platform>'.yellow +
+    '--profile|-p <tag>': '(' + chalk.yellow('build <platform>') +
       ') Specify the Security Profile to use with this build',
-    '--noresources': '(' + 'build <platform>'.yellow +
+    '--noresources': '(' + chalk.yellow('build <platform>') +
       ') Do not generate icon and splash screen resources during this build',
-    '--destination|-d <path>': '(' + 'download'.yellow +
+    '--destination|-d <path>': '(' + chalk.yellow('download') +
       ') Specify the destination directory to download your packaged app.'
   },
   module: './ionic/package',
@@ -59,7 +60,8 @@ function run(ionic, argv) {
     appId = project.get('app_id');
 
     if (!appId) {
-      throw new Error('Missing Ionic App ID. Make sure to run "ionic upload" first or set your app_id in the ionic.config.json file.');
+      throw new Error('Missing Ionic App ID. Make sure to run "ionic upload" first or set ' +
+        'your app_id in the ionic.config.json file.');
     }
   } catch (ex) {
     return fail(ex, 'package');
@@ -141,9 +143,9 @@ function packageBuild(ionic, argv, dir, project, appId) {
 function formatStatus(status) {
   switch (status) {
   case 'SUCCESS':
-    return status.green;
+    return chalk.green(status);
   case 'FAILED':
-    return status.red;
+    return chalk.red(status);
   }
 
   return status;
@@ -173,7 +175,7 @@ function packageList(ionic, argv, dir, project, appId) {
     .then(function(body) {
       if (body.data.length === 0) {
         log.info('You don\'t have any builds yet!');
-        log.info('Type ' + 'ionic help package'.yellow + ' to learn how to use Ionic Package.');
+        log.info('Type ' + chalk.yellow('ionic help package') + ' to learn how to use Ionic Package.');
       } else {
         var count = 0;
         var headers = ['id', 'status', 'platform', 'mode'];
@@ -213,7 +215,7 @@ function packageList(ionic, argv, dir, project, appId) {
 
         log.info('');
         log.info(table.toString());
-        log.info('\nShowing', String(count).yellow, 'of your latest builds.');
+        log.info('\nShowing', chalk.yellow(String(count)), 'of your latest builds.');
         log.info('');
       }
     })
@@ -252,15 +254,15 @@ function packageInfo(ionic, argv, dir, project, appId) {
       var build = body.data;
 
       table.push(
-        ['id'.yellow, build.id],
-        ['status'.yellow, formatStatus(build.status)],
-        ['platform'.yellow, build.platform],
-        ['mode'.yellow, build.mode],
-        ['started'.yellow, formatDate(build.created)]
+        [chalk.yellow('id'), build.id],
+        [chalk.yellow('status'), formatStatus(build.status)],
+        [chalk.yellow('platform'), build.platform],
+        [chalk.yellow('mode'), build.mode],
+        [chalk.yellow('started'), formatDate(build.created)]
       );
 
       if (build.completed) {
-        table.push(['completed'.yellow, formatDate(build.completed)]);
+        table.push([chalk.yellow('completed'), formatDate(build.completed)]);
       }
 
       log.info('');
@@ -268,7 +270,7 @@ function packageInfo(ionic, argv, dir, project, appId) {
       log.info('');
 
       if (build.output) {
-        log.info('output'.yellow + ':');
+        log.info(chalk.yellow('output') + ':');
         log.info('');
         log.info(build.output);
         log.info('');
@@ -322,7 +324,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
       }
 
       log.info('Wrote:', filename);
-      log.info('Done!'.green);
+      log.info(chalk.green('Done!'));
     }, null, function(state) {
       if (typeof bar === 'undefined') {
         bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
diff --git a/lib/ionic/push.js b/lib/ionic/push.js
index 2382a4c4f3..720c903221 100644
--- a/lib/ionic/push.js
+++ b/lib/ionic/push.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var fs = require('fs');
 var path = require('path');
@@ -53,7 +54,7 @@ function run(ionic, argv) {
       if (argv._[2]) {
         set_webhook_url(task, argv._[2].trim());
       } else {
-        log.error('You need to specify a webhook url!'.bold.red);
+        log.error(chalk.bold.red('You need to specify a webhook url!'));
       }
     } else if (argv['google-api-key']) {
       set_google_api_key(task, argv['google-api-key'].trim());
@@ -82,7 +83,7 @@ function set_webhook_url(task, webhook_url) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error('You need to upload your app first!'.bold.red);
+    log.error(chalk.bold.red('You need to upload your app first!'));
     return false;
   }
 
@@ -126,7 +127,7 @@ function set_google_api_key(task, google_api_key) { // eslint-disable-line camel
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error('You need to upload your app first!'.bold.red);
+    log.error(chalk.bold.red('You need to upload your app first!'));
     return false;
   }
 
@@ -155,7 +156,7 @@ function set_google_api_key(task, google_api_key) { // eslint-disable-line camel
       }
 
       if (parseInt(response.statusCode, 10) === '200') {
-        log.info('Google API Key Saved'.green);
+        log.info(chalk.green('Google API Key Saved'));
       } else {
         return fail('App not found');
       }
@@ -170,7 +171,7 @@ function send_push() { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error('You need to upload your app first!'.bold.red);
+    log.error(chalk.bold.red('You need to upload your app first!'));
     return false;
   }
 
@@ -179,35 +180,35 @@ function send_push() { // eslint-disable-line camelcase
 
   promptProperties['push-api-key'] = {
     name: 'push-api-key',
-    description: 'Your private API key'.yellow.bold,
+    description: chalk.yellow.bold('Your private API key'),
     required: true,
     isFile: false
   };
 
   promptProperties['device-token'] = {
     name: 'device-token',
-    description: 'Device token'.yellow.bold,
+    description: chalk.yellow.bold('Device token'),
     required: true,
     isFile: false
   };
 
   promptProperties['alert'] = {
     name: 'alert',
-    description: 'Notification alert message'.yellow.bold,
+    description: chalk.yellow.bold('Notification alert message'),
     required: false,
     isFile: false
   };
 
   promptProperties['badge'] = {
     name: 'badge',
-    description: 'Badge count'.yellow.bold,
+    description: chalk.yellow.bold('Badge count'),
     required: false,
     isFile: false
   };
 
   promptProperties['sound'] = {
     name: 'sound',
-    description: 'Sound file name'.yellow.bold,
+    description: chalk.yellow.bold('Sound file name'),
     required: false,
     isFile: false
   };
@@ -258,19 +259,19 @@ function set_production_mode(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error('You need to upload your app first!'.bold.red);
+    log.error(chalk.bold.red('You need to upload your app first!'));
     return false;
   }
 
   if (task.inputValues['production-mode'] === true) {
-    log.error('You need to specify a value [y/n] to set the production mode!'.bold.red);
+    log.error(chalk.bold.red('You need to specify a value [y/n] to set the production mode!'));
     return false;
   }
 
   task.inputValues['production-mode'] = task.inputValues['production-mode'].toLowerCase();
 
   if (task.inputValues['production-mode'] !== 'y' && task.inputValues['production-mode'] !== 'n') {
-    log.error('You need to specify a value [y/n] to set the production mode!'.bold.red);
+    log.error(chalk.bold.red('You need to specify a value [y/n] to set the production mode!'));
     return false;
   }
 
@@ -307,7 +308,7 @@ function set_production_mode(task) { // eslint-disable-line camelcase
         var d = JSON.parse(data);
         if (d.errors && d.errors.length) {
           for (var j = 0; j < d.errors.length; j += 1) {
-            log.error((d.errors[j]).bold.red);
+            log.error(chalk.bold.red(d.errors[j]));
           }
           return fail('Unable to set mode');
         }
@@ -329,7 +330,7 @@ function upload_cert(task) { // eslint-disable-line camelcase
   var project = IonicProject.load();
 
   if (!project.get('app_id')) {
-    log.error('You need to upload your app first!'.bold.red);
+    log.error(chalk.bold.red('You need to upload your app first!'));
     return false;
   }
 
@@ -340,7 +341,7 @@ function upload_cert(task) { // eslint-disable-line camelcase
   if (argv['ios-dev-cert']) {
     promptProperties['ios-push-cert'] = {
       name: 'ios-push-cert',
-      description: 'iOS Dev Push Certificate File (.p12)'.yellow.bold,
+      description: chalk.yellow.bold('iOS Dev Push Certificate File (.p12)'),
       required: true,
       conform: fileExists,
       isFile: true
@@ -348,7 +349,7 @@ function upload_cert(task) { // eslint-disable-line camelcase
   } else if (argv['ios-prod-cert']) {
     promptProperties['ios-push-cert'] = {
       name: 'ios-push-cert',
-      description: 'iOS Prod Push Certificate File (.p12)'.yellow.bold,
+      description: chalk.yellow.bold('iOS Prod Push Certificate File (.p12)'),
       required: true,
       conform: fileExists,
       isFile: true
@@ -408,7 +409,7 @@ function upload_cert(task) { // eslint-disable-line camelcase
           var d = JSON.parse(data);
           if (d.errors && d.errors.length) {
             for (var j = 0; j < d.errors.length; j += 1) {
-              log.error((d.errors[j]).bold.red);
+              log.error(chalk.bold.red(d.errors[j]));
             }
             return fail('Unable to upload certificate');
           }
diff --git a/lib/ionic/remove.js b/lib/ionic/remove.js
index 248ab3038e..68ea7a4c19 100644
--- a/lib/ionic/remove.js
+++ b/lib/ionic/remove.js
@@ -7,6 +7,7 @@ var appLibUtils = IonicAppLib.utils;
 var ioLib = IonicAppLib.ioConfig;
 var log = IonicAppLib.logging.logger;
 var bower = require('../utils/bower');
+var chalk = require('chalk');
 
 var settings = {
   title: 'remove',
@@ -26,12 +27,12 @@ function uninstallBowerComponent(componentName) {
 
     if (result.code === 0) {
       var message = 'Bower component removed - ' + componentName;
-      return log.info(message.red);
+      return log.info(chalk.red(message));
     }
   } catch (e) {} // eslint-disable-line no-empty
 
-  var errorMessage = 'Failed to find the bower component "'.red.bold + componentName +
-    '"'.red.bold + '.\nAre you sure it exists?'.red.bold;
+  var errorMessage = chalk.red.bold('Failed to find the bower component "') + componentName +
+    chalk.red.bold('"') + chalk.red.bold('.\nAre you sure it exists?');
 
   appLibUtils.fail(errorMessage, 'remove');
 }
@@ -45,10 +46,10 @@ function uninstallBowerComponent(componentName) {
 function run(ionic, argv) {
 
   // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
+  var deprecationMsg = 'This command has been ' + chalk.red('deprecated') + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
-  log.info(deprecationMsg.bold);
+  log.info(chalk.bold(deprecationMsg));
 
   if (!bower.checkForBower()) {
     appLibUtils.fail(bower.installMessage, 'remove');
diff --git a/lib/ionic/resources.js b/lib/ionic/resources.js
index 6497d161cb..fe0bb48440 100644
--- a/lib/ionic/resources.js
+++ b/lib/ionic/resources.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var IonicAppLib = require('ionic-app-lib');
 var IonicResources = IonicAppLib.resources;
@@ -7,7 +8,7 @@ var appLibUtils = IonicAppLib.utils;
 var Project = IonicAppLib.project;
 
 var resourcesSummary = [
-  'Automatically create icon and splash screen resources' + ' (beta)'.yellow,
+  'Automatically create icon and splash screen resources' + chalk.yellow(' (beta)'),
   'Put your images in the ./resources directory, named splash or icon.',
   'Accepted file types are .png, .ai, and .psd.',
   'Icons should be 192x192 px without rounded corners.',
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 9188e3b844..385273cc58 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -10,7 +11,7 @@ var log = IonicAppLib.logging.logger;
 var cordovaUtils = require('../utils/cordova');
 
 var cordovaRunEmulateOptions = {
-  '--livereload|-l': 'Live reload app dev files from the device' + ' (beta)'.yellow,
+  '--livereload|-l': 'Live reload app dev files from the device' + chalk.yellow(' (beta)'),
   '--address': 'Use specific address (livereload req.)',
   '--port|-p': 'Dev server HTTP port (8100 default, livereload req.)',
   '--livereload-port|-r': 'Live Reload port (35729 default, livereload req.)',
diff --git a/lib/ionic/security.js b/lib/ionic/security.js
index d97ec68113..6d4cfdb9c5 100644
--- a/lib/ionic/security.js
+++ b/lib/ionic/security.js
@@ -14,6 +14,7 @@ var log = IonicAppLib.logging.logger;
 var LoginTask = require('./login');
 var Prompt = require('../utils/prompt');
 var Table = require('../utils/table');
+var chalk = require('chalk');
 
 var Project = IonicAppLib.project;
 
@@ -22,26 +23,26 @@ var settings = {
   name: 'security',
   summary: 'Store your app\'s credentials for the Ionic Cloud',
   args: {
-    '<command>': 'profiles list'.yellow + ', ' + 'profiles add "<name>"'.yellow + ', ' +
-      'credentials android'.yellow + ', or ' + 'credentials ios'.yellow,
+    '<command>': chalk.yellow('profiles list') + ', ' + chalk.yellow('profiles add "<name>"') + ', ' +
+      chalk.yellow('credentials android') + ', or ' + chalk.yellow('credentials ios'),
     '[options]': ''
   },
   options: {
-    '--profile <tag>': '(' + 'credentials <platform>'.yellow +
+    '--profile <tag>': '(' + chalk.yellow('credentials <platform>') +
       ') Specify the profile on which these credentials are saved',
-    '--keystore|-s <path>': '(' + 'credentials android'.yellow +
+    '--keystore|-s <path>': '(' + chalk.yellow('credentials android') +
       ') Specify the location of your keystore file',
-    '--keystore-password|-p <password>': '(' + 'credentials android'.yellow +
+    '--keystore-password|-p <password>': '(' + chalk.yellow('credentials android') +
       ') Specify your keystore password (exclude for prompt)',
-    '--key-alias|-k <alias>': '(' + 'credentials android'.yellow +
+    '--key-alias|-k <alias>': '(' + chalk.yellow('credentials android') +
       ') Specify your key alias for this app',
-    '--key-password|-w <password>': '(' + 'credentials android'.yellow +
+    '--key-password|-w <password>': '(' + chalk.yellow('credentials android') +
       ') Specify your key password for this app (exclude for prompt)',
-    '--cert|-c <path>': '(' + 'credentials ios'.yellow +
+    '--cert|-c <path>': '(' + chalk.yellow('credentials ios') +
       ') Specify the location of your .p12 file',
-    '--cert-password|-p <password>': '(' + 'credentials ios'.yellow +
+    '--cert-password|-p <password>': '(' + chalk.yellow('credentials ios') +
       ') Specify your certificate password (exclude for prompt)',
-    '--provisioning-profile|-r <path>': '(' + 'credentials ios'.yellow +
+    '--provisioning-profile|-r <path>': '(' + chalk.yellow('credentials ios') +
       ') Specify the location of your .mobileprovision file'
   },
   isProjectTask: true
@@ -157,7 +158,7 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
     .then(function(body) {
       if (body.data.length === 0) {
         log.info('You don\'t have any Security Profiles yet!');
-        log.info('Type ' + 'ionic help security'.yellow + ' to learn how to use Security Profiles.');
+        log.info('Type ' + chalk.yellow('ionic help security') + ' to learn how to use Security Profiles.');
       } else {
         var table = new Table({ head: ['name', 'tag', 'android', 'ios'] });
 
@@ -165,8 +166,8 @@ function listSecurityProfiles(ionic, argv, dir, appId) {
           table.push([
             profile.name,
             profile.tag,
-            typeof profile.credentials.android === 'undefined' ? '✗'.red.bold : '✓'.green.bold,
-            typeof profile.credentials.ios === 'undefined' ? '✗'.red.bold : '✓'.green.bold
+            typeof profile.credentials.android === 'undefined' ? chalk.red.bold('✗') : chalk.green.bold('✓'),
+            typeof profile.credentials.ios === 'undefined' ? chalk.red.bold('✗') : chalk.green.bold('✓')
           ]);
         });
 
diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 636e019b8e..6febc53ac9 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -3,7 +3,6 @@
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var IonicAppLib = require('ionic-app-lib');
-var appLibUtils = IonicAppLib.utils;
 var events = IonicAppLib.events;
 var Q = require('q');
 var Serve = IonicAppLib.serve;
diff --git a/lib/ionic/service.js b/lib/ionic/service.js
index ae489ce24d..fe95cd1d00 100644
--- a/lib/ionic/service.js
+++ b/lib/ionic/service.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var fs = require('fs');
 var path = require('path');
 var execSync = require('child_process').execSync;
@@ -69,8 +70,8 @@ function installBowerComponent(serviceName) {
   } catch (e) {} // eslint-disable-line no-empty
 
   // Error happened, report it.
-  var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
-    '"'.bold + '.\nAre you sure it exists?'.bold;
+  var errorMessage = chalk.bold('Failed to find the service "') + serviceName.verbose +
+    chalk.bold('".\nAre you sure it exists?');
   fail(errorMessage, 'service');
 }
 
@@ -85,8 +86,8 @@ function uninstallBowerComponent(serviceName) {
     }
   } catch (e) {} // eslint-disable-line no-empty
 
-  var errorMessage = 'Failed to find the service "'.bold + serviceName.verbose +
-    '"'.bold + '.\nAre you sure it exists?'.bold;
+  var errorMessage = chalk.bold('Failed to find the service "') + serviceName.verbose +
+    chalk.bold('".\nAre you sure it exists?');
   fail(errorMessage, 'service');
 }
 
@@ -132,7 +133,7 @@ function installBowerPlugins(directory, serviceName) {
       }
     } catch (e) {} // eslint-disable-line no-empty
 
-    var errorMessage = 'Failed to find the plugin "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
+    var errorMessage = chalk.bold('Failed to find the plugin "') + plugin.name.verbose + chalk.bold('".');
     fail(errorMessage, 'service');
   });
 }
@@ -151,7 +152,7 @@ function uninstallBowerPlugins(bowerJson) {
       }
     } catch (e) {} // eslint-disable-line no-empty
 
-    var errorMessage = 'Failed to find the plugin to remove "'.bold + plugin.name.verbose + '"'.bold + '.'.bold;
+    var errorMessage = chalk.bold('Failed to find the plugin to remove "') + plugin.name.verbose + chalk.bold('".');
     fail(errorMessage, 'service');
   });
 }
@@ -183,10 +184,10 @@ function removeService(serviceName) {
 function run(ionic, argv) {
 
   // This command will be deprecated in the future.
-  var deprecationMsg = 'This command has been ' + 'deprecated'.red + '.  All ' +
+  var deprecationMsg = 'This command has been ' + chalk.red('deprecated') + '.  All ' +
    'resources are currently available in NPM and we recommend that you use NPM to manage these.\n' +
    'More information is available here: https://github.com/driftyco/ionic-cli/wiki/Migrating-to-NPM-from-bower\n';
-  log.info(deprecationMsg.bold);
+  log.info(chalk.bold(deprecationMsg));
 
   if (!bower.checkForBower()) {
     fail(bower.installMessage, 'service');
diff --git a/lib/ionic/setup.js b/lib/ionic/setup.js
index 484db3daca..2d15e33078 100644
--- a/lib/ionic/setup.js
+++ b/lib/ionic/setup.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var Q = require('q');
 var IonicAppLib = require('ionic-app-lib');
@@ -12,16 +11,16 @@ var appLibSetup = IonicAppLib.setup;
 var settings = {
   title: 'setup',
   name: 'setup',
-  summary: 'Configure the project with a build tool ' + '(beta)'.yellow,
+  summary: 'Configure the project with a build tool ' + chalk.yellow('(beta)'),
   args: {
     '[sass]': 'Setup the project to use Sass CSS precompiling'
   },
   isProjectTask: true
-}
+};
 
 function run(ionic, argv) {
   var taskName = argv._[1];
-  if(!taskName) {
+  if (!taskName) {
     appLibUtils.fail('Missing setup task command.', 'setup');
     return Q();
   }
@@ -30,14 +29,14 @@ function run(ionic, argv) {
     return Q();
   }
 
- return appLibSetup.sassSetup(process.cwd())
+  return appLibSetup.sassSetup(process.cwd())
     .then(function() {
-      log.info('Ionic setup complete'.green);
+      log.info(chalk.green('Ionic setup complete'));
     })
     .catch(function(error) {
       log.error('Error from setup - ' + error);
-    })
-};
+    });
+}
 
 module.exports = extend(settings, {
   run: run
diff --git a/lib/ionic/share.js b/lib/ionic/share.js
index f61be09fee..906b0526d0 100644
--- a/lib/ionic/share.js
+++ b/lib/ionic/share.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var LoginTask = require('./login');
 var IonicAppLib = require('ionic-app-lib');
@@ -43,7 +44,8 @@ function run(ionic, argv) {
     return appLibUtils.fail('Invalid email address', 'share');
   }
 
-  log.info(['Sharing app ', project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('').green);
+  log.info(chalk.green(['Sharing app ',
+    project.get('name'), ' (', project.get('app_id'), ') with ', email, '.'].join('')));
 
   return Login.retrieveLogin()
   .then(function(jar) {
diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index bc891fd7b2..b49598a49e 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -1,6 +1,6 @@
 require('shelljs/global');
-require('colors');
 
+var chalk = require('chalk');
 var extend = require('../utils/extend');
 var fs = require('fs');
 var Q = require('q');
@@ -63,7 +63,7 @@ function run(ionic, argv) {
   }
 
   if (argv._[1] === '.') {
-    return log.error('Please name your Ionic project something meaningful other than \'.\''.red);
+    return log.error(chalk.red('Please name your Ionic project something meaningful other than \'.\''));
   }
 
   // Ensure that the folder name provided is a String
diff --git a/lib/utils/bower.js b/lib/utils/bower.js
index 9e24f66a71..5cbc10fd56 100644
--- a/lib/utils/bower.js
+++ b/lib/utils/bower.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var fs = require('fs');
 var path = require('path');
 var childProcess = require('child_process');
@@ -43,7 +42,7 @@ function saveData(bowerData) {
     var bowerFilePath = path.resolve('bower.json');
     fs.writeFileSync(bowerFilePath, JSON.stringify(bowerData, null, 2));
   } catch (e) {
-    log.error(('Error saving ' + bowerFilePath + ': ' + e).red.bold);
+    log.error(chalk.red.bold('Error saving ' + bowerFilePath + ': ' + e));
   }
 }
 
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index c6b71e2968..8cee6053d2 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -1,7 +1,6 @@
 'use strict';
 
-require('colors');
-
+var chalk = require('chalk');
 var Q = require('q');
 var _ = require('underscore');
 var path = require('path');
@@ -59,7 +58,7 @@ function arePluginsInstalled(baseDir) {
  * @return {Promise} Promise upon completion
  */
 function installPlatform(platform) {
-  log.info(('• You\'re trying to build for ' + platform + ' but don\'t have the platform installed yet.').yellow);
+  log.info(chalk.yellow('• You\'re trying to build for ' + platform + ' but don\'t have the platform installed yet.'));
   log.info('∆ Installing ' + platform + ' for you.');
 
   return promiseExec('cordova platform add ' + platform).then(function() {
@@ -80,7 +79,7 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
 
   cordovaProcess.stderr.on('data', function(data) {
     if (data) {
-      log.error(data.toString().bold);
+      log.error(chalk.bold(data.toString()));
     }
   });
 
@@ -210,7 +209,7 @@ function filterArgumentsForCordova(cmdName, argv, rawCliArguments) {
  * @return {Promise} Promise upon completion
  */
 function setupLiveReload(argv, baseDir) {
-  log.info(('Setup Live Reload').green.bold);
+  log.info(chalk.green.bold('Setup Live Reload'));
 
   var project = Project.load(baseDir);
   var options = _.extend(Serve.loadSettings(argv, project), {
diff --git a/lib/utils/help.js b/lib/utils/help.js
index 2aebb576f7..bc1b69d1cf 100644
--- a/lib/utils/help.js
+++ b/lib/utils/help.js
@@ -2,8 +2,8 @@
 
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
+var chalk = require('chalk');
 var EOL = require('os').EOL;
-require('colors');
 
 /**
  * @method printIonic
@@ -50,7 +50,7 @@ function printTaskListShortUsage(taskList, taskName, ionicVersion) {
       while ((name + dots).length < 20) {
         dots += '.';
       }
-      return name.green.bold + dots.grey + '  ' + task.summary.bold;
+      return chalk.green.bold(name) + chalk.grey(dots) + '  ' + chalk.bold(task.summary);
     });
 
   var lines = [].concat(
@@ -62,9 +62,9 @@ function printTaskListShortUsage(taskList, taskName, ionicVersion) {
       '',
       '=======================',
       (taskName ?
-        (taskName + ' is not a valid task\n\n').bold.red
+        chalk.bold.red(taskName + ' is not a valid task\n\n')
         : null),
-      'Available tasks: '.bold,
+      chalk.bold('Available tasks: '),
       '(use --help or -h for more info)',
       '',
       ''
@@ -152,16 +152,16 @@ function printTaskDetails(d) {
     }
   }
 
-  w(taskArgs.green.bold);
+  w(chalk.green.bold(taskArgs));
 
   while ((taskArgs + dots).length < rightColumn + 1) {
     dots += '.';
   }
 
-  w(' ' + dots.grey + '  ');
+  w(' ' + chalk.grey(dots) + '  ');
 
   if (d.summary) {
-    w(d.summary.bold);
+    w(chalk.bold(d.summary));
   }
 
   for (arg in d.args) {
@@ -172,7 +172,7 @@ function printTaskDetails(d) {
     while (indent.length < rightColumn) {
       indent += ' ';
     }
-    w((indent + '    ' + arg + ' ').bold);
+    w(chalk.bold(indent + '    ' + arg + ' '));
 
     var argDescs = d.args[arg].split(EOL);
     var argIndent = indent + '    ';
@@ -183,9 +183,9 @@ function printTaskDetails(d) {
 
     for (x = 0; x < argDescs.length; x += 1) {
       if (x === 0) {
-        w(argDescs[x].bold);
+        w(chalk.bold(argDescs[x]));
       } else {
-        w('\n' + argIndent + argDescs[x].bold);
+        w('\n' + argIndent + chalk.bold(argDescs[x]));
       }
     }
   }
@@ -207,13 +207,13 @@ function printTaskDetails(d) {
 
       var optLine = indent + '[' + opt + ']  ';
 
-      w(optLine.yellow.bold);
+      w(chalk.yellow.bold(optLine));
 
       if (d.options[opt]) {
         while ((dots.length + optLine.length - 2) < rightColumn) {
           dots += '.';
         }
-        w(dots.grey + '  ');
+        w(chalk.grey(dots) + '  ');
 
         var taskOpt = d.options[opt];
         var optDescs;
@@ -225,9 +225,9 @@ function printTaskDetails(d) {
         }
         for (x = 0; x < optDescs.length; x += 1) {
           if (x === 0) {
-            w(optDescs[x].bold);
+            w(chalk.bold(optDescs[x]));
           } else {
-            w('\n' + optIndent + optDescs[x].bold);
+            w('\n' + optIndent + chalk.bold(optDescs[x]));
           }
         }
       }
diff --git a/lib/utils/ionitron.js b/lib/utils/ionitron.js
index fd630f04e8..2568b62a26 100644
--- a/lib/utils/ionitron.js
+++ b/lib/utils/ionitron.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var colors = require('colors');
+var chalk = require('chalk');
 var path = require('path');
 var fs = require('fs');
 var IonicAppLib = require('ionic-app-lib');
@@ -67,7 +67,7 @@ function print(lang) {
     }
   }
   contents = contents.replace(replaceString, messageContent);
-  log.info(colors.cyan(contents));
+  log.info(chalk.cyan(contents));
 
   return;
 }
diff --git a/lib/utils/templates.js b/lib/utils/templates.js
index 1f58639602..83ee22b6df 100644
--- a/lib/utils/templates.js
+++ b/lib/utils/templates.js
@@ -1,5 +1,4 @@
-require('colors');
-
+var chalk = require('chalk');
 var _ = require('underscore');
 var Q = require('q');
 var request = require('request');
@@ -11,8 +10,7 @@ function fetchStarterTemplates() {
   // log.info('About to fetch template');
   var downloadUrl = 'http://code.ionicframework.com/content/starter-templates.json';
 
-  // log.info('\nDownloading Starter Templates'.bold, downloadUrl, starterTemplateJsonPath);
-  log.info('\nDownloading Starter Templates'.bold, '-', downloadUrl);
+  log.info(chalk.bold('\nDownloading Starter Templates'), '-', downloadUrl);
 
   var q = Q.defer();
 
@@ -47,7 +45,7 @@ function list(templates) {
     while ((shortName + dots).length < rightColumn + 1) {
       dots += '.';
     }
-    log.info(shortName.green, dots, template.description);
+    log.info(chalk.green(shortName), dots, template.description);
   });
 }
 
@@ -56,7 +54,7 @@ function listTemplates() {
   return fetchStarterTemplates()
     .then(function(starterTemplates) {
       var templates = _.sortBy(starterTemplates.items, function(template) { return template.name; });
-      log.info('Ionic Starter templates'.green);
+      log.info(chalk.green('Ionic Starter templates'));
       return list(templates);
     });
 }
diff --git a/package.json b/package.json
index 3eeda02abb..be563b5f6f 100644
--- a/package.json
+++ b/package.json
@@ -61,8 +61,8 @@
   "license": "MIT",
   "dependencies": {
     "@ionic/app-generators": "0.0.3",
+    "chalk": "^1.1.3",
     "cli-table": "0.3.1",
-    "colors": "0.6.2",
     "cross-spawn-async": "2.1.9",
     "expand-tilde": "1.2.0",
     "form-data": "0.1.4",
@@ -87,7 +87,8 @@
   "devDependencies": {
     "conventional-changelog-cli": "1.1.1",
     "coveralls": "^2.2.0",
-    "eslint": "^3.0.1",
+    "eslint": "^3.8.1",
+    "eslint-plugin-no-use-extend-native": "^0.3.11",
     "github": "0.2.4",
     "istanbul": "^0.4.4",
     "jasmine-node": "1.14.5",
@@ -96,7 +97,7 @@
   },
   "bundledDependencies": [
     "cli-table",
-    "colors",
+    "chalk",
     "cross-spawn-async",
     "expand-tilde",
     "form-data",

From 38cfaaa5a0d5b5a733ccdbdc5edcf6e64538ce8c Mon Sep 17 00:00:00 2001
From: benmag1 <benmagriso@gmail.com>
Date: Sat, 29 Oct 2016 14:29:28 +0300
Subject: [PATCH 1072/1100] chore(): update request dependency to a more secure
 version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be563b5f6f..4cb4808653 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "progress": "1.1.7",
     "prompt": "0.2.12",
     "q": "1.0.1",
-    "request": "2.51.0",
+    "request": "2.74.0",
     "semver": "4.3.6",
     "serve-static": "1.7.1",
     "shelljs": "0.2.6",

From 2df9b701f49f9f1c1b3dcd42913335e2854da9f3 Mon Sep 17 00:00:00 2001
From: Ramon Henrique Ornelas <ramon.ornela@gmail.com>
Date: Sat, 29 Oct 2016 09:31:18 -0200
Subject: [PATCH 1073/1100] docs(generator): add docs help in usage #1411
 (#1446)

---
 lib/ionic/generate.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/generate.js b/lib/ionic/generate.js
index f7e616b671..86faab4f71 100644
--- a/lib/ionic/generate.js
+++ b/lib/ionic/generate.js
@@ -16,7 +16,21 @@ var settings = {
     '--list': {
       title: 'List available generators',
       boolean: true
-    }
+    },
+    '--includeSpec': {
+      title: 'Create test spec basic to pages, components, directives, pipes and providers',
+      boolean: true
+    },
+    '--skipScss': {
+      title: 'Not create scss for components and pages',
+      boolean: true
+    },
+    '--componentsDir': 'Path directory target is created component',
+    '--directivesDir': 'Path directory target is created directive',
+    '--pagesDir': 'Path directory target is created page',
+    '--pipesDir': 'Path directory target is created pipe',
+    '--providersDir': 'Path directory target is created provider',
+    '--templateDir': 'Path directory templates custom to pages, components, directives, pipes and providers'
   },
   isProjectTask: true
 };

From dc4ff0a56a2178599df164801d5d2db8c5041d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20M=C3=A9zino?= <VincentM@users.noreply.github.com>
Date: Sat, 29 Oct 2016 13:33:41 +0200
Subject: [PATCH 1074/1100] fix(docs): Add summary and options in settings of
 login

---
 lib/ionic/login.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ionic/login.js b/lib/ionic/login.js
index 2ee35a5e95..2e9045fdf9 100644
--- a/lib/ionic/login.js
+++ b/lib/ionic/login.js
@@ -12,6 +12,11 @@ var appLibSettings = IonicAppLib.settings;
 var settings =  {
   title: 'login',
   name: 'login',
+  summary: 'Login to your Ionic account',
+  options: {
+    '--email|-e': 'Ionic account email',
+    '--password|-p': 'Ionic account password'
+  },
   isProjectTask: false
 };
 

From 6bd2658e40f31744ade5ac5ee0ca9bc171269a9e Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Wed, 9 Nov 2016 12:18:04 -0600
Subject: [PATCH 1075/1100] feat(): allow emulate and run to use serve for
 livereload. (#1614)

---
 lib/cli.js                 |  61 +++++++++-------
 lib/ionic/emulate.js       |  50 +++++++++----
 lib/ionic/info.js          |  16 +---
 lib/ionic/run.js           |  53 +++++++++-----
 lib/ionic/stats.js         | 145 -------------------------------------
 lib/utils/serve.js         |  24 ++++++
 lib/utils/stats.js         |  11 +--
 package.json               |   2 +-
 spec/cli.spec.js           |  62 ++++++++--------
 spec/tasks/emulate.spec.js |  69 ++++++++++++++++--
 spec/tasks/info.spec.js    |  43 +++++------
 spec/tasks/run.spec.js     |  71 ++++++++++++++++--
 spec/utils/stats.spec.js   | 137 ++++++++++++++++-------------------
 13 files changed, 380 insertions(+), 364 deletions(-)
 delete mode 100644 lib/ionic/stats.js
 create mode 100644 lib/utils/serve.js

diff --git a/lib/cli.js b/lib/cli.js
index 1dbf2dcfea..b8d7a2b564 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -42,6 +42,21 @@ log.level = 'info';
  * @return {Promise}
  */
 Cli.run = function run(processArgv) {
+
+  /*
+  * Before taking any more steps, lets check their
+  * environment and display any upgrade warnings
+  */
+  return Q.all([
+    Cli.doRuntimeCheck(),
+    Cli.checkLatestVersion()
+  ]).then(function() {
+    Cli.runr(processArgv);
+  }).catch(function(ex) {
+    return appLibUtils.fail(ex);
+  });
+};
+Cli.runr = function runr(processArgv) {
   try {
 
     /*
@@ -54,18 +69,11 @@ Cli.run = function run(processArgv) {
     var taskList;
 
     Cli.attachErrorHandling();
-    Cli.latestVersion = Cli.checkLatestVersion();
 
     process.on('exit', function() {
       Cli.printVersionWarning(settings.version, Cli.npmVersion);
     });
 
-    /*
-     * Before taking any more steps, lets check their
-     * environment and display any upgrade warnings
-     */
-    Cli.doRuntimeCheck(settings.version);
-
     /*
      * Print version if '--version' or '--v' is an option
      * TODO: version should probably also be a command
@@ -180,7 +188,7 @@ Cli.run = function run(processArgv) {
     log.debug('\nNpm scripts:', npmScripts);
     log.debug('Gulpfile found:', gulpLoaded, '\n');
 
-    if (npmScripts) {
+    if (npmScripts.hasOwnProperty(taskName + ':before') || npmScripts.hasOwnProperty(taskName + ':after')) {
       return Cli.runWithNpmScripts(argv, task, rawCliArguments);
     } else if (gulpLoaded) {
       return Cli.runWithGulp(argv, task, rawCliArguments);
@@ -621,13 +629,6 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
   return q.promise;
 };
 
-Cli.gatherInfo = function gatherInfo() {
-  var info = Info.gatherInfo();
-  Info.getIonicVersion(info, process.cwd());
-  Info.getIonicCliVersion(info, path.join(__dirname, '../'));
-  return info;
-};
-
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
   log.error(chalk.red.bold('An uncaught exception occurred and has been reported to Ionic'));
   var errorMessage = typeof err === 'string' ? err : err.message;
@@ -637,12 +638,12 @@ Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
 
 Cli.attachErrorHandling = function attachErrorHandling() {
   appLibUtils.errorHandler = function errorHandler(msg) {
-    try {
-      log.debug('Cli.appLibUtils.errorHandler msg', msg, typeof msg);
-      var stack = typeof msg == 'string' ? '' : msg.stack;
-      var errorMessage = typeof msg == 'string' ? msg : msg.message;
-      if (msg) {
-        var info = Cli.gatherInfo();
+    log.debug('Cli.appLibUtils.errorHandler msg', msg, typeof msg);
+    var stack = typeof msg == 'string' ? '' : msg.stack;
+    var errorMessage = typeof msg == 'string' ? msg : msg.message;
+    var promise = Q();
+    if (msg) {
+      promise = Info.gatherInfo().then(function(info) {
         var ionicCliVersion = info.ionic_cli;
         if (stack && stack.length > 0) {
           process.stderr.write('\n' + chalk.bold(stack) + '\n\n');
@@ -651,14 +652,16 @@ Cli.attachErrorHandling = function attachErrorHandling() {
         process.stderr.write(chalk.bold(' (CLI v' + ionicCliVersion + ')') + '\n');
 
         Info.printInfo(info);
-      }
+      });
+    }
+    promise.then(function() {
       process.stderr.write('\n');
       process.exit(1);
       return '';
-    } catch (ex) {
+    }).catch(function(ex) {
       console.log('errorHandler had an error', ex);
       console.log(ex.stack);
-    }
+    });
   };
 
   // TODO Attach error reporter here
@@ -686,10 +689,14 @@ Cli.doRuntimeCheck = function doRuntimeCheck(version) {
   }
 
   if (!lastVersionChecked || !versionHasBeenChecked) {
-    Info.checkRuntime();
-    IonicConfig.set('lastVersionChecked', version);
-    IonicConfig.save();
+    return Info.gatherInfo().then(function(info) {
+      Info.checkRuntime(info);
+      IonicConfig.set('lastVersionChecked', version);
+      IonicConfig.save();
+    });
   }
+
+  return Q();
 };
 
 module.exports = Cli;
diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 714a824854..e09025822c 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
+var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -46,6 +47,10 @@ function run(ionic, argv, rawCliArguments) {
   var appDirectory = process.cwd();
   var rawArgs = rawCliArguments.slice(0);
   var cmdName = argv._[0].toLowerCase();
+  var hasBuildCommand = false;
+  var hasServeCommand = false;
+  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
+  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
@@ -64,30 +69,45 @@ function run(ionic, argv, rawCliArguments) {
   var promiseList = []
     .concat(!cordovaUtils.isPlatformInstalled(runPlatform, appDirectory) ?
       cordovaUtils.installPlatform(runPlatform) :
-      [])
+      Q())
     .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
       cordovaUtils.installPlugins() :
-      []);
+      Q())
+    .concat(npmScripts.hasIonicScript('build'))
+    .concat(npmScripts.hasIonicScript('serve'));
 
-  return Q.all(promiseList).then(function() {
-    return npmScripts.hasIonicScript('build');
-  })
-  .then(function(hasBuildCommand) {
-    if (hasBuildCommand) {
+  return Q.all(promiseList).then(function(results) {
+    hasBuildCommand = results[2];
+    hasServeCommand = results[3];
+
+    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
       return npmScripts.runIonicScript('build');
     }
-    return Q.resolve();
+    return Q();
   })
   .then(function() {
-    if (isLiveReload) {
+
+    if (isLiveReload && hasServeCommand) {
+
+      // using app-scripts and livereload is requested
+      return ConfigXml.setConfigXml(process.cwd(), {
+        devServer: serveUtil.getUrl(address, port)
+      }).then(function() {
+        isLiveReload = false;
+        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+      });
+    } else if (isLiveReload) {
+
+      // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    }
+    } else {
 
-    // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(appDirectory, {
-      resetContent: true,
-      errorWhenNotFound: false
-    });
+      // ensure the content node was set back to its original
+      return ConfigXml.setConfigXml(appDirectory, {
+        resetContent: true,
+        errorWhenNotFound: false
+      });
+    }
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
diff --git a/lib/ionic/info.js b/lib/ionic/info.js
index 8827b22b5e..049fa9a0e4 100644
--- a/lib/ionic/info.js
+++ b/lib/ionic/info.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var extend = require('../utils/extend');
-var path = require('path');
 var IonicAppLib = require('ionic-app-lib');
 var Info = IonicAppLib.info;
 var appLibUtils = IonicAppLib.utils;
@@ -14,20 +13,13 @@ var settings = {
 };
 
 function run() {
-  try {
-
-    var info = Info.gatherInfo();
-
-    Info.getIonicVersion(info, process.cwd());
-    Info.getIonicCliVersion(info, path.join(__dirname, '../../'));
-    Info.getIonicAppScriptsVersion(info, process.cwd());
-
+  return Info.gatherInfo().then(function(info) {
     Info.printInfo(info);
 
-    Info.checkRuntime();
-  } catch (ex) {
+    Info.checkRuntime(info);
+  }).catch(function(ex) {
     appLibUtils.fail('There was an error retrieving your environment information:', ex);
-  }
+  });
 }
 
 module.exports = extend(settings, {
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 385273cc58..85e4c4ec3f 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var chalk = require('chalk');
+var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -46,6 +47,10 @@ function run(ionic, argv, rawCliArguments) {
   var appDirectory = process.cwd();
   var rawArgs = rawCliArguments.slice(0);
   var cmdName = argv._[0].toLowerCase();
+  var hasBuildCommand = false;
+  var hasServeCommand = false;
+  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
+  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
@@ -64,30 +69,44 @@ function run(ionic, argv, rawCliArguments) {
   var promiseList = []
     .concat(!cordovaUtils.isPlatformInstalled(runPlatform, appDirectory) ?
       cordovaUtils.installPlatform(runPlatform) :
-      [])
+      Q())
     .concat(!cordovaUtils.arePluginsInstalled(appDirectory) ?
       cordovaUtils.installPlugins() :
-      []);
+      Q())
+    .concat(npmScripts.hasIonicScript('build'))
+    .concat(npmScripts.hasIonicScript('serve'));
 
-  return Q.all(promiseList).then(function() {
-    return npmScripts.hasIonicScript('build');
-  })
-  .then(function(hasBuildCommand) {
-    if (hasBuildCommand) {
+  return Q.all(promiseList).then(function(results) {
+    hasBuildCommand = results[2];
+    hasServeCommand = results[3];
+
+    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
       return npmScripts.runIonicScript('build');
     }
-    return Q.resolve();
-  })  
-  .then(function() {
-    if (isLiveReload) {
+    return Q();
+  }).then(function() {
+
+    if (isLiveReload && hasServeCommand) {
+
+      // using app-scripts and livereload is requested
+      return ConfigXml.setConfigXml(process.cwd(), {
+        devServer: serveUtil.getUrl(address, port)
+      }).then(function() {
+        isLiveReload = false;
+        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+      });
+    } else if (isLiveReload) {
+
+      // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    }
+    } else {
 
-    // ensure the content node was set back to its original
-    return ConfigXml.setConfigXml(appDirectory, {
-      resetContent: true,
-      errorWhenNotFound: false
-    });
+      // ensure the content node was set back to its original
+      return ConfigXml.setConfigXml(appDirectory, {
+        resetContent: true,
+        errorWhenNotFound: false
+      });
+    }
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
diff --git a/lib/ionic/stats.js b/lib/ionic/stats.js
deleted file mode 100644
index 4509a10bd3..0000000000
--- a/lib/ionic/stats.js
+++ /dev/null
@@ -1,145 +0,0 @@
-var request = require('request'),
-  IonicConfig = require('./config');
-
-var proxy = process.env.PROXY || process.env.http_proxy || null;
-
-var s = {
-  track: function(event, uuid, data, callback) {
-    var data = {
-      '_event' : event,
-      '_uuid': uuid,
-      'data': data
-    };
-
-    request({
-      url: 'https://t.ionic.io/event/cli',
-      method: "POST",
-      json: data,
-      proxy: proxy
-    }, function(err, res, body) {
-      callback(err, res, body);
-    });
-  }
-};
-
-var ionicConfig = IonicConfig.load();
-
-exports.IonicStats = {
-  t: function(additionalData) {
-    try {
-
-      if(process.argv.length < 3) return;
-
-      if( ionicConfig.get('statsOptOut') === true ) {
-        return;
-      }
-
-      var cmdName = process.argv[2].toLowerCase();
-      var cmdArgs = (process.argv.length > 3 ? process.argv.slice(3) : []); // skip the cmdName
-
-      var statsData = additionalData || {};
-      var platforms = [];
-      var x, y, cmd;
-
-      // update any aliases with the full cmd so there's a common property
-      var aliasMap = {
-        'rm': 'remove',
-        'ls': 'list',
-        'up': 'update',
-        '-w': '--no-cordova',
-        '-b': '--nobrowser',
-        '-r': '--nolivereload',
-        '-x': '--noproxy',
-        '-l': '--livereload',
-        '-c': '--consolelogs',
-        '-s': '--serverlogs',
-        '-n': '--no-email',
-        '-s': '--sass'
-      };
-      for(x=0; x<cmdArgs.length; x++) {
-        for(y in aliasMap) {
-          if(cmdArgs[x].toLowerCase() == y) {
-            cmdArgs[x] = aliasMap[y];
-          }
-        }
-      }
-
-      var platformWhitelist = 'android ios firefoxos wp7 wp8 amazon-fireos blackberry10 tizen'.split(' ');
-      var argsWhitelist = 'add remove list update check debug release search --livereload --consolelogs --serverlogs --no-cordova --nobrowser --nolivereload --noproxy --no-email --debug --release --device --emulator --sass --splash --icon'.split(' ');
-
-      // collect only certain args, skip over everything else
-      for(x=0; x<cmdArgs.length; x++) {
-        cmd = cmdArgs[x].toLowerCase();
-
-        // gather what platforms this is targeting
-        for(y=0; y<platformWhitelist.length; y++) {
-          if(cmd == platformWhitelist[y]) {
-            platforms.push(cmd); // group them together
-            statsData[cmd] = true; // also give them their own property
-            break;
-          }
-        }
-        // gather only args that are in our list of valid stat args
-        for(y=0; y<argsWhitelist.length; y++) {
-          if(cmd == argsWhitelist[y]) {
-            statsData[cmd] = true;
-            break;
-          }
-        }
-      }
-
-      // create a platform property only when there is 1 or more
-      if(platforms.length) {
-        statsData.platform = platforms.sort().join(',');
-      }
-
-      // add which ionic lib version they're using
-      try {
-        statsData.ionic_version = require( path.resolve('www/lib/ionic/version.json') ).version;
-      } catch(e2) {}
-
-      // add which cli version is being used
-      try {
-        statsData.cli_version = require('../../package.json').version;
-      } catch(e2) {}
-
-      try {
-        statsData.email = ionicConfig.get('email');
-      } catch (e2) {}
-
-      try {
-        statsData.account_id = ionicConfig.get('id');
-      } catch (e2) {}
-
-      var releaseTag = statsData.cli_version.split('-')[1];
-      if (releaseTag) {
-        statsData.cli_release_tag = releaseTag.split('.')[0];
-      }
-
-      this.mp(cmdName, statsData);
-      //console.log(cmdName, statsData);
-
-    } catch(e) {
-      console.log( ('Error stats: ' + e) );
-    }
-  },
-  mp: function(e, d) {
-    var unique_id = ionicConfig.get('ank');
-    if(!unique_id) {
-      this.createId();
-      unique_id = ionicConfig.get('ank');
-    }
-    s.track(e, unique_id, d, function(err, data) {
-    });
-  },
-  createId: function() {
-    var d = new Date().getTime();
-    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = (d + Math.random()*16)%16 | 0;
-      d = Math.floor(d/16);
-      return (c=='x' ? r : (r&0x7|0x8)).toString(16);
-    });
-
-    ionicConfig.set('ank', uuid);
-  }
-};
diff --git a/lib/utils/serve.js b/lib/utils/serve.js
new file mode 100644
index 0000000000..0f8916a8e5
--- /dev/null
+++ b/lib/utils/serve.js
@@ -0,0 +1,24 @@
+var DEFAULT_ADDRESS = '0.0.0.0';
+var DEFAULT_HTTP_PORT = 8100;
+var DEFAULT_LIVE_RELOAD_PORT = 35729;
+
+function getUrl(address, port) {
+  
+  var platformName = require('os').platform();
+
+  if ((platformName.indexOf('win') !== -1 && platformName !== 'darwin') &&
+      (address === '0.0.0.0' || address.indexOf('0.0.0.0') !== -1)) {
+
+    // Windows doesnt understand 0.0.0.0 - direct to localhost instead
+    address = 'localhost';
+  }
+
+  return ['http://', address, ':', port].join('');
+}
+
+module.exports = {
+  DEFAULT_ADDRESS: DEFAULT_ADDRESS,
+  DEFAULT_HTTP_PORT: DEFAULT_HTTP_PORT,
+  DEFAULT_LIVE_RELOAD_PORT: DEFAULT_LIVE_RELOAD_PORT,
+  getUrl: getUrl
+};
\ No newline at end of file
diff --git a/lib/utils/stats.js b/lib/utils/stats.js
index c8ae31190e..aabec30400 100644
--- a/lib/utils/stats.js
+++ b/lib/utils/stats.js
@@ -72,6 +72,12 @@ function mp(e, d) {
 }
 
 function t(additionalData) {
+  return IonicInfo.gatherInfo().then(function(info) {
+    return mainTrack(additionalData, info);
+  });
+}
+
+function mainTrack(additionalData, info) {
   try {
 
     if (process.argv.length < 3) return;
@@ -142,11 +148,6 @@ function t(additionalData) {
       statsData.cli_release_tag = releaseTag.split('.')[0];
     }
 
-    var info = {};
-    IonicInfo.getNodeVersion(info);
-    IonicInfo.getOsEnvironment(info);
-    IonicInfo.gatherGulpInfo(info);
-
     mp(cmdName, ({
       os: info.os,
       gulp: info.gulp,
diff --git a/package.json b/package.json
index 4cb4808653..84c768c1b2 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.2",
+    "ionic-app-lib": "2.1.3",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",
diff --git a/spec/cli.spec.js b/spec/cli.spec.js
index 6b247ff47f..5cd479d043 100644
--- a/spec/cli.spec.js
+++ b/spec/cli.spec.js
@@ -384,7 +384,7 @@ describe('Cli', function() {
         spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(true);
-        spyOn(IonicCli, 'loadNpmScripts').andReturn(false);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn({});
 
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
@@ -404,7 +404,9 @@ describe('Cli', function() {
         spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(false);
-        spyOn(IonicCli, 'loadNpmScripts').andReturn(true);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn({
+          'fake:before': true
+        });
 
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
@@ -424,7 +426,9 @@ describe('Cli', function() {
         spyOn(IonicCli, 'runWithNpmScripts').andReturn(Q(true));
         spyOn(fs, 'existsSync').andReturn(true);
         spyOn(IonicCli, 'loadGulpfile').andReturn(true);
-        spyOn(IonicCli, 'loadNpmScripts').andReturn(true);
+        spyOn(IonicCli, 'loadNpmScripts').andReturn({
+          'fake:before': true
+        });
 
         IonicCli.run(['node', 'bin/ionic', 'fake'])
         .then(function() {
@@ -434,14 +438,16 @@ describe('Cli', function() {
         });
       });
 
-      it('should call Utils.fail if an exception occurrs within run', function() {
+      it('should call Utils.fail if an exception occurrs within run', function(done) {
         var error = new Error('error happened');
         spyOn(IonicCli, 'checkLatestVersion').andCallFake(function() {
-          throw error;
+          return Q.reject(error);
         });
 
-        IonicCli.run(['node', 'bin/ionic', '--stats-opt-out']);
-        expect(Utils.fail).toHaveBeenCalledWith(error);
+        IonicCli.run(['node', 'bin/ionic', '--stats-opt-out']).fin(function() {
+          expect(Utils.fail).toHaveBeenCalledWith(error);
+          done();
+        });
       });
 
       it('should save to the config if stats-opt-out is passed', function(done) {
@@ -807,18 +813,6 @@ describe('Cli', function() {
   describe('processExit method', function() {
   });
 
-  describe('gatherInfo method', function() {
-    it('should return an object and gather info from Info function from app-lib', function() {
-      spyOn(Info, 'gatherInfo').andReturn({});
-      spyOn(Info, 'getIonicVersion');
-      spyOn(Info, 'getIonicCliVersion');
-
-      var info = IonicCli.gatherInfo();
-
-      expect(info).toEqual(jasmine.any(Object));
-    });
-  });
-
   describe('printVersionWarning method', function() {
     it('should write out a warning if the version is not equal to version specified by the cli', function() {
       spyOn(log, 'warn');
@@ -946,7 +940,7 @@ describe('Cli', function() {
     });
   });
 
-  describe('doRuntimeCheck method', function() {
+  describe('doRuntimeCheck method', function(done) {
     it('should update IonicConfig if semver is not met', function() {
       var version = '0.2.0';
       var error = new Error('semver failure');
@@ -957,32 +951,38 @@ describe('Cli', function() {
         throw error;
       });
 
-      IonicCli.doRuntimeCheck(version);
-      expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
-      expect(IonicStore.prototype.save).toHaveBeenCalled();
+      IonicCli.doRuntimeCheck(version).then(function() {
+        expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
+        expect(IonicStore.prototype.save).toHaveBeenCalled();
+        done();
+      });
     });
 
-    it('should update IonicConfig if lastVersionChecked from IonicConfig is not available', function() {
+    it('should update IonicConfig if lastVersionChecked from IonicConfig is not available', function(done) {
       var version = '0.2.0';
       spyOn(IonicStore.prototype, 'get').andReturn(null);
       spyOn(IonicStore.prototype, 'set');
       spyOn(IonicStore.prototype, 'save');
 
-      IonicCli.doRuntimeCheck(version);
-      expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
-      expect(IonicStore.prototype.save).toHaveBeenCalled();
+      IonicCli.doRuntimeCheck(version).then(function() {
+        expect(IonicStore.prototype.set).toHaveBeenCalledWith('lastVersionChecked', version);
+        expect(IonicStore.prototype.save).toHaveBeenCalled();
+        done();
+      });
     });
 
-    it('should not update IonicConfig if lastVersionChecked is available and semver is met', function() {
+    it('should not update IonicConfig if lastVersionChecked is available and semver is met', function(done) {
       var version = '0.2.0';
       spyOn(IonicStore.prototype, 'get').andReturn('0.2.0');
       spyOn(IonicStore.prototype, 'set');
       spyOn(IonicStore.prototype, 'save');
       spyOn(semver, 'satisfies').andReturn(true);
 
-      IonicCli.doRuntimeCheck(version);
-      expect(IonicStore.prototype.set).not.toHaveBeenCalled();
-      expect(IonicStore.prototype.save).not.toHaveBeenCalled();
+      IonicCli.doRuntimeCheck(version).then(function() {
+        expect(IonicStore.prototype.set).not.toHaveBeenCalled();
+        expect(IonicStore.prototype.save).not.toHaveBeenCalled();
+        done();
+      });
     });
   });
 
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index 46ea4fefc5..36ce8aeecb 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -242,12 +242,17 @@ describe('emulate command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
-    it('should not call runIonicScript if hasIonicScript is false', function(done) {
-      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+    it('should not call runIonicScript if hasIonicScript for build and serve are both false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(false);
+        } else if (task === 'serve') {
+          return Q(false);
+        }
+      });
       spyOn(npmScripts, 'runIonicScript');
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
         expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
         done();
@@ -256,12 +261,38 @@ describe('emulate command', function() {
       });
     });
 
-    it('should call runIonicScript if hasIonicScript is true', function(done) {
-      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(false);
+        }
+      });
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is true and liveReload is not passed', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(true);
+        }
+      });
       spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
         expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
         done();
@@ -269,5 +300,31 @@ describe('emulate command', function() {
         console.log(e);
       });
     });
+
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is true and liveReload is passed', function(done) {
+      var processArguments = ['node', 'ionic', 'emulate', 'android', '--livereload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(true);
+        }
+      });
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      emulate.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', ['-p', jasmine.any(Number), '--address', jasmine.any(String)]);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
   });
 });
diff --git a/spec/tasks/info.spec.js b/spec/tasks/info.spec.js
index 5246bfbf2e..d2d9863822 100644
--- a/spec/tasks/info.spec.js
+++ b/spec/tasks/info.spec.js
@@ -5,6 +5,7 @@ var info = require('../../lib/ionic/info');
 var IonicAppLib = require('ionic-app-lib');
 var appLibUtils = IonicAppLib.utils;
 var appLibInfo = IonicAppLib.info;
+var Q = require('q');
 
 describe('info command', function() {
   describe('command settings', function() {
@@ -26,48 +27,42 @@ describe('info command', function() {
     var rawCliArguments = processArguments.slice(2);
     var argv = optimist(rawCliArguments).argv;
 
-    it('should fail if any Info task throws', function() {
+    it('should fail if any Info task throws', function(done) {
       spyOn(appLibUtils, 'fail');
       spyOn(appLibInfo, 'gatherInfo').andCallFake(function() {
-        throw new Error('error stuff');
+        return Q.reject(new Error('error stuff'));
       });
-      spyOn(appLibInfo, 'getIonicVersion');
-      spyOn(appLibInfo, 'getIonicCliVersion');
       spyOn(appLibInfo, 'printInfo');
       spyOn(appLibInfo, 'checkRuntime');
 
       // Expect failure
-      info.run(null, argv, rawCliArguments);
-      expect(appLibInfo.gatherInfo).toHaveBeenCalled();
-      expect(appLibUtils.fail).toHaveBeenCalled();
+      info.run(null, argv, rawCliArguments).fin(function() {
+        expect(appLibInfo.gatherInfo).toHaveBeenCalled();
+        expect(appLibUtils.fail).toHaveBeenCalled();
 
-      expect(appLibInfo.getIonicVersion).not.toHaveBeenCalled();
-      expect(appLibInfo.getIonicCliVersion).not.toHaveBeenCalled();
-      expect(appLibInfo.printInfo).not.toHaveBeenCalled();
-      expect(appLibInfo.checkRuntime).not.toHaveBeenCalled();
+        expect(appLibInfo.printInfo).not.toHaveBeenCalled();
+        expect(appLibInfo.checkRuntime).not.toHaveBeenCalled();
+        done();
+      });
     });
 
-    it('should gather info', function() {
+    it('should gather info', function(done) {
       var gatheredInfo = { info: 'hi' };
       spyOn(appLibUtils, 'fail');
       spyOn(process, 'cwd').andReturn('/hello/how/areyou');
-      spyOn(appLibInfo, 'gatherInfo').andReturn(gatheredInfo);
-      spyOn(appLibInfo, 'getIonicVersion');
-      spyOn(appLibInfo, 'getIonicCliVersion');
-      spyOn(appLibInfo, 'getIonicAppScriptsVersion');
+      spyOn(appLibInfo, 'gatherInfo').andReturn(Q(gatheredInfo));
       spyOn(appLibInfo, 'printInfo');
       spyOn(appLibInfo, 'checkRuntime');
 
       // Expect failure
-      info.run(null, argv, rawCliArguments);
-      expect(appLibInfo.gatherInfo).toHaveBeenCalled();
-      expect(appLibInfo.getIonicVersion).toHaveBeenCalledWith(gatheredInfo, '/hello/how/areyou');
-      expect(appLibInfo.getIonicCliVersion).toHaveBeenCalledWith(gatheredInfo, jasmine.any(String));
-      expect(appLibInfo.getIonicAppScriptsVersion).toHaveBeenCalledWith(gatheredInfo, '/hello/how/areyou');
-      expect(appLibInfo.printInfo).toHaveBeenCalledWith(gatheredInfo);
-      expect(appLibInfo.checkRuntime).toHaveBeenCalled();
+      info.run(null, argv, rawCliArguments).then(function() {
+        expect(appLibInfo.gatherInfo).toHaveBeenCalled();
+        expect(appLibInfo.printInfo).toHaveBeenCalledWith(gatheredInfo);
+        expect(appLibInfo.checkRuntime).toHaveBeenCalled();
 
-      expect(appLibUtils.fail).not.toHaveBeenCalled();
+        expect(appLibUtils.fail).not.toHaveBeenCalled();
+        done();
+      });
     });
   });
 });
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
index 08240aa99a..40aa3e22a3 100644
--- a/spec/tasks/run.spec.js
+++ b/spec/tasks/run.spec.js
@@ -234,15 +234,20 @@ describe('run command', function() {
 
       spyOn(cordovaUtils, 'isPlatformInstalled').andReturn(true);
       spyOn(cordovaUtils, 'arePluginsInstalled').andReturn(true);
-      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(0));
+      spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
     });
 
-    it('should not call runIonicScript if hasIonicScript is false', function(done) {
-      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(false));
+    it('should not call runIonicScript if hasIonicScript for build and serve are both false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(false);
+        } else if (task === 'serve') {
+          return Q(false);
+        }
+      });
       spyOn(npmScripts, 'runIonicScript');
 
       run.run(null, argv, rawCliArguments).then(function() {
-        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
         expect(npmScripts.runIonicScript).not.toHaveBeenCalled();
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
         done();
@@ -251,12 +256,38 @@ describe('run command', function() {
       });
     });
 
-    it('should call runIonicScript if hasIonicScript is true', function(done) {
-      spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is false', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(false);
+        }
+      });
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
+
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is true and liveReload is not passed', function(done) {
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(true);
+        }
+      });
       spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
 
       run.run(null, argv, rawCliArguments).then(function() {
-        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
         expect(npmScripts.runIonicScript).toHaveBeenCalledWith('build');
         expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
         done();
@@ -264,5 +295,31 @@ describe('run command', function() {
         console.log(e);
       });
     });
+
+    it('should call runIonicScript(build) if ' +
+      'hasIonicScript(build) is true and hasIonicScript(build) is true and liveReload is passed', function(done) {
+      var processArguments = ['node', 'ionic', 'run', 'android', '--livereload'];
+      var rawCliArguments = processArguments.slice(2);
+      var argv = optimist(rawCliArguments).argv;
+
+
+      spyOn(npmScripts, 'hasIonicScript').andCallFake(function(task) {
+        if (task === 'build') {
+          return Q(true);
+        } else if (task === 'serve') {
+          return Q(true);
+        }
+      });
+      spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
+
+      run.run(null, argv, rawCliArguments).then(function() {
+        expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', ['-p', jasmine.any(Number), '--address', jasmine.any(String)]);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+      });
+    });
   });
 });
diff --git a/spec/utils/stats.spec.js b/spec/utils/stats.spec.js
index 7e28429770..bcf687e57f 100644
--- a/spec/utils/stats.spec.js
+++ b/spec/utils/stats.spec.js
@@ -24,7 +24,7 @@ describe('Stats', function() {
       process.argv = oldprocessargv;
     });
 
-    it('should not track if process.argv is less than 3', function() {
+    it('should not track if process.argv is less than 3', function(done) {
       process.argv = ['node', 'bin/ionic'];
 
       var mpSpy = jasmine.createSpy('mpSpy');
@@ -35,15 +35,16 @@ describe('Stats', function() {
 
       var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
 
-      IonicStats.t();
-
-      expect(configSpy.get).not.toHaveBeenCalled();
-      expect(mpSpy).not.toHaveBeenCalled();
-      revertMpSpy();
-      revertConfig();
+      IonicStats.t().then(function() {
+        expect(configSpy.get).not.toHaveBeenCalled();
+        expect(mpSpy).not.toHaveBeenCalled();
+        revertMpSpy();
+        revertConfig();
+        done();
+      });
     });
 
-    it('should not track stats if opted out', function() {
+    it('should not track stats if opted out', function(done) {
       process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
 
       var mpSpy = jasmine.createSpy('mpSpy');
@@ -54,15 +55,16 @@ describe('Stats', function() {
 
       var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
 
-      IonicStats.t();
-
-      expect(configSpy.get).toHaveBeenCalled();
-      expect(mpSpy).not.toHaveBeenCalled();
-      revertMpSpy();
-      revertConfig();
+      IonicStats.t().then(function() {
+        expect(configSpy.get).toHaveBeenCalled();
+        expect(mpSpy).not.toHaveBeenCalled();
+        revertMpSpy();
+        revertConfig();
+        done();
+      });
     });
 
-    it('should catch errors thrown mp', function() {
+    it('should catch errors thrown mp', function(done) {
       process.argv = ['node', 'bin/ionic', 'start', 'foldername'];
 
       spyOn(log, 'error');
@@ -76,16 +78,17 @@ describe('Stats', function() {
       var revertMpSpy = IonicStats.__set__('mp', mpSpy);
       var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
 
-      IonicStats.t();
-
-      expect(configSpy.get).toHaveBeenCalled();
-      expect(mpSpy).not.toHaveBeenCalled();
-      expect(log.error).toHaveBeenCalled();
-      revertMpSpy();
-      revertConfig();
+      IonicStats.t().then(function() {
+        expect(configSpy.get).toHaveBeenCalled();
+        expect(mpSpy).not.toHaveBeenCalled();
+        expect(log.error).toHaveBeenCalled();
+        revertMpSpy();
+        revertConfig();
+        done();
+      });
     });
 
-    it('should track the correct command', function() {
+    it('should track the correct command', function(done) {
       process.argv = ['node', 'bin/ionic', 'update', 'foldername', '-w', 'android', 'ios'];
 
       spyOn(fs, 'readFileSync').andReturn('{ "version": "2.0.0-beta.25" }');
@@ -93,42 +96,35 @@ describe('Stats', function() {
       var mpSpy = jasmine.createSpy('mpSpy');
       var revertMpSpy = IonicStats.__set__('mp', mpSpy);
 
-      spyOn(IonicInfoModule, 'getNodeVersion');
-      spyOn(IonicInfoModule, 'getOsEnvironment');
-      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
-        info.os = 'Mac OS X El Capitan';
-        info.node = 'v5.10.1';
-        info.gulp = 'v3.0.0';
-      });
-
       var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
       configSpy.get.andReturn(false);
 
       var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
 
-      IonicStats.t();
-
-      expect(mpSpy).toHaveBeenCalledWith('update', {
-        ionic_version: '2.0.0-beta.25', // eslint-disable-line camelcase
-        cli_version: '2.0.0-beta.25', // eslint-disable-line camelcase
-        email: false,
-        account_id: false, // eslint-disable-line camelcase
-        /*
-        os: 'Mac OS X El Capitan',
-        gulp: 'v3.0.0',
-        node: 'v5.10.1',
-        */
-        cli_release_tag: 'beta', // eslint-disable-line camelcase
-        '--no-cordova': true,
-        android: true,
-        ios: true,
-        platform: 'android,ios'
+      IonicStats.t().then(function() {
+        expect(mpSpy).toHaveBeenCalledWith('update', {
+          ionic_version: '2.0.0-beta.25', // eslint-disable-line camelcase
+          cli_version: '2.0.0-beta.25', // eslint-disable-line camelcase
+          email: false,
+          account_id: false, // eslint-disable-line camelcase
+          /*
+          os: 'Mac OS X El Capitan',
+          gulp: 'v3.0.0',
+          node: 'v5.10.1',
+          */
+          cli_release_tag: 'beta', // eslint-disable-line camelcase
+          '--no-cordova': true,
+          android: true,
+          ios: true,
+          platform: 'android,ios'
+        });
+        revertMpSpy();
+        revertConfig();
+        done();
       });
-      revertMpSpy();
-      revertConfig();
     });
 
-    it('should track the correct command with no platforms or releaseTags', function() {
+    it('should track the correct command with no platforms or releaseTags', function(done) {
       process.argv = ['node', 'bin/ionic', 'update', 'foldername', '-w'];
 
       spyOn(fs, 'readFileSync').andReturn('{ "version": "2.0.0" }');
@@ -136,35 +132,28 @@ describe('Stats', function() {
       var mpSpy = jasmine.createSpy('mpSpy');
       var revertMpSpy = IonicStats.__set__('mp', mpSpy);
 
-      spyOn(IonicInfoModule, 'getNodeVersion');
-      spyOn(IonicInfoModule, 'getOsEnvironment');
-      spyOn(IonicInfoModule, 'gatherGulpInfo').andCallFake(function(info) {
-        info.os = 'Mac OS X El Capitan';
-        info.node = 'v5.10.1';
-        info.gulp = 'v3.0.0';
-      });
-
       var configSpy = jasmine.createSpyObj('ionicConfig', ['get']);
       configSpy.get.andReturn(false);
 
       var revertConfig = IonicStats.__set__('ionicConfig', configSpy);
 
-      IonicStats.t();
-
-      expect(mpSpy).toHaveBeenCalledWith('update', {
-        ionic_version: '2.0.0', // eslint-disable-line camelcase
-        cli_version: '2.0.0', // eslint-disable-line camelcase
-        email: false,
-        account_id: false, // eslint-disable-line camelcase
-        /*
-        os: 'Mac OS X El Capitan',
-        gulp: 'v3.0.0',
-        node: 'v5.10.1',
-        */
-        '--no-cordova': true
+      IonicStats.t().then(function() {
+        expect(mpSpy).toHaveBeenCalledWith('update', {
+          ionic_version: '2.0.0', // eslint-disable-line camelcase
+          cli_version: '2.0.0', // eslint-disable-line camelcase
+          email: false,
+          account_id: false, // eslint-disable-line camelcase
+          /*
+          os: 'Mac OS X El Capitan',
+          gulp: 'v3.0.0',
+          node: 'v5.10.1',
+          */
+          '--no-cordova': true
+        });
+        revertMpSpy();
+        revertConfig();
+        done();
       });
-      revertMpSpy();
-      revertConfig();
     });
   });
 

From 9a55db83f9e2c6a9fec56c22c047acda87781081 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 9 Nov 2016 12:20:25 -0600
Subject: [PATCH 1076/1100] chore(): update changelog and package.json.

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eb17d536f..b859d6648a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="2.1.5"></a>
+## [2.1.5](https://github.com/driftyco/ionic-cli/compare/v2.1.4...v2.1.5) (2016-11-09)
+
+
+### Bug Fixes
+
+* **cli:** npm install under windows ([#1539](https://github.com/driftyco/ionic-cli/issues/1539)) ([26486d2](https://github.com/driftyco/ionic-cli/commit/26486d2)), closes [#1445](https://github.com/driftyco/ionic-cli/issues/1445)
+* **docs:** Add summary and options in settings of login ([dc4ff0a](https://github.com/driftyco/ionic-cli/commit/dc4ff0a))
+
+
+### Features
+
+* allow emulate and run to use serve for livereload. ([#1614](https://github.com/driftyco/ionic-cli/issues/1614)) ([6bd2658](https://github.com/driftyco/ionic-cli/commit/6bd2658))
+
+
+
 <a name="2.1.4"></a>
 ## [2.1.4](https://github.com/driftyco/ionic-cli/compare/v2.1.2...v2.1.4) (2016-10-21)
 
diff --git a/package.json b/package.json
index 84c768c1b2..4fbd5b3a6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 70a691c1f4194eb81c41141e1993581a3539e4b9 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 9 Nov 2016 13:36:45 -0600
Subject: [PATCH 1077/1100] fix(start): fix regression with new version of
 app-lib

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4fbd5b3a6d..8ee95c4a4f 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.3",
+    "ionic-app-lib": "2.1.4",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From f53eea90fd482557232b9a45d58c3bff8504b40d Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 9 Nov 2016 13:37:50 -0600
Subject: [PATCH 1078/1100] chore(): create changelog and increment npm
 version.

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b859d6648a..bb0b28647d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.1.6"></a>
+## [2.1.6](https://github.com/driftyco/ionic-cli/compare/v2.1.5...v2.1.6) (2016-11-09)
+
+
+### Bug Fixes
+
+* **start:** fix regression with new version of app-lib ([70a691c](https://github.com/driftyco/ionic-cli/commit/70a691c))
+
+
+
 <a name="2.1.5"></a>
 ## [2.1.5](https://github.com/driftyco/ionic-cli/compare/v2.1.4...v2.1.5) (2016-11-09)
 
diff --git a/package.json b/package.json
index 8ee95c4a4f..81b589f5a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ddcc2a0dbc33fe0501858feb936a1b7b908593cb Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 9 Nov 2016 14:53:25 -0600
Subject: [PATCH 1079/1100] fix(serve): prevent emulate and run livereload from
 using app-scripts for now.

---
 lib/ionic/emulate.js | 26 ++++++++++++++------------
 lib/ionic/run.js     | 29 ++++++++++++++++-------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index e09025822c..b74ad7e596 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -80,39 +80,41 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
+    if (hasBuildCommand) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
   })
   .then(function() {
 
-    if (isLiveReload && hasServeCommand) {
+    if (isLiveReload && hasServeCommand && false) {
 
       // using app-scripts and livereload is requested
       return ConfigXml.setConfigXml(process.cwd(), {
         devServer: serveUtil.getUrl(address, port)
-      }).then(function() {
-        isLiveReload = false;
-        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
       });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    } else {
-
-      // ensure the content node was set back to its original
-      return ConfigXml.setConfigXml(appDirectory, {
-        resetContent: true,
-        errorWhenNotFound: false
-      });
     }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(appDirectory, {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
+  .then(function() {
+    if (isLiveReload && hasServeCommand && false) {
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+    }
+    return Q();
+  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 85e4c4ec3f..c22f87b989 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -80,38 +80,41 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
+    if (hasBuildCommand) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
-  }).then(function() {
+  })
+  .then(function() {
 
-    if (isLiveReload && hasServeCommand) {
+    if (isLiveReload && hasServeCommand && false) {
 
       // using app-scripts and livereload is requested
       return ConfigXml.setConfigXml(process.cwd(), {
         devServer: serveUtil.getUrl(address, port)
-      }).then(function() {
-        isLiveReload = false;
-        return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
       });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
       return cordovaUtils.setupLiveReload(argv, appDirectory);
-    } else {
-
-      // ensure the content node was set back to its original
-      return ConfigXml.setConfigXml(appDirectory, {
-        resetContent: true,
-        errorWhenNotFound: false
-      });
     }
+
+    // ensure the content node was set back to its original
+    return ConfigXml.setConfigXml(appDirectory, {
+      resetContent: true,
+      errorWhenNotFound: false
+    });
   })
   .then(function(serveOptions) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
+  .then(function() {
+    if (isLiveReload && hasServeCommand && false) {
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
+    }
+    return Q();
+  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);

From 01112e9a2c231c39a3de932ba1e205869da95c78 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 9 Nov 2016 14:54:25 -0600
Subject: [PATCH 1080/1100] chore(): update npm version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 81b589f5a7..10ebf8e74a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From 3fde6464af7f175ccd857fb35040c15a948c0b9c Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 10 Nov 2016 14:09:36 -0600
Subject: [PATCH 1081/1100] fix(): check that npm scripts exists before
 checking for properties.

---
 lib/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.js b/lib/cli.js
index b8d7a2b564..c8682d5227 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -188,7 +188,7 @@ Cli.runr = function runr(processArgv) {
     log.debug('\nNpm scripts:', npmScripts);
     log.debug('Gulpfile found:', gulpLoaded, '\n');
 
-    if (npmScripts.hasOwnProperty(taskName + ':before') || npmScripts.hasOwnProperty(taskName + ':after')) {
+    if (npmScripts && (npmScripts.hasOwnProperty(taskName + ':before') || npmScripts.hasOwnProperty(taskName + ':after'))) {
       return Cli.runWithNpmScripts(argv, task, rawCliArguments);
     } else if (gulpLoaded) {
       return Cli.runWithGulp(argv, task, rawCliArguments);

From 9c5ebeda33feed75d8058fc785a57be035f0ac83 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 10 Nov 2016 16:59:21 -0600
Subject: [PATCH 1082/1100] fix(): ensure params are passed correctly to
 app-scripts

---
 lib/ionic/serve.js      | 4 ++--
 lib/utils/npmScripts.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 6febc53ac9..2c5412de33 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -59,7 +59,7 @@ var settings =  {
   isProjectTask: true
 };
 
-function run(ionic, argv) {
+function run(ionic, argv, rawCliArguments) {
 
   /**
    * Before running the internal server check to see if npmscripts has 
@@ -68,7 +68,7 @@ function run(ionic, argv) {
   return npmScripts.hasIonicScript('serve')
     .then(function(hasServeCommand) {
       if (hasServeCommand) {
-        return npmScripts.runIonicScript('serve', argv);
+        return npmScripts.runIonicScript('serve', rawCliArguments.slice(1));
       } else {
         return runServer(argv);
       }
diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index e538e5dd7c..a380326426 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -23,7 +23,7 @@ function runIonicScript(name, argv) {
   var scriptName = getScriptName(name);
   var q = Q.defer();
 
-  var scriptSpawn = spawn('npm', ['run', scriptName].concat(argv || []), { stdio: 'inherit' })
+  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), { stdio: 'inherit' })
     .on('error', function(err) {
       log.debug('Spawn command', scriptName, 'failed');
       q.reject('Unable to run spawn command ' + err);

From 8a6b55428640ff262cf9d933393bd314d7e06c81 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 10 Nov 2016 17:02:34 -0600
Subject: [PATCH 1083/1100] chore(): update changelog and package.json file.

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0b28647d..4de1a513eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="2.1.8"></a>
+## [2.1.8](https://github.com/driftyco/ionic-cli/compare/v2.1.7...v2.1.8) (2016-11-10)
+
+
+### Bug Fixes
+
+* check that npm scripts exists before checking for properties. ([3fde646](https://github.com/driftyco/ionic-cli/commit/3fde646))
+* ensure params are passed correctly to app-scripts ([9c5ebed](https://github.com/driftyco/ionic-cli/commit/9c5ebed))
+
+
+
 <a name="2.1.6"></a>
 ## [2.1.6](https://github.com/driftyco/ionic-cli/compare/v2.1.5...v2.1.6) (2016-11-09)
 
diff --git a/package.json b/package.json
index 10ebf8e74a..1870af4ea1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From c34b3c0958d897a30ea832ae97342fdf2fdf09cf Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 14 Nov 2016 19:55:03 -0600
Subject: [PATCH 1084/1100] fix(): ensure run and emulate are delegating
 livereload and serve to app-scripts when applicable.

---
 lib/ionic/emulate.js    | 21 ++++++++++-----------
 lib/ionic/run.js        | 21 ++++++++++-----------
 lib/utils/cordova.js    |  2 +-
 lib/utils/npmScripts.js | 14 +++++++++++++-
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index b74ad7e596..bf3d29fbb5 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -80,19 +80,24 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand) {
+    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
   })
   .then(function() {
 
-    if (isLiveReload && hasServeCommand && false) {
+    // If we are running livereload and are using "ionic:serve" app-script
+    // then configure devServer manually
+    if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return ConfigXml.setConfigXml(process.cwd(), {
-        devServer: serveUtil.getUrl(address, port)
-      });
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
+        .then(function() {
+          return ConfigXml.setConfigXml(process.cwd(), {
+            devServer: serveUtil.getUrl(address, port)
+          });
+        });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
@@ -109,12 +114,6 @@ function run(ionic, argv, rawCliArguments) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
-  .then(function() {
-    if (isLiveReload && hasServeCommand && false) {
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
-    }
-    return Q();
-  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index c22f87b989..1e8b1b046b 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -80,19 +80,24 @@ function run(ionic, argv, rawCliArguments) {
     hasBuildCommand = results[2];
     hasServeCommand = results[3];
 
-    if (hasBuildCommand) {
+    if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
       return npmScripts.runIonicScript('build');
     }
     return Q();
   })
   .then(function() {
 
-    if (isLiveReload && hasServeCommand && false) {
+    // If we are running livereload and are using "ionic:serve" app-script
+    // then configure devServer manually
+    if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return ConfigXml.setConfigXml(process.cwd(), {
-        devServer: serveUtil.getUrl(address, port)
-      });
+      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
+        .then(function() {
+          return ConfigXml.setConfigXml(process.cwd(), {
+            devServer: serveUtil.getUrl(address, port)
+          });
+        });
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
@@ -109,12 +114,6 @@ function run(ionic, argv, rawCliArguments) {
     var optionList = cordovaUtils.filterArgumentsForCordova(cmdName, argv, rawArgs);
     return cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions);
   })
-  .then(function() {
-    if (isLiveReload && hasServeCommand && false) {
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address]);
-    }
-    return Q();
-  })
   .catch(function(ex) {
     if (ex instanceof Error) {
       log.error(ex);
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 8cee6053d2..48fd2f33cb 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -93,7 +93,6 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
   if (isLiveReload) {
     cordovaProcess.on('exit', function() {
 
-      Serve.printCommandTips(serveOptions);
       setTimeout(function() {
 
         // set it back to the original src after a few seconds
@@ -206,6 +205,7 @@ function filterArgumentsForCordova(cmdName, argv, rawCliArguments) {
  *
  * @param {Array} argv List of arguments
  * @param {String} baseDir The projects base directory
+ * @param {Obj} options options for live reload function
  * @return {Promise} Promise upon completion
  */
 function setupLiveReload(argv, baseDir) {
diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index a380326426..121b0fdfdd 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -5,6 +5,7 @@ var path = require('path');
 var fs = require('fs');
 var IonicAppLib = require('ionic-app-lib');
 var log = IonicAppLib.logging.logger;
+var DEV_SERVER_COMPLETION_STRING = 'dev server running';
 
 function getScriptName(name) {
   return 'ionic:' + name;
@@ -23,12 +24,23 @@ function runIonicScript(name, argv) {
   var scriptName = getScriptName(name);
   var q = Q.defer();
 
-  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), { stdio: 'inherit' })
+  var scriptSpawn = spawn('npm', ['run', scriptName, '--', '--colors'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
     .on('error', function(err) {
       log.debug('Spawn command', scriptName, 'failed');
       q.reject('Unable to run spawn command ' + err);
     });
   
+  scriptSpawn.stdout.pipe(process.stdout);
+
+  scriptSpawn.stdout.on('data', function(data) {
+    var dataLines = data.toString().split('\n').find(function(line) {
+      return line.indexOf(DEV_SERVER_COMPLETION_STRING) > -1;
+    });
+    if (dataLines && dataLines.length > 0) {
+      return q.resolve();
+    }
+  });
+  
   scriptSpawn.on('exit', function(code) {
     log.debug('Spawn command', scriptName, 'completed');
     if (code !== 0) {

From 9667f3d211b08478f28418b400f57bd40eada8d4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 14 Nov 2016 21:57:59 -0600
Subject: [PATCH 1085/1100] chore(): increment npm version and app-lib version.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1870af4ea1..e70492c273 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.4",
+    "ionic-app-lib": "2.1.5",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From bfadd19ae8e5f9ed326651099fd415bacc15b2f6 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 14 Nov 2016 22:01:36 -0600
Subject: [PATCH 1086/1100] chore(): update changelog.

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4de1a513eb..3270ac6e2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.1.9"></a>
+## [2.1.9](https://github.com/driftyco/ionic-cli/compare/v2.1.8...v2.1.9) (2016-11-15)
+
+
+### Bug Fixes
+
+* ensure run and emulate are delegating livereload and serve to app-scripts when applicable. ([c34b3c0](https://github.com/driftyco/ionic-cli/commit/c34b3c0))
+
+
+
 <a name="2.1.8"></a>
 ## [2.1.8](https://github.com/driftyco/ionic-cli/compare/v2.1.7...v2.1.8) (2016-11-10)
 

From 70531bc3e26531c27ec2ab2fa2e75d9940894d69 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 15 Nov 2016 23:07:16 -0600
Subject: [PATCH 1087/1100] feat(emulate): ensure emulate and run are choosing
 an IP and port that are available.

---
 lib/ionic/emulate.js    | 14 ++++--------
 lib/ionic/run.js        | 13 +++--------
 lib/utils/cordova.js    | 50 ++++++++++++++++++++++++++++++++++++++++-
 lib/utils/npmScripts.js | 10 +++++++--
 4 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index bf3d29fbb5..7295d0158a 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var chalk = require('chalk');
-var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -49,8 +48,6 @@ function run(ionic, argv, rawCliArguments) {
   var cmdName = argv._[0].toLowerCase();
   var hasBuildCommand = false;
   var hasServeCommand = false;
-  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
-  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
@@ -58,7 +55,7 @@ function run(ionic, argv, rawCliArguments) {
   var runPlatform = argv._[1];
   if (!runPlatform) {
     runPlatform = 'ios';
-    rawArgs.push(runPlatform);
+    rawArgs.splice(1, 0, runPlatform);
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
@@ -92,12 +89,9 @@ function run(ionic, argv, rawCliArguments) {
     if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
-        .then(function() {
-          return ConfigXml.setConfigXml(process.cwd(), {
-            devServer: serveUtil.getUrl(address, port)
-          });
-        });
+      // Also remove commandName from the rawArgs passed
+      return cordovaUtils.startAppScriptsServer(argv);
+
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index 1e8b1b046b..ab052daf5c 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var chalk = require('chalk');
-var serveUtil = require('../utils/serve');
 var extend = require('../utils/extend');
 var npmScripts = require('../utils/npmScripts');
 var os = require('os');
@@ -49,8 +48,6 @@ function run(ionic, argv, rawCliArguments) {
   var cmdName = argv._[0].toLowerCase();
   var hasBuildCommand = false;
   var hasServeCommand = false;
-  var address = argv.address || serveUtil.DEFAULT_ADDRESS;
-  var port = argv.port || serveUtil.DEFAULT_HTTP_PORT;
 
   var isLiveReload = argv.livereload || argv['live-reload'] || argv.l || false;
 
@@ -58,7 +55,7 @@ function run(ionic, argv, rawCliArguments) {
   var runPlatform = argv._[1];
   if (!runPlatform) {
     runPlatform = 'ios';
-    rawArgs.push(runPlatform);
+    rawArgs.splice(1, 0, runPlatform);
   }
 
   if (runPlatform === 'ios' && os.platform() !== 'darwin') {
@@ -92,12 +89,8 @@ function run(ionic, argv, rawCliArguments) {
     if (isLiveReload && hasServeCommand) {
 
       // using app-scripts and livereload is requested
-      return npmScripts.runIonicScript('serve', ['-p', port, '--address', address, '--nobrowser'])
-        .then(function() {
-          return ConfigXml.setConfigXml(process.cwd(), {
-            devServer: serveUtil.getUrl(address, port)
-          });
-        });
+      // Also remove commandName from the rawArgs passed
+      return cordovaUtils.startAppScriptsServer(argv);
     } else if (isLiveReload) {
 
       // not an app-scripts project but the user wants livereload
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 48fd2f33cb..52ac816577 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -13,6 +13,7 @@ var ConfigXml = IonicAppLib.configXml;
 var childProcess = require('child_process');
 var childExec = childProcess.exec;
 var promiseExec = Q.denodeify(childExec);
+var npmScripts = require('../utils/npmScripts');
 
 /**
  * Returns true or false after checking if the platform exists
@@ -266,6 +267,52 @@ function setupLiveReload(argv, baseDir) {
   });
 }
 
+/**
+ * Start the app scripts server for emulator or device
+ *
+ * @param {Number} port
+ * @param {String} address
+ * @return {Promise} Promise upon completion
+ */
+function startAppScriptsServer(argv) {
+  var options = _.extend(argv, {
+    runLivereload: true,
+    isPlatformServe: true
+  });
+
+  return Serve.getAddress(options)
+  .then(function() {
+
+    // Check that the server port is available
+    return Serve.checkPorts(true, options.port, options.address, options);
+  })
+  .then(function() {
+
+    // Check that the liveReload port is available
+    return Serve.checkPorts(false, options.liveReloadPort, options.address, options);
+  })
+  .then(function() {
+
+    // Execute the serve command from app-scripts
+    // Also remove platform from the raw args passed
+    return npmScripts.runIonicScript('serve',
+      [
+        '--port', options.port,
+        '--address', options.address,
+        '--liveReloadPort', options.liveReloadPort,
+        '--nobrowser'
+      ]
+      .concat(options.consolelogs ? '--consolelogs' : [])
+      .concat(options.serverlogs ? '--serverlogs' : [])
+    );
+  })
+  .then(function() {
+    return ConfigXml.setConfigXml(process.cwd(), {
+      devServer: Serve.host(options.address, options.port)
+    });
+  });
+}
+
 module.exports = {
   isPlatformInstalled: isPlatformInstalled,
   arePluginsInstalled: arePluginsInstalled,
@@ -273,5 +320,6 @@ module.exports = {
   installPlugins: installPlugins,
   execCordovaCommand: execCordovaCommand,
   filterArgumentsForCordova: filterArgumentsForCordova,
-  setupLiveReload: setupLiveReload
+  setupLiveReload: setupLiveReload,
+  startAppScriptsServer: startAppScriptsServer
 };
diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index 121b0fdfdd..999c6b05d0 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -20,11 +20,12 @@ function hasIonicScript(name) {
 }
 
 function runIonicScript(name, argv) {
-  var spawn = require('cross-spawn-async');
+  var spawn = require('cross-spawn-async');  
   var scriptName = getScriptName(name);
   var q = Q.defer();
 
-  var scriptSpawn = spawn('npm', ['run', scriptName, '--', '--colors'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
+  process.env['FORCE_COLOR'] = true;
+  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
     .on('error', function(err) {
       log.debug('Spawn command', scriptName, 'failed');
       q.reject('Unable to run spawn command ' + err);
@@ -48,6 +49,11 @@ function runIonicScript(name, argv) {
     }
     return q.resolve();
   });
+
+  // If this process ends ensure that we killed the spawned child
+  process.on('exit', function() {
+    scriptSpawn.kill();
+  });
   
   return q.promise;
 }

From acce85307413b5292afb7e6a24fdd734a5f2afe0 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 16 Nov 2016 13:53:23 -0600
Subject: [PATCH 1088/1100] chore(): update npm version and changelog.

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3270ac6e2c..2d0671f166 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="2.1.10"></a>
+## [2.1.10](https://github.com/driftyco/ionic-cli/compare/v2.1.8...v2.1.10) (2016-11-16)
+
+
+### Bug Fixes
+
+* ensure run and emulate are delegating livereload and serve to app-scripts when applicable. ([c34b3c0](https://github.com/driftyco/ionic-cli/commit/c34b3c0))
+
+
+### Features
+
+* **emulate:** ensure emulate and run are choosing an IP and port that are available. ([70531bc](https://github.com/driftyco/ionic-cli/commit/70531bc))
+
+
+
 <a name="2.1.9"></a>
 ## [2.1.9](https://github.com/driftyco/ionic-cli/compare/v2.1.8...v2.1.9) (2016-11-15)
 
diff --git a/package.json b/package.json
index e70492c273..d1e5647c00 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.5",
+    "ionic-app-lib": "2.1.6",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From bdb35d84d5debb01b4d1e9fafe54cc92897e8957 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 16 Nov 2016 14:26:53 -0600
Subject: [PATCH 1089/1100] chore(): update app-lib dependency.

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d1e5647c00..e0f1dcbaa5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",
@@ -69,7 +69,7 @@
     "gulp": "3.8.8",
     "gulp-util": "3.0.7",
     "inquirer": "0.11.2",
-    "ionic-app-lib": "2.1.6",
+    "ionic-app-lib": "2.1.7",
     "moment": "2.11.1",
     "open": "0.0.5",
     "optimist": "0.6.0",

From 768733771488bdc8d5d5354bc64ba94329c3ee2a Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 17 Nov 2016 10:04:55 -0600
Subject: [PATCH 1090/1100] fix(): when spawning npmScripts ensure that stderr
 is piped correctly

---
 lib/utils/npmScripts.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index 999c6b05d0..5b786a01aa 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -25,7 +25,9 @@ function runIonicScript(name, argv) {
   var q = Q.defer();
 
   process.env['FORCE_COLOR'] = true;
-  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), [process.stdin, 'pipe', process.stderr])
+  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), {
+    stdio: [process.stdin, 'pipe', process.stderr]
+  })
     .on('error', function(err) {
       log.debug('Spawn command', scriptName, 'failed');
       q.reject('Unable to run spawn command ' + err);

From 1a3de90787c0b4a8e24a22726e1d4f1a2921dd42 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Thu, 17 Nov 2016 10:06:42 -0600
Subject: [PATCH 1091/1100] chore(): increment npm script and update changelog.

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d0671f166..8e3f49077c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.1.12"></a>
+## [2.1.12](https://github.com/driftyco/ionic-cli/compare/v2.1.11...v2.1.12) (2016-11-17)
+
+
+### Bug Fixes
+
+* when spawning npmScripts ensure that stderr is piped correctly ([7687337](https://github.com/driftyco/ionic-cli/commit/7687337))
+
+
+
 <a name="2.1.10"></a>
 ## [2.1.10](https://github.com/driftyco/ionic-cli/compare/v2.1.8...v2.1.10) (2016-11-16)
 
diff --git a/package.json b/package.json
index e0f1dcbaa5..e0efe32ad8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ae6d904f3c58b959515fd63c3208f098c85d6775 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 23 Nov 2016 15:31:23 -0600
Subject: [PATCH 1092/1100] fix(cordova): maxBuffer was too small

---
 lib/utils/cordova.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 52ac816577..02cf863e88 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -72,7 +72,9 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
   isLiveReload = !!isLiveReload;
 
   log.debug('Executing cordova cli: ' + optionList.join(' '));
-  var cordovaProcess = childProcess.exec('cordova ' + optionList.join(' '));
+  var cordovaProcess = childProcess.exec('cordova ' + optionList.join(' '), {
+    maxBuffer: 1024 * 1024 * 1024
+  });
 
   cordovaProcess.stdout.on('data', function(data) {
     log.info(data.toString());

From 57e4ad49040d6984217e085f3df1628e17f15633 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 23 Nov 2016 15:51:42 -0600
Subject: [PATCH 1093/1100] chore(): update npm version and changelog

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e3f49077c..cadf0bd1ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.1.13"></a>
+## [2.1.13](https://github.com/driftyco/ionic-cli/compare/v2.1.12...v2.1.13) (2016-11-23)
+
+
+### Bug Fixes
+
+* **cordova:** maxBuffer was too small ([ae6d904](https://github.com/driftyco/ionic-cli/commit/ae6d904))
+
+
+
 <a name="2.1.12"></a>
 ## [2.1.12](https://github.com/driftyco/ionic-cli/compare/v2.1.11...v2.1.12) (2016-11-17)
 
diff --git a/package.json b/package.json
index e0efe32ad8..32d37b13b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From cdf2ed3b5d95a95e4f2ee64405136e76dbdb2b29 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Mon, 28 Nov 2016 22:30:52 -0600
Subject: [PATCH 1094/1100] chore(): replace exec with spawn and ensure all
 tests pass.

---
 lib/cli.js                 |   4 +-
 lib/utils/cordova.js       | 106 +++++++++++++++++++++++++------------
 lib/utils/npmScripts.js    |   4 +-
 package.json               |   4 +-
 spec/tasks/emulate.spec.js |  11 ++--
 spec/tasks/run.spec.js     |  11 ++--
 spec/tasks/serve.spec.js   |   4 +-
 spec/utils/cordova.spec.js | 104 ++++++++++++++++++++----------------
 8 files changed, 154 insertions(+), 94 deletions(-)

diff --git a/lib/cli.js b/lib/cli.js
index c8682d5227..71f711698b 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -332,9 +332,9 @@ Cli.runNpmHook = function runNpmHook(hook) {
   process.env['FORCE_COLOR'] = true;
 
   var q = Q.defer();
-  var spawn = require('cross-spawn-async');
+  var crossSpawn = require('cross-spawn');
 
-  var spawned = spawn('npm', args, { stdio: ['pipe', 'pipe', process.stderr] });
+  var spawned = crossSpawn.spawn('npm', args, { stdio: ['pipe', 'pipe', process.stderr] });
   spawned.on('error', function(err) {
     log.error('Unable to run spawn command ' + err);
   });
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 02cf863e88..2010a8962e 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -10,11 +10,38 @@ var Serve = IonicAppLib.serve;
 var Project = IonicAppLib.project;
 var log = IonicAppLib.logging.logger;
 var ConfigXml = IonicAppLib.configXml;
-var childProcess = require('child_process');
-var childExec = childProcess.exec;
-var promiseExec = Q.denodeify(childExec);
+var crossSpawn = require('cross-spawn');  
 var npmScripts = require('../utils/npmScripts');
 
+
+function promiseSpawn(cmd, args) {
+  var deferred = Q.defer();
+  var info = '';
+
+  try {
+    var proc = crossSpawn.spawn(cmd, args);
+
+    proc.stdout.on('data', function(data) {
+      info += data.toString('utf8');
+    });
+
+    proc.on('error', function(error) {
+      deferred.reject(error);
+    });
+
+    proc.on('close', function(code) {
+      if (code !== 0) {
+        return deferred.reject(code);
+      }
+      deferred.resolve(info.replace('\n', ' '));
+    });
+  } catch (e) {
+    return deferred.reject(e);
+  }
+
+  return deferred.promise;
+}
+
 /**
  * Returns true or false after checking if the platform exists
  * Synchronous
@@ -24,14 +51,21 @@ var npmScripts = require('../utils/npmScripts');
  * @return {Boolean} True if platform is installed
  */
 function isPlatformInstalled(platform, baseDir) {
+  var deferred = Q.defer();
   var platformPath = path.join(baseDir, 'platforms', platform);
 
   try {
-    fs.statSync(platformPath);
-    return true;
+    fs.stat(platformPath, function(err) {
+      if (err) {
+        return deferred.resolve(false);
+      }
+      return deferred.resolve(true);
+    });
   } catch (ex) {
-    return false;
+    deferred.resolve(false);
   }
+
+  return deferred.promise;
 }
 
 /**
@@ -42,14 +76,42 @@ function isPlatformInstalled(platform, baseDir) {
  * @return {Boolean} True if any plugin is installed
  */
 function arePluginsInstalled(baseDir) {
+  var deferred = Q.defer();
   var pluginPath = path.join(baseDir, 'plugins');
 
   try {
-    fs.statSync(pluginPath);
-    return true;
+    fs.stat(pluginPath, function(err) {
+      if (err) {
+        return deferred.resolve(false);
+      }
+      return deferred.resolve(true);
+    });
   } catch (ex) {
-    return false;
+    deferred.resolve(false);
   }
+
+  return deferred.promise;
+}
+
+/**
+ * Install ionic required plugins
+ *
+ * @return {Promise} Promise upon completion
+ */
+function installPlugins() {
+  var plugins = [
+    'cordova-plugin-device',
+    'cordova-plugin-console',
+    'cordova-plugin-whitelist',
+    'cordova-plugin-splashscreen',
+    'cordova-plugin-statusbar',
+    'ionic-plugin-keyboard'
+  ];
+
+  return Q.all(plugins.map(function(plugin) {
+    log.info(['Installing ', plugin].join(''));
+    return promiseSpawn('cordova', ['plugin', 'add', '--save', plugin]);
+  }));
 }
 
 /**
@@ -62,7 +124,7 @@ function installPlatform(platform) {
   log.info(chalk.yellow('• You\'re trying to build for ' + platform + ' but don\'t have the platform installed yet.'));
   log.info('∆ Installing ' + platform + ' for you.');
 
-  return promiseExec('cordova platform add ' + platform).then(function() {
+  return promiseSpawn('cordova', ['platform', 'add', platform]).then(function() {
     log.info('√ Installed platform ' + platform);
   });
 }
@@ -72,9 +134,7 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
   isLiveReload = !!isLiveReload;
 
   log.debug('Executing cordova cli: ' + optionList.join(' '));
-  var cordovaProcess = childProcess.exec('cordova ' + optionList.join(' '), {
-    maxBuffer: 1024 * 1024 * 1024
-  });
+  var cordovaProcess = crossSpawn.spawn('cordova', optionList);
 
   cordovaProcess.stdout.on('data', function(data) {
     log.info(data.toString());
@@ -137,26 +197,6 @@ function execCordovaCommand(optionList, isLiveReload, serveOptions) {
   return deferred.promise;
 }
 
-/**
- * Install ionic required plugins
- *
- * @return {Promise} Promise upon completion
- */
-function installPlugins() {
-  var plugins = [
-    'cordova-plugin-device',
-    'cordova-plugin-console',
-    'cordova-plugin-whitelist',
-    'cordova-plugin-splashscreen',
-    'cordova-plugin-statusbar',
-    'ionic-plugin-keyboard'
-  ];
-
-  return Q.all(plugins.map(function(plugin) {
-    log.info(['Installing ', plugin].join(''));
-    return promiseExec('cordova plugin add --save ' + plugin);
-  }));
-}
 
 /**
  * Filter and gather arguments from command line to be passed to Cordova
diff --git a/lib/utils/npmScripts.js b/lib/utils/npmScripts.js
index 5b786a01aa..728a8a385e 100644
--- a/lib/utils/npmScripts.js
+++ b/lib/utils/npmScripts.js
@@ -20,12 +20,12 @@ function hasIonicScript(name) {
 }
 
 function runIonicScript(name, argv) {
-  var spawn = require('cross-spawn-async');  
+  var crossSpawn = require('cross-spawn');  
   var scriptName = getScriptName(name);
   var q = Q.defer();
 
   process.env['FORCE_COLOR'] = true;
-  var scriptSpawn = spawn('npm', ['run', scriptName, '--'].concat(argv || []), {
+  var scriptSpawn = crossSpawn.spawn('npm', ['run', scriptName, '--'].concat(argv || []), {
     stdio: [process.stdin, 'pipe', process.stderr]
   })
     .on('error', function(err) {
diff --git a/package.json b/package.json
index 32d37b13b9..320f7181cc 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "@ionic/app-generators": "0.0.3",
     "chalk": "^1.1.3",
     "cli-table": "0.3.1",
-    "cross-spawn-async": "2.1.9",
+    "cross-spawn": "^5.0.1",
     "expand-tilde": "1.2.0",
     "form-data": "0.1.4",
     "gulp": "3.8.8",
@@ -98,7 +98,7 @@
   "bundledDependencies": [
     "cli-table",
     "chalk",
-    "cross-spawn-async",
+    "cross-spawn",
     "expand-tilde",
     "form-data",
     "gulp",
diff --git a/spec/tasks/emulate.spec.js b/spec/tasks/emulate.spec.js
index 36ce8aeecb..85d8bec5cc 100644
--- a/spec/tasks/emulate.spec.js
+++ b/spec/tasks/emulate.spec.js
@@ -186,7 +186,7 @@ describe('emulate command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       emulate.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', '-n', 'ios'], false, true);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'ios', '-n'], false, true);
         done();
       });
     });
@@ -319,8 +319,13 @@ describe('emulate command', function() {
 
       emulate.run(null, argv, rawCliArguments).then(function() {
         expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
-        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', ['-p', jasmine.any(Number), '--address', jasmine.any(String)]);
-        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], false, true);
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', [
+          '--port', jasmine.any(Number),
+          '--address', jasmine.any(String),
+          '--liveReloadPort', jasmine.any(Number),
+          '--nobrowser'
+        ]);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['emulate', 'android'], true, true);
         done();
       }).catch(function(e) {
         console.log(e);
diff --git a/spec/tasks/run.spec.js b/spec/tasks/run.spec.js
index 40aa3e22a3..ebd2325f2c 100644
--- a/spec/tasks/run.spec.js
+++ b/spec/tasks/run.spec.js
@@ -157,7 +157,7 @@ describe('run command', function() {
       spyOn(cordovaUtils, 'execCordovaCommand').andReturn(Q(true));
 
       run.run(null, argv, rawCliArguments).then(function() {
-        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', '-n', 'ios'], false, true);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'ios', '-n'], false, true);
         done();
       });
     });
@@ -314,8 +314,13 @@ describe('run command', function() {
 
       run.run(null, argv, rawCliArguments).then(function() {
         expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('build');
-        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', ['-p', jasmine.any(Number), '--address', jasmine.any(String)]);
-        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], false, true);
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', [
+          '--port', jasmine.any(Number),
+          '--address', jasmine.any(String),
+          '--liveReloadPort', jasmine.any(Number),
+          '--nobrowser'
+        ]);
+        expect(cordovaUtils.execCordovaCommand).toHaveBeenCalledWith(['run', 'android'], true, true);
         done();
       }).catch(function(e) {
         console.log(e);
diff --git a/spec/tasks/serve.spec.js b/spec/tasks/serve.spec.js
index e3f53220eb..35bdbe365a 100644
--- a/spec/tasks/serve.spec.js
+++ b/spec/tasks/serve.spec.js
@@ -283,9 +283,9 @@ describe('Serve', function() {
       spyOn(npmScripts, 'hasIonicScript').andReturn(Q(true));
       spyOn(npmScripts, 'runIonicScript').andReturn(Q(true));
 
-      serveTask.run({}, argv).then(function() {
+      serveTask.run({}, argv, rawCliArguments).then(function() {
         expect(npmScripts.hasIonicScript).toHaveBeenCalledWith('serve');
-        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', argv);
+        expect(npmScripts.runIonicScript).toHaveBeenCalledWith('serve', rawCliArguments.slice(1));
         done();
       });
     });
diff --git a/spec/utils/cordova.spec.js b/spec/utils/cordova.spec.js
index f3641e51a7..b87db6e729 100644
--- a/spec/utils/cordova.spec.js
+++ b/spec/utils/cordova.spec.js
@@ -3,60 +3,64 @@
 var fs = require('fs');
 var Q = require('q');
 var rewire = require('rewire');
-var childProcess = require('child_process');
 var cordovaUtils = rewire('../../lib/utils/cordova');
 var optimist = require('optimist');
 var IonicAppLib = require('ionic-app-lib');
 var Project = require('ionic-app-lib').project;
 var Serve = require('ionic-app-lib').serve;
+var crossSpawn = require('cross-spawn'); 
 var ConfigXml = require('ionic-app-lib').configXml;
 var log = IonicAppLib.logging.logger;
 
 describe('isPlatformInstalled', function() {
-  it('should return true if the platform directory does exist', function() {
-    spyOn(fs, 'statSync').andCallFake(function() {
-      return;
+  it('should return true if the platform directory does exist', function(done) {
+    spyOn(fs, 'stat').andCallFake(function(param, callback) {
+      callback(null);
     });
 
-    var result = cordovaUtils.isPlatformInstalled('ios', '/tmp');
-
-    expect(result).toEqual(true);
-    expect(fs.statSync).toHaveBeenCalledWith('/tmp/platforms/ios');
+    cordovaUtils.isPlatformInstalled('ios', '/tmp').then(function(result) {
+      expect(result).toEqual(true);
+      expect(fs.stat).toHaveBeenCalledWith('/tmp/platforms/ios', jasmine.any(Function));
+      done();
+    });
   });
 
-  it('should return false if the platform directory does not exist', function() {
-    spyOn(fs, 'statSync').andCallFake(function() {
+  it('should return false if the platform directory does not exist', function(done) {
+    spyOn(fs, 'stat').andCallFake(function() {
       throw new Error('Dir does not exist');
     });
 
-    var result = cordovaUtils.isPlatformInstalled('ios', '/tmp');
-
-    expect(result).toEqual(false);
-    expect(fs.statSync).toHaveBeenCalledWith('/tmp/platforms/ios');
+    cordovaUtils.isPlatformInstalled('ios', '/tmp').then(function(result) {
+      expect(result).toEqual(false);
+      expect(fs.stat).toHaveBeenCalledWith('/tmp/platforms/ios', jasmine.any(Function));
+      done();
+    });
   });
 });
 
 describe('arePluginsInstalled', function() {
-  it('should return true if the plugins directory does exist', function() {
-    spyOn(fs, 'statSync').andCallFake(function() {
-      return;
+  it('should return true if the plugins directory does exist', function(done) {
+    spyOn(fs, 'stat').andCallFake(function(param, callback) {
+      callback(null);
     });
 
-    var result = cordovaUtils.arePluginsInstalled('/tmp');
-
-    expect(result).toEqual(true);
-    expect(fs.statSync).toHaveBeenCalledWith('/tmp/plugins');
+    cordovaUtils.arePluginsInstalled('/tmp').then(function(result) {
+      expect(fs.stat).toHaveBeenCalledWith('/tmp/plugins', jasmine.any(Function));
+      expect(result).toEqual(true);
+      done();
+    });
   });
 
-  it('should return false if the plugins directory does not exist', function() {
-    spyOn(fs, 'statSync').andCallFake(function() {
+  it('should return false if the plugins directory does not exist', function(done) {
+    spyOn(fs, 'stat').andCallFake(function() {
       throw new Error('Dir does not exist');
     });
 
-    var result = cordovaUtils.arePluginsInstalled('/tmp');
-
-    expect(result).toEqual(false);
-    expect(fs.statSync).toHaveBeenCalledWith('/tmp/plugins');
+    cordovaUtils.arePluginsInstalled('/tmp').then(function(result) {
+      expect(result).toEqual(false);
+      expect(fs.stat).toHaveBeenCalledWith('/tmp/plugins', jasmine.any(Function));
+      done();
+    });
   });
 });
 
@@ -65,16 +69,16 @@ describe('installPlatform', function() {
     spyOn(log, 'info');
   });
 
-  it('should call promiseExec', function(done) {
+  it('should call promiseSpawn', function(done) {
     var installPlatform = cordovaUtils.__get__('installPlatform');
-    var promiseExecSpy = jasmine.createSpy('promiseExec');
-    promiseExecSpy.andReturn(Q(true));
-    var revertPromiseExecSpy = cordovaUtils.__set__('promiseExec', promiseExecSpy);
+    var promiseSpawnSpy = jasmine.createSpy('promiseSpawn');
+    promiseSpawnSpy.andReturn(Q(true));
+    var revertPromiseSpawnSpy = cordovaUtils.__set__('promiseSpawn', promiseSpawnSpy);
 
 
     installPlatform('ios').then(function() {
-      expect(promiseExecSpy).toHaveBeenCalledWith('cordova platform add ios');
-      revertPromiseExecSpy();
+      expect(promiseSpawnSpy).toHaveBeenCalledWith('cordova', ['platform', 'add', 'ios']);
+      revertPromiseSpawnSpy();
       done();
     });
   });
@@ -85,20 +89,26 @@ describe('installPlugins', function() {
     spyOn(log, 'info');
   });
 
-  it('should call promiseExec', function(done) {
+  it('should call promiseSpawn', function(done) {
     var installPlugins = cordovaUtils.__get__('installPlugins');
-    var promiseExecSpy = jasmine.createSpy('promiseExec');
-    promiseExecSpy.andReturn(Q(true));
-    var revertPromiseExecSpy = cordovaUtils.__set__('promiseExec', promiseExecSpy);
+    var promiseSpawnSpy = jasmine.createSpy('promiseSpawn');
+    promiseSpawnSpy.andReturn(Q(true));
+    var revertPromiseSpawnSpy = cordovaUtils.__set__('promiseSpawn', promiseSpawnSpy);
 
     installPlugins().then(function() {
-      expect(promiseExecSpy.calls[0].args[0]).toEqual('cordova plugin add --save cordova-plugin-device');
-      expect(promiseExecSpy.calls[1].args[0]).toEqual('cordova plugin add --save cordova-plugin-console');
-      expect(promiseExecSpy.calls[2].args[0]).toEqual('cordova plugin add --save cordova-plugin-whitelist');
-      expect(promiseExecSpy.calls[3].args[0]).toEqual('cordova plugin add --save cordova-plugin-splashscreen');
-      expect(promiseExecSpy.calls[4].args[0]).toEqual('cordova plugin add --save cordova-plugin-statusbar');
-      expect(promiseExecSpy.calls[5].args[0]).toEqual('cordova plugin add --save ionic-plugin-keyboard');
-      revertPromiseExecSpy();
+      expect(promiseSpawnSpy.calls[0].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'cordova-plugin-device']]);
+      expect(promiseSpawnSpy.calls[1].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'cordova-plugin-console']]);
+      expect(promiseSpawnSpy.calls[2].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'cordova-plugin-whitelist']]);
+      expect(promiseSpawnSpy.calls[3].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'cordova-plugin-splashscreen']]);
+      expect(promiseSpawnSpy.calls[4].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'cordova-plugin-statusbar']]);
+      expect(promiseSpawnSpy.calls[5].args)
+        .toEqual(['cordova', ['plugin', 'add', '--save', 'ionic-plugin-keyboard']]);
+      revertPromiseSpawnSpy();
       done();
     });
   });
@@ -277,7 +287,7 @@ describe('setupLiveReload', function() {
 
 describe('execCordovaCommand', function() {
   beforeEach(function() {
-    spyOn(childProcess, 'exec').andCallThrough();
+    spyOn(crossSpawn, 'spawn').andCallThrough();
   });
 
   it('should execute the command against the cordova util', function(done) {
@@ -290,7 +300,7 @@ describe('execCordovaCommand', function() {
     var serveOptions = {};
 
     cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions).catch(function() {
-      expect(childProcess.exec).toHaveBeenCalledWith('cordova build -n ios');
+      expect(crossSpawn.spawn).toHaveBeenCalledWith('cordova', ['build', '-n', 'ios']);
       done();
     });
   });
@@ -304,7 +314,7 @@ describe('execCordovaCommand', function() {
     var serveOptions = {};
 
     cordovaUtils.execCordovaCommand(optionList, isLiveReload, serveOptions).catch(function() {
-      expect(childProcess.exec).toHaveBeenCalledWith('cordova build android');
+      expect(crossSpawn.spawn).toHaveBeenCalledWith('cordova', ['build', 'android']);
       done();
     });
   });

From fb53608d41ac5f70c2ce166d03bbd206e2fb2387 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 29 Nov 2016 14:04:35 -0600
Subject: [PATCH 1095/1100] fix(run): add flag so that serve has info on when
 it is serving a cordova app.

---
 lib/utils/cordova.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index 2010a8962e..ae28e63622 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -342,6 +342,7 @@ function startAppScriptsServer(argv) {
         '--port', options.port,
         '--address', options.address,
         '--liveReloadPort', options.liveReloadPort,
+        '--iscordovaserve',
         '--nobrowser'
       ]
       .concat(options.consolelogs ? '--consolelogs' : [])

From 044171c988c41cd3f6b39b11a0a954febb031ca4 Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Wed, 30 Nov 2016 00:26:23 -0600
Subject: [PATCH 1096/1100] chore(): update package.json version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 320f7181cc..ea77a28bfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From f834ccacd34c9ceaf27398cb6c209b6d7583255a Mon Sep 17 00:00:00 2001
From: Justin Willis <jgw9617@gmail.com>
Date: Wed, 30 Nov 2016 09:39:12 -0600
Subject: [PATCH 1097/1100] fix(start): getting started url (#1738)

---
 lib/ionic/start.js       | 2 +-
 spec/tasks/start.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ionic/start.js b/lib/ionic/start.js
index b49598a49e..9ea8d364b9 100644
--- a/lib/ionic/start.js
+++ b/lib/ionic/start.js
@@ -102,7 +102,7 @@ function run(ionic, argv) {
   })
   .then(function() {
     if (options.v2 && startingApp) {
-      log.info('\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n');
+      log.info('\nNew to Ionic? Get started here: http://ionicframework.com/getting-started\n');
     }
   })
   .catch(function(error) {
diff --git a/spec/tasks/start.spec.js b/spec/tasks/start.spec.js
index 109f476bc0..fcc24c795c 100644
--- a/spec/tasks/start.spec.js
+++ b/spec/tasks/start.spec.js
@@ -190,7 +190,7 @@ describe('start command', function() {
       start.run({}, argv).then(function() {
         expect(appLibUtils.preprocessCliOptions.calls[0].args[0].v2).toEqual(true);
         expect(log.info).toHaveBeenCalledWith(
-          '\nNew to Ionic? Get started here: http://ionicframework.com/docs/v2/getting-started\n'
+          '\nNew to Ionic? Get started here: http://ionicframework.com/getting-started\n'
         );
         done();
       });

From 68eb3e53f4b24775fe8957f1bb2f080cde88565c Mon Sep 17 00:00:00 2001
From: Josh Thomas <jthoms1@gmail.com>
Date: Tue, 6 Dec 2016 10:16:03 -0600
Subject: [PATCH 1098/1100] fix(run): update run and emulate to pass additional
 options on to app-scripts. (#1735)

---
 lib/ionic/emulate.js       |  2 +-
 lib/ionic/run.js           |  2 +-
 lib/utils/cordova.js       | 60 ++++++++++++++++++++++---
 spec/utils/cordova.spec.js | 91 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+), 9 deletions(-)

diff --git a/lib/ionic/emulate.js b/lib/ionic/emulate.js
index 7295d0158a..447c2dbc5a 100644
--- a/lib/ionic/emulate.js
+++ b/lib/ionic/emulate.js
@@ -78,7 +78,7 @@ function run(ionic, argv, rawCliArguments) {
     hasServeCommand = results[3];
 
     if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
-      return npmScripts.runIonicScript('build');
+      return npmScripts.runIonicScript('build', rawArgs.slice(2));
     }
     return Q();
   })
diff --git a/lib/ionic/run.js b/lib/ionic/run.js
index ab052daf5c..35c21e79e7 100644
--- a/lib/ionic/run.js
+++ b/lib/ionic/run.js
@@ -78,7 +78,7 @@ function run(ionic, argv, rawCliArguments) {
     hasServeCommand = results[3];
 
     if (hasBuildCommand && !(isLiveReload && hasServeCommand)) {
-      return npmScripts.runIonicScript('build');
+      return npmScripts.runIonicScript('build', rawArgs.slice(2));
     }
     return Q();
   })
diff --git a/lib/utils/cordova.js b/lib/utils/cordova.js
index ae28e63622..e6d546ad29 100644
--- a/lib/utils/cordova.js
+++ b/lib/utils/cordova.js
@@ -321,6 +321,11 @@ function startAppScriptsServer(argv) {
     runLivereload: true,
     isPlatformServe: true
   });
+  options = consolidateOptions(['port', 'p'], options);
+  options = consolidateOptions(['liveReloadPort', 'r'], options);
+  options = consolidateOptions(['consolelogs', 'c'], options);
+  options = consolidateOptions(['serverlogs', 's'], options);
+  options = consolidateOptions(['livereload', 'l'], options);
 
   return Serve.getAddress(options)
   .then(function() {
@@ -338,15 +343,13 @@ function startAppScriptsServer(argv) {
     // Execute the serve command from app-scripts
     // Also remove platform from the raw args passed
     return npmScripts.runIonicScript('serve',
-      [
-        '--port', options.port,
-        '--address', options.address,
-        '--liveReloadPort', options.liveReloadPort,
+      optionsToArray(options)
+
+      // Serve specific options not related to the actual run or emulate code
+      .concat([
         '--iscordovaserve',
         '--nobrowser'
-      ]
-      .concat(options.consolelogs ? '--consolelogs' : [])
-      .concat(options.serverlogs ? '--serverlogs' : [])
+      ])
     );
   })
   .then(function() {
@@ -356,6 +359,49 @@ function startAppScriptsServer(argv) {
   });
 }
 
+/**
+ * Consolidate a list of options based on those passed to it.
+ *
+ * @param {Array} list of option names. Consolidate will be to the first array element name
+ * @param {Object} key/value object that is to be used as the source of consolidation
+ * @return {Object} key/value object with consolidated options
+ */
+function consolidateOptions(list, options) {
+  var newOptions = _.extend({}, options);
+
+  list.forEach(function(optionName) {
+    delete newOptions[optionName];
+  });
+
+  var value = list.reduce(function(final, optionName) {
+    if (options.hasOwnProperty(optionName) && !!options[optionName]) {
+      final = options[optionName];
+    }
+    return final;
+  }, null);
+
+  if (value !== null) {
+    newOptions[list[0]] = value;
+  }
+
+  return newOptions;
+}
+
+function optionsToArray(options) {
+  return Object.keys(options)
+  .filter(function(itemName) {
+    return itemName !== '_' && itemName.indexOf('$') !== 0;
+  })
+  .reduce(function(array, optionName) {
+    if (typeof options[optionName] === 'boolean' && options[optionName]) {
+      array.push('--' + optionName);
+    } else if (typeof options[optionName] !== 'boolean') {
+      array.push('--' + optionName, options[optionName]);
+    }
+    return array;
+  }, []);
+}
+
 module.exports = {
   isPlatformInstalled: isPlatformInstalled,
   arePluginsInstalled: arePluginsInstalled,
diff --git a/spec/utils/cordova.spec.js b/spec/utils/cordova.spec.js
index b87db6e729..8e5b477af8 100644
--- a/spec/utils/cordova.spec.js
+++ b/spec/utils/cordova.spec.js
@@ -423,3 +423,94 @@ describe('filterArgumentsForCordova', function() {
   });
 });
 
+describe('consolidate options', function() {
+  var consolidateOptions = cordovaUtils.__get__('consolidateOptions');
+
+  it('should consolidate options to the first array element', function() {
+    var options = {
+      _: ['run', 'ios'],
+      consolelogs: false,
+      c: true,
+      serverlogs: false,
+      s: true,
+      debug: false,
+      release: false,
+      l: true,
+      p: 8100,
+      r: 6000,
+      '$0': 'ionic',
+      v2: true,
+      runLivereload: true,
+      isPlatformServe: true
+    };
+    var results = consolidateOptions(['port', 'p'], options);
+    expect(results).toEqual({
+      _: ['run', 'ios'],
+      consolelogs: false,
+      c: true,
+      serverlogs: false,
+      s: true,
+      debug: false,
+      release: false,
+      l: true,
+      port: 8100,
+      r: 6000,
+      '$0': 'ionic',
+      v2: true,
+      runLivereload: true,
+      isPlatformServe: true
+    });
+  });
+
+  it('should consolidate duplicates', function() {
+    var options = {
+      _: ['run', 'ios'],
+      consolelogs: false,
+      c: true,
+      serverlogs: false,
+      s: true,
+      debug: false,
+      release: false,
+      l: true,
+      p: 8100,
+      port: 8100,
+      r: 6000,
+      '$0': 'ionic',
+      v2: true,
+      runLivereload: true,
+      isPlatformServe: true
+    };
+    var results = consolidateOptions(['port', 'p'], options);
+    expect(results).toEqual({
+      _: ['run', 'ios'],
+      consolelogs: false,
+      c: true,
+      serverlogs: false,
+      s: true,
+      debug: false,
+      release: false,
+      l: true,
+      port: 8100,
+      r: 6000,
+      '$0': 'ionic',
+      v2: true,
+      runLivereload: true,
+      isPlatformServe: true
+    });
+  });
+});
+
+describe('optionsToArray options', function() {
+  var optionsToArray = cordovaUtils.__get__('optionsToArray');
+
+  it('should convert argv options into an array', function() {
+    var processArguments = ['node', 'ionic', 'run', 'ios', '--port', '8100', '--livereload'];
+    var rawCliArguments = processArguments.slice(2);
+    var argv = optimist(rawCliArguments).argv;
+    var results = optionsToArray(argv);
+    expect(results).toEqual([
+      '--port', 8100,
+      '--livereload',
+    ]);
+  });
+});

From d5a00692cfdece8b2f43dbef6a7ddc655ddda2af Mon Sep 17 00:00:00 2001
From: Josh Thomas <josh@ionic.io>
Date: Tue, 6 Dec 2016 10:24:32 -0600
Subject: [PATCH 1099/1100] chore(): increment version and update changelog.

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cadf0bd1ba..3b61e8d308 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="2.1.15"></a>
+## [2.1.15](https://github.com/driftyco/ionic-cli/compare/v2.1.14...v2.1.15) (2016-12-06)
+
+
+### Bug Fixes
+
+* **run:** update run and emulate to pass additional options on to app-scripts. ([#1735](https://github.com/driftyco/ionic-cli/issues/1735)) ([68eb3e5](https://github.com/driftyco/ionic-cli/commit/68eb3e5))
+* **start:** getting started url ([#1738](https://github.com/driftyco/ionic-cli/issues/1738)) ([f834cca](https://github.com/driftyco/ionic-cli/commit/f834cca))
+
+
+
 <a name="2.1.13"></a>
 ## [2.1.13](https://github.com/driftyco/ionic-cli/compare/v2.1.12...v2.1.13) (2016-11-23)
 
diff --git a/package.json b/package.json
index ea77a28bfb..845e76fb6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

From ae718c0d1db262b75c7c58f2cfad2f14bf17793d Mon Sep 17 00:00:00 2001
From: robustwangace <robustwangace@gmail.com>
Date: Wed, 7 Dec 2016 23:49:07 +0800
Subject: [PATCH 1100/1100] Add feature to disable cordova mock by command line

---
 lib/ionic/serve.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ionic/serve.js b/lib/ionic/serve.js
index 2c5412de33..ac4ef23bcf 100644
--- a/lib/ionic/serve.js
+++ b/lib/ionic/serve.js
@@ -54,6 +54,10 @@ var settings =  {
       title: 'Disable running gulp during serve',
       boolean: true
     },
+    '--nocordovamock|-m': {
+      title: 'Disable cordova mock',
+      boolean: true
+    },
     '--platform|-t': 'Start serve with a specific platform (ios/android)'
   },
   isProjectTask: true
@@ -62,7 +66,7 @@ var settings =  {
 function run(ionic, argv, rawCliArguments) {
 
   /**
-   * Before running the internal server check to see if npmscripts has 
+   * Before running the internal server check to see if npmscripts has
    * a ionic specific serve command.  If so then run it instead.
    */
   return npmScripts.hasIonicScript('serve')